recoverd: Banned nodes should not be told to run "ipreallocated" event

They will reject it because they are in recovery.  This can result in
extra banning credits being applied to banned nodes.

This corresponds to commit 9132e6814ed927fa317f333f03dedb18f75d0e5b
from the 1.2.40 branch.

Signed-off-by: Martin Schwenke <martin@meltin.net>
(This used to be ctdb commit 403938804caf1322f9773d63197e4303a7b2a788)

diff --git a/ctdb/server/ctdb_takeover.c b/ctdb/server/ctdb_takeover.c
index 130df8a3484f775c7ddffc80be498449a1dc7501..c3513ad0a6352492db34c46bb504026a054d484b 100644 (file)
--- a/ctdb/server/ctdb_takeover.c
+++ b/ctdb/server/ctdb_takeover.c
@@ -2612,10 +2612,10 @@ static void iprealloc_fail_callback(struct ctdb_context *ctdb, uint32_t pnn,
                        return;
                }
 
-               /* Can't run the "ipreallocated" event on a STOPPED node */
-               if (cd->nodemap->nodes[pnn].flags & NODE_FLAGS_STOPPED) {
+               /* Can't run the "ipreallocated" event on a INACTIVE node */
+               if (cd->nodemap->nodes[pnn].flags & NODE_FLAGS_INACTIVE) {
                        DEBUG(DEBUG_ERR,
-                             ("ipreallocated failure from node %d, but node is stopped - not flagging a retry\n",
+                             ("ipreallocated failure from node %d, but node is inactive - not flagging a retry\n",
                               pnn));
                        return;
                }