sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-02-28 01:58:17 +03:00
Code

change ctdb_ctrl_getvnn to ctdb_ctrl_getpnn

Browse Source 
(This used to be ctdb commit ef47cc4cd416065c69382e4d9e76c30a0a34e42f)
This commit is contained in:
Ronnie Sahlberg 2007-09-04 10:38:48 +10:00
parent 211b497818
commit 157be530dd
7 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ctdb/client/ctdb_client.c
View File

@ -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;
}

2
ctdb/common/cmdline.c
View File

@ -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);

2
ctdb/include/ctdb.h
View File

@ -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,

2
ctdb/include/ctdb_private.h
View File

@ -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,

2
ctdb/server/ctdb_control.c
View File

@ -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:

2
ctdb/server/ctdb_recoverd.c
View File

@ -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;

8
ctdb/tools/ctdb.c
View File

@ -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;
}