Skip to content

Commit 8ef7afe

Browse files
committed
Issues with folsom starting
Running the generated basho_bench escript was failing, due to failures to start applications. Seems to be expectations that everything in app.src is started when running as a script. Removed addition of applications from app.src. Then there was an issue with folsom not starting, as it depended on bear starting (which is a module of functions not an application). Added an ensure started for bear prior to starting folsom ... and this now at least allows the script to run.
1 parent 64340a3 commit 8ef7afe

File tree

4 files changed

+7
-26
lines changed

4 files changed

+7
-26
lines changed

rebar.config

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,15 @@
1-
%% Known library limitations that make support for Erlang/OTP
2-
%% versions R15 or earlier difficult:
3-
%%
4-
%% katja: Defines a function `query()`, which is a reserved word in R15
5-
%% uuid: Dep on quickrand
6-
%% quickrand: Bogus (IMHO) inability to adapt to R15 environment.
71
{require_otp_vsn, "20"}.
82

93
{deps,
104
[
11-
%% NOTE: some basho_bench drivers make use of pre-folsom stats
12-
%% that permitted float type counter increments. Thus
13-
%% we currently rely on a custom branch of folsom that
14-
%% has a useful-but-icky hack that allows fractional
15-
%% increments. If someone wants to take advantage of a
16-
%% new folsom feature, that desire + float incr must be
17-
%% weighed.
185
{folsom, "0.8.7"},
196
{lager, "2.*", {git, "git://github.com/erlang-lager/lager", {tag, "3.8.0"}}},
207
{ibrowse, ".*",
218
{git, "git://github.com/basho/ibrowse.git", {branch, "develop-3.0"}}},
229
{riakc, ".*",
2310
{git, "git://github.com/basho/riak-erlang-client", {branch, "develop-3.0"}}},
2411
{mochiweb, "2.9.*",
25-
{git, "git://github.com/mochi/mochiweb", {tag, "v2.9.0"}}},
12+
{git, "git://github.com/basho/mochiweb", {branch, "develop-3.0"}}},
2613
{getopt, ".*",
2714
{git, "git://github.com/jcomellas/getopt", {tag, "v0.8.2"}}},
2815
{bitcask, ".*",

rebar.lock

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@
2727
{ref,"4ecc1ae9089edc6977e8c8c4cd41081513cc5590"}},
2828
3},
2929
{<<"mochiweb">>,
30-
{git,"git://github.com/mochi/mochiweb",
31-
{ref,"9090c7942f9dcde4ddbf9f78429e289ff5600c18"}},
30+
{git,"git://github.com/basho/mochiweb",
31+
{ref,"8471d2197afd412fcec239dd9ad5cbe90e64eefa"}},
3232
0},
3333
{<<"protobuffs">>,
3434
{git,"https://github.com/basho/erlang_protobuffs.git",

src/basho_bench.app.src

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,7 @@
66
{applications, [kernel,
77
stdlib,
88
sasl,
9-
getopt,
10-
ibrowse,
11-
lager,
12-
mochiweb,
13-
riakc,
14-
folsom,
15-
bitcask,
16-
eleveldb]},
9+
lager]},
1710
{mod, {basho_bench_app, []}},
1811
{env, [
1912
%% Run mode: How should basho_bench started as a separate node, or part of an

src/basho_bench_stats.erl

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,8 +82,9 @@ init([]) ->
8282
process_flag(trap_exit, true),
8383
process_flag(priority, high),
8484

85-
%% Spin up folsom
86-
folsom:start(),
85+
%% Spin up folsom, but check bear is started
86+
{ok, _} = application:ensure_all_started(bear),
87+
ok = folsom:start(),
8788

8889
%% Initialize an ETS table to track error and crash counters during
8990
%% reporting interval

0 commit comments

Comments
 (0)