couchdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rnew...@apache.org
Subject [05/27] rexi commit: updated refs/heads/windsor-merge to 096f0cf
Date Fri, 01 Aug 2014 09:06:34 GMT
Start per-node servers regardless of feature flag

Previously rexi_server_mon would fail to start per-node servers on a
node where the use of those servers in rexi:cast messages was disabled
by the "server_per_node" feature flag.  This mostly defeats the purpose
of the feature flag, which is to ensure that we can start all the
per-node servers before we try to use them.  Moreover, it cluttered up
the error logs because rexi_server_mon would crash after trying to
execute a `start_child` on rexi_server.

The fix is not DRY but it does the job well.

BugzID: 18970


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

Branch: refs/heads/windsor-merge
Commit: d1995a5b76f10b94edc4bf729ace583d228e9ffa
Parents: ad79591
Author: Adam Kocoloski <adam@cloudant.com>
Authored: Tue Apr 16 10:12:58 2013 -0400
Committer: Robert Newson <rnewson@apache.org>
Committed: Wed Jul 23 17:57:21 2014 +0100

----------------------------------------------------------------------
 src/rexi_server_mon.erl | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/couchdb-rexi/blob/d1995a5b/src/rexi_server_mon.erl
----------------------------------------------------------------------
diff --git a/src/rexi_server_mon.erl b/src/rexi_server_mon.erl
index 3545dba..8cee6e9 100644
--- a/src/rexi_server_mon.erl
+++ b/src/rexi_server_mon.erl
@@ -101,7 +101,8 @@ start_rexi_servers() ->
 
 
 missing_servers() ->
-    ServerIds = [rexi_utils:server_id(Node) || Node <- [node() | nodes()]],
+    ServerIds = [list_to_atom("rexi_server_" ++ atom_to_list(Node))
+        || Node <- [node() | nodes()]],
     ChildIds = [Id || {Id, _, _, _} <- supervisor:which_children(?SUP_MODULE)],
     ServerIds -- ChildIds.
 


Mime
View raw message