diff options
| author | Martin Schwenke <martin@meltin.net> | 2009-07-29 10:08:56 +1000 |
|---|---|---|
| committer | Martin Schwenke <martin@meltin.net> | 2009-07-29 10:08:56 +1000 |
| commit | e50a067cb5e9525828c8b678c6058adc0ef30796 (patch) | |
| tree | 21e6dafc702539cb40b1894c04c82b26524bdf44 /ctdb | |
| parent | 50650fbbd1787896ca71f6e730238fba7d521cd8 (diff) | |
| parent | 62c4a841d2cda9e96f70e00ed1c84908f69c3675 (diff) | |
| download | samba-e50a067cb5e9525828c8b678c6058adc0ef30796.tar.gz samba-e50a067cb5e9525828c8b678c6058adc0ef30796.tar.xz samba-e50a067cb5e9525828c8b678c6058adc0ef30796.zip | |
Merge commit 'origin/master'
(This used to be ctdb commit d7ff60a74595dcb4ae41f5a8193de5b898d61227)
Diffstat (limited to 'ctdb')
| -rw-r--r-- | ctdb/client/ctdb_client.c | 5 | ||||
| -rw-r--r-- | ctdb/tools/ctdb.c | 3 |
2 files changed, 4 insertions, 4 deletions
diff --git a/ctdb/client/ctdb_client.c b/ctdb/client/ctdb_client.c index 7062fa703b5..38893568848 100644 --- a/ctdb/client/ctdb_client.c +++ b/ctdb/client/ctdb_client.c @@ -3714,10 +3714,11 @@ int ctdb_ctrl_setreclock(struct ctdb_context *ctdb, struct timeval timeout, uint int ctdb_ctrl_stop_node(struct ctdb_context *ctdb, struct timeval timeout, uint32_t destnode) { int ret; + int32_t res; ret = ctdb_control(ctdb, destnode, 0, CTDB_CONTROL_STOP_NODE, 0, tdb_null, - ctdb, NULL, NULL, &timeout, NULL); - if (ret != 0) { + ctdb, NULL, &res, &timeout, NULL); + if (ret != 0 || res != 0) { DEBUG(DEBUG_ERR,("Failed to stop node\n")); return -1; } diff --git a/ctdb/tools/ctdb.c b/ctdb/tools/ctdb.c index 4c74da7976f..d576fd41cfe 100644 --- a/ctdb/tools/ctdb.c +++ b/ctdb/tools/ctdb.c @@ -1679,8 +1679,7 @@ static int control_stop(struct ctdb_context *ctdb, int argc, const char **argv) do { ret = ctdb_ctrl_stop_node(ctdb, TIMELIMIT(), options.pnn); if (ret != 0) { - DEBUG(DEBUG_ERR, ("Unable to stop node %u\n", options.pnn)); - return ret; + DEBUG(DEBUG_ERR, ("Unable to stop node %u try again\n", options.pnn)); } sleep(1); |