summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Newson <robert.newson@cloudant.com>2013-11-26 14:25:42 +0000
committerRobert Newson <robert.newson@cloudant.com>2013-11-26 14:25:42 +0000
commit9c54c916ffe06c8a74cd415da327ba2f96932a96 (patch)
tree552d388a8e71267c184dfaf90ffc04bdfcb23af5
parent98018c0388955280115cbb3ddacb2176ed594543 (diff)
downloadcouchdb-9c54c916ffe06c8a74cd415da327ba2f96932a96.tar.gz
Fix conflict alerts, summary should report just the number of conflicted dbs
-rw-r--r--src/custodian/src/custodian_util.erl6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/custodian/src/custodian_util.erl b/src/custodian/src/custodian_util.erl
index 5de1753cf..90f2cc2e3 100644
--- a/src/custodian/src/custodian_util.erl
+++ b/src/custodian/src/custodian_util.erl
@@ -17,8 +17,10 @@ summary() ->
Dict0 = dict:from_list([{conflicted, 0}] ++
[{{live, N}, 0} || N <- lists:seq(0, cluster_n() - 1)] ++
[{{safe, N}, 0} || N <- lists:seq(0, cluster_n() - 1)]),
- Fun = fun(_Id, _Range, Item, Dict) ->
- dict:update_counter(Item, 1, Dict)
+ Fun = fun(_Id, _Range, {conflicted, _N}, Dict) ->
+ dict:update_counter(conflicted, 1, Dict);
+ (_Id, _Range, Item, Dict) ->
+ dict:update_counter(Item, 1, Dict)
end,
dict:to_list(fold_dbs(Dict0, Fun)).