From 157be530dd9223ee6623d59ffa86ad03b7404cd1 Mon Sep 17 00:00:00 2001 From: Ronnie Sahlberg Date: Tue, 4 Sep 2007 10:38:48 +1000 Subject: [PATCH] change ctdb_ctrl_getvnn to ctdb_ctrl_getpnn (This used to be ctdb commit ef47cc4cd416065c69382e4d9e76c30a0a34e42f) --- ctdb/client/ctdb_client.c | 8 ++++---- ctdb/common/cmdline.c | 2 +- ctdb/include/ctdb.h | 2 +- ctdb/include/ctdb_private.h | 2 +- ctdb/server/ctdb_control.c | 2 +- ctdb/server/ctdb_recoverd.c | 2 +- ctdb/tools/ctdb.c | 8 ++++---- 7 files changed, 13 insertions(+), 13 deletions(-) diff --git a/ctdb/client/ctdb_client.c b/ctdb/client/ctdb_client.c index a49e64d484d..a7f097ed2d2 100644 --- a/ctdb/client/ctdb_client.c +++ b/ctdb/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/ctdb/common/cmdline.c b/ctdb/common/cmdline.c index 8999c2a1f73..a8010711fb2 100644 --- a/ctdb/common/cmdline.c +++ b/ctdb/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/ctdb/include/ctdb.h b/ctdb/include/ctdb.h index 34c8d0877c5..8fcf3a9b501 100644 --- a/ctdb/include/ctdb.h +++ b/ctdb/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/ctdb/include/ctdb_private.h b/ctdb/include/ctdb_private.h index 9aae446891d..ec9267edbfc 100644 --- a/ctdb/include/ctdb_private.h +++ b/ctdb/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/ctdb/server/ctdb_control.c b/ctdb/server/ctdb_control.c index ca0ea9a937f..2c146c4795b 100644 --- a/ctdb/server/ctdb_control.c +++ b/ctdb/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/ctdb/server/ctdb_recoverd.c b/ctdb/server/ctdb_recoverd.c index f359fe3329e..0210c8c9c0a 100644 --- a/ctdb/server/ctdb_recoverd.c +++ b/ctdb/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/ctdb/tools/ctdb.c b/ctdb/tools/ctdb.c index c8651fb081b..3815a5a78de 100644 --- a/ctdb/tools/ctdb.c +++ b/ctdb/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; }