Ra systems

src/ra_app.erl

@@ -16,3 +16,4 @@ start(_Type, _Args) ->
 
 stop(_State) ->
     ok.
+

src/ra_bench.erl

@@ -104,7 +104,7 @@ start(Name, Nodes) when is_atom(Name) ->
                      initial_members => ServerIds,
                      machine => {module, ?MODULE, #{}}}
                end || N <- Nodes],
-    ra:start_cluster(Configs).
+    ra:start_cluster(default, Configs).
 
 prepare() ->
     _ = application:ensure_all_started(ra),

src/ra_directory.erl

@@ -8,20 +8,18 @@
 
 -export([
          init/1,
-         deinit/0,
-         register_name/3,
-         register_name/4,
-         register_name/5,
-         unregister_name/1,
-         where_is/1,
-         where_is_parent/1,
-         name_of/1,
-         cluster_name_of/1,
-         pid_of/1,
-         uid_of/1,
-         send/2,
-         overview/0,
-         list_registered/0
+         init/2,
+         deinit/1,
+         register_name/6,
+         unregister_name/2,
+         where_is/2,
+         where_is_parent/2,
+         name_of/2,
+         cluster_name_of/2,
+         pid_of/2,
+         uid_of/2,
+         overview/1,
+         list_registered/1
          ]).
 
 -export_type([
@@ -33,121 +31,142 @@
 
 % registry for a ra servers's locally unique name
 
--spec init(file:filename()) -> ok.
-init(Dir) ->
-    _ = ets:new(?MODULE, [named_table,
+-spec init(atom()) -> ok | {error, system_not_started}.
+init(System) when is_atom(System) ->
+    case ra_system:fetch(System) of
+        undefined ->
+            {error, system_not_started};
+        #{data_dir := Dir,
+          names := Names} ->
+            init(Dir, Names)
+    end.
+
+-spec init(file:filename(), ra_system:names()) -> ok.
+init(Dir, #{directory := Name,
+            directory_rev := NameRev}) ->
+    _ = ets:new(Name, [named_table,
                           public,
                           {read_concurrency, true},
                           {write_concurrency, true}
                          ]),
     ok = ra_lib:make_dir(Dir),
     Dets = filename:join(Dir, "names.dets"),
-    {ok, ?REVERSE_TBL} = dets:open_file(?REVERSE_TBL,
-                                        [{file, Dets},
-                                         {auto_save, 500},
-                                         {access, read_write}]),
+    {ok, NameRev} = dets:open_file(NameRev,
+                                   [{file, Dets},
+                                    {auto_save, 500},
+                                    {access, read_write}]),
     ok.
 
--spec deinit() -> ok.
-deinit() ->
-    _ = ets:delete(?MODULE),
-    _ = dets:close(?REVERSE_TBL),
+-spec deinit(atom() | ra_system:names()) -> ok.
+deinit(System) when is_atom(System) ->
+    deinit(get_names(System));
+deinit(#{directory := Name,
+         directory_rev := NameRev}) ->
+    _ = ets:delete(Name),
+    _ = dets:close(NameRev),
     ok.
 
--spec register_name(ra_uid(), pid(), maybe(pid()), atom(),
-		    ra_cluster_name()) -> yes | no.
-register_name(UId, Pid, ParentPid, ServerName, ClusterName) ->
-    true = ets:insert(?MODULE, {UId, Pid, ParentPid, ServerName,
-                                ClusterName}),
-    ok = dets:insert(?REVERSE_TBL, {ServerName, UId}),
-    yes.
-
--spec register_name(ra_uid(), pid(), maybe(pid()), atom()) -> yes | no.
-register_name(UId, Pid, ParentPid, ServerName) ->
-    register_name(UId, Pid, ParentPid, ServerName, undefined).
-
--spec register_name(ra_uid(), pid(), atom()) -> yes | no.
-register_name(UId, Pid, ServerName) ->
-    register_name(UId, Pid, undefined, ServerName).
-
--spec unregister_name(ra_uid()) -> ra_uid().
-unregister_name(UId) ->
-    case ets:take(?MODULE, UId) of
+-spec register_name(ra_system:names() | atom(), ra_uid(), pid(), maybe(pid()), atom(),
+                    ra_cluster_name()) -> ok.
+register_name(System, UId, Pid, ParentPid, ServerName, ClusterName)
+  when is_atom(System) ->
+    register_name(get_names(System), UId, Pid,
+                  ParentPid, ServerName, ClusterName);
+register_name(#{
+                directory := Directory,
+                directory_rev := DirRev}, UId, Pid, ParentPid,
+              ServerName, ClusterName) ->
+    true = ets:insert(Directory, {UId, Pid, ParentPid, ServerName,
+                                  ClusterName}),
+    ok = dets:insert(DirRev, {ServerName, UId}),
+    ok.
+
+-spec unregister_name(atom() | ra_system:names(), ra_uid()) -> ra_uid().
+unregister_name(System, UId) when is_atom(System) ->
+    unregister_name(get_names(System), UId);
+unregister_name(#{directory := Directory,
+                  directory_rev := DirRev}, UId) ->
+    case ets:take(Directory, UId) of
         [{_, _, _, ServerName, _}] ->
