recoverd: main_loop() should not verify local IPs if node is stopped
authorMartin Schwenke <martin@meltin.net>
Tue, 3 Jul 2012 00:30:29 +0000 (10:30 +1000)
committerMartin Schwenke <martin@meltin.net>
Wed, 8 Aug 2012 06:11:11 +0000 (16:11 +1000)
Doing these checks is pointless and potentially causes unnecessary log
messages.

Signed-off-by: Martin Schwenke <martin@meltin.net>
server/ctdb_recoverd.c

index 66fb0b10acccc9602a99b42e74b219af326e5523..9608774dbd4b855c1b8c899ee4837673b80bebcf 100644 (file)
@@ -3403,6 +3403,14 @@ static void main_loop(struct ctdb_context *ctdb, struct ctdb_recoverd *rec,
                return;
        }
 
+       /* If this node is stopped then it is not the recovery master
+        * so the only remaining action is to potentially to verify
+        * the local IP allocation below.  This won't accomplish
+        * anything useful so skip it.
+        */
+       if (rec->node_flags & NODE_FLAGS_STOPPED) {
+               return;
+       }
 
        /* verify that we have all ip addresses we should have and we dont
         * have addresses we shouldnt have.