[44/48] mem3 commit: updated refs/heads/windsor-merge to ff02b9a

[rn...@apache.org]

Avoid decom:true nodes when fixing zoning

This patch prevents mem3_rebalance:fix_zoning from suggesting moves
onto nodes that are flagged with "decom":true.

BugzID: 26362


Project: http://git-wip-us.apache.org/repos/asf/couchdb-mem3/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-mem3/commit/fd3c7b59
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-mem3/tree/fd3c7b59
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-mem3/diff/fd3c7b59

Branch: refs/heads/windsor-merge
Commit: fd3c7b59f2f79519b8a1f04b6931adde47aaa659
Parents: e64dd02
Author: Mike Wallace <mi...@googlemail.com>
Authored: Fri Dec 20 14:15:43 2013 +0000
Committer: Robert Newson <rn...@apache.org>
Committed: Wed Jul 23 18:51:29 2014 +0100

----------------------------------------------------------------------
 src/mem3_rebalance.erl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/couchdb-mem3/blob/fd3c7b59/src/mem3_rebalance.erl
----------------------------------------------------------------------
diff --git a/src/mem3_rebalance.erl b/src/mem3_rebalance.erl
index 54dcd1c..3972d89 100644
--- a/src/mem3_rebalance.erl
+++ b/src/mem3_rebalance.erl
@@ -400,7 +400,7 @@ apply_shard_moves(Shards, [{copy, Shard, Node}| Rest]) ->
 allowed_nodes(Fun) ->
     lists:filter(fun(Node) ->
         Fun(mem3:node_info(Node, <<"zone">>))
-    end, mem3:nodes()).
+    end, surviving_nodes()).
 
 surviving_nodes() ->
     lists:filter(fun(Node) ->