You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by da...@apache.org on 2018/03/26 20:55:53 UTC

[couchdb] 22/33: WIP - fabric API

This is an automated email from the ASF dual-hosted git repository.

davisp pushed a commit to branch COUCHDB-3326-clustered-purge-davisp-refactor
in repository https://gitbox.apache.org/repos/asf/couchdb.git

commit 46be71e4d4c2b3f3bacce8e9ff01a1a78d64968d
Author: Paul J. Davis <pa...@gmail.com>
AuthorDate: Mon Mar 26 13:08:47 2018 -0500

    WIP - fabric API
---
 src/fabric/src/fabric.erl           |  2 +-
 src/fabric/src/fabric_doc_purge.erl | 37 +++++++++++++++++--------------------
 2 files changed, 18 insertions(+), 21 deletions(-)

diff --git a/src/fabric/src/fabric.erl b/src/fabric/src/fabric.erl
index 7532d9d..1900f79 100644
--- a/src/fabric/src/fabric.erl
+++ b/src/fabric/src/fabric.erl
@@ -284,7 +284,7 @@ update_docs(DbName, Docs, Options) ->
 %% @doc purge revisions for a list '{Id, Revs}'
 %%      returns {ok, {PurgeSeq, Results}}
 -spec purge_docs(dbname(), [{docid(), [revision()]}], [option()]) ->
-    {ok, [{Health, [revision()]}] | {error, any()}}} when
+    {ok, [{Health, [revision()]}] | {error, any()}} when
     Health :: ok | accepted.
 purge_docs(DbName, IdsRevs, Options) when is_list(IdsRevs) ->
     IdsRevs2 = [idrevs(IdRs) || IdRs <- IdsRevs],
diff --git a/src/fabric/src/fabric_doc_purge.erl b/src/fabric/src/fabric_doc_purge.erl
index c11f533..b51f28e 100644
--- a/src/fabric/src/fabric_doc_purge.erl
+++ b/src/fabric/src/fabric_doc_purge.erl
@@ -38,20 +38,19 @@ go(DbName, IdsRevs, Options) ->
 
     % Fire off rexi workers for each shard.
     {Workers, WorkerUUIDs} = dict:fold(fun(Shard, ShardReqs, {Ws, WUUIDs}) ->
-        UUIDs = [UUID || {UUID, _Id, _Revs} <- ShardReqs],
-        #shard{name = Name, node = Node} = Shard,
-        Args = [ShardDbName, Reqs, Options]
+        #shard{name = ShardDbName, node = Node} = Shard,
+        Args = [ShardDbName, ShardReqs, Options],
         Ref = rexi:cast(Node, {fabric_rpc, purge_docs, Args}),
         Worker = Shard#shard{ref=Ref},
-        {[Worker | Ws], [{Worker, UUIDs} | WUUIDs]}
+        ShardUUIDs = [UUID || {UUID, _Id, _Revs} <- ShardReqs],
+        {[Worker | Ws], [{Worker, ShardUUIDs} | WUUIDs]}
     end, {[], []}, group_reqs_by_shard(DbName, Reqs)),
 
     RexiMon = fabric_util:create_monitors(Workers),
     Timeout = fabric_util:request_timeout(),
     Acc0 = #acc{
-        workers = Workers,
+        worker_uuids = WorkerUUIDs,
         req_count = Count,
-        ref_uuids = RefUUIDs,
         resps = dict:from_list([{UUID, []} || UUID <- UUIDs]),
         w = w(DbName, Options)
     },
@@ -63,11 +62,11 @@ go(DbName, IdsRevs, Options) ->
             #acc{
                 worker_uuids = WorkerUUIDs,
                 resps = Resps
-            } = Acc1
-            DefunctWorkers = [Worker || {Worker, _} <- WorkerUUIDs]
+            } = Acc1,
+            DefunctWorkers = [Worker || {Worker, _} <- WorkerUUIDs],
             fabric_util:log_timeout(DefunctWorkers, "purge_docs"),
             NewResps = append_errors(timeout, WorkerUUIDs, Resps),
-            Acc1#acc{worker_uuids = [], resps = NewResps}
+            Acc1#acc{worker_uuids = [], resps = NewResps};
         Else ->
             Else
     after
