Merging in changes proposed in:

basho#87
Invotas · Jul 22, 2016 · 42cc60b · 42cc60b
1 parent 499d013
commit 42cc60b
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 5 deletions.
diff --git a/rebar.config b/rebar.config
@@ -11,6 +11,7 @@
 {deps, [
   {lager, "(2.0|2.1|2.2).*", {git, "git://github.com/basho/lager.git", {tag, "2.2.3"}}},
   {eleveldb, ".*", {git, "git://github.com/basho/eleveldb.git", {branch, "2.2"}}}
+  {time_compat, ".*", {git, "git://github.com/lasp-lang/time_compat.git", {branch, "master"}}}
 ]}.
 
 {port_specs,

diff --git a/src/riak_ensemble_manager.erl b/src/riak_ensemble_manager.erl
@@ -487,7 +487,7 @@ reload_state() ->
 -spec initial_state() -> state().
 initial_state() ->
     ets:insert(?ETS, {enabled, false}),
-    ClusterName = {node(), erlang:now()},
+    ClusterName = {node(), time_compat:timestamp()},
     CS = riak_ensemble_state:new(ClusterName),
     State=#state{version=0,
                  ensemble_data=[],

diff --git a/src/synctree_leveldb.erl b/src/synctree_leveldb.erl
@@ -87,7 +87,7 @@ get_path(Opts) ->
     case proplists:get_value(path, Opts) of
         undefined ->
             Base = "/tmp/ST",
-            Name = integer_to_list(timestamp(erlang:now())),
+            Name = integer_to_list(time_compat:unique_integer([positive])),
             filename:join(Base, Name);
         Path ->
             Path
@@ -151,9 +151,6 @@ store(Updates, State=?STATE{id=Id, db=DB}) ->
     _ = eleveldb:write(DB, DBUpdates, []),
     State.
 
-timestamp({Mega, Secs, Micro}) ->
-    Mega*1000*1000*1000*1000 + Secs * 1000 * 1000 + Micro.
-
 leveldb_opts() ->
     [{is_internal_db, true},
      {write_buffer_size, 4 * 1024 * 1024},