diff options
author | Geir Storli <geirstorli@yahoo.no> | 2017-11-09 11:44:30 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-11-09 11:44:30 +0100 |
commit | b8a4409e3f8693bf9445d23ac240a9d105371692 (patch) | |
tree | 6ed4a86f4630af66bbf17aafce1cc3091e119d91 | |
parent | 2da7da8141e6395d7ed73a8694c97cbc56842c7b (diff) | |
parent | 4f8d4adde6910171b45e785b98fcfc8be568bd18 (diff) |
Merge pull request #4055 from vespa-engine/toregge/continue-checking-distributor-nodes
Check all distributor nodes that go down instead of only the first one.
-rw-r--r-- | storage/src/vespa/storage/distributor/pendingclusterstate.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/storage/src/vespa/storage/distributor/pendingclusterstate.cpp b/storage/src/vespa/storage/distributor/pendingclusterstate.cpp index 41c8974470f..1186cc23c5f 100644 --- a/storage/src/vespa/storage/distributor/pendingclusterstate.cpp +++ b/storage/src/vespa/storage/distributor/pendingclusterstate.cpp @@ -252,8 +252,10 @@ PendingClusterState::distributorChanged( const lib::State& nw(newState.getNodeState(node).getState()); if (nodeWasUpButNowIsDown(old, nw)) { - return (nodeInSameGroupAsSelf(i) - || nodeNeedsOwnershipTransferFromGroupDown(i, newState)); + if (nodeInSameGroupAsSelf(i) || + nodeNeedsOwnershipTransferFromGroupDown(i, newState)) { + return true; + } } } |