diff options
| author | Martin Schwenke <martin@meltin.net> | 2019-08-19 21:48:04 +1000 |
|---|---|---|
| committer | Amitay Isaacs <amitay@samba.org> | 2019-08-20 08:32:27 +0000 |
| commit | e9f2e205ee89f4f3d6302cc11b4d0eb2efaf0f53 (patch) | |
| tree | ebef79e7da9bd16ddd3d7f5ccd4bc1b50ea237a5 | |
| parent | 91ac4c13d8472955d1f04bd775ec4b3ff8bf1b61 (diff) | |
| download | samba-e9f2e205ee89f4f3d6302cc11b4d0eb2efaf0f53.tar.gz | |
ctdb-daemon: Make node inactive in the NODE_STOP control
Currently some of this is supported by a periodic check in the
recovery daemon's main_loop(), which notices the flag change, sets
recovery mode active and freezes databases. If STOP_NODE returns
immediately then the associated recovery can complete and the node can
be continued before databases are actually frozen.
Instead, immediately do all of the things that make a node inactive.
BUG: https://bugzilla.samba.org/show_bug.cgi?id=14087
RN: Stop "ctdb stop" from completing before freezing databases
Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>
Autobuild-User(master): Amitay Isaacs <amitay@samba.org>
Autobuild-Date(master): Tue Aug 20 08:32:27 UTC 2019 on sn-devel-184
| -rw-r--r-- | ctdb/server/ctdb_recover.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/ctdb/server/ctdb_recover.c b/ctdb/server/ctdb_recover.c index df60a4cb9c0..1654c6d3978 100644 --- a/ctdb/server/ctdb_recover.c +++ b/ctdb/server/ctdb_recover.c @@ -1469,6 +1469,8 @@ int32_t ctdb_control_stop_node(struct ctdb_context *ctdb) DEBUG(DEBUG_ERR, ("Stopping node\n")); ctdb->nodes[ctdb->pnn]->flags |= NODE_FLAGS_STOPPED; + ctdb_node_become_inactive(ctdb); + return 0; } |