couchdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rnew...@apache.org
Subject [01/48] mem3 commit: updated refs/heads/windsor-merge to ff02b9a
Date Fri, 01 Aug 2014 09:10:47 GMT
Repository: couchdb-mem3
Updated Branches:
  refs/heads/windsor-merge [created] ff02b9a1f


Update to use new multi rexi_server protocol


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

Branch: refs/heads/windsor-merge
Commit: 7fa726f696fde998a075bf56818941bf65e2bedf
Parents: 9dbea03
Author: Paul J. Davis <paul.joseph.davis@gmail.com>
Authored: Mon Mar 18 22:57:46 2013 -0500
Committer: Robert Newson <rnewson@apache.org>
Committed: Wed Jul 23 18:11:38 2014 +0100

----------------------------------------------------------------------
 src/mem3_rep.erl        | 2 +-
 src/mem3_sync_event.erl | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/couchdb-mem3/blob/7fa726f6/src/mem3_rep.erl
----------------------------------------------------------------------
diff --git a/src/mem3_rep.erl b/src/mem3_rep.erl
index a4aadb5..1a528e7 100644
--- a/src/mem3_rep.erl
+++ b/src/mem3_rep.erl
@@ -184,7 +184,7 @@ update_locals(Acc) ->
     rexi_call(Node, {fabric_rpc, update_docs, [Name, [Doc], Options]}).
 
 rexi_call(Node, MFA) ->
-    Mon = rexi_monitor:start([{rexi_server, Node}]),
+    Mon = rexi_monitor:start([rexi_utils:server_pid(Node)]),
     Ref = rexi:cast(Node, self(), MFA, [sync]),
     try
         receive {Ref, {ok, Reply}} ->

http://git-wip-us.apache.org/repos/asf/couchdb-mem3/blob/7fa726f6/src/mem3_sync_event.erl
----------------------------------------------------------------------
diff --git a/src/mem3_sync_event.erl b/src/mem3_sync_event.erl
index 7a20b0b..2cc86d9 100644
--- a/src/mem3_sync_event.erl
+++ b/src/mem3_sync_event.erl
@@ -36,7 +36,7 @@ handle_call(_Request, State) ->
     {ok, ok, State}.
 
 handle_info({nodeup, Node}, State) ->
-    Nodes0 = lists:usort(drain_nodeups([Node])),
+    Nodes0 = lists:usort([node() | drain_nodeups([Node])]),
     Nodes = lists:filter(fun(N) -> lists:member(N, mem3:nodes()) end, Nodes0),
     wait_for_rexi(Nodes, 5),
     {ok, State};
@@ -67,9 +67,9 @@ wait_for_rexi([], _Retries) ->
 wait_for_rexi(Waiting, Retries) ->
     % Hack around rpc:multicall/4 so that we can
     % be sure which nodes gave which response
-    Msg = {call, erlang, whereis, [rexi_server], group_leader()},
+    Msg = {call, rexi_server_mon, status, [], group_leader()},
     {Resp, _Bad} = gen_server:multi_call(Waiting, rex, Msg, 1000),
-    Up = [N || {N, P} <- Resp, is_pid(P)],
+    Up = [N || {N, R} <- Resp, R == ok],
     NotUp = Waiting -- Up,
     case length(Up) > 0 of
         true ->


Mime
View raw message