don't share the data directory by default

fix issues during test when the data directory was shared by 2 vm
instances

Author: benoitc

config/sys.config

@@ -7,7 +7,7 @@
   ]},
 
   {barrel, [
-    {data_dir, "data"},
+    %%{data_dir, "data"},
     {in_memory, false}
   ]},
 

src/core/barrel_store.erl

@@ -132,10 +132,13 @@ db_properties(DbId) ->
 
 get_conf() -> gen_server:call(?MODULE, get_conf).
 
+default_dir() ->
+  filename:join([?DATA_DIR, node()]).
+
 -spec data_dir() -> string().
 data_dir() ->
-  Dir = application:get_env(barrel, data_dir, ?DATA_DIR),
-  _ = filelib:ensure_dir(filename:join([".",Dir, "dummy"])),
+  Dir = application:get_env(barrel, data_dir, default_dir()),
+  _ = filelib:ensure_dir(filename:join([".", Dir, "dummy"])),
   Dir.
 
 

test/replicate/barrel_replicate_SUITE.erl

@@ -162,11 +162,11 @@ persistent_replication(_Config) ->
   ok = barrel_replicate:stop_replication(RepId),
   [{RepId, {true, nil, nil}}] = ets:lookup(replication_ids, RepId),
   [] = ets:lookup(replication_ids, Pid),
-  {ok, [AllConfig2]} = file:consult("data/replication.config"),
+  {ok, [AllConfig2]} = file:consult(config_file()),
   RepConfig2 = maps:get(<<"a">>, AllConfig2),
   #{ <<"source">> := <<"source">>, <<"target">> := <<"testdb">>, options := Options} = RepConfig2,
   ok = barrel_replicate:delete_replication(RepId),
-  {ok, [AllConfig3]} = file:consult("data/replication.config"),
+  {ok, [AllConfig3]} = file:consult(config_file()),
   undefined = maps:get(RepId, AllConfig3, undefined),
   [] = ets:lookup(replication_ids, RepId),
   ok.
@@ -195,7 +195,7 @@ restart_persistent_replication(_Config) ->
   {'EXIT', {badarg, _}} = (catch ets:lookup(replication_ids, RepId)),
   timer:sleep(200),
   ok = barrel_replicate:delete_replication(RepId),
-  {ok, [AllConfig3]} = file:consult("data/replication.config"),
+  {ok, [AllConfig3]} = file:consult(config_file()),
   undefined = maps:get(RepId, AllConfig3, undefined),
   [] = ets:lookup(replication_ids, RepId),
   ok.
@@ -390,3 +390,7 @@ read_checkpoint_doc(Db, RepId) ->
 
 checkpoint_docid(RepId) ->
   <<"replication-checkpoint-", RepId/binary>>.
+
+
+config_file() ->
+  filename:join([barrel_store:data_dir(), "replication.config"]).