diff options
| author | Ronnie Sahlberg <ronniesahlberg@gmail.com> | 2009-06-10 10:28:47 +1000 |
|---|---|---|
| committer | Ronnie Sahlberg <ronniesahlberg@gmail.com> | 2009-06-10 10:35:20 +1000 |
| commit | d1c40424f6fd754cc2941b0b42903083af71e087 (patch) | |
| tree | 74fde20318653118e865b07bf7d0953415dcca43 /ctdb/server/ctdb_monitor.c | |
| parent | 2bb687c4cdfc2e88b851957ffc873a70f1b06354 (diff) | |
| download | samba-d1c40424f6fd754cc2941b0b42903083af71e087.tar.gz samba-d1c40424f6fd754cc2941b0b42903083af71e087.tar.xz samba-d1c40424f6fd754cc2941b0b42903083af71e087.zip | |
When we ban a node, only drop the IPs on the node being banned, not on every node
(This used to be ctdb commit 46e8c3737e6ff54fc80de8e962e922924c27bc35)
Diffstat (limited to 'ctdb/server/ctdb_monitor.c')
| -rw-r--r-- | ctdb/server/ctdb_monitor.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ctdb/server/ctdb_monitor.c b/ctdb/server/ctdb_monitor.c index 46d9c632293..14da3b77e4b 100644 --- a/ctdb/server/ctdb_monitor.c +++ b/ctdb/server/ctdb_monitor.c @@ -309,7 +309,7 @@ int32_t ctdb_control_modflags(struct ctdb_context *ctdb, TDB_DATA indata) CTDB_SRVID_SET_NODE_FLAGS, indata); /* if we have become banned, we should go into recovery mode */ - if ((node->flags & NODE_FLAGS_BANNED) && !(c->old_flags & NODE_FLAGS_BANNED)) { + if ((node->flags & NODE_FLAGS_BANNED) && !(c->old_flags & NODE_FLAGS_BANNED) && (node->pnn == ctdb->pnn)) { /* make sure we are frozen */ DEBUG(DEBUG_NOTICE,("This node has been banned - forcing freeze and recovery\n")); /* Reset the generation id to 1 to make us ignore any |