-            _ = ets:take(?MODULE, UId),
-            ok = dets:delete(?REVERSE_TBL, ServerName),
+            _ = ets:take(Directory, UId),
+            ok = dets:delete(DirRev, ServerName),
             UId;
         [] ->
             UId
     end.
 
--spec where_is(ra_uid() | atom()) -> pid() | undefined.
-where_is(ServerName) when is_atom(ServerName) ->
-    case dets:lookup(?REVERSE_TBL, ServerName) of
+-spec where_is(atom() | ra_system:names(), ra_uid() | atom()) ->
+    pid() | undefined.
+where_is(System, ServerName) when is_atom(System) ->
+    where_is(get_names(System), ServerName);
+where_is(#{directory_rev := DirRev} = Names, ServerName)
+  when is_atom(ServerName) ->
+    case dets:lookup(DirRev, ServerName) of
         [] -> undefined;
         [{_, UId}] ->
-            where_is(UId)
+            where_is(Names, UId)
     end;
-where_is(UId) when is_binary(UId) ->
-    case ets:lookup(?MODULE, UId) of
+where_is(#{directory := Dir}, UId) when is_binary(UId) ->
+    case ets:lookup(Dir, UId) of
         [{_, Pid, _, _, _}] -> Pid;
         [] -> undefined
     end.
 
--spec where_is_parent(ra_uid() | atom()) -> pid() | undefined.
-where_is_parent(ServerName) when is_atom(ServerName) ->
-    case dets:lookup(?REVERSE_TBL, ServerName) of
+-spec where_is_parent(atom() | ra_system:names(), ra_uid() | atom()) ->
+    pid() | undefined.
+where_is_parent(System, ServerName) when is_atom(System) ->
+    where_is_parent(get_names(System), ServerName);
+where_is_parent(#{directory_rev := DirRev} = Names, ServerName)
+  when is_atom(ServerName) ->
+    case dets:lookup(DirRev, ServerName) of
         [] -> undefined;
         [{_, UId}] ->
-            where_is_parent(UId)
+            where_is_parent(Names, UId)
     end;
-where_is_parent(UId) when is_binary(UId) ->
-    case ets:lookup(?MODULE, UId) of
+where_is_parent(#{directory := Dir}, UId) when is_binary(UId) ->
+    case ets:lookup(Dir, UId) of
         [{_, _, Pid, _, _}] -> Pid;
         [] -> undefined
     end.
 
--spec name_of(ra_uid()) -> maybe(atom()).
-name_of(UId) ->
-    case ets:lookup(?MODULE, UId) of
+-spec name_of(atom() | ra_system:names(), ra_uid()) -> maybe(atom()).
+name_of(SystemOrNames, UId) ->
+    Tbl = get_name(SystemOrNames),
+    case ets:lookup(Tbl, UId) of
         [{_, _, _, ServerName, _}] -> ServerName;
         [] -> undefined
     end.
 
--spec cluster_name_of(ra_uid()) -> maybe(ra_cluster_name()).
-cluster_name_of(UId) ->
-    case ets:lookup(?MODULE, UId) of
+-spec cluster_name_of(ra_system:names() | atom(), ra_uid()) ->
+    maybe(ra_cluster_name()).
+cluster_name_of(SystemOrNames, UId) ->
+    Tbl = get_name(SystemOrNames),
+    case ets:lookup(Tbl, UId) of
 	[{_, _, _, _, ClusterName}] -> ClusterName;
 	[] -> undefined
     end.
 
 
--spec pid_of(ra_uid()) -> maybe(pid()).
-pid_of(UId) ->
-    case ets:lookup(?MODULE, UId) of
+-spec pid_of(atom() | ra_system:names(), ra_uid()) -> maybe(pid()).
+pid_of(SystemOrNames, UId) ->
+    case ets:lookup(get_name(SystemOrNames), UId) of
         [{_, Pid, _, _, _}] -> Pid;
         [] -> undefined
     end.
 
-uid_of(ServerName) when is_atom(ServerName) ->
-    case dets:lookup(?REVERSE_TBL, ServerName) of
+uid_of(System, ServerName) when is_atom(System) ->
+    uid_of(get_names(System), ServerName);
+uid_of(#{directory_rev := Tbl}, ServerName) when is_atom(ServerName) ->
+    case dets:lookup(Tbl, ServerName) of
         [] -> undefined;
         [{_, UId}] ->
             UId
     end.
 
--spec send(ra_uid() | atom(), term()) -> pid().
-send(UIdOrName, Msg) ->
-    case where_is(UIdOrName) of
-        undefined ->
-            exit({badarg, {UIdOrName, Msg}});
-        Pid ->
-            _ = erlang:send(Pid, Msg),
-            Pid
-    end.
-
-overview() ->
-    Dir = ets:tab2list(?MODULE),
+overview(System) when is_atom(System) ->
+    #{directory := Tbl,
+      directory_rev := _TblRev} = get_names(System),
+    Dir = ets:tab2list(Tbl),
     States = maps:from_list(ets:tab2list(ra_state)),
     Snaps = maps:from_list(ets:tab2list(ra_log_snapshot_state)),
     lists:foldl(fun ({UId, Pid, Parent, ServerName, ClusterName}, Acc) ->
@@ -161,6 +180,22 @@ overview() ->
                                                           undefined)}}
                 end, #{}, Dir).
 
--spec list_registered() -> [{atom(), ra_uid()}].
-list_registered() ->
-    dets:select(?REVERSE_TBL, [{'_', [], ['$_']}]).
+-spec list_registered(atom()) -> [{atom(), ra_uid()}].
+list_registered(System) when is_atom(System) ->
+    Tbl = get_reverse(System),
+    dets:select(Tbl, [{'_', [], ['$_']}]).
+
+get_name(#{directory := Tbl}) ->
+    Tbl;
+get_name(System) when is_atom(System) ->
+    {ok, Tbl} = ra_system:lookup_name(System, directory),
+    Tbl.
+
+get_reverse(System) when is_atom(System) ->
+    {ok, Tbl} = ra_system:lookup_name(System, directory_rev),
+    Tbl.
+
+get_names(System) when is_atom(System) ->
+    #{names := Names} = ra_system:fetch(System),
+    Names.
+

src/ra_env.erl

@@ -8,8 +8,7 @@
 
 -export([
          data_dir/0,
-         server_data_dir/1,
-         wal_data_dir/0,
+         server_data_dir/2,
          configure_logger/1
          ]).
 
@@ -27,18 +26,10 @@ data_dir() ->
     Node = ra_lib:to_list(node()),
     filename:join(DataDir, Node).
 
-server_data_dir(UId) ->
+server_data_dir(System, UId) when is_atom(System) ->
+    #{data_dir := Dir} = ra_system:fetch(System),
     Me = ra_lib:to_list(UId),
-    filename:join(data_dir(), Me).
-
-wal_data_dir() ->
-    %% allows the wal director to be overridden or fall back to the default
-    %% data directory
-    case application:get_env(ra, wal_data_dir) of
-        {ok, Dir} -> Dir;
-        _ ->
-            data_dir()
-    end.
+    filename:join(Dir, Me).
 
 %% use this when interacting with Ra from a node without Ra running on it
 configure_logger(Module) ->