Resume spawning jobs using fabric_rpc Finishing off the update dance for BugzID: 14075. This just repoints our fabric RPC jobs to spawn using the fabric_rpc module instead of the temporary fabric_rpc2 module we used to avoid breaking internode communication.
Project: http://git-wip-us.apache.org/repos/asf/couchdb-fabric/repo Commit: http://git-wip-us.apache.org/repos/asf/couchdb-fabric/commit/dbb7113a Tree: http://git-wip-us.apache.org/repos/asf/couchdb-fabric/tree/dbb7113a Diff: http://git-wip-us.apache.org/repos/asf/couchdb-fabric/diff/dbb7113a Branch: refs/heads/import Commit: dbb7113adc5aec1a5206c07d89b8222b4da72456 Parents: 73a5864 Author: Paul J. Davis <[email protected]> Authored: Mon Nov 26 13:44:28 2012 -0600 Committer: Paul J. Davis <[email protected]> Committed: Mon Nov 26 13:46:09 2012 -0600 ---------------------------------------------------------------------- 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/dbb7113a/src/fabric_util.erl ---------------------------------------------------------------------- diff --git a/src/fabric_util.erl b/src/fabric_util.erl index 3579f56..25b2e7b 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_rpc2, EndPoint, ExtraArgs). + submit_jobs(Shards, fabric_rpc, 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/dbb7113a/src/fabric_view_changes.erl ---------------------------------------------------------------------- diff --git a/src/fabric_view_changes.erl b/src/fabric_view_changes.erl index 2f02c7c..8843562 100644 --- a/src/fabric_view_changes.erl +++ b/src/fabric_view_changes.erl @@ -103,14 +103,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_rpc2, changes, [Name,ChangesArgs,Seq]}), + Ref = rexi:cast(N, {fabric_rpc, 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_rpc2, changes, [Name2,ChangesArgs,0]}), + Ref = rexi:cast(N2, {fabric_rpc, 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/dbb7113a/src/fabric_view_reduce.erl ---------------------------------------------------------------------- diff --git a/src/fabric_view_reduce.erl b/src/fabric_view_reduce.erl index 3792adb..ca206b3 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_rpc2, reduce_view, [Name,Group,VName,Args]}), + Ref = rexi:cast(N, {fabric_rpc, reduce_view, [Name,Group,VName,Args]}), Shard#shard{ref = Ref} end, fabric_view:get_shards(DbName, Args)), RexiMon = fabric_util:create_monitors(Workers),
