ovs-appctl: Add "version" command to print version of running daemons.

When debugging a running system, we occasionally see a mismatch of
different versions because someone forgets to restart one or more
daemons.  Often times, it would be useful to know what's running as
opposed to what's on the current runpath.

diff --git a/ChangeLog b/ChangeLog
index bc8714792c346444184c6eef840d04a71c7e7fc4..6dab0b37a2dc38bd4b54d1682bf323986e1b2f5a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,7 @@
 Post-v1.2.0
 ------------------------
-
+    - ovs-appctl:
+      - New "version" command to determine version of running daemon
 
 v1.2.0 - 03 Aug 2011
 ------------------------

diff --git a/lib/unixctl.c b/lib/unixctl.c
index c333c54e9eb5b8ce4971960e9e6e31ac57437cf9..ca90b396aa8abf26d50843a015a56849c51ec60f 100644 (file)
--- a/lib/unixctl.c
+++ b/lib/unixctl.c
@@ -107,6 +107,13 @@ unixctl_help(struct unixctl_conn *conn, const char *args OVS_UNUSED,
     ds_destroy(&ds);
 }
 
+static void
+unixctl_version(struct unixctl_conn *conn, const char *args OVS_UNUSED,
+                void *aux OVS_UNUSED)
+{
+    unixctl_command_reply(conn, 200, get_program_version());
+}
+
 void
 unixctl_command_register(const char *name, unixctl_cb_func *cb, void *aux)
 {
@@ -206,6 +213,7 @@ unixctl_server_create(const char *path, struct unixctl_server **serverp)
     }
 
     unixctl_command_register("help", unixctl_help, NULL);
+    unixctl_command_register("version", unixctl_version, NULL);
 
     server = xmalloc(sizeof *server);
     list_init(&server->conns);

diff --git a/utilities/ovs-appctl.c b/utilities/ovs-appctl.c
index 699ff7bd14846d801fde82d9f5012d498319714b..d3c701b480206d283546724c31b3383b5b1b39e2 100644 (file)
--- a/utilities/ovs-appctl.c
+++ b/utilities/ovs-appctl.c
@@ -88,6 +88,7 @@ Targets:\n\
   -t, --target=TARGET  pidfile or socket to contact\n\
 Common commands:\n\
   help               List commands supported by the target\n\
+  version            Print version of the target\n\
   vlog/list          List current logging levels\n\
   vlog/set MODULE[:FACILITY[:LEVEL]]\n\
       Set MODULE and FACILITY log level to LEVEL\n\
@@ -97,7 +98,7 @@ Common commands:\n\
   vlog/reopen        Make the program reopen its log file\n\
 Other options:\n\
   -h, --help         Print this helpful information\n\
-  -V, --version      Display version information\n",
+  -V, --version      Display ovs-appctl version information\n",
            program_name, program_name);
     exit(EXIT_SUCCESS);
 }