Updated Branches: refs/heads/import [created] 5518feafa
Use fabric_rpc2 endpoints BugzID: 13311 Project: http://git-wip-us.apache.org/repos/asf/couchdb-fabric/repo Commit: http://git-wip-us.apache.org/repos/asf/couchdb-fabric/commit/093b86ae Tree: http://git-wip-us.apache.org/repos/asf/couchdb-fabric/tree/093b86ae Diff: http://git-wip-us.apache.org/repos/asf/couchdb-fabric/diff/093b86ae Branch: refs/heads/import Commit: 093b86aed6dbe681858a49af0805f8f3c1a075bc Parents: a448312 Author: Adam Kocoloski <[email protected]> Authored: Mon Nov 19 22:16:19 2012 -0500 Committer: Adam Kocoloski <[email protected]> Committed: Mon Nov 19 22:18:26 2012 -0500 ---------------------------------------------------------------------- src/fabric_util.erl | 2 +- src/fabric_view_changes.erl | 4 ++-- src/fabric_view_reduce.erl | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/couchdb-fabric/blob/093b86ae/src/fabric_util.erl ---------------------------------------------------------------------- diff --git a/src/fabric_util.erl b/src/fabric_util.erl index 25b2e7b..3579f56 100644 --- a/src/fabric_util.erl +++ b/src/fabric_util.erl @@ -34,7 +34,7 @@ remove_down_workers(Workers, BadNode) -> end. submit_jobs(Shards, EndPoint, ExtraArgs) -> - submit_jobs(Shards, fabric_rpc, EndPoint, ExtraArgs). + submit_jobs(Shards, fabric_rpc2, EndPoint, ExtraArgs). submit_jobs(Shards, Module, EndPoint, ExtraArgs) -> lists:map(fun(#shard{node=Node, name=ShardName} = Shard) -> http://git-wip-us.apache.org/repos/asf/couchdb-fabric/blob/093b86ae/src/fabric_view_changes.erl ---------------------------------------------------------------------- diff --git a/src/fabric_view_changes.erl b/src/fabric_view_changes.erl index 2219dac..4e4767f 100644 --- a/src/fabric_view_changes.erl +++ b/src/fabric_view_changes.erl @@ -96,14 +96,14 @@ send_changes(DbName, ChangesArgs, Callback, PackedSeqs, AccIn, Timeout) -> Seqs = lists:flatmap(fun({#shard{name=Name, node=N} = Shard, Seq}) -> case lists:member(Shard, AllLiveShards) of true -> - Ref = rexi:cast(N, {fabric_rpc, changes, [Name,ChangesArgs,Seq]}), + Ref = rexi:cast(N, {fabric_rpc2, changes, [Name,ChangesArgs,Seq]}), [{Shard#shard{ref = Ref}, Seq}]; false -> % Find some replacement shards to cover the missing range % TODO It's possible in rare cases of shard merging to end up % with overlapping shard ranges from this technique lists:map(fun(#shard{name=Name2, node=N2} = NewShard) -> - Ref = rexi:cast(N2, {fabric_rpc, changes, [Name2,ChangesArgs,0]}), + Ref = rexi:cast(N2, {fabric_rpc2, changes, [Name2,ChangesArgs,0]}), {NewShard#shard{ref = Ref}, 0} end, find_replacement_shards(Shard, AllLiveShards)) end http://git-wip-us.apache.org/repos/asf/couchdb-fabric/blob/093b86ae/src/fabric_view_reduce.erl ---------------------------------------------------------------------- diff --git a/src/fabric_view_reduce.erl b/src/fabric_view_reduce.erl index f810a95..4487e1d 100644 --- a/src/fabric_view_reduce.erl +++ b/src/fabric_view_reduce.erl @@ -30,7 +30,7 @@ go(DbName, DDoc, VName, Args, Callback, Acc0) -> {NthRed, View} = fabric_view:extract_view(nil, VName, Views, reduce), {VName, RedSrc} = lists:nth(NthRed, View#view.reduce_funs), Workers = lists:map(fun(#shard{name=Name, node=N} = Shard) -> - Ref = rexi:cast(N, {fabric_rpc, reduce_view, [Name,Group,VName,Args]}), + Ref = rexi:cast(N, {fabric_rpc2, reduce_view, [Name,Group,VName,Args]}), Shard#shard{ref = Ref} end, fabric_view:get_shards(DbName, Args)), RexiMon = fabric_util:create_monitors(Workers),
