The branch, 1.2.40 has been updated
via 5620a403f3ed8dd1ec8dcb449de4cf8a840893a8 (commit)
via 69f68d77adbd6383003c560a2a7d7efa15fdafda (commit)
via ea8e313613cc4c5032b4c187ea7c9431e5ff1296 (commit)
from 9aca0c4c9e50eb9b56c6d0307bc93ffedb84179a (commit)
http://gitweb.samba.org/?p=ctdb.git;a=shortlog;h=1.2.40
- Log -----------------------------------------------------------------
commit 5620a403f3ed8dd1ec8dcb449de4cf8a840893a8
Author: Martin Schwenke <mar...@meltin.net>
Date: Mon Nov 25 13:43:42 2013 +1100
New version 1.2.70
Signed-off-by: Martin Schwenke <mar...@meltin.net>
commit 69f68d77adbd6383003c560a2a7d7efa15fdafda
Author: Martin Schwenke <mar...@meltin.net>
Date: Thu Nov 14 14:25:47 2013 +1100
recoverd: Remove duplicate code to update flags during recovery
This also happens earlier in do_recovery() and the nodemap is not
updated after that, so this update is redundant.
Signed-off-by: Martin Schwenke <mar...@meltin.net>
(cherry picked from commit e58ef9a9bc080e39bebea9e93abcd696fa29ea36)
commit ea8e313613cc4c5032b4c187ea7c9431e5ff1296
Author: Amitay Isaacs <ami...@gmail.com>
Date: Fri Sep 27 18:02:39 2013 +1000
recoverd: Ignore failed flag updates on inactive nodes
Signed-off-by: Amitay Isaacs <ami...@gmail.com>
Pair-programmed-with: Martin Schwenke <mar...@meltin.net>
(cherry picked from commit 484c46eaae056480baf050fd91868f2fd0537985)
-----------------------------------------------------------------------
Summary of changes:
packaging/RPM/ctdb.spec.in | 4 +++-
server/ctdb_recoverd.c | 25 ++++++-------------------
2 files changed, 9 insertions(+), 20 deletions(-)
Changeset truncated at 500 lines:
diff --git a/packaging/RPM/ctdb.spec.in b/packaging/RPM/ctdb.spec.in
index 51e1f14..2792b59 100644
--- a/packaging/RPM/ctdb.spec.in
+++ b/packaging/RPM/ctdb.spec.in
@@ -3,7 +3,7 @@ Name: ctdb
Summary: Clustered TDB
Vendor: Samba Team
Packager: Samba Team <sa...@samba.org>
-Version: 1.2.69
+Version: 1.2.70
Release: 1GITHASH
Epoch: 0
License: GNU GPL version 3
@@ -155,6 +155,8 @@ development libraries for ctdb
%changelog
+* Mon Nov 25 2013 : Version 1.2.70
+ - Just warn when recovery fails to update flags on inactive node
* Mon Nov 04 2013 : Version 1.2.69
- Nodes should always update recovery master during an election
* Tue Sep 10 2013 : Version 1.2.68
diff --git a/server/ctdb_recoverd.c b/server/ctdb_recoverd.c
index f7cee58..c879dd5 100644
--- a/server/ctdb_recoverd.c
+++ b/server/ctdb_recoverd.c
@@ -1630,8 +1630,12 @@ static int do_recovery(struct ctdb_recoverd *rec,
ret = update_flags_on_all_nodes(ctdb, nodemap, i,
nodemap->nodes[i].flags);
if (ret != 0) {
- DEBUG(DEBUG_ERR, (__location__ " Unable to update flags
on all nodes for node %d\n", i));
- return -1;
+ if (nodemap->nodes[i].flags & NODE_FLAGS_INACTIVE) {
+ DEBUG(DEBUG_WARNING, (__location__ "Unable to
update flags on inactive node %d\n", i));
+ } else {
+ DEBUG(DEBUG_ERR, (__location__ " Unable to
update flags on all nodes for node %d\n", i));
+ return -1;
+ }
}
}
@@ -1765,23 +1769,6 @@ static int do_recovery(struct ctdb_recoverd *rec,
DEBUG(DEBUG_NOTICE, (__location__ " Recovery - updated recmaster\n"));
- /*
- update all nodes to have the same flags that we have
- */
- for (i=0;i<nodemap->num;i++) {
- if (nodemap->nodes[i].flags & NODE_FLAGS_DISCONNECTED) {
- continue;
- }
-
- ret = update_flags_on_all_nodes(ctdb, nodemap, i,
nodemap->nodes[i].flags);
- if (ret != 0) {
- DEBUG(DEBUG_ERR, (__location__ " Unable to update flags
on all nodes for node %d\n", i));
- return -1;
- }
- }
-
- DEBUG(DEBUG_NOTICE, (__location__ " Recovery - updated flags\n"));
-
/* disable recovery mode */
ret = set_recovery_mode(ctdb, rec, nodemap, CTDB_RECOVERY_NORMAL);
if (ret != 0) {
--
CTDB repository
