From: Peter Lemenkov <lemenkov@gmail.com>
Date: Sat, 23 Apr 2016 18:49:40 +0300
Subject: [PATCH] Don't use obsolete erlang:now/0
Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
diff --git a/priv/tracers/tracer_accumulating_time.erl b/priv/tracers/tracer_accumulating_time.erl
index 9607b0cb..08ecfcdb 100644
--- a/priv/tracers/tracer_accumulating_time.erl
+++ b/priv/tracers/tracer_accumulating_time.erl
@@ -46,7 +46,7 @@ trace({trace_ts, Pid, return_from, {Mod, Func, Arity}, _Res, TS}, {Dict}) ->
DKey = {Pid, MFA},
Start = case dict:find(DKey, Dict) of
{ok, StTime} -> StTime;
- error -> now()
+ error -> os:timestamp()
end,
Elapsed = timer:now_diff(TS, Start),
SumKey = {sum, MFA},
diff --git a/priv/tracers/tracer_backend_latency.erl b/priv/tracers/tracer_backend_latency.erl
index 4a58f86f..1ce93e56 100644
--- a/priv/tracers/tracer_backend_latency.erl
+++ b/priv/tracers/tracer_backend_latency.erl
@@ -136,7 +136,7 @@ trace({trace_ts, Pid, call, {riak_kv_put_fsm, init, _}, TS}, {Dict, LMS}) ->
trace({trace_ts, Pid, call, {riak_kv_put_fsm, finish, _}, TS}, {Dict, LatencyMS}) ->
Start = case dict:find({put, Pid}, Dict) of
{ok, StTime} -> StTime;
- error -> now()
+ error -> os:timestamp()
end,
case timer:now_diff(TS, Start) div 1000 of
Elapsed when Elapsed > LatencyMS ->
@@ -150,7 +150,7 @@ trace({trace_ts, Pid, call, {riak_kv_get_fsm, init, _}, TS}, {Dict, LMS}) ->
trace({trace_ts, Pid, call, {riak_kv_get_fsm, finalize, _}, TS}, {Dict, LatencyMS}) ->
Start = case dict:find({get, Pid}, Dict) of
{ok, StTime} -> StTime;
- error -> now()
+ error -> os:timestamp()
end,
case timer:now_diff(TS, Start) div 1000 of
Elapsed when Elapsed > LatencyMS ->
@@ -165,7 +165,7 @@ trace({trace_ts, Pid, return_from, {Mod, Func, _}, _Res, TS}, {Dict, LatencyMS})
DKey = {Mod, Pid},
Start = case dict:find(DKey, Dict) of
{ok, StTime} -> StTime;
- error -> now()
+ error -> os:timestamp()
end,
case timer:now_diff(TS, Start) div 1000 of
Elapsed when Elapsed > LatencyMS ->
diff --git a/priv/tracers/tracer_latency_histogram.erl b/priv/tracers/tracer_latency_histogram.erl
index 79ea25c5..ff2b62d9 100644
--- a/priv/tracers/tracer_latency_histogram.erl
+++ b/priv/tracers/tracer_latency_histogram.erl
@@ -105,7 +105,7 @@ trace({trace_ts, Pid, return_from, {_, _, _}, _Res, TS}, {Dict, LatencyMS}) ->
DKey = Pid,
Start = case dict:find(DKey, Dict) of
{ok, StTime} -> StTime;
- error -> now()
+ error -> os:timestamp()
end,
Elapsed = timer:now_diff(TS, Start) div 1000,
folsom_metrics_histogram:update(foo, Elapsed),
diff --git a/priv/tracers/tracer_timeit.erl b/priv/tracers/tracer_timeit.erl
index b9b6456c..ef2cff4a 100644
--- a/priv/tracers/tracer_timeit.erl
+++ b/priv/tracers/tracer_timeit.erl
@@ -43,21 +43,21 @@ timeit(Mod, Fun, Arity, Type) ->
stop() -> dbg:stop_clear().
trace({trace, Pid, call, {Mod, Fun, _}}, {D, {all, {Count, Max}}}) ->
- D2 = orddict:store({Pid, Mod, Fun}, now(), D),
+ D2 = orddict:store({Pid, Mod, Fun}, os:timestamp(), D),
{D2, {all, {Count, Max}}};
trace({trace, Pid, call, {Mod, Fun, _}},
{D, {sample, {N, Max}, {M, K, Total}}}) ->
M2 = M+1,
Total2 = Total+1,
if N == M2 ->
- D2 = orddict:store({Pid, Mod, Fun}, now(), D),
+ D2 = orddict:store({Pid, Mod, Fun}, os:timestamp(), D),
{D2, {sample, {N, Max}, {0, K, Total2}}};
true ->
{D, {sample, {N, Max}, {M2, K, Total2}}}
end;
trace({trace, Pid, call, {Mod, Fun, _}},
{D, {threshold, {Millis, Max}, {Over, Total}}}) ->
- D2 = orddict:store({Pid, Mod, Fun}, now(), D),
+ D2 = orddict:store({Pid, Mod, Fun}, os:timestamp(), D),
{D2, {threshold, {Millis, Max}, {Over, Total+1}}};
trace({trace, Pid, return_from, {Mod, Fun, _}, _Result},
@@ -66,7 +66,7 @@ trace({trace, Pid, return_from, {Mod, Fun, _}, _Result},
case orddict:find(Key, D) of
{ok, StartTime} ->
Count2 = Count+1,
- ElapsedUs = timer:now_diff(now(), StartTime),
+ ElapsedUs = timer:now_diff(os:timestamp(), StartTime),
ElapsedMs = ElapsedUs/1000,
io:format(user, "~p:~p:~p: ~p ms\n", [Pid, Mod, Fun, ElapsedMs]),
if Count2 == Max -> stop();
@@ -82,7 +82,7 @@ trace({trace, Pid, return_from, {Mod, Fun, _}, _Result},
case orddict:find(Key, D) of
{ok, StartTime} ->
K2 = K+1,
- ElapsedUs = timer:now_diff(now(), StartTime),
+ ElapsedUs = timer:now_diff(os:timestamp(), StartTime),
ElapsedMs = ElapsedUs/1000,
io:format(user, "[sample ~p/~p] ~p:~p:~p: ~p ms\n",
[K2, Total, Pid, Mod, Fun, ElapsedMs]),
@@ -98,7 +98,7 @@ trace({trace, Pid, return_from, {Mod, Fun, _}, _Result},
Key = {Pid, Mod, Fun},
case orddict:find(Key, D) of
{ok, StartTime} ->
- ElapsedUs = timer:now_diff(now(), StartTime),
+ ElapsedUs = timer:now_diff(os:timestamp(), StartTime),
ElapsedMs = ElapsedUs / 1000,
if ElapsedMs > Millis ->
Over2 = Over+1,
diff --git a/src/riak_index.erl b/src/riak_index.erl
index e80d9e76..4e02da8f 100644
--- a/src/riak_index.erl
+++ b/src/riak_index.erl
@@ -235,7 +235,7 @@ format_failure_reason(FailureReason) ->
%% @spec timestamp() -> integer()
%% @doc Get a timestamp, the number of milliseconds returned by
-%% erlang:now().
+%% os:timestamp().
timestamp() ->
{MegaSeconds,Seconds,MilliSeconds}=os:timestamp(),
(MegaSeconds * 1000000000000) + (Seconds * 1000000) + MilliSeconds.
diff --git a/src/riak_kv_2i_aae.erl b/src/riak_kv_2i_aae.erl
index a3e46f94..71be716e 100644
--- a/src/riak_kv_2i_aae.erl
+++ b/src/riak_kv_2i_aae.erl
@@ -363,7 +363,7 @@ create_index_data_db(Partition, DutyCycle, DBDir, DBRef) ->
lager:info("Grabbing all index data for partition ~p", [Partition]),
Ref = make_ref(),
Sender = {raw, Ref, Client},
- StartTime = now(),
+ StartTime = os:timestamp(),
riak_core_vnode_master:command({Partition, node()},
{fold_indexes, Fun, 0},
Sender,
@@ -395,7 +395,7 @@ leveldb_opts() ->
duty_cycle_pause(WaitFactor, StartTime) ->
case WaitFactor > 0 of
true ->
- Now = now(),
+ Now = os:timestamp(),
ElapsedMicros = timer:now_diff(Now, StartTime),
WaitMicros = ElapsedMicros * WaitFactor,
WaitMillis = trunc(WaitMicros / 1000 + 0.5),
@@ -416,7 +416,7 @@ wait_for_index_scan(Ref, BatchRef, StartTime, WaitFactor) ->
duty_cycle_pause(WaitFactor, StartTime),
Pid ! {BatchRef, continue},
send_event({index_scan_update, Count}),
- wait_for_index_scan(Ref, BatchRef, now(), WaitFactor);
+ wait_for_index_scan(Ref, BatchRef, os:timestamp(), WaitFactor);
{Ref, Result} ->
Result
after
@@ -468,7 +468,7 @@ build_tmp_tree(Index, DBRef, DutyCycle) ->
0 ->
send_event({hashtree_population_update, Count2}),
duty_cycle_pause(WaitFactor, StartTime),
- now();
+ os:timestamp();
_ ->
StartTime
end,
@@ -476,7 +476,7 @@ build_tmp_tree(Index, DBRef, DutyCycle) ->
end,
send_event({hashtree_population_update, 0}),
{Count, Tree2, _} = eleveldb:fold(DBRef, FoldFun,
- {0, Tree, erlang:now()}, []),
+ {0, Tree, os:timestamp()}, []),
lager:info("Done building temporary tree for 2i data "
"with ~p entries",
[Count]),
diff --git a/src/riak_kv_bitcask_backend.erl b/src/riak_kv_bitcask_backend.erl
index 3d922c78..6a0fb20f 100644
--- a/src/riak_kv_bitcask_backend.erl
+++ b/src/riak_kv_bitcask_backend.erl
@@ -136,7 +136,7 @@ make_bk(1, Bucket, Key) ->
%% @doc Start the bitcask backend
-spec start(integer(), config()) -> {ok, state()} | {error, term()}.
start(Partition, Config0) ->
- random:seed(erlang:now()),
+ random:seed(os:timestamp()),
{Config, KeyVsn} =
case app_helper:get_prop_or_env(small_keys, Config0, bitcask) of
false ->
diff --git a/src/riak_kv_delete.erl b/src/riak_kv_delete.erl
index fff2388d..15eca5be 100644
--- a/src/riak_kv_delete.erl
+++ b/src/riak_kv_delete.erl
@@ -274,7 +274,7 @@ delete_test_() ->
invalid_rw_delete() ->
RW = <<"abc">>,
%% Start the gen_fsm process
- RequestId = erlang:phash2(erlang:now()),
+ RequestId = erlang:phash2(os:timestamp()),
Bucket = <<"testbucket">>,
Key = <<"testkey">>,
Timeout = 60000,
@@ -291,7 +291,7 @@ invalid_rw_delete() ->
invalid_r_delete() ->
R = <<"abc">>,
%% Start the gen_fsm process
- RequestId = erlang:phash2(erlang:now()),
+ RequestId = erlang:phash2(os:timestamp()),
Bucket = <<"testbucket">>,
Key = <<"testkey">>,
Timeout = 60000,
@@ -308,7 +308,7 @@ invalid_r_delete() ->
invalid_w_delete() ->
W = <<"abc">>,
%% Start the gen_fsm process
- RequestId = erlang:phash2(erlang:now()),
+ RequestId = erlang:phash2(os:timestamp()),
Bucket = <<"testbucket">>,
Key = <<"testkey">>,
Timeout = 60000,
@@ -326,7 +326,7 @@ invalid_w_delete() ->
invalid_pr_delete() ->
PR = <<"abc">>,
%% Start the gen_fsm process
- RequestId = erlang:phash2(erlang:now()),
+ RequestId = erlang:phash2(os:timestamp()),
Bucket = <<"testbucket">>,
Key = <<"testkey">>,
Timeout = 60000,
@@ -343,7 +343,7 @@ invalid_pr_delete() ->
invalid_pw_delete() ->
PW = <<"abc">>,
%% Start the gen_fsm process
- RequestId = erlang:phash2(erlang:now()),
+ RequestId = erlang:phash2(os:timestamp()),
Bucket = <<"testbucket">>,
Key = <<"testkey">>,
Timeout = 60000,
diff --git a/src/riak_kv_eleveldb_backend.erl b/src/riak_kv_eleveldb_backend.erl
index 130c172f..e478126a 100644
--- a/src/riak_kv_eleveldb_backend.erl
+++ b/src/riak_kv_eleveldb_backend.erl
@@ -96,7 +96,7 @@ capabilities(_, _) ->
-spec start(integer(), config()) -> {ok, state()} | {error, term()}.
start(Partition, Config) ->
%% Initialize random seed
- random:seed(now()),
+ random:seed(os:timestamp()),
%% Get the data root directory
DataDir = filename:join(app_helper:get_prop_or_env(data_root, Config, eleveldb),
diff --git a/src/riak_kv_exchange_fsm.erl b/src/riak_kv_exchange_fsm.erl
index fc8573e1..b0697fca 100644
--- a/src/riak_kv_exchange_fsm.erl
+++ b/src/riak_kv_exchange_fsm.erl
@@ -180,7 +180,7 @@ key_exchange(timeout, State=#state{local=LocalVN,
lager:debug("Exchanging hashes for preflist ~p", [IndexN]),
TmpDir = tmp_dir(),
- {NA, NB, NC} = Now = WriteLog = now(),
+ {NA, NB, NC} = Now = WriteLog = os:timestamp(),
LogFile1 = lists:flatten(io_lib:format("~s/in.~p.~p.~p",
[TmpDir, NA, NB, NC])),
LogFile2 = lists:flatten(io_lib:format("~s/out.~p.~p.~p",
@@ -239,10 +239,10 @@ key_exchange(timeout, State=#state{local=LocalVN,
%% by BKey is unlikely to be any worse. For Riak CS's use
%% pattern, sorting may have some benefit since block N is
%% likely to be nearby on disk of block N+1.
- StartTime = now(),
+ StartTime = os:timestamp(),
ok = sort_disk_log(LogFile1, LogFile2),
lager:debug("~s:key_exchange: sorting time = ~p seconds\n",
- [?MODULE, timer:now_diff(now(), StartTime) / 1000000]),
+ [?MODULE, timer:now_diff(os:timestamp(), StartTime) / 1000000]),
{ok, ReadLog} = open_disk_log(Now, LogFile2, read_only),
FoldRes =
fold_disk_log(fun(Diff, Acc) ->
@@ -362,9 +362,9 @@ open_disk_log(Name, Path, RWorRO, OtherOpts) ->
disk_log:open([{name, Name}, {file, Path}, {mode, RWorRO}|OtherOpts]).
sort_disk_log(InputFile, OutputFile) ->
- {ok, ReadLog} = open_disk_log(now(), InputFile, read_only),
+ {ok, ReadLog} = open_disk_log(os:timestamp(), InputFile, read_only),
_ = file:delete(OutputFile),
- {ok, WriteLog} = open_disk_log(now(), OutputFile, read_write),
+ {ok, WriteLog} = open_disk_log(os:timestamp(), OutputFile, read_write),
Input = sort_disk_log_input(ReadLog),
Output = sort_disk_log_output(WriteLog),
try
diff --git a/src/riak_kv_fsm_timing.erl b/src/riak_kv_fsm_timing.erl
index 263edc0a..2037fb79 100644
--- a/src/riak_kv_fsm_timing.erl
+++ b/src/riak_kv_fsm_timing.erl
@@ -33,7 +33,7 @@
-type duration() :: {StageName::atom(), StageDuration::non_neg_integer()}.
-type durations() :: {ResponseUSecs::non_neg_integer(), [duration()]}.
-%% @doc add timing information of `{State, erlang:now()}' to the Timings
+%% @doc add timing information of `{State, os:timestamp()}' to the Timings
-spec add_timing(atom(), timings()) -> timings().
add_timing(State, Timings) when is_list(Timings) ->
diff --git a/src/riak_kv_get_fsm.erl b/src/riak_kv_get_fsm.erl
index df5b2d18..7f3e2ea5 100644
--- a/src/riak_kv_get_fsm.erl
+++ b/src/riak_kv_get_fsm.erl
@@ -695,7 +695,7 @@ happy_path_case() ->
%% Start the FSM to issue a get and check notfound
- ReqId1 = 112381838, % erlang:phash2(erlang:now()).
+ ReqId1 = 112381838, % erlang:phash2(os:timestamp()).
R = 2,
Timeout = 1000,
{ok, _FsmPid1} = test_link(ReqId1, Bucket, Key, R, Timeout, self(),
@@ -734,7 +734,7 @@ happy_path_case() ->
n_val_violation_case() ->
- ReqId1 = 13210434, % erlang:phash2(erlang:now()).
+ ReqId1 = 13210434, % erlang:phash2(os:timestamp()).
Bucket = <<"mybucket">>,
Key = <<"badnvalkey">>,
Nval = 3,
diff --git a/src/riak_kv_mrc_pipe.erl b/src/riak_kv_mrc_pipe.erl
index 570a83cf..7485636a 100644
--- a/src/riak_kv_mrc_pipe.erl
+++ b/src/riak_kv_mrc_pipe.erl
@@ -1110,7 +1110,7 @@ compat_fun(_, _, _) ->
random_constant_hash()->
%% using now/0 as a randomizer, so that we don't overload just one
%% riak node with reduce work
- Random = chash:key_of(now()),
+ Random = chash:key_of(os:timestamp()),
%% the trick here: generate a random hash, then find the first
%% vnode alive in its preflist, then re-generate a hash that puts
diff --git a/src/riak_kv_sweeper.erl b/src/riak_kv_sweeper.erl
index 79f2cbd7..e6cf74be 100644
--- a/src/riak_kv_sweeper.erl
+++ b/src/riak_kv_sweeper.erl
@@ -204,7 +204,7 @@ timestamp() ->
%% ====================================================================
init([]) ->
process_flag(trap_exit, true),
- random:seed(erlang:now()),
+ random:seed(os:timestamp()),
schedule_initial_sweep_tick(),
State = riak_kv_sweeper_state:new(),
{ok, State}.
diff --git a/src/riak_kv_util.erl b/src/riak_kv_util.erl
index b677422f..22c315b2 100644
--- a/src/riak_kv_util.erl
+++ b/src/riak_kv_util.erl
@@ -442,7 +442,7 @@ non_ttl_bucket_test() ->
make_vtag_test() ->
crypto:start(),
- ?assertNot(make_vtag(now()) =:=
- make_vtag(now())).
+ ?assertNot(make_vtag(os:timestamp()) =:=
+ make_vtag(os:timestamp())).
-endif.
diff --git a/src/riak_kv_vnode.erl b/src/riak_kv_vnode.erl
index bb8243e4..86431feb 100644
--- a/src/riak_kv_vnode.erl
+++ b/src/riak_kv_vnode.erl
@@ -285,7 +285,7 @@ local_put(Index, Obj) ->
local_put(Index, Obj, Options) ->
BKey = {riak_object:bucket(Obj), riak_object:key(Obj)},
- ReqId = erlang:phash2(erlang:now()),
+ ReqId = erlang:phash2(os:timestamp()),
StartTime = riak_core_util:moment(),
put({Index, node()}, BKey, Obj, ReqId, StartTime, Options, ignore).
@@ -300,7 +300,7 @@ local_reap(Index, BKey, RObj) ->
local_get(Index, BKey) ->
Ref = make_ref(),
- ReqId = erlang:phash2(erlang:now()),
+ ReqId = erlang:phash2(os:timestamp()),
Sender = {raw, Ref, self()},
get({Index,node()}, BKey, ReqId, Sender),
receive
diff --git a/src/riak_kv_vnode_status_mgr.erl b/src/riak_kv_vnode_status_mgr.erl
index 1c27ce08..ea01aa4e 100644
--- a/src/riak_kv_vnode_status_mgr.erl
+++ b/src/riak_kv_vnode_status_mgr.erl
@@ -237,7 +237,7 @@ code_change(_OldVsn, State, _Extra) ->
get_counter_lease(_LeaseSize, Status, 1) ->
case get_status_item(vnodeid, Status, undefined) of
undefined ->
- {VnodeId, Status2} = assign_vnodeid(erlang:now(),
+ {VnodeId, Status2} = assign_vnodeid(os:timestamp(),
riak_core_nodeid:get(),
Status),
{0, 0, VnodeId, Status2};
@@ -283,7 +283,7 @@ get_counter_lease(LeaseSize0, Status, ?VNODE_STATUS_VERSION) ->
-spec new_id_and_counter(status(), non_neg_integer()) ->
{non_neg_integer(), non_neg_integer(), binary(), status()}.
new_id_and_counter(Status, LeaseSize) ->
- {VnodeId, Status2} = assign_vnodeid(erlang:now(),
+ {VnodeId, Status2} = assign_vnodeid(os:timestamp(),
riak_core_nodeid:get(),
Status),
{0, LeaseSize, VnodeId, orddict:store(counter, LeaseSize, Status2)}.
diff --git a/test/backend_eqc.erl b/test/backend_eqc.erl
index 745bd710..fa32a2e1 100644
--- a/test/backend_eqc.erl
+++ b/test/backend_eqc.erl
@@ -257,7 +257,7 @@ fold_objects_fun() ->
end.
get_partition() ->
- {MegaSecs, Secs, MicroSecs} = erlang:now(),
+ {MegaSecs, Secs, MicroSecs} = os:timestamp(),
Partition = integer_to_list(MegaSecs) ++
integer_to_list(Secs) ++
integer_to_list(MicroSecs),
diff --git a/test/fsm_eqc_util.erl b/test/fsm_eqc_util.erl
index 3d6b400a..a6871667 100644
--- a/test/fsm_eqc_util.erl
+++ b/test/fsm_eqc_util.erl
@@ -149,7 +149,7 @@ build_riak_obj(B,K,Vc,Val,notombstone) ->
riak_object:set_vclock(
riak_object:new(B,K,Val),
Vc),
- [{dict:from_list([{<<"X-Riak-Last-Modified">>,now()}]), Val}]);
+ [{dict:from_list([{<<"X-Riak-Last-Modified">>,os:timestamp()}]), Val}]);
build_riak_obj(B,K,Vc,Val,tombstone) ->
Obj = build_riak_obj(B,K,Vc,Val,notombstone),
add_tombstone(Obj).
diff --git a/test/put_fsm_eqc.erl b/test/put_fsm_eqc.erl
index 6d7f6a4b..abd322a0 100644
--- a/test/put_fsm_eqc.erl
+++ b/test/put_fsm_eqc.erl
@@ -97,7 +97,7 @@ setup() ->
%% not been run from the commandline.
os:cmd("epmd -daemon"),
timer:sleep(100),
- TestNode = list_to_atom("putfsmeqc" ++ integer_to_list(element(3, now())) ++ integer_to_list(element(2, now()))),
+ TestNode = list_to_atom("putfsmeqc" ++ integer_to_list(element(3, os:timestamp())) ++ integer_to_list(element(2, os:timestamp()))),
{ok, _Pid} = net_kernel:start([TestNode, shortnames]),
started
end,