change ctdb_ctrl_getvnn to ctdb_ctrl_getpnn

diff --git a/client/ctdb_client.c b/client/ctdb_client.c
index a49e64d484dac8d92cd1833781109b4f6c616c7d..a7f097ed2d2eb07380ddccf249ba8ab93f0ddf62 100644 (file)
--- a/client/ctdb_client.c
+++ b/client/ctdb_client.c
@@ -1869,18 +1869,18 @@ int ctdb_ctrl_thaw(struct ctdb_context *ctdb, struct timeval timeout, uint32_t d
 }
 
 /*
-  get vnn of a node, or -1
+  get pnn of a node, or -1
  */
-int ctdb_ctrl_getvnn(struct ctdb_context *ctdb, struct timeval timeout, uint32_t destnode)
+int ctdb_ctrl_getpnn(struct ctdb_context *ctdb, struct timeval timeout, uint32_t destnode)
 {
        int ret;
        int32_t res;
 
        ret = ctdb_control(ctdb, destnode, 0, 
-                          CTDB_CONTROL_GET_VNN, 0, tdb_null, 
+                          CTDB_CONTROL_GET_PNN, 0, tdb_null, 
                           NULL, NULL, &res, &timeout, NULL);
        if (ret != 0) {
-               DEBUG(0,(__location__ " ctdb_control for getvnn failed\n"));
+               DEBUG(0,(__location__ " ctdb_control for getpnn failed\n"));
                return -1;
        }
 

diff --git a/common/cmdline.c b/common/cmdline.c
index 8999c2a1f73961007ae0738f2ffee607d6c3d2c0..a8010711fb2bf7ac271ff781005df5d85c47d767 100644 (file)
--- a/common/cmdline.c
+++ b/common/cmdline.c
@@ -125,7 +125,7 @@ struct ctdb_context *ctdb_cmdline_client(struct event_context *ev)
        }
 
        /* get our pnn */
