specify which node to perform recovery to when using the recovery

control

(This used to be ctdb commit c67f8a1783ce6f5af9940d2e22847ddcd939763d)

diff --git a/ctdb/tools/ctdb_control.c b/ctdb/tools/ctdb_control.c
index 29b9984ce5fcad761c51a62a4588a6ea51aaab05..117a6ad23d50412fe964aae2eb69a76bc52e724e 100644 (file)
--- a/ctdb/tools/ctdb_control.c
+++ b/ctdb/tools/ctdb_control.c
@@ -49,7 +49,7 @@ static void usage(void)
        printf("  cleardb <vnn> <dbid>               deletes all records in a db\n");
        printf("  getrecmode <vnn>                   get recovery mode\n");
        printf("  setrecmode <vnn> <mode>            set recovery mode\n");
-       printf("  recover                            recover the cluster\n");
+       printf("  recover <vnn>                      recover the cluster\n");
        exit(1);
 }
 
@@ -240,9 +240,14 @@ static int control_recover(struct ctdb_context *ctdb, int argc, const char **arg
        int i, j, ret;
        struct ctdb_dbid_map dbmap;
 
-       vnn = ctdb_get_vnn(ctdb);
-       printf("recover\n");
-       printf("this vnn:%d\n",vnn);
+       if (argc < 1) {
+               usage();
+       }
+
+
+       vnn = strtoul(argv[0], NULL, 0);
+
+       printf("recover ctdb from node %d\n", vnn);
 
        /* 1: find a list of all nodes */
        printf("\n1: fetching list of nodes\n");