MINOR: map/acl: add the possibility to specify the version in "show map/acl"
The maps and ACLs internally all have two versions, the "current" one,
which is the one being matched against, and the "next" one, the one being
filled during an atomic replacement. Till now the "show" commands only used
to show the current one but it can be convenient to be able to show other
ones as well, so let's add the ability to do this with "show map" and
"show acl". The method used here consists in passing the version number
as "@<ver>" before the map/acl name or ID. It would have been better after
it but that could create confusion with keys already using such a format.
diff --git a/doc/management.txt b/doc/management.txt
index c6fc403..c15e71a 100644
--- a/doc/management.txt
+++ b/doc/management.txt
@@ -2028,13 +2028,17 @@
"admin". Both the backend and the server may be specified either by their
name or by their numeric ID, prefixed with a sharp ('#').
-show acl [<acl>]
+show acl [[@<ver>] <acl>]
Dump info about acl converters. Without argument, the list of all available
- acls is returned. If a <acl> is specified, its contents are dumped. <acl> if
- the #<id> or <file>. The dump format is the same than the map even for the
- sample value. The data returned are not a list of available ACL, but are the
- list of all patterns composing any ACL. Many of these patterns can be shared
- with maps.
+ acls is returned. If a <acl> is specified, its contents are dumped. <acl> is
+ the #<id> or <file>. By default the current version of the ACL is shown (the
+ version currently being matched against and reported as 'curr_ver' in the ACL
+ list). It is possible to instead dump other versions by prepending '@<ver>'
+ before the ACL's identifier. The version works as a filter and non-existing
+ versions will simply report no result. The dump format is the same as for the
+ maps even for the sample values. The data returned are not a list of
+ available ACL, but are the list of all patterns composing any ACL. Many of
+ these patterns can be shared with maps.
show backend
Dump the list of backends available in the running process
@@ -2326,11 +2330,17 @@
$ echo "show info json" | socat /var/run/haproxy.sock stdio | \
python -m json.tool
-show map [<map>]
+show map [[@<ver>] <map>]
Dump info about map converters. Without argument, the list of all available
maps is returned. If a <map> is specified, its contents are dumped. <map> is
- the #<id> or <file>. The first column is a unique identifier. It can be used
- as reference for the operation "del map" and "set map". The second column is
+ the #<id> or <file>. By default the current version of the map is shown (the
+ version currently being matched against and reported as 'curr_ver' in the map
+ list). It is possible to instead dump other versions by prepending '@<ver>'
+ before the map's identifier. The version works as a filter and non-existing
+ versions will simply report no result.
+
+ In the output, the first column is a unique entry identifier, which is usable
+ as a reference for operations "del map" and "set map". The second column is
the pattern and the third column is the sample if available. The data returned
are not directly a list of available maps, but are the list of all patterns
composing any map. Many of these patterns can be shared with ACL.