sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-12 09:18:10 +03:00
Code

Merge commit 'origin/master'

Browse Source 
(This used to be ctdb commit d7ff60a74595dcb4ae41f5a8193de5b898d61227)
This commit is contained in:
Martin Schwenke 2009-07-29 10:08:56 +10:00
commit e50a067cb5
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ctdb/client/ctdb_client.c
View File

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

3
ctdb/tools/ctdb.c
View File

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