-       ctdb->pnn = ctdb_ctrl_getvnn(ctdb, timeval_current_ofs(3, 0), CTDB_CURRENT_NODE);
+       ctdb->pnn = ctdb_ctrl_getpnn(ctdb, timeval_current_ofs(3, 0), CTDB_CURRENT_NODE);
        if (ctdb->pnn == (uint32_t)-1) {
                DEBUG(0,(__location__ " Failed to get ctdb pnn\n"));
                talloc_free(ctdb);

diff --git a/include/ctdb.h b/include/ctdb.h
index 34c8d0877c523ba4d5e80a7acf41a4ffee7cb238..8fcf3a9b50162027c6fa4550c5212692d56d38d2 100644 (file)
--- a/include/ctdb.h
+++ b/include/ctdb.h
@@ -391,7 +391,7 @@ int ctdb_ctrl_freeze_recv(struct ctdb_context *ctdb, TALLOC_CTX *mem_ctx,
 
 int ctdb_ctrl_thaw(struct ctdb_context *ctdb, struct timeval timeout, uint32_t destnode);
 
-int ctdb_ctrl_getvnn(struct ctdb_context *ctdb, struct timeval timeout, uint32_t destnode);
+int ctdb_ctrl_getpnn(struct ctdb_context *ctdb, struct timeval timeout, uint32_t destnode);
 
 int ctdb_ctrl_get_tunable(struct ctdb_context *ctdb, 
                          struct timeval timeout, 

diff --git a/include/ctdb_private.h b/include/ctdb_private.h
index 9aae446891d67a938cf65bd3079900d452fbdccd..ec9267edbfce9efed91cb74983452245793eea79 100644 (file)
--- a/include/ctdb_private.h
+++ b/include/ctdb_private.h
@@ -437,7 +437,7 @@ enum ctdb_controls {CTDB_CONTROL_PROCESS_EXISTS          = 0,
                    CTDB_CONTROL_SET_RECMASTER           = 32,
                    CTDB_CONTROL_FREEZE                  = 33,
                    CTDB_CONTROL_THAW                    = 34,
-                   CTDB_CONTROL_GET_VNN                 = 35,
+                   CTDB_CONTROL_GET_PNN                 = 35,
                    CTDB_CONTROL_SHUTDOWN                = 36,
                    CTDB_CONTROL_GET_MONMODE             = 37,
                    CTDB_CONTROL_SET_MONMODE             = 38,

diff --git a/server/ctdb_control.c b/server/ctdb_control.c
index ca0ea9a937fb74fc965fbb33126eb804baaef77f..2c146c4795bd351e39f10e1c96f6c5b26f1b488c 100644 (file)
--- a/server/ctdb_control.c
+++ b/server/ctdb_control.c
@@ -141,7 +141,7 @@ static int32_t ctdb_control_dispatch(struct ctdb_context *ctdb,
        case CTDB_CONTROL_GET_PID:
                return getpid();
 
-       case CTDB_CONTROL_GET_VNN:
+       case CTDB_CONTROL_GET_PNN:
                return ctdb->pnn;
 
        case CTDB_CONTROL_PING:

diff --git a/server/ctdb_recoverd.c b/server/ctdb_recoverd.c
index f359fe3329e9695274afe3f84f761013979229e5..0210c8c9c0a3fa71424e6b5358932f5ff3d29634 100644 (file)
--- a/server/ctdb_recoverd.c
+++ b/server/ctdb_recoverd.c
@@ -1466,7 +1466,7 @@ again:
                goto again;
        }
 
-       pnn = ctdb_ctrl_getvnn(ctdb, CONTROL_TIMEOUT(), CTDB_CURRENT_NODE);
+       pnn = ctdb_ctrl_getpnn(ctdb, CONTROL_TIMEOUT(), CTDB_CURRENT_NODE);
        if (pnn == (uint32_t)-1) {
                DEBUG(0,("Failed to get local pnn - retrying\n"));
                goto again;

diff --git a/tools/ctdb.c b/tools/ctdb.c
index c8651fb081bd427b783cd36b14609feac37b932b..3815a5a78de310a6b871f9306a7d91aa93a83a50 100644 (file)
--- a/tools/ctdb.c
+++ b/tools/ctdb.c
@@ -219,7 +219,7 @@ static int control_status(struct ctdb_context *ctdb, int argc, const char **argv
        uint32_t recmode, recmaster;
        int mypnn;
 
-       mypnn = ctdb_ctrl_getvnn(ctdb, TIMELIMIT(), options.pnn);
+       mypnn = ctdb_ctrl_getpnn(ctdb, TIMELIMIT(), options.pnn);
        if (mypnn == -1) {
                return -1;
        }
@@ -528,7 +528,7 @@ static int control_ip(struct ctdb_context *ctdb, int argc, const char **argv)
        struct ctdb_all_public_ips *ips;
        int mypnn;
 
-       mypnn = ctdb_ctrl_getvnn(ctdb, TIMELIMIT(), options.pnn);
+       mypnn = ctdb_ctrl_getpnn(ctdb, TIMELIMIT(), options.pnn);
        if (mypnn == -1) {
                return -1;
        }
@@ -569,7 +569,7 @@ static int control_publicip(struct ctdb_context *ctdb, int argc, const char **ar
        struct ctdb_all_public_ips *ips;
        int mypnn;
 
-       mypnn = ctdb_ctrl_getvnn(ctdb, TIMELIMIT(), options.pnn);
+       mypnn = ctdb_ctrl_getpnn(ctdb, TIMELIMIT(), options.pnn);
        if (mypnn == -1) {
                return -1;
        }
@@ -1177,7 +1177,7 @@ int main(int argc, const char *argv[])
 
                        if (options.pnn == CTDB_CURRENT_NODE) {
                                int pnn;
-                               pnn = ctdb_ctrl_getvnn(ctdb, TIMELIMIT(), options.pnn);         
+                               pnn = ctdb_ctrl_getpnn(ctdb, TIMELIMIT(), options.pnn);         
                                if (pnn == -1) {
                                        return -1;
                                }