@@ -83,7 +82,7 @@ handle_message({rexi_DOWN, _, {_, Node}, _}, _Worker, Acc) ->
         resps = Resps
     } = Acc,
     Pred = fun({#shard{node = N}, _}) -> N == Node end,
-    {Failed, Rest} = lists:partition(Pred, WorkerUUIDs)
+    {Failed, Rest} = lists:partition(Pred, WorkerUUIDs),
     NewResps = append_errors(internal_server_error, Failed, Resps),
     maybe_stop(Acc#acc{worker_uuids = Rest, resps = NewResps});
 
@@ -94,7 +93,7 @@ handle_message({rexi_EXIT, _}, Worker, Acc) ->
     } = Acc,
     {value, WorkerPair, Rest} = lists:keytake(Worker, 1, WorkerUUIDs),
     NewResps = append_errors(internal_server_error, [WorkerPair], Resps),
-    maybe_stop(Acc#acc{worker_uuids = Rest, resps = NewResps})
+    maybe_stop(Acc#acc{worker_uuids = Rest, resps = NewResps});
 
 handle_message({ok, Replies}, Worker, Acc) ->
     #acc{
@@ -102,6 +101,7 @@ handle_message({ok, Replies}, Worker, Acc) ->
         resps = Resps
     } = Acc,
     {value, {_W, UUIDs}, Rest} = lists:keytake(Worker, 1, WorkerUUIDs),
+    couch_log:error("XKCD: ~p ~p :: ~p ~p", [length(UUIDs), length(Replies), UUIDs, Replies]),
     NewResps = append_resps(UUIDs, Replies, Resps),
     maybe_stop(Acc#acc{worker_uuids = Rest, resps = NewResps});
 
@@ -114,7 +114,7 @@ create_reqs([], UUIDs, Reqs, Count) ->
 
 create_reqs([{Id, Revs} | RestIdsRevs], UUIDs, Reqs, Count) ->
     UUID = couch_uuids:new(),
-    NewUUIDS = [UUID | UUIDs],
+    NewUUIDs = [UUID | UUIDs],
     NewReqs = [{UUID, Id, Revs} | Reqs],
     create_reqs(RestIdsRevs, NewUUIDs, NewReqs, Count + 1).
 
@@ -124,7 +124,7 @@ group_reqs_by_shard(DbName, Reqs) ->
         lists:foldl(fun(Shard, D1) ->
             dict:append(Shard, Req, D1)
         end, D0, mem3:shards(DbName, Id))
-    end, dict:new(), UUIDsIdsRevs).
+    end, dict:new(), Reqs).
 
 
 w(DbName, Options) ->
@@ -153,12 +153,13 @@ maybe_stop(#acc{worker_uuids = []} = Acc) ->
     {stop, Acc};
 maybe_stop(#acc{resps = Resps, w = W} = Acc) ->
     try
-        dict:fold(fun(UUID, UUIDResps, _) ->
+        dict:fold(fun(_UUID, UUIDResps, _) ->
+            couch_log:error("XKCD: ~p ~p", [UUIDResps, W]),
             case has_quorum(UUIDResps, W) of
                 true -> ok;
                 false -> throw(keep_going)
             end
-        end, nil, Resps)
+        end, nil, Resps),
         {stop, Acc}
     catch throw:keep_going ->
         {ok, Acc}
@@ -177,7 +178,7 @@ format_resps(UUIDs, #acc{} = Acc) ->
                 [Error | _] = lists:usort(Replies),
                 [{UUID, Error} | ReplyAcc];
             _ ->
-                AllRevs = lists:usort(lists:flatten(OkReplies)).
+                AllRevs = lists:usort(lists:flatten(OkReplies)),
                 Health = if length(OkReplies) >= W -> ok; true -> accepted end,
                 [{UUID, {Health, AllRevs}} | ReplyAcc]
         end
@@ -197,10 +198,6 @@ has_quorum([{ok, _} | Rest], W) when W > 0 ->
     has_quorum(Rest, W - 1).
 
 
-update_health(ok, Health) -> Health;
-update_health(accepted, _) -> accepted.
-
-
 %% % eunits
 %% doc_purge_ok_test() ->
 %%     meck:new(couch_log),

-- 
To stop receiving notification emails like this one, please contact
davisp@apache.org.