From 007515cd0fc2a63795f92ae2570ad48f87b6c914 Mon Sep 17 00:00:00 2001 From: Amit Siddhu Date: Thu, 2 Feb 2017 14:52:52 +0530 Subject: [PATCH 1/6] using rebar 3.2.2 --- master/rebar.config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/master/rebar.config b/master/rebar.config index f13d7efae..29bb4d5a7 100644 --- a/master/rebar.config +++ b/master/rebar.config @@ -5,7 +5,7 @@ {platform_define, "^(18|19|2\d+|\d{3,})", time_correction} ]}. {deps, -[{lager, "2.0.3", +[{lager, "3.2.2", {git, "https://github.com/basho/lager.git", {tag, "2.0.3"}}}, {folsomite, "", {git, "https://github.com/discoproject/folsomite", {branch, "master"}}}, From 4763ac81b26a7dd50d3aa88f6db3fb83b5cfad52 Mon Sep 17 00:00:00 2001 From: Amit Siddhu Date: Thu, 2 Feb 2017 14:56:16 +0530 Subject: [PATCH 2/6] using rand instead of random fixes #646 --- master/src/ddfs/ddfs_rebalance.erl | 2 +- master/src/disco_util.erl | 2 +- master/src/job_coordinator.erl | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/master/src/ddfs/ddfs_rebalance.erl b/master/src/ddfs/ddfs_rebalance.erl index a75f4d925..344f70532 100644 --- a/master/src/ddfs/ddfs_rebalance.erl +++ b/master/src/ddfs/ddfs_rebalance.erl @@ -103,7 +103,7 @@ weighted_select_items(L, K) -> weighted_select_items(_, 0, Items, _) -> Items; weighted_select_items(L, K, Items, Consumed) -> - P = random:uniform() * (1 - Consumed), + P = rand:uniform() * (1 - Consumed), {Item, Weight} = weighted_choose(L, P), Rest = lists:keydelete(Item, 1, L), weighted_select_items(Rest, K - 1, [Item|Items], Consumed + Weight). diff --git a/master/src/disco_util.erl b/master/src/disco_util.erl index a15b0129c..21e91e68d 100644 --- a/master/src/disco_util.erl +++ b/master/src/disco_util.erl @@ -31,7 +31,7 @@ groupby(N, [H|_] = List, Groups) -> -spec choose_random([T,...]) -> T. choose_random(L) -> - lists:nth(random:uniform(length(L)), L). + lists:nth(rand:uniform(length(L)), L). -spec choose_random(list(T), non_neg_integer()) -> list(T). choose_random(L, N) -> diff --git a/master/src/job_coordinator.erl b/master/src/job_coordinator.erl index fec47c46a..e9674de5c 100644 --- a/master/src/job_coordinator.erl +++ b/master/src/job_coordinator.erl @@ -433,7 +433,7 @@ retry_task(Host, _Error, Sleep = lists:min([FC * ?FAILED_MIN_PAUSE, ?FAILED_MAX_PAUSE]) - + random:uniform(?FAILED_PAUSE_RANDOMIZE), + + rand:uniform(?FAILED_PAUSE_RANDOMIZE), M = "Task ~s:~B failed on ~p, ~Bth failures so far." " Sleeping ~B seconds before retrying.", MArgs = [Stage, TaskId, Host, FC, round(Sleep / 1000)], From d68d84e503fed42aaa8421b8596715e79b341069 Mon Sep 17 00:00:00 2001 From: Amit Siddhu Date: Thu, 2 Feb 2017 18:49:21 +0530 Subject: [PATCH 3/6] updated travis.yml --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 3c00cf5cf..271465a1d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,6 +2,7 @@ language: erlang notification: email: false otp_release: + - 19.2 - 18.2.1 - 18.1 - 17.5 From cadeb6ce2e842657ea21febc084a713ecd0eceaa Mon Sep 17 00:00:00 2001 From: Amit Siddhu Date: Fri, 3 Feb 2017 12:56:05 +0530 Subject: [PATCH 4/6] removed rebar tag --- master/rebar.config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/master/rebar.config b/master/rebar.config index 29bb4d5a7..d8ecf4d4b 100644 --- a/master/rebar.config +++ b/master/rebar.config @@ -6,7 +6,7 @@ ]}. {deps, [{lager, "3.2.2", - {git, "https://github.com/basho/lager.git", {tag, "2.0.3"}}}, + {git, "https://github.com/basho/lager.git"}}, {folsomite, "", {git, "https://github.com/discoproject/folsomite", {branch, "master"}}}, {plists, "", From bd691b90596fcb3811673120f4b529cbd39f987f Mon Sep 17 00:00:00 2001 From: Amit Siddhu Date: Fri, 3 Feb 2017 19:28:04 +0530 Subject: [PATCH 5/6] updated triq source --- master/eunit.config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/master/eunit.config b/master/eunit.config index badcd7138..eb64bf6f8 100644 --- a/master/eunit.config +++ b/master/eunit.config @@ -7,4 +7,4 @@ {git, "https://github.com/discoproject/mochiweb.git", {branch, "discoproject"}}}, {triq, ".*", - {git, "https://github.com/krestenkrab/triq.git", "master"}}]}. + {git, "https://github.com/triqng/triq.git", "master"}}]}. From 5d61636e9cad7bfc3c1488a5ccd5d850a8f5c000 Mon Sep 17 00:00:00 2001 From: Amit Siddhu Date: Fri, 3 Feb 2017 20:36:22 +0530 Subject: [PATCH 6/6] updated tci yml --- .travis.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 271465a1d..56e51e797 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,8 +2,5 @@ language: erlang notification: email: false otp_release: - - 19.2 - 18.2.1 - 18.1 - - 17.5 - - 17.4