git.samba.org
/
ctdb.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
54731e4
)
recoverd: main_loop() should not verify local IPs if node is stopped
author
Martin Schwenke
<martin@meltin.net>
Tue, 3 Jul 2012 00:30:29 +0000
(10:30 +1000)
committer
Michael Adam
<obnox@samba.org>
Mon, 26 Aug 2013 11:35:53 +0000
(13:35 +0200)
Doing these checks is pointless and potentially causes unnecessary log
messages.
Signed-off-by: Martin Schwenke <martin@meltin.net>
(cherry picked from commit
a0c30c820fd47d4f8620dc060c825be10754f5d1
)
(cherry picked from commit
d181a5dadffacc5bfe04dcab6595b03499e613ad
)
server/ctdb_recoverd.c
patch
|
blob
|
history
diff --git
a/server/ctdb_recoverd.c
b/server/ctdb_recoverd.c
index ae6bbd006153834ec9a1875a68e44b062c51fac8..3e9d41374a88645c500478ef72536d85eacbcc8d 100644
(file)
--- a/
server/ctdb_recoverd.c
+++ b/
server/ctdb_recoverd.c
@@
-3085,6
+3085,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.