You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by da...@apache.org on 2014/07/31 23:24:49 UTC
[01/50] folsom commit: updated refs/heads/import-master to 4824aec
Repository: couchdb-folsom
Updated Branches:
refs/heads/import-master [created] 4824aec69
Merge pull request #54 from tsloughter/master
replace use of now() with os:timestamp()
Project: http://git-wip-us.apache.org/repos/asf/couchdb-folsom/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-folsom/commit/3322e752
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-folsom/tree/3322e752
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-folsom/diff/3322e752
Branch: refs/heads/import-master
Commit: 3322e75282cd935554b0e66efcc43ff6f415ae21
Parents: 154024e 8b4a75f
Author: Joe Williams <wi...@gmail.com>
Authored: Mon Mar 4 08:37:23 2013 -0800
Committer: Joe Williams <wi...@gmail.com>
Committed: Mon Mar 4 08:37:23 2013 -0800
----------------------------------------------------------------------
include/folsom.hrl | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
[47/50] folsom commit: updated refs/heads/import-master to 4824aec
Posted by da...@apache.org.
Merge pull request #78 from kape1395/master
Supprt for spiral in application config.
Project: http://git-wip-us.apache.org/repos/asf/couchdb-folsom/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-folsom/commit/99cbf58a
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-folsom/tree/99cbf58a
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-folsom/diff/99cbf58a
Branch: refs/heads/import-master
Commit: 99cbf58a04c03bde67bb389eb066038972ed1052
Parents: ca127d7 6593e88
Author: Joe Williams <wi...@gmail.com>
Authored: Mon Jan 20 17:33:30 2014 -0800
Committer: Joe Williams <wi...@gmail.com>
Committed: Mon Jan 20 17:33:30 2014 -0800
----------------------------------------------------------------------
src/folsom.erl | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
[02/50] folsom commit: updated refs/heads/import-master to 4824aec
Posted by da...@apache.org.
Change the order of delete cascade for `spiral'
A crash of `folsom_metrics_histogram_ets` leaves spirals broken.
The spiral ets table goes away, so it can not be updated, nor
can it be deleted and re-created due to the delete order of
metric table, spiral table, folsom table. Have changed the order
to be more like that of `histogram` so deletes will succeed in
the event of a missing `spiral` ets table.
Project: http://git-wip-us.apache.org/repos/asf/couchdb-folsom/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-folsom/commit/dbcabd9d
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-folsom/tree/dbcabd9d
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-folsom/diff/dbcabd9d
Branch: refs/heads/import-master
Commit: dbcabd9d37a896526c0133b3e4df32e4879380a1
Parents: 3322e75
Author: Russell Brown <ru...@mac.com>
Authored: Mon Mar 18 08:46:45 2013 +0000
Committer: Russell Brown <ru...@mac.com>
Committed: Mon Mar 18 08:53:52 2013 +0000
----------------------------------------------------------------------
src/folsom_ets.erl | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-folsom/blob/dbcabd9d/src/folsom_ets.erl
----------------------------------------------------------------------
diff --git a/src/folsom_ets.erl b/src/folsom_ets.erl
index edd2f36..8a223c5 100644
--- a/src/folsom_ets.erl
+++ b/src/folsom_ets.erl
@@ -300,9 +300,9 @@ delete_metric(Name, meter_reader) ->
delete_metric(Name, spiral) ->
#spiral{tid=Tid, server=Pid} = folsom_metrics_spiral:get_value(Name),
folsom_sample_slide_server:stop(Pid),
- true = ets:delete(Tid),
ets:delete(?SPIRAL_TABLE, Name),
ets:delete(?FOLSOM_TABLE, Name),
+ ets:delete(Tid),
ok.
delete_histogram(Name, #histogram{type = uniform, sample = #uniform{reservoir = Reservoir}}) ->
[39/50] folsom commit: updated refs/heads/import-master to 4824aec
Posted by da...@apache.org.
Merge pull request #72 from urbanserj/init_meter_reader
Fix initialization of meter_reader
Project: http://git-wip-us.apache.org/repos/asf/couchdb-folsom/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-folsom/commit/551ffadc
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-folsom/tree/551ffadc
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-folsom/diff/551ffadc
Branch: refs/heads/import-master
Commit: 551ffadca3febf017e60a237a8184f7023d1d5e2
Parents: 66b72b7 a7f3307
Author: Joe Williams <wi...@gmail.com>
Authored: Wed Dec 4 19:31:15 2013 -0800
Committer: Joe Williams <wi...@gmail.com>
Committed: Wed Dec 4 19:31:15 2013 -0800
----------------------------------------------------------------------
src/folsom_ets.erl | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
[30/50] folsom commit: updated refs/heads/import-master to 4824aec
Posted by da...@apache.org.
clean up superfluous brackets
Project: http://git-wip-us.apache.org/repos/asf/couchdb-folsom/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-folsom/commit/d0c1241c
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-folsom/tree/d0c1241c
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-folsom/diff/d0c1241c
Branch: refs/heads/import-master
Commit: d0c1241c986ada45d1d662d0479929d16d26ecc4
Parents: ade45c8
Author: Joe Williams <jo...@github.com>
Authored: Mon Nov 4 11:16:45 2013 -0800
Committer: Joe Williams <jo...@github.com>
Committed: Mon Nov 4 11:16:45 2013 -0800
----------------------------------------------------------------------
src/folsom_vm_metrics.erl | 52 +++++++++++++++++++-------------------
test/folsom_erlang_checks.erl | 4 +--
2 files changed, 28 insertions(+), 28 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-folsom/blob/d0c1241c/src/folsom_vm_metrics.erl
----------------------------------------------------------------------
diff --git a/src/folsom_vm_metrics.erl b/src/folsom_vm_metrics.erl
index fc91d86..1adc5b0 100644
--- a/src/folsom_vm_metrics.erl
+++ b/src/folsom_vm_metrics.erl
@@ -35,7 +35,7 @@
]).
%% exported for eunit test
--export([convert_system_info/1]).
+-export([convert_system_info/2]).
-include("folsom.hrl").
@@ -46,10 +46,10 @@ get_memory() ->
erlang:memory().
get_statistics() ->
- [{Key, convert_statistics({Key, get_statistics(Key)})} || Key <- ?STATISTICS].
+ [{Key, convert_statistics(Key, get_statistics(Key))} || Key <- ?STATISTICS].
get_system_info() ->
- [{Key, convert_system_info({Key, get_system_info(Key)})} || Key <- ?SYSTEM_INFO].
+ [{Key, convert_system_info(Key, get_system_info(Key))} || Key <- ?SYSTEM_INFO].
get_process_info() ->
[{pid_port_fun_to_atom(Pid), get_process_info(Pid)} || Pid <- processes()].
@@ -80,57 +80,57 @@ get_statistics(Key) ->
%% conversion functions for erlang:statistics(Key)
-convert_statistics({context_switches, {ContextSwitches, 0}}) ->
+convert_statistics(context_switches, {ContextSwitches, 0}) ->
ContextSwitches;
-convert_statistics({garbage_collection, {NumberofGCs, WordsReclaimed, 0}}) ->
+convert_statistics(garbage_collection, {NumberofGCs, WordsReclaimed, 0}) ->
[{number_of_gcs, NumberofGCs}, {words_reclaimed, WordsReclaimed}];
-convert_statistics({io, {Input, Output}}) ->
+convert_statistics(io, {Input, Output}) ->
[Input, Output];
-convert_statistics({reductions, {TotalReductions, ReductionsSinceLastCall}}) ->
+convert_statistics(reductions, {TotalReductions, ReductionsSinceLastCall}) ->
[{total_reductions, TotalReductions},
{reductions_since_last_call, ReductionsSinceLastCall}];
-convert_statistics({runtime, {TotalRunTime, TimeSinceLastCall}}) ->
+convert_statistics(runtime, {TotalRunTime, TimeSinceLastCall}) ->
[{total_run_time, TotalRunTime}, {time_since_last_call, TimeSinceLastCall}];
-convert_statistics({wall_clock, {TotalWallclockTime, WallclockTimeSinceLastCall}}) ->
+convert_statistics(wall_clock, {TotalWallclockTime, WallclockTimeSinceLastCall}) ->
[{total_wall_clock_time, TotalWallclockTime},
{wall_clock_time_since_last_call, WallclockTimeSinceLastCall}];
-convert_statistics({_, Value}) ->
+convert_statistics(_, Value) ->
Value.
%% conversion functions for erlang:system_info(Key)
-convert_system_info({allocated_areas, List}) ->
+convert_system_info(allocated_areas, List) ->
[convert_allocated_areas(Value) || Value <- List];
-convert_system_info({allocator, {_,_,_,List}}) ->
+convert_system_info(allocator, {_,_,_,List}) ->
List;
-convert_system_info({c_compiler_used, {Compiler, Version}}) ->
+convert_system_info(c_compiler_used, {Compiler, Version}) ->
[{compiler, Compiler}, {version, convert_c_compiler_version(Version)}];
-convert_system_info({cpu_topology, undefined}) ->
+convert_system_info(cpu_topology, undefined) ->
undefined;
-convert_system_info({cpu_topology, List}) when is_list(List) ->
+convert_system_info(cpu_topology, List) when is_list(List) ->
[{Type, convert_cpu_topology(Item, [])} || {Type, Item} <- List];
-convert_system_info({cpu_topology, {logical,Item}}) ->
- convert_system_info({cpu_topology, [{processor,[{core,{logical,Item}}]}]});
-convert_system_info({dist_ctrl, List}) ->
+convert_system_info(cpu_topology, {logical,Item}) ->
+ convert_system_info(cpu_topology, [{processor,[{core,{logical,Item}}]}]);
+convert_system_info(dist_ctrl, List) ->
lists:map(fun({Node, Socket}) ->
{ok, Stats} = inet:getstat(Socket),
{Node, Stats}
end, List);
-convert_system_info({driver_version, Value}) ->
+convert_system_info(driver_version, Value) ->
list_to_binary(Value);
-convert_system_info({machine, Value}) ->
+convert_system_info(machine, Value) ->
list_to_binary(Value);
-convert_system_info({otp_release, Value}) ->
+convert_system_info(otp_release, Value) ->
list_to_binary(Value);
-convert_system_info({scheduler_bindings, Value}) ->
+convert_system_info(scheduler_bindings, Value) ->
tuple_to_list(Value);
-convert_system_info({system_version, Value}) ->
+convert_system_info(system_version, Value) ->
list_to_binary(Value);
-convert_system_info({system_architecture, Value}) ->
+convert_system_info(system_architecture, Value) ->
list_to_binary(Value);
-convert_system_info({version, Value}) ->
+convert_system_info(version, Value) ->
list_to_binary(Value);
-convert_system_info({_, Value}) ->
+convert_system_info(_, Value) ->
Value.
convert_allocated_areas({Key, Value1, Value2}) ->
http://git-wip-us.apache.org/repos/asf/couchdb-folsom/blob/d0c1241c/test/folsom_erlang_checks.erl
----------------------------------------------------------------------
diff --git a/test/folsom_erlang_checks.erl b/test/folsom_erlang_checks.erl
index 820b79e..374dad6 100644
--- a/test/folsom_erlang_checks.erl
+++ b/test/folsom_erlang_checks.erl
@@ -465,7 +465,7 @@ cpu_topology() ->
run_convert_and_jsonify(Item) ->
?debugFmt("Converting ... ~n~p~n", [Item]),
- Result = folsom_vm_metrics:convert_system_info({cpu_topology, Item}),
+ Result = folsom_vm_metrics:convert_system_info(cpu_topology, Item),
%?debugFmt("~p~n", [mochijson2:encode(Result)]).
mochijson2:encode(Result).
@@ -478,7 +478,7 @@ c_compiler_used() ->
[{compiler, gnuc}, {version, <<"4.4">>}],
[{compiler, msc}, {version, <<"1600">>}]],
- ?assertEqual(Expected, [folsom_vm_metrics:convert_system_info({c_compiler_used, {Compiler, Version}})
+ ?assertEqual(Expected, [folsom_vm_metrics:convert_system_info(c_compiler_used, {Compiler, Version})
|| {Compiler, Version} <- Test]).
[26/50] folsom commit: updated refs/heads/import-master to 4824aec
Posted by da...@apache.org.
Merge pull request #59 from jlouis/fix-ets-dets-race
Fix a race against querying the ETS/DETS tables.
Project: http://git-wip-us.apache.org/repos/asf/couchdb-folsom/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-folsom/commit/eeb4c369
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-folsom/tree/eeb4c369
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-folsom/diff/eeb4c369
Branch: refs/heads/import-master
Commit: eeb4c369b942deb5cb11aef6c6f5809ef294d43b
Parents: 264b7c4 d999b67
Author: Joe Williams <wi...@gmail.com>
Authored: Mon Nov 4 10:26:22 2013 -0800
Committer: Joe Williams <wi...@gmail.com>
Committed: Mon Nov 4 10:26:22 2013 -0800
----------------------------------------------------------------------
src/folsom_vm_metrics.erl | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
[37/50] folsom commit: updated refs/heads/import-master to 4824aec
Posted by da...@apache.org.
Fix initialization of meter_reader
Project: http://git-wip-us.apache.org/repos/asf/couchdb-folsom/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-folsom/commit/a7f33073
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-folsom/tree/a7f33073
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-folsom/diff/a7f33073
Branch: refs/heads/import-master
Commit: a7f330737fd5921f448255a1c98c7dff7d72f6d5
Parents: bc0b9ef
Author: Sergey Urbanovich <se...@gmail.com>
Authored: Wed Nov 13 18:23:36 2013 +0400
Committer: Sergey Urbanovich <se...@gmail.com>
Committed: Wed Nov 13 18:23:36 2013 +0400
----------------------------------------------------------------------
src/folsom_ets.erl | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-folsom/blob/a7f33073/src/folsom_ets.erl
----------------------------------------------------------------------
diff --git a/src/folsom_ets.erl b/src/folsom_ets.erl
index a59f130..888000b 100644
--- a/src/folsom_ets.erl
+++ b/src/folsom_ets.erl
@@ -413,7 +413,7 @@ notify(Name, Value, meter_reader, true) ->
folsom_metrics_meter_reader:mark(Name, Value),
ok;
notify(Name, Value, meter_reader, false) ->
- add_handler(meter, Name),
+ add_handler(meter_reader, Name),
folsom_metrics_meter_reader:mark(Name, Value),
ok;
notify(Name, Value, duration, true) ->
[31/50] folsom commit: updated refs/heads/import-master to 4824aec
Posted by da...@apache.org.
fix exdec paper link
Project: http://git-wip-us.apache.org/repos/asf/couchdb-folsom/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-folsom/commit/c6446fe4
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-folsom/tree/c6446fe4
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-folsom/diff/c6446fe4
Branch: refs/heads/import-master
Commit: c6446fe4cf0faf4778409f5201e21f016e610e7d
Parents: d0c1241
Author: Joe Williams <jo...@github.com>
Authored: Mon Nov 4 15:33:38 2013 -0800
Committer: Joe Williams <jo...@github.com>
Committed: Mon Nov 4 15:33:38 2013 -0800
----------------------------------------------------------------------
src/folsom_sample_exdec.erl | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-folsom/blob/c6446fe4/src/folsom_sample_exdec.erl
----------------------------------------------------------------------
diff --git a/src/folsom_sample_exdec.erl b/src/folsom_sample_exdec.erl
index 5c1e56c..a7a5d04 100644
--- a/src/folsom_sample_exdec.erl
+++ b/src/folsom_sample_exdec.erl
@@ -26,7 +26,7 @@
%%%
%%% that implementation is based on:
%%%
-%%% http://www.research.att.com/people/Cormode_Graham/library/publications/CormodeShkapenyukSrivastavaXu09.pdf
+%%% http://dimacs.rutgers.edu/~graham/pubs/papers/fwddecay.pdf
%%% @end
%%%------------------------------------------------------------------
[45/50] folsom commit: updated refs/heads/import-master to 4824aec
Posted by da...@apache.org.
Merge pull request #77 from vascokk/master
Ability to resize a sliding window
Project: http://git-wip-us.apache.org/repos/asf/couchdb-folsom/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-folsom/commit/ca127d7b
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-folsom/tree/ca127d7b
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-folsom/diff/ca127d7b
Branch: refs/heads/import-master
Commit: ca127d7bb0dcafd77c48663a76237f64077bb829
Parents: 66071d9 13549b4
Author: Joe Williams <wi...@gmail.com>
Authored: Thu Jan 9 14:08:23 2014 -0800
Committer: Joe Williams <wi...@gmail.com>
Committed: Thu Jan 9 14:08:23 2014 -0800
----------------------------------------------------------------------
rebar | Bin 101515 -> 135173 bytes
src/folsom_sample_slide.erl | 7 ++-
src/folsom_sample_slide_server.erl | 9 ++-
src/folsom_sample_slide_uniform.erl | 7 ++-
test/folsom_sample_slide_test.erl | 104 ++++++++++++++++++++++++++++++-
5 files changed, 123 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
[35/50] folsom commit: updated refs/heads/import-master to 4824aec
Posted by da...@apache.org.
pin to bear 0.8.0
Project: http://git-wip-us.apache.org/repos/asf/couchdb-folsom/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-folsom/commit/bc0b9efb
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-folsom/tree/bc0b9efb
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-folsom/diff/bc0b9efb
Branch: refs/heads/import-master
Commit: bc0b9efbb191ed9b35388a7e6de355422748b05d
Parents: d3bed30
Author: Joe Williams <jo...@github.com>
Authored: Wed Nov 6 08:06:13 2013 -0800
Committer: Joe Williams <jo...@github.com>
Committed: Wed Nov 6 08:06:13 2013 -0800
----------------------------------------------------------------------
rebar.config | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-folsom/blob/bc0b9efb/rebar.config
----------------------------------------------------------------------
diff --git a/rebar.config b/rebar.config
index b3fff28..b4adc6e 100644
--- a/rebar.config
+++ b/rebar.config
@@ -1,7 +1,7 @@
{sub_dirs, ["deps"]}.
{deps, [
- {'bear', ".*", {git, "git://github.com/boundary/bear.git", master}},
+ {'bear', ".*", {git, "git://github.com/boundary/bear.git", {tag, "0.8.0"}}},
{meck, ".*", {git, "git://github.com/eproxus/meck", {tag, "0.7.2"}}}
]}.
[20/50] folsom commit: updated refs/heads/import-master to 4824aec
Posted by da...@apache.org.
Merge pull request #68 from tagged/slide_uniform_default
add tuple default for slide_uniform
Project: http://git-wip-us.apache.org/repos/asf/couchdb-folsom/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-folsom/commit/58990d51
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-folsom/tree/58990d51
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-folsom/diff/58990d51
Branch: refs/heads/import-master
Commit: 58990d51d6d64e43f4df5bb4ce2b1c87631202f7
Parents: 14a2d17 217d145
Author: Joe Williams <wi...@gmail.com>
Authored: Thu Oct 31 09:42:22 2013 -0700
Committer: Joe Williams <wi...@gmail.com>
Committed: Thu Oct 31 09:42:22 2013 -0700
----------------------------------------------------------------------
src/folsom_metrics.erl | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
[43/50] folsom commit: updated refs/heads/import-master to 4824aec
Posted by da...@apache.org.
Added ability to resize sliding window
Project: http://git-wip-us.apache.org/repos/asf/couchdb-folsom/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-folsom/commit/5694f42d
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-folsom/tree/5694f42d
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-folsom/diff/5694f42d
Branch: refs/heads/import-master
Commit: 5694f42dff1f0b732a081cca3a29a96a7064d08e
Parents: 66071d9
Author: Vasco <va...@vas.io>
Authored: Sat Jan 4 18:45:35 2014 +0000
Committer: Vasco <va...@vas.io>
Committed: Sat Jan 4 18:45:35 2014 +0000
----------------------------------------------------------------------
rebar | Bin 101515 -> 135173 bytes
src/folsom_sample_slide.erl | 7 +++-
src/folsom_sample_slide_server.erl | 9 +++++-
src/folsom_sample_slide_uniform.erl | 7 +++-
test/folsom_sample_slide_test.erl | 53 ++++++++++++++++++++++++++++++-
5 files changed, 72 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-folsom/blob/5694f42d/rebar
----------------------------------------------------------------------
diff --git a/rebar b/rebar
index 77abae6..860c19e 100755
Binary files a/rebar and b/rebar differ
http://git-wip-us.apache.org/repos/asf/couchdb-folsom/blob/5694f42d/src/folsom_sample_slide.erl
----------------------------------------------------------------------
diff --git a/src/folsom_sample_slide.erl b/src/folsom_sample_slide.erl
index 631d821..b82acf9 100644
--- a/src/folsom_sample_slide.erl
+++ b/src/folsom_sample_slide.erl
@@ -28,7 +28,8 @@
update/2,
get_values/1,
moment/0,
- trim/2
+ trim/2,
+ resize/2
]).
-include("folsom.hrl").
@@ -47,6 +48,10 @@ update(#slide{reservoir = Reservoir} = Sample, Value) ->
ets:insert(Reservoir, {{Moment, Rnd}, Value}),
Sample.
+resize(Sample, NewSize) ->
+ folsom_sample_slide_server:resize(Sample#slide.server, NewSize),
+ Sample#slide{window = NewSize}.
+
get_values(#slide{window = Window, reservoir = Reservoir}) ->
Oldest = moment() - Window,
ets:select(Reservoir, [{{{'$1','_'},'$2'},[{'>=', '$1', Oldest}],['$2']}]).
http://git-wip-us.apache.org/repos/asf/couchdb-folsom/blob/5694f42d/src/folsom_sample_slide_server.erl
----------------------------------------------------------------------
diff --git a/src/folsom_sample_slide_server.erl b/src/folsom_sample_slide_server.erl
index 5986918..f02b4a2 100644
--- a/src/folsom_sample_slide_server.erl
+++ b/src/folsom_sample_slide_server.erl
@@ -31,7 +31,7 @@
-behaviour(gen_server).
%% API
--export([start_link/3, stop/1]).
+-export([start_link/3, stop/1, resize/2]).
-record(state, {sample_mod, reservoir, window}).
@@ -48,6 +48,13 @@ stop(Pid) ->
init([SampleMod, Reservoir, Window]) ->
{ok, #state{sample_mod = SampleMod, reservoir = Reservoir, window = Window}, timeout(Window)}.
+resize(Pid, NewWindow) ->
+ gen_server:call(Pid, {resize, NewWindow}).
+
+handle_call({resize, NewWindow}, _From, State) ->
+ NewState = State#state{window=NewWindow},
+ Reply = ok,
+ {reply, Reply, NewState, timeout(NewWindow)};
handle_call(_Request, _From, State) ->
Reply = ok,
{reply, Reply, State}.
http://git-wip-us.apache.org/repos/asf/couchdb-folsom/blob/5694f42d/src/folsom_sample_slide_uniform.erl
----------------------------------------------------------------------
diff --git a/src/folsom_sample_slide_uniform.erl b/src/folsom_sample_slide_uniform.erl
index 1d0204c..d99373f 100644
--- a/src/folsom_sample_slide_uniform.erl
+++ b/src/folsom_sample_slide_uniform.erl
@@ -28,7 +28,8 @@
update/2,
get_values/1,
moment/0,
- trim/2
+ trim/2,
+ resize/2
]).
-include("folsom.hrl").
@@ -53,6 +54,10 @@ update(#slide_uniform{reservoir = Reservoir, size = Size} = Sample0, Value) ->
end,
Sample.
+resize(Sample, NewSize) ->
+ folsom_sample_slide_server:resize(Sample#slide.server, NewSize),
+ Sample#slide{window = NewSize}.
+
maybe_update(Reservoir, {{_Moment, Rnd}, _Value}=Obj, Size) when Rnd =< Size ->
ets:insert(Reservoir, Obj);
maybe_update(_Reservoir, _Obj, _Size) ->
http://git-wip-us.apache.org/repos/asf/couchdb-folsom/blob/5694f42d/test/folsom_sample_slide_test.erl
----------------------------------------------------------------------
diff --git a/test/folsom_sample_slide_test.erl b/test/folsom_sample_slide_test.erl
index fa31a0e..dc08d95 100644
--- a/test/folsom_sample_slide_test.erl
+++ b/test/folsom_sample_slide_test.erl
@@ -27,7 +27,9 @@
-include("folsom.hrl").
-define(HISTO, test_slide).
+-define(HISTO2, test_slide2).
-define(WINDOW, 30).
+-define(DOUBLE_WINDOW, 60).
-define(RUNTIME, 90).
-define(READINGS, 10).
@@ -41,7 +43,9 @@ slide_test_() ->
[{"Create sliding window",
fun create/0},
{"test sliding window",
- {timeout, 30, fun exercise/0}}
+ {timeout, 30, fun exercise/0}},
+ {"resize sliding window",
+ {timeout, 30, fun resize_window/0}}
]}.
create() ->
@@ -87,6 +91,53 @@ exercise() ->
check_table(Slide, []),
ok.
+resize_window() ->
+ %% create a new histogram
+ %% will leave the trim server running, as resize() needs it
+ ok = folsom_metrics:new_histogram(?HISTO2, slide, ?WINDOW),
+ #histogram{sample=Slide} = folsom_metrics_histogram:get_value(?HISTO2),
+ Moments = lists:seq(1, ?RUNTIME ),
+ %% pump in 90 seconds worth of readings
+ Moment = lists:foldl(fun(_X, Tick) ->
+ Tock = tick(Tick),
+ [folsom_sample_slide:update(Slide, N) ||
+ N <- lists:duplicate(?READINGS, Tock)],
+ Tock end,
+ 0,
+ Moments),
+ %% are all readings in the table?
+ check_table(Slide, Moments),
+
+ %% get values only returns last ?WINDOW seconds
+ ExpectedValues = lists:sort(lists:flatten([lists:duplicate(?READINGS, N) ||
+ N <- lists:seq(?RUNTIME - ?WINDOW, ?RUNTIME)])),
+ Values = lists:sort(folsom_sample_slide:get_values(Slide)),
+ ?assertEqual(ExpectedValues, Values),
+
+ %%resize the sliding window
+ NewSlide = folsom_sample_slide:resize(Slide, ?DOUBLE_WINDOW),
+
+ %% get values only returns last ?WINDOW*2 seconds
+ NewExpectedValues = lists:sort(lists:flatten([lists:duplicate(?READINGS, N) ||
+ N <- lists:seq(?RUNTIME - ?DOUBLE_WINDOW, ?RUNTIME)])),
+ NewValues = lists:sort(folsom_sample_slide:get_values(NewSlide)),
+ ?assertEqual(NewExpectedValues, NewValues),
+
+
+ %% trim the table
+ Trimmed = folsom_sample_slide:trim(NewSlide#slide.reservoir, ?DOUBLE_WINDOW),
+ ?assertEqual((?RUNTIME - ?DOUBLE_WINDOW - 1) * ?READINGS, Trimmed),
+ check_table(NewSlide, lists:seq(?RUNTIME - ?DOUBLE_WINDOW, ?RUNTIME)),
+ %% increment the clock past the window
+ tick(Moment, ?DOUBLE_WINDOW*2),
+ %% get values should be empty
+ ?assertEqual([], folsom_sample_slide:get_values(NewSlide)),
+ %% trim, and table should be empty
+ Trimmed2 = folsom_sample_slide:trim(NewSlide#slide.reservoir, ?DOUBLE_WINDOW),
+ ?assertEqual((?RUNTIME * ?READINGS) - ((?RUNTIME - ?DOUBLE_WINDOW - 1) * ?READINGS), Trimmed2),
+ check_table(NewSlide, []),
+ ok.
+
tick(Moment0, IncrBy) ->
Moment = Moment0 + IncrBy,
meck:expect(folsom_utils, now_epoch, fun() ->
[42/50] folsom commit: updated refs/heads/import-master to 4824aec
Posted by da...@apache.org.
Merge pull request #76 from doubleyou/patch-1
Update meck version requirement
Project: http://git-wip-us.apache.org/repos/asf/couchdb-folsom/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-folsom/commit/66071d92
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-folsom/tree/66071d92
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-folsom/diff/66071d92
Branch: refs/heads/import-master
Commit: 66071d927db9e90397970baf47998e913bf31696
Parents: 4262632 e968955
Author: Joe Williams <wi...@gmail.com>
Authored: Mon Dec 9 11:56:20 2013 -0800
Committer: Joe Williams <wi...@gmail.com>
Committed: Mon Dec 9 11:56:20 2013 -0800
----------------------------------------------------------------------
rebar.config | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
[07/50] folsom commit: updated refs/heads/import-master to 4824aec
Posted by da...@apache.org.
Remove counters from folsom counters table on delete operation
Project: http://git-wip-us.apache.org/repos/asf/couchdb-folsom/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-folsom/commit/01eb3958
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-folsom/tree/01eb3958
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-folsom/diff/01eb3958
Branch: refs/heads/import-master
Commit: 01eb3958b73c9cd4a3a2773ebd142ccba0256ec3
Parents: 600dd78
Author: Diana Corbacho <di...@erlang-solutions.com>
Authored: Wed May 1 15:31:01 2013 +0100
Committer: Diana Corbacho <di...@erlang-solutions.com>
Committed: Wed May 1 15:31:01 2013 +0100
----------------------------------------------------------------------
src/folsom_ets.erl | 2 +-
src/folsom_metrics_counter.erl | 8 +++++++-
2 files changed, 8 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-folsom/blob/01eb3958/src/folsom_ets.erl
----------------------------------------------------------------------
diff --git a/src/folsom_ets.erl b/src/folsom_ets.erl
index 8a223c5..8c1e66d 100644
--- a/src/folsom_ets.erl
+++ b/src/folsom_ets.erl
@@ -280,7 +280,7 @@ delete_metric(Name, duration) ->
true = ets:delete(?FOLSOM_TABLE, Name),
ok;
delete_metric(Name, counter) ->
- true = ets:delete(?COUNTER_TABLE, Name),
+ ok = folsom_metrics_counter:delete(Name),
true = ets:delete(?FOLSOM_TABLE, Name),
ok;
delete_metric(Name, gauge) ->
http://git-wip-us.apache.org/repos/asf/couchdb-folsom/blob/01eb3958/src/folsom_metrics_counter.erl
----------------------------------------------------------------------
diff --git a/src/folsom_metrics_counter.erl b/src/folsom_metrics_counter.erl
index 1861ffe..ebef6a3 100644
--- a/src/folsom_metrics_counter.erl
+++ b/src/folsom_metrics_counter.erl
@@ -30,7 +30,8 @@
dec/1,
dec/2,
get_value/1,
- clear/1]).
+ clear/1,
+ delete/1]).
-define(WIDTH, 16). %% Keep this a power of two
@@ -59,6 +60,11 @@ get_value(Name) ->
clear(Name) ->
new(Name).
+delete(Name) ->
+ Counters = [{Name,N} || N <- lists:seq(0,?WIDTH-1)],
+ [ets:delete(?COUNTER_TABLE, Counter) || Counter <- Counters],
+ ok.
+
key(Name) ->
X = erlang:system_info(scheduler_id),
Rnd = X band (?WIDTH-1),
[50/50] folsom commit: updated refs/heads/import-master to 4824aec
Posted by da...@apache.org.
Merge pull request #79 from cybergrind/dev_r17
Make compatible with R17
Project: http://git-wip-us.apache.org/repos/asf/couchdb-folsom/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-folsom/commit/4824aec6
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-folsom/tree/4824aec6
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-folsom/diff/4824aec6
Branch: refs/heads/import-master
Commit: 4824aec693c7f284363f19d999289952ec4ed586
Parents: 015c646 740282b
Author: Joe Williams <wi...@gmail.com>
Authored: Tue May 6 10:28:28 2014 -0700
Committer: Joe Williams <wi...@gmail.com>
Committed: Tue May 6 10:28:28 2014 -0700
----------------------------------------------------------------------
rebar.config | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
[08/50] folsom commit: updated refs/heads/import-master to 4824aec
Posted by da...@apache.org.
Merge pull request #58 from dcorbacho/delete_counter
Delete counter from folsom counters table
Project: http://git-wip-us.apache.org/repos/asf/couchdb-folsom/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-folsom/commit/37320053
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-folsom/tree/37320053
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-folsom/diff/37320053
Branch: refs/heads/import-master
Commit: 373200532e3ddaed7a6391369c0341b0cbc7c6b7
Parents: 5e2d2e0 01eb395
Author: Joe Williams <wi...@gmail.com>
Authored: Wed May 1 09:00:50 2013 -0700
Committer: Joe Williams <wi...@gmail.com>
Committed: Wed May 1 09:00:50 2013 -0700
----------------------------------------------------------------------
src/folsom_ets.erl | 2 +-
src/folsom_metrics_counter.erl | 8 +++++++-
test/folsom_erlang_checks.erl | 13 ++++++++++++-
test/folsom_tests.erl | 4 +++-
4 files changed, 23 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
[10/50] folsom commit: updated refs/heads/import-master to 4824aec
Posted by da...@apache.org.
Add safe histogram notify functions
Project: http://git-wip-us.apache.org/repos/asf/couchdb-folsom/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-folsom/commit/31a348ba
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-folsom/tree/31a348ba
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-folsom/diff/31a348ba
Branch: refs/heads/import-master
Commit: 31a348ba88fd6aa5d69a15995c8d4eaf6ecda0f1
Parents: 3732005
Author: Paul Oliver <pu...@gmail.com>
Authored: Wed Jun 12 09:18:24 2013 -0400
Committer: Paul Oliver <pu...@gmail.com>
Committed: Wed Jun 12 09:18:24 2013 -0400
----------------------------------------------------------------------
src/folsom_metrics.erl | 27 ++++++++++++++++++++++++++-
test/folsom_erlang_checks.erl | 5 +++++
2 files changed, 31 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-folsom/blob/31a348ba/src/folsom_metrics.erl
----------------------------------------------------------------------
diff --git a/src/folsom_metrics.erl b/src/folsom_metrics.erl
index a6245c0..40f66f2 100644
--- a/src/folsom_metrics.erl
+++ b/src/folsom_metrics.erl
@@ -64,7 +64,11 @@
histogram_timed_update/3,
histogram_timed_update/4,
histogram_timed_begin/1,
- histogram_timed_notify/1
+ histogram_timed_notify/1,
+ safely_histogram_timed_update/2,
+ safely_histogram_timed_update/3,
+ safely_histogram_timed_update/4,
+ safely_histogram_timed_notify/1
]).
-include("folsom.hrl").
@@ -201,3 +205,24 @@ histogram_timed_notify({Name, Begin}) ->
Now = os:timestamp(),
Time = timer:now_diff(Now, Begin),
ok = notify({Name, Time}).
+
+safely_histogram_timed_update(Name, Fun) ->
+ {Time, Value} = timer:tc(Fun),
+ _ = safely_notify({Name, Time}),
+ Value.
+
+safely_histogram_timed_update(Name, Fun, Args) ->
+ {Time, Value} = timer:tc(Fun, Args),
+ _ = safely_notify({Name, Time}),
+ Value.
+
+safely_histogram_timed_update(Name, Mod, Fun, Args) ->
+ {Time, Value} = timer:tc(Mod, Fun, Args),
+ _ = safely_notify({Name, Time}),
+ Value.
+
+safely_histogram_timed_notify({Name, Begin}) ->
+ Now = os:timestamp(),
+ Time = timer:now_diff(Now, Begin),
+ _ = safely_notify({Name, Time}),
+ ok.
http://git-wip-us.apache.org/repos/asf/couchdb-folsom/blob/31a348ba/test/folsom_erlang_checks.erl
----------------------------------------------------------------------
diff --git a/test/folsom_erlang_checks.erl b/test/folsom_erlang_checks.erl
index 6b92bb6..6ea9a5a 100644
--- a/test/folsom_erlang_checks.erl
+++ b/test/folsom_erlang_checks.erl
@@ -109,6 +109,11 @@ populate_metrics() ->
meck:new(folsom_ets),
meck:expect(folsom_ets, notify, fun(_Event) -> meck:exception(error, something_wrong_with_ets) end),
{'EXIT', {something_wrong_with_ets, _}} = folsom_metrics:safely_notify({unknown_counter, {inc, 1}}),
+ ok = folsom_metrics:safely_histogram_timed_update(unknown_histogram, fun() -> ok end),
+ ok = folsom_metrics:safely_histogram_timed_update(unknown_histogram, fun(ok) -> ok end, [ok]),
+ 3.141592653589793 = folsom_metrics:safely_histogram_timed_update(unknown_histogram, math, pi, []),
+ UnknownHistogramBegin = folsom_metrics:histogram_timed_begin(unknown_histogram),
+ ok = folsom_metrics:safely_histogram_timed_notify(UnknownHistogramBegin),
meck:unload(folsom_ets),
ok = folsom_metrics:notify({<<"gauge">>, 2}),
[41/50] folsom commit: updated refs/heads/import-master to 4824aec
Posted by da...@apache.org.
Update meck version requirement
For better compatibility with https://github.com/basho/erlang_protobuffs
Project: http://git-wip-us.apache.org/repos/asf/couchdb-folsom/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-folsom/commit/e9689550
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-folsom/tree/e9689550
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-folsom/diff/e9689550
Branch: refs/heads/import-master
Commit: e968955086fa4b11bc072dd00276b620a8716216
Parents: 4262632
Author: Dmitry Demeshchuk <de...@gmail.com>
Authored: Mon Dec 9 11:55:38 2013 -0800
Committer: Dmitry Demeshchuk <de...@gmail.com>
Committed: Mon Dec 9 11:55:38 2013 -0800
----------------------------------------------------------------------
rebar.config | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-folsom/blob/e9689550/rebar.config
----------------------------------------------------------------------
diff --git a/rebar.config b/rebar.config
index b3fff28..deda9f1 100644
--- a/rebar.config
+++ b/rebar.config
@@ -2,7 +2,7 @@
{deps, [
{'bear', ".*", {git, "git://github.com/boundary/bear.git", master}},
- {meck, ".*", {git, "git://github.com/eproxus/meck", {tag, "0.7.2"}}}
+ {meck, ".*", {git, "git://github.com/eproxus/meck", {tag, "0.8.1"}}}
]}.
{erl_opts, [debug_info]}.
[36/50] folsom commit: updated refs/heads/import-master to 4824aec
Posted by da...@apache.org.
switch back to master
Project: http://git-wip-us.apache.org/repos/asf/couchdb-folsom/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-folsom/commit/66b72b72
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-folsom/tree/66b72b72
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-folsom/diff/66b72b72
Branch: refs/heads/import-master
Commit: 66b72b72ba6f7da1f66294ed080e2ec0c236661a
Parents: bc0b9ef
Author: Joe Williams <jo...@github.com>
Authored: Wed Nov 6 08:08:26 2013 -0800
Committer: Joe Williams <jo...@github.com>
Committed: Wed Nov 6 08:08:26 2013 -0800
----------------------------------------------------------------------
rebar.config | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-folsom/blob/66b72b72/rebar.config
----------------------------------------------------------------------
diff --git a/rebar.config b/rebar.config
index b4adc6e..b3fff28 100644
--- a/rebar.config
+++ b/rebar.config
@@ -1,7 +1,7 @@
{sub_dirs, ["deps"]}.
{deps, [
- {'bear', ".*", {git, "git://github.com/boundary/bear.git", {tag, "0.8.0"}}},
+ {'bear', ".*", {git, "git://github.com/boundary/bear.git", master}},
{meck, ".*", {git, "git://github.com/eproxus/meck", {tag, "0.7.2"}}}
]}.
[32/50] folsom commit: updated refs/heads/import-master to 4824aec
Posted by da...@apache.org.
switch bear to master
Project: http://git-wip-us.apache.org/repos/asf/couchdb-folsom/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-folsom/commit/d4f5827b
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-folsom/tree/d4f5827b
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-folsom/diff/d4f5827b
Branch: refs/heads/import-master
Commit: d4f5827bce74d26d24fe36e25cb24553c29806fc
Parents: c6446fe
Author: Joe Williams <jo...@github.com>
Authored: Tue Nov 5 15:57:26 2013 -0800
Committer: Joe Williams <jo...@github.com>
Committed: Tue Nov 5 15:57:26 2013 -0800
----------------------------------------------------------------------
rebar.config | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-folsom/blob/d4f5827b/rebar.config
----------------------------------------------------------------------
diff --git a/rebar.config b/rebar.config
index c3fab02..b3fff28 100644
--- a/rebar.config
+++ b/rebar.config
@@ -1,7 +1,7 @@
{sub_dirs, ["deps"]}.
{deps, [
- {'bear', ".*", {git, "git://github.com/boundary/bear.git", {tag, "0.1.3"}}},
+ {'bear', ".*", {git, "git://github.com/boundary/bear.git", master}},
{meck, ".*", {git, "git://github.com/eproxus/meck", {tag, "0.7.2"}}}
]}.
[03/50] folsom commit: updated refs/heads/import-master to 4824aec
Posted by da...@apache.org.
Merge pull request #56 from basho/rdb-spiral-delete
Change the order of delete cascade for `spiral'
Project: http://git-wip-us.apache.org/repos/asf/couchdb-folsom/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-folsom/commit/c7b450ff
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-folsom/tree/c7b450ff
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-folsom/diff/c7b450ff
Branch: refs/heads/import-master
Commit: c7b450ff3dd2bbff022756f47bb9d4df2ca2cae3
Parents: 3322e75 dbcabd9
Author: Joe Williams <wi...@gmail.com>
Authored: Mon Mar 18 11:08:02 2013 -0700
Committer: Joe Williams <wi...@gmail.com>
Committed: Mon Mar 18 11:08:02 2013 -0700
----------------------------------------------------------------------
src/folsom_ets.erl | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
[25/50] folsom commit: updated refs/heads/import-master to 4824aec
Posted by da...@apache.org.
Merge pull request #69 from rodo/master
Add .mailmap to clean up the output of `git shortlog -nes`
Project: http://git-wip-us.apache.org/repos/asf/couchdb-folsom/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-folsom/commit/264b7c46
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-folsom/tree/264b7c46
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-folsom/diff/264b7c46
Branch: refs/heads/import-master
Commit: 264b7c468149d11d39ca0069ffd2c4ef119bb4c6
Parents: 9745617 6fedbb4
Author: Joe Williams <wi...@gmail.com>
Authored: Mon Nov 4 10:24:43 2013 -0800
Committer: Joe Williams <wi...@gmail.com>
Committed: Mon Nov 4 10:24:43 2013 -0800
----------------------------------------------------------------------
.mailmap | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
[38/50] folsom commit: updated refs/heads/import-master to 4824aec
Posted by da...@apache.org.
Updated the app description
Updated the app description to "Erlang based metrics system"
Project: http://git-wip-us.apache.org/repos/asf/couchdb-folsom/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-folsom/commit/1d090a7d
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-folsom/tree/1d090a7d
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-folsom/diff/1d090a7d
Branch: refs/heads/import-master
Commit: 1d090a7d3d63a17faebc4452050be55c536ca113
Parents: 66b72b7
Author: Byaruhanga Franklin <by...@gmail.com>
Authored: Sat Nov 16 16:50:03 2013 +0300
Committer: Byaruhanga Franklin <by...@gmail.com>
Committed: Sat Nov 16 16:50:03 2013 +0300
----------------------------------------------------------------------
src/folsom.app.src | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-folsom/blob/1d090a7d/src/folsom.app.src
----------------------------------------------------------------------
diff --git a/src/folsom.app.src b/src/folsom.app.src
index 3380bed..424cac0 100644
--- a/src/folsom.app.src
+++ b/src/folsom.app.src
@@ -1,7 +1,7 @@
%% -*- mode: erlang -*-
{application, folsom,
[
- {description, ""},
+ {description, "Erlang based metrics system"},
{vsn, git},
{registered, [folsom_meter_timer_server,
folsom_metrics_histogram_ets,
[13/50] folsom commit: updated refs/heads/import-master to 4824aec
Posted by da...@apache.org.
Merge pull request #61 from Lastres/fix_none_histogram
Fix histogram of type 'none'
Project: http://git-wip-us.apache.org/repos/asf/couchdb-folsom/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-folsom/commit/47a408a2
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-folsom/tree/47a408a2
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-folsom/diff/47a408a2
Branch: refs/heads/import-master
Commit: 47a408a2493664a0d3e83a5fdf4994f6d7313934
Parents: e9be9f7 19e5c24
Author: Joe Williams <wi...@gmail.com>
Authored: Thu Jun 20 09:36:20 2013 -0700
Committer: Joe Williams <wi...@gmail.com>
Committed: Thu Jun 20 09:36:20 2013 -0700
----------------------------------------------------------------------
include/folsom.hrl | 2 +-
src/folsom_sample_none.erl | 8 +++-----
test/folsom_erlang_checks.erl | 19 +++++++++++++++++--
3 files changed, 21 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
[04/50] folsom commit: updated refs/heads/import-master to 4824aec
Posted by da...@apache.org.
Let the slide server crash and stay crashed after multiple errors
The restart strategy on the slide server was such that it would
_never_ stop in the case that the ets table it was trimming went away.
Instead it would metronimically add a crash message to your log
every 30 seconds. This commit sets the restart strategy to 3
failures in 3 minutes. Since the only seen live examples of
a slide server crash have been when the ets table has gone
away, it is best crash and stay dead than be restarted after
3 failed trims.
Project: http://git-wip-us.apache.org/repos/asf/couchdb-folsom/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-folsom/commit/a82f2aa6
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-folsom/tree/a82f2aa6
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-folsom/diff/a82f2aa6
Branch: refs/heads/import-master
Commit: a82f2aa6465575ad8dd651c6c6dd0cdecb1490aa
Parents: c7b450f
Author: Russell Brown <ru...@mac.com>
Authored: Tue Mar 19 15:55:58 2013 +0000
Committer: Russell Brown <ru...@mac.com>
Committed: Tue Mar 19 15:55:58 2013 +0000
----------------------------------------------------------------------
src/folsom_sample_slide_sup.erl | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-folsom/blob/a82f2aa6/src/folsom_sample_slide_sup.erl
----------------------------------------------------------------------
diff --git a/src/folsom_sample_slide_sup.erl b/src/folsom_sample_slide_sup.erl
index c8929d1..670352b 100644
--- a/src/folsom_sample_slide_sup.erl
+++ b/src/folsom_sample_slide_sup.erl
@@ -44,7 +44,7 @@ start_slide_server(SampleMod, Reservoir, Window) ->
%% @private
init ([]) ->
- {ok,{{simple_one_for_one,10,10},
+ {ok,{{simple_one_for_one, 3, 180},
[
{undefined, {folsom_sample_slide_server, start_link, []},
transient, brutal_kill, worker, [folsom_sample_slide_server]}
[49/50] folsom commit: updated refs/heads/import-master to 4824aec
Posted by da...@apache.org.
Make compatible with R17
Project: http://git-wip-us.apache.org/repos/asf/couchdb-folsom/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-folsom/commit/740282b9
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-folsom/tree/740282b9
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-folsom/diff/740282b9
Branch: refs/heads/import-master
Commit: 740282b9d3c619cf96d75120f367959ecb216cac
Parents: 015c646
Author: Kirill Pinchuk <k_...@wargaming.net>
Authored: Mon May 5 16:32:29 2014 +0300
Committer: Kirill Pinchuk <k_...@wargaming.net>
Committed: Mon May 5 16:32:29 2014 +0300
----------------------------------------------------------------------
rebar.config | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-folsom/blob/740282b9/rebar.config
----------------------------------------------------------------------
diff --git a/rebar.config b/rebar.config
index 54d1b8f..d775509 100644
--- a/rebar.config
+++ b/rebar.config
@@ -2,7 +2,7 @@
{deps, [
{'bear', ".*", {git, "git://github.com/boundary/bear.git", {tag, "0.8.1"}}},
- {meck, ".*", {git, "git://github.com/eproxus/meck", {tag, "0.8.1"}}}
+ {meck, ".*", {git, "git://github.com/eproxus/meck", {tag, "0.8.2"}}}
]}.
{erl_opts, [debug_info]}.
[29/50] folsom commit: updated refs/heads/import-master to 4824aec
Posted by da...@apache.org.
wrap erlang:statistics and get_system_info to avoid issues on new/old vms
Project: http://git-wip-us.apache.org/repos/asf/couchdb-folsom/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-folsom/commit/ade45c8a
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-folsom/tree/ade45c8a
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-folsom/diff/ade45c8a
Branch: refs/heads/import-master
Commit: ade45c8a6edd39e497211900db6f4c4362911dec
Parents: ffc18d2
Author: Joe Williams <jo...@github.com>
Authored: Mon Nov 4 11:07:20 2013 -0800
Committer: Joe Williams <jo...@github.com>
Committed: Mon Nov 4 11:07:20 2013 -0800
----------------------------------------------------------------------
src/folsom_vm_metrics.erl | 17 +++++++++++++++--
1 file changed, 15 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-folsom/blob/ade45c8a/src/folsom_vm_metrics.erl
----------------------------------------------------------------------
diff --git a/src/folsom_vm_metrics.erl b/src/folsom_vm_metrics.erl
index 8a42f40..fc91d86 100644
--- a/src/folsom_vm_metrics.erl
+++ b/src/folsom_vm_metrics.erl
@@ -46,10 +46,10 @@ get_memory() ->
erlang:memory().
get_statistics() ->
- [{Key, convert_statistics({Key, erlang:statistics(Key)})} || Key <- ?STATISTICS].
+ [{Key, convert_statistics({Key, get_statistics(Key)})} || Key <- ?STATISTICS].
get_system_info() ->
- [{Key, convert_system_info({Key, erlang:system_info(Key)})} || Key <- ?SYSTEM_INFO].
+ [{Key, convert_system_info({Key, get_system_info(Key)})} || Key <- ?SYSTEM_INFO].
get_process_info() ->
[{pid_port_fun_to_atom(Pid), get_process_info(Pid)} || Pid <- processes()].
@@ -65,6 +65,19 @@ get_dets_info() ->
% internal functions
+% wrap system_info and statistics in a try/catch in case keys are missing
+% in old/new versions of erlang
+
+get_system_info(Key) ->
+ try erlang:system_info(Key) catch
+ error:badarg->undefined
+ end.
+
+get_statistics(Key) ->
+ try erlang:statistics(Key) catch
+ error:badarg->undefined
+ end.
+
%% conversion functions for erlang:statistics(Key)
convert_statistics({context_switches, {ContextSwitches, 0}}) ->
[17/50] folsom commit: updated refs/heads/import-master to 4824aec
Posted by da...@apache.org.
Add bear to start applications
Project: http://git-wip-us.apache.org/repos/asf/couchdb-folsom/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-folsom/commit/d46722d9
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-folsom/tree/d46722d9
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-folsom/diff/d46722d9
Branch: refs/heads/import-master
Commit: d46722d9d28920e624cb4f1401ba3b9e920ef5fc
Parents: 497559d
Author: Paul Oliver <pu...@gmail.com>
Authored: Tue Oct 29 19:02:15 2013 +0100
Committer: Paul Oliver <pu...@gmail.com>
Committed: Tue Oct 29 19:02:15 2013 +0100
----------------------------------------------------------------------
src/folsom.app.src | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-folsom/blob/d46722d9/src/folsom.app.src
----------------------------------------------------------------------
diff --git a/src/folsom.app.src b/src/folsom.app.src
index 3380bed..81b1451 100644
--- a/src/folsom.app.src
+++ b/src/folsom.app.src
@@ -8,7 +8,8 @@
folsom_sup]},
{applications, [
kernel,
- stdlib
+ stdlib,
+ bear
]},
{env, []},
{mod, {folsom, []}}
[06/50] folsom commit: updated refs/heads/import-master to 4824aec
Posted by da...@apache.org.
Tests for delete counter, contents of folsom counters table are not deleted
Project: http://git-wip-us.apache.org/repos/asf/couchdb-folsom/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-folsom/commit/600dd78e
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-folsom/tree/600dd78e
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-folsom/diff/600dd78e
Branch: refs/heads/import-master
Commit: 600dd78ecd9177cbccb630210f902e5d7f228057
Parents: 5e2d2e0
Author: Diana Corbacho <di...@erlang-solutions.com>
Authored: Wed May 1 15:29:57 2013 +0100
Committer: Diana Corbacho <di...@erlang-solutions.com>
Committed: Wed May 1 15:29:57 2013 +0100
----------------------------------------------------------------------
test/folsom_erlang_checks.erl | 13 ++++++++++++-
test/folsom_tests.erl | 4 +++-
2 files changed, 15 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-folsom/blob/600dd78e/test/folsom_erlang_checks.erl
----------------------------------------------------------------------
diff --git a/test/folsom_erlang_checks.erl b/test/folsom_erlang_checks.erl
index eeeffd7..6b92bb6 100644
--- a/test/folsom_erlang_checks.erl
+++ b/test/folsom_erlang_checks.erl
@@ -36,7 +36,8 @@
vm_metrics/0,
counter_metric/2,
cpu_topology/0,
- c_compiler_used/0
+ c_compiler_used/0,
+ create_delete_metrics/0
]).
-define(DATA, [0, 1, 5, 10, 100, 200, 500, 750, 1000, 2000, 5000]).
@@ -453,3 +454,13 @@ duration_check(Duration) ->
?assertEqual(10, proplists:get_value(count, Duration)),
Last = proplists:get_value(last, Duration),
?assert(Last > 10000).
+
+create_delete_metrics() ->
+ ?assertMatch(ok, folsom_metrics:new_counter(counter)),
+ ?assertMatch(ok, folsom_metrics:notify_existing_metric(counter, {inc, 1}, counter)),
+ ?assertMatch(1, folsom_metrics:get_metric_value(counter)),
+ ?assertMatch(ok, folsom_metrics:delete_metric(counter)),
+ ?assertError(badarg, folsom_metrics:notify_existing_metric(counter, {inc, 1}, counter)),
+ ?assertMatch(ok, folsom_metrics:new_counter(counter)),
+ ?assertMatch(ok, folsom_metrics:notify_existing_metric(counter, {inc, 1}, counter)),
+ ?assertMatch(1, folsom_metrics:get_metric_value(counter)).
http://git-wip-us.apache.org/repos/asf/couchdb-folsom/blob/600dd78e/test/folsom_tests.erl
----------------------------------------------------------------------
diff --git a/test/folsom_tests.erl b/test/folsom_tests.erl
index 389c3f9..0917b8f 100644
--- a/test/folsom_tests.erl
+++ b/test/folsom_tests.erl
@@ -51,7 +51,9 @@ run_test_() ->
{"cpu topology test",
fun folsom_erlang_checks:cpu_topology/0},
{"c compiler test",
- fun folsom_erlang_checks:c_compiler_used/0}]}.
+ fun folsom_erlang_checks:c_compiler_used/0},
+ {"create and delete tests",
+ fun folsom_erlang_checks:create_delete_metrics/0}]}.
configure_test_() ->
{foreach, fun setup_app/0, fun cleanup_app/1,
[40/50] folsom commit: updated refs/heads/import-master to 4824aec
Posted by da...@apache.org.
Merge pull request #73 from byaruhaf/patch-1
Updated the app description
Project: http://git-wip-us.apache.org/repos/asf/couchdb-folsom/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-folsom/commit/4262632a
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-folsom/tree/4262632a
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-folsom/diff/4262632a
Branch: refs/heads/import-master
Commit: 4262632a6f560bc075ac73bf85c21e88d969de71
Parents: 551ffad 1d090a7
Author: Joe Williams <wi...@gmail.com>
Authored: Wed Dec 4 19:31:39 2013 -0800
Committer: Joe Williams <wi...@gmail.com>
Committed: Wed Dec 4 19:31:39 2013 -0800
----------------------------------------------------------------------
src/folsom.app.src | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
[16/50] folsom commit: updated refs/heads/import-master to 4824aec
Posted by da...@apache.org.
use meck 0.7.2
Project: http://git-wip-us.apache.org/repos/asf/couchdb-folsom/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-folsom/commit/cae0c35e
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-folsom/tree/cae0c35e
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-folsom/diff/cae0c35e
Branch: refs/heads/import-master
Commit: cae0c35eae147367edb0a83ca7bc66e23cd1991c
Parents: 497559d
Author: Tilman Holschuh <th...@pugpharm.com>
Authored: Wed Sep 11 15:11:56 2013 -0700
Committer: Tilman Holschuh <th...@pugpharm.com>
Committed: Wed Sep 11 15:11:56 2013 -0700
----------------------------------------------------------------------
rebar.config | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-folsom/blob/cae0c35e/rebar.config
----------------------------------------------------------------------
diff --git a/rebar.config b/rebar.config
index 88bce87..c3fab02 100644
--- a/rebar.config
+++ b/rebar.config
@@ -2,7 +2,7 @@
{deps, [
{'bear', ".*", {git, "git://github.com/boundary/bear.git", {tag, "0.1.3"}}},
- {meck, ".*", {git, "git://github.com/eproxus/meck", "master"}}
+ {meck, ".*", {git, "git://github.com/eproxus/meck", {tag, "0.7.2"}}}
]}.
{erl_opts, [debug_info]}.
[44/50] folsom commit: updated refs/heads/import-master to 4824aec
Posted by da...@apache.org.
Added a test case for downsizing sliding window
Project: http://git-wip-us.apache.org/repos/asf/couchdb-folsom/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-folsom/commit/13549b40
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-folsom/tree/13549b40
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-folsom/diff/13549b40
Branch: refs/heads/import-master
Commit: 13549b407dbedd6fdb78dfd665727882b98735c9
Parents: 5694f42
Author: Vasco <va...@vas.io>
Authored: Thu Jan 9 19:24:18 2014 +0000
Committer: Vasco <va...@vas.io>
Committed: Thu Jan 9 19:24:18 2014 +0000
----------------------------------------------------------------------
src/folsom_sample_slide.erl | 2 +-
src/folsom_sample_slide_uniform.erl | 2 +-
test/folsom_sample_slide_test.erl | 59 +++++++++++++++++++++++++++++---
3 files changed, 57 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-folsom/blob/13549b40/src/folsom_sample_slide.erl
----------------------------------------------------------------------
diff --git a/src/folsom_sample_slide.erl b/src/folsom_sample_slide.erl
index b82acf9..e1dd455 100644
--- a/src/folsom_sample_slide.erl
+++ b/src/folsom_sample_slide.erl
@@ -29,7 +29,7 @@
get_values/1,
moment/0,
trim/2,
- resize/2
+ resize/2
]).
-include("folsom.hrl").
http://git-wip-us.apache.org/repos/asf/couchdb-folsom/blob/13549b40/src/folsom_sample_slide_uniform.erl
----------------------------------------------------------------------
diff --git a/src/folsom_sample_slide_uniform.erl b/src/folsom_sample_slide_uniform.erl
index d99373f..906e5d8 100644
--- a/src/folsom_sample_slide_uniform.erl
+++ b/src/folsom_sample_slide_uniform.erl
@@ -29,7 +29,7 @@
get_values/1,
moment/0,
trim/2,
- resize/2
+ resize/2
]).
-include("folsom.hrl").
http://git-wip-us.apache.org/repos/asf/couchdb-folsom/blob/13549b40/test/folsom_sample_slide_test.erl
----------------------------------------------------------------------
diff --git a/test/folsom_sample_slide_test.erl b/test/folsom_sample_slide_test.erl
index dc08d95..dc88bc9 100644
--- a/test/folsom_sample_slide_test.erl
+++ b/test/folsom_sample_slide_test.erl
@@ -44,8 +44,11 @@ slide_test_() ->
fun create/0},
{"test sliding window",
{timeout, 30, fun exercise/0}},
- {"resize sliding window",
- {timeout, 30, fun resize_window/0}}
+ {"resize sliding window (expand)",
+ {timeout, 30, fun expand_window/0}},
+ {"resize sliding window (shrink)",
+ {timeout, 30, fun shrink_window/0}}
+
]}.
create() ->
@@ -91,7 +94,7 @@ exercise() ->
check_table(Slide, []),
ok.
-resize_window() ->
+expand_window() ->
%% create a new histogram
%% will leave the trim server running, as resize() needs it
ok = folsom_metrics:new_histogram(?HISTO2, slide, ?WINDOW),
@@ -114,7 +117,7 @@ resize_window() ->
Values = lists:sort(folsom_sample_slide:get_values(Slide)),
?assertEqual(ExpectedValues, Values),
- %%resize the sliding window
+ %%expand the sliding window
NewSlide = folsom_sample_slide:resize(Slide, ?DOUBLE_WINDOW),
%% get values only returns last ?WINDOW*2 seconds
@@ -136,6 +139,54 @@ resize_window() ->
Trimmed2 = folsom_sample_slide:trim(NewSlide#slide.reservoir, ?DOUBLE_WINDOW),
?assertEqual((?RUNTIME * ?READINGS) - ((?RUNTIME - ?DOUBLE_WINDOW - 1) * ?READINGS), Trimmed2),
check_table(NewSlide, []),
+ ok = folsom_metrics:delete_metric(?HISTO2).
+
+
+shrink_window() ->
+ %% create a new histogram
+ %% will leave the trim server running, as resize() needs it
+ ok = folsom_metrics:new_histogram(?HISTO2, slide, ?DOUBLE_WINDOW),
+ #histogram{sample=Slide} = folsom_metrics_histogram:get_value(?HISTO2),
+ Moments = lists:seq(1, ?RUNTIME ),
+ %% pump in 90 seconds worth of readings
+ Moment = lists:foldl(fun(_X, Tick) ->
+ Tock = tick(Tick),
+ [folsom_sample_slide:update(Slide, N) ||
+ N <- lists:duplicate(?READINGS, Tock)],
+ Tock end,
+ 0,
+ Moments),
+ %% are all readings in the table?
+ check_table(Slide, Moments),
+
+ %% get values only returns last ?DOUBLE_WINDOW seconds
+ ExpectedValues = lists:sort(lists:flatten([lists:duplicate(?READINGS, N) ||
+ N <- lists:seq(?RUNTIME - ?DOUBLE_WINDOW, ?RUNTIME)])),
+ Values = lists:sort(folsom_sample_slide:get_values(Slide)),
+ ?assertEqual(ExpectedValues, Values),
+
+ %%shrink the sliding window
+ NewSlide = folsom_sample_slide:resize(Slide, ?WINDOW),
+
+ %% get values only returns last ?WINDOW*2 seconds
+ NewExpectedValues = lists:sort(lists:flatten([lists:duplicate(?READINGS, N) ||
+ N <- lists:seq(?RUNTIME - ?WINDOW, ?RUNTIME)])),
+ NewValues = lists:sort(folsom_sample_slide:get_values(NewSlide)),
+ ?assertEqual(NewExpectedValues, NewValues),
+
+
+ %% trim the table
+ Trimmed = folsom_sample_slide:trim(NewSlide#slide.reservoir, ?WINDOW),
+ ?assertEqual((?RUNTIME - ?WINDOW - 1) * ?READINGS, Trimmed),
+ check_table(NewSlide, lists:seq(?RUNTIME - ?WINDOW, ?RUNTIME)),
+ %% increment the clock past the window
+ tick(Moment, ?WINDOW*2),
+ %% get values should be empty
+ ?assertEqual([], folsom_sample_slide:get_values(NewSlide)),
+ %% trim, and table should be empty
+ Trimmed2 = folsom_sample_slide:trim(NewSlide#slide.reservoir, ?WINDOW),
+ ?assertEqual((?RUNTIME * ?READINGS) - ((?RUNTIME - ?WINDOW - 1) * ?READINGS), Trimmed2),
+ check_table(NewSlide, []),
ok.
tick(Moment0, IncrBy) ->
[22/50] folsom commit: updated refs/heads/import-master to 4824aec
Posted by da...@apache.org.
Add .mailmap to clean up the output of `git shortlog -nes`
Project: http://git-wip-us.apache.org/repos/asf/couchdb-folsom/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-folsom/commit/6fedbb47
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-folsom/tree/6fedbb47
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-folsom/diff/6fedbb47
Branch: refs/heads/import-master
Commit: 6fedbb477da188ead867fbefc6c013b1c72e4775
Parents: a5bb8fc
Author: Rodolphe Quiédeville <ro...@quiedeville.org>
Authored: Thu Oct 31 19:02:17 2013 +0100
Committer: Rodolphe Quiédeville <ro...@quiedeville.org>
Committed: Thu Oct 31 19:02:17 2013 +0100
----------------------------------------------------------------------
.mailmap | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-folsom/blob/6fedbb47/.mailmap
----------------------------------------------------------------------
diff --git a/.mailmap b/.mailmap
new file mode 100644
index 0000000..15b3849
--- /dev/null
+++ b/.mailmap
@@ -0,0 +1,2 @@
+Joe Williams <wi...@gmail.com> <jo...@joetify.com>
+Joe Williams <wi...@gmail.com> <wi...@gmail.com>
[18/50] folsom commit: updated refs/heads/import-master to 4824aec
Posted by da...@apache.org.
add tuple default for slide_uniform
Project: http://git-wip-us.apache.org/repos/asf/couchdb-folsom/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-folsom/commit/217d1451
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-folsom/tree/217d1451
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-folsom/diff/217d1451
Branch: refs/heads/import-master
Commit: 217d14515cd5bdbf61e74411652eeb27a1b2ed5d
Parents: 497559d
Author: Christopher A. Stelma <st...@gmail.com>
Authored: Wed Oct 30 16:19:26 2013 -0700
Committer: Christopher A. Stelma <cs...@tagged.com>
Committed: Wed Oct 30 16:34:10 2013 -0700
----------------------------------------------------------------------
src/folsom_metrics.erl | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-folsom/blob/217d1451/src/folsom_metrics.erl
----------------------------------------------------------------------
diff --git a/src/folsom_metrics.erl b/src/folsom_metrics.erl
index 40f66f2..f844d1f 100644
--- a/src/folsom_metrics.erl
+++ b/src/folsom_metrics.erl
@@ -84,6 +84,8 @@ new_gauge(Name) ->
new_histogram(Name) ->
folsom_metrics:new_histogram(Name, ?DEFAULT_SAMPLE_TYPE, ?DEFAULT_SIZE, ?DEFAULT_ALPHA).
+new_histogram(Name, slide_uniform) ->
+ folsom_metrics:new_histogram(Name, slide_uniform, {?DEFAULT_SLIDING_WINDOW, ?DEFAULT_SIZE}, ?DEFAULT_ALPHA);
new_histogram(Name, SampleType) ->
folsom_metrics:new_histogram(Name, SampleType, ?DEFAULT_SIZE, ?DEFAULT_ALPHA).
[14/50] folsom commit: updated refs/heads/import-master to 4824aec
Posted by da...@apache.org.
Add histogram of type 'slide_sorted'
* This histogram is a simple sliding window of fixed size.
* Tests included.
Project: http://git-wip-us.apache.org/repos/asf/couchdb-folsom/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-folsom/commit/df263eb3
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-folsom/tree/df263eb3
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-folsom/diff/df263eb3
Branch: refs/heads/import-master
Commit: df263eb33ceedc6abef5e246e2848d9383fdb892
Parents: 47a408a
Author: Lastres <ra...@gmail.com>
Authored: Wed Jul 17 15:22:25 2013 +0100
Committer: Lastres <ra...@gmail.com>
Committed: Wed Jul 17 15:24:39 2013 +0100
----------------------------------------------------------------------
include/folsom.hrl | 6 ++++
src/folsom_ets.erl | 5 ++++
src/folsom_sample.erl | 6 ++++
src/folsom_sample_slide_sorted.erl | 52 +++++++++++++++++++++++++++++++++
test/folsom_erlang_checks.erl | 12 ++++++--
5 files changed, 79 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-folsom/blob/df263eb3/include/folsom.hrl
----------------------------------------------------------------------
diff --git a/include/folsom.hrl b/include/folsom.hrl
index 8be22d6..0249e7e 100644
--- a/include/folsom.hrl
+++ b/include/folsom.hrl
@@ -61,6 +61,12 @@
reservoir = folsom_metrics_histogram_ets:new(folsom_none,[ordered_set, {write_concurrency, true}, public])
}).
+-record(slide_sorted, {
+ size = ?DEFAULT_SIZE,
+ n = 0,
+ reservoir = folsom_metrics_histogram_ets:new(folsom_slide_sorted,[ordered_set, {write_concurrency, true}, public])
+ }).
+
-record(histogram, {
type = uniform,
sample = #uniform{}
http://git-wip-us.apache.org/repos/asf/couchdb-folsom/blob/df263eb3/src/folsom_ets.erl
----------------------------------------------------------------------
diff --git a/src/folsom_ets.erl b/src/folsom_ets.erl
index 8c1e66d..a7dfaf1 100644
--- a/src/folsom_ets.erl
+++ b/src/folsom_ets.erl
@@ -315,6 +315,11 @@ delete_histogram(Name, #histogram{type = none, sample = #none{reservoir = Reserv
true = ets:delete(?FOLSOM_TABLE, Name),
true = ets:delete(Reservoir),
ok;
+delete_histogram(Name, #histogram{type = slide_sorted, sample = #slide_sorted{reservoir = Reservoir}}) ->
+ true = ets:delete(?HISTOGRAM_TABLE, Name),
+ true = ets:delete(?FOLSOM_TABLE, Name),
+ true = ets:delete(Reservoir),
+ ok;
delete_histogram(Name, #histogram{type = exdec}) ->
true = ets:delete(?HISTOGRAM_TABLE, Name),
true = ets:delete(?FOLSOM_TABLE, Name),
http://git-wip-us.apache.org/repos/asf/couchdb-folsom/blob/df263eb3/src/folsom_sample.erl
----------------------------------------------------------------------
diff --git a/src/folsom_sample.erl b/src/folsom_sample.erl
index f08d233..fc05724 100644
--- a/src/folsom_sample.erl
+++ b/src/folsom_sample.erl
@@ -54,6 +54,8 @@ new(uniform, Size, _) ->
folsom_sample_uniform:new(Size);
new(none, Size, _) ->
folsom_sample_none:new(Size);
+new(slide_sorted, Size, _) ->
+ folsom_sample_slide_sorted:new(Size);
new(exdec, Size, Alpha) ->
folsom_sample_exdec:new(Size, Alpha).
@@ -61,6 +63,8 @@ update(uniform, Sample, Value) ->
folsom_sample_uniform:update(Sample, Value);
update(none, Sample, Value) ->
folsom_sample_none:update(Sample, Value);
+update(slide_sorted, Sample, Value) ->
+ folsom_sample_slide_sorted:update(Sample, Value);
update(exdec, Sample, Value) ->
folsom_sample_exdec:update(Sample, Value);
update(slide, Sample, Value) ->
@@ -73,6 +77,8 @@ get_values(uniform, Sample) ->
folsom_sample_uniform:get_values(Sample);
get_values(none, Sample) ->
folsom_sample_none:get_values(Sample);
+get_values(slide_sorted, Sample) ->
+ folsom_sample_slide_sorted:get_values(Sample);
get_values(exdec, Sample) ->
folsom_sample_exdec:get_values(Sample);
get_values(slide, Sample) ->
http://git-wip-us.apache.org/repos/asf/couchdb-folsom/blob/df263eb3/src/folsom_sample_slide_sorted.erl
----------------------------------------------------------------------
diff --git a/src/folsom_sample_slide_sorted.erl b/src/folsom_sample_slide_sorted.erl
new file mode 100644
index 0000000..f751790
--- /dev/null
+++ b/src/folsom_sample_slide_sorted.erl
@@ -0,0 +1,52 @@
+%%%
+%%% Copyright 2011, Boundary
+%%%
+%%% Licensed under the Apache License, Version 2.0 (the "License");
+%%% you may not use this file except in compliance with the License.
+%%% You may obtain a copy of the License at
+%%%
+%%% http://www.apache.org/licenses/LICENSE-2.0
+%%%
+%%% Unless required by applicable law or agreed to in writing, software
+%%% distributed under the License is distributed on an "AS IS" BASIS,
+%%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+%%% See the License for the specific language governing permissions and
+%%% limitations under the License.
+%%%
+
+
+%%%-------------------------------------------------------------------
+%%% File: folsom_sample_slide_sorted.erl
+%%% @author Ramon Lastres <ra...@erlang-solutions.com>
+%%% @doc
+%%% simple sliding window histogram.
+%%% @end
+%%%-----------------------------------------------------------------
+
+-module(folsom_sample_slide_sorted).
+
+-export([
+ new/1,
+ update/2,
+ get_values/1
+ ]).
+
+-include("folsom.hrl").
+
+new(Size) ->
+ #slide_sorted{size = Size}.
+
+update(#slide_sorted{size = Size, reservoir = Reservoir, n = N} = Sample, Value)
+ when N < Size ->
+ ets:insert(Reservoir, {os:timestamp(), Value}),
+ Sample#slide_sorted{n = N + 1};
+update(#slide_sorted{reservoir = Reservoir, n = N, size = Size} = Sample, Value)
+ when N == Size ->
+ Oldest = ets:first(Reservoir),
+ ets:delete(Reservoir, Oldest),
+ ets:insert(Reservoir, {os:timestamp(), Value}),
+ Sample.
+
+get_values(#slide_sorted{reservoir = Reservoir}) ->
+ {_, Values} = lists:unzip(ets:tab2list(Reservoir)),
+ Values.
http://git-wip-us.apache.org/repos/asf/couchdb-folsom/blob/df263eb3/test/folsom_erlang_checks.erl
----------------------------------------------------------------------
diff --git a/test/folsom_erlang_checks.erl b/test/folsom_erlang_checks.erl
index 710344d..743a405 100644
--- a/test/folsom_erlang_checks.erl
+++ b/test/folsom_erlang_checks.erl
@@ -63,6 +63,8 @@ create_metrics() ->
ok = folsom_metrics:new_histogram(noneb, none, 10),
ok = folsom_metrics:new_histogram(nonec, none, 5),
+ ok = folsom_metrics:new_histogram(slide_sorted_a, slide_sorted, 10),
+
ok = folsom_metrics:new_histogram(timed, none, 5000),
ok = folsom_metrics:new_histogram(timed2, none, 5000),
@@ -90,7 +92,7 @@ create_metrics() ->
%% check a server got started for the spiral metric
1 = length(supervisor:which_children(folsom_sample_slide_sup)),
- 17 = length(folsom_metrics:get_metrics()),
+ 18 = length(folsom_metrics:get_metrics()),
?debugFmt("~n~nmetrics: ~p~n", [folsom_metrics:get_metrics()]).
@@ -136,6 +138,8 @@ populate_metrics() ->
[ok = folsom_metrics:notify({nonec, Value}) || Value <- ?DATA2],
+ [ok = folsom_metrics:notify({slide_sorted_a, Value}) || Value <- ?DATA2],
+
3.141592653589793 = folsom_metrics:histogram_timed_update(timed, math, pi, []),
Begin = folsom_metrics:histogram_timed_begin(timed2),
@@ -192,6 +196,8 @@ check_metrics() ->
[11,12,13,14,15] = folsom_metrics:get_metric_value(nonec),
+ [6,7,8,9,10,11,12,13,14,15] = folsom_metrics:get_metric_value(slide_sorted_a),
+
Histogram1 = folsom_metrics:get_histogram_statistics(<<"uniform">>),
histogram_checks(Histogram1),
@@ -296,7 +302,7 @@ check_group_metrics() ->
{counter, 0} = lists:keyfind(counter,1,Metrics).
delete_metrics() ->
- 19 = length(ets:tab2list(?FOLSOM_TABLE)),
+ 20 = length(ets:tab2list(?FOLSOM_TABLE)),
ok = folsom_metrics:delete_metric(counter),
ok = folsom_metrics:delete_metric(counter2),
@@ -314,6 +320,8 @@ delete_metrics() ->
ok = folsom_metrics:delete_metric(noneb),
ok = folsom_metrics:delete_metric(nonec),
+ ok = folsom_metrics:delete_metric(slide_sorted_a),
+
ok = folsom_metrics:delete_metric(timed),
ok = folsom_metrics:delete_metric(timed2),
ok = folsom_metrics:delete_metric(testcounter),
[19/50] folsom commit: updated refs/heads/import-master to 4824aec
Posted by da...@apache.org.
Merge pull request #65 from ypaq/master
use meck 0.7.2
Project: http://git-wip-us.apache.org/repos/asf/couchdb-folsom/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-folsom/commit/14a2d179
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-folsom/tree/14a2d179
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-folsom/diff/14a2d179
Branch: refs/heads/import-master
Commit: 14a2d179e5d012864eb51fd63134455363351cdc
Parents: 497559d cae0c35
Author: Joe Williams <wi...@gmail.com>
Authored: Thu Oct 31 09:37:44 2013 -0700
Committer: Joe Williams <wi...@gmail.com>
Committed: Thu Oct 31 09:37:44 2013 -0700
----------------------------------------------------------------------
rebar.config | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
[24/50] folsom commit: updated refs/heads/import-master to 4824aec
Posted by da...@apache.org.
Merge pull request #70 from avasenin/tagged-notify
Add ability to pass tags to notify
Project: http://git-wip-us.apache.org/repos/asf/couchdb-folsom/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-folsom/commit/9745617d
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-folsom/tree/9745617d
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-folsom/diff/9745617d
Branch: refs/heads/import-master
Commit: 9745617d5d481b58a99459449a41647ddb30ecf0
Parents: a5bb8fc 091ccfd
Author: Joe Williams <wi...@gmail.com>
Authored: Mon Nov 4 10:22:19 2013 -0800
Committer: Joe Williams <wi...@gmail.com>
Committed: Mon Nov 4 10:22:19 2013 -0800
----------------------------------------------------------------------
src/folsom_ets.erl | 33 ++++++++++++++++++++++++---------
src/folsom_metrics.erl | 12 ++++++++++++
test/folsom_erlang_checks.erl | 11 ++++++++++-
3 files changed, 46 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
[09/50] folsom commit: updated refs/heads/import-master to 4824aec
Posted by da...@apache.org.
Fix a race against querying the ETS/DETS tables.
There is a window from the query of, say, `ets:all()` to the point where we fetch out the table data. The table may disappear in between. This patch fixes this problem by ignoring such tables and returning the empty list for those where there is no data available anymore.
Project: http://git-wip-us.apache.org/repos/asf/couchdb-folsom/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-folsom/commit/d999b679
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-folsom/tree/d999b679
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-folsom/diff/d999b679
Branch: refs/heads/import-master
Commit: d999b67944b4d2d6424f513fe4b00773f69c1c86
Parents: 154024e
Author: Jesper Louis Andersen <je...@gmail.com>
Authored: Tue May 14 11:15:31 2013 +0200
Committer: Jesper Louis Andersen <je...@gmail.com>
Committed: Tue May 14 11:15:31 2013 +0200
----------------------------------------------------------------------
src/folsom_vm_metrics.erl | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-folsom/blob/d999b679/src/folsom_vm_metrics.erl
----------------------------------------------------------------------
diff --git a/src/folsom_vm_metrics.erl b/src/folsom_vm_metrics.erl
index 4ff72d1..fab4ef0 100644
--- a/src/folsom_vm_metrics.erl
+++ b/src/folsom_vm_metrics.erl
@@ -230,7 +230,11 @@ get_socket_sockname(Socket) ->
end.
get_ets_dets_info(Type, Tab) ->
- [{Key, pid_port_fun_to_atom(Value)} || {Key, Value} <- Type:info(Tab)].
+ case Type:info(Tab) of
+ undefined -> [];
+ Entries when is_list(Entries) ->
+ [{Key, pid_port_fun_to_atom(Value)} || {Key, Value} <- Entries]
+ end.
ip_to_binary(Tuple) ->
iolist_to_binary(string:join(lists:map(fun integer_to_list/1, tuple_to_list(Tuple)), ".")).
[21/50] folsom commit: updated refs/heads/import-master to 4824aec
Posted by da...@apache.org.
Merge pull request #67 from puzza007/bear-in-start-applications
Add bear to start applications
Project: http://git-wip-us.apache.org/repos/asf/couchdb-folsom/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-folsom/commit/a5bb8fcf
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-folsom/tree/a5bb8fcf
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-folsom/diff/a5bb8fcf
Branch: refs/heads/import-master
Commit: a5bb8fcf021f4ad8f53226f187447347bf85d193
Parents: 58990d5 d46722d
Author: Joe Williams <wi...@gmail.com>
Authored: Thu Oct 31 09:42:54 2013 -0700
Committer: Joe Williams <wi...@gmail.com>
Committed: Thu Oct 31 09:42:54 2013 -0700
----------------------------------------------------------------------
src/folsom.app.src | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
[28/50] folsom commit: updated refs/heads/import-master to 4824aec
Posted by da...@apache.org.
Revert "Add bear to start applications"
This reverts commit d46722d9d28920e624cb4f1401ba3b9e920ef5fc.
Project: http://git-wip-us.apache.org/repos/asf/couchdb-folsom/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-folsom/commit/7032b844
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-folsom/tree/7032b844
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-folsom/diff/7032b844
Branch: refs/heads/import-master
Commit: 7032b84473f2cf8863a1d52c6333340bcc26a7f5
Parents: eeb4c36
Author: Joe Williams <jo...@github.com>
Authored: Mon Nov 4 10:47:04 2013 -0800
Committer: Joe Williams <jo...@github.com>
Committed: Mon Nov 4 10:51:03 2013 -0800
----------------------------------------------------------------------
src/folsom.app.src | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-folsom/blob/7032b844/src/folsom.app.src
----------------------------------------------------------------------
diff --git a/src/folsom.app.src b/src/folsom.app.src
index 81b1451..3380bed 100644
--- a/src/folsom.app.src
+++ b/src/folsom.app.src
@@ -8,8 +8,7 @@
folsom_sup]},
{applications, [
kernel,
- stdlib,
- bear
+ stdlib
]},
{env, []},
{mod, {folsom, []}}
[48/50] folsom commit: updated refs/heads/import-master to 4824aec
Posted by da...@apache.org.
bear bump
Project: http://git-wip-us.apache.org/repos/asf/couchdb-folsom/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-folsom/commit/015c6464
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-folsom/tree/015c6464
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-folsom/diff/015c6464
Branch: refs/heads/import-master
Commit: 015c646487f48f2dd1bba721f39d36f0c330626e
Parents: 99cbf58
Author: Joe Williams <jo...@github.com>
Authored: Tue Jan 28 15:52:40 2014 -0800
Committer: Joe Williams <jo...@github.com>
Committed: Tue Jan 28 15:52:40 2014 -0800
----------------------------------------------------------------------
rebar.config | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-folsom/blob/015c6464/rebar.config
----------------------------------------------------------------------
diff --git a/rebar.config b/rebar.config
index deda9f1..54d1b8f 100644
--- a/rebar.config
+++ b/rebar.config
@@ -1,7 +1,7 @@
{sub_dirs, ["deps"]}.
{deps, [
- {'bear', ".*", {git, "git://github.com/boundary/bear.git", master}},
+ {'bear', ".*", {git, "git://github.com/boundary/bear.git", {tag, "0.8.1"}}},
{meck, ".*", {git, "git://github.com/eproxus/meck", {tag, "0.8.1"}}}
]}.
[05/50] folsom commit: updated refs/heads/import-master to 4824aec
Posted by da...@apache.org.
Merge pull request #57 from basho/rdb-letitcrash
Let the slide server crash and stay crashed after multiple errors
Project: http://git-wip-us.apache.org/repos/asf/couchdb-folsom/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-folsom/commit/5e2d2e0d
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-folsom/tree/5e2d2e0d
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-folsom/diff/5e2d2e0d
Branch: refs/heads/import-master
Commit: 5e2d2e0da4ce9d2edb5d60414ee554ec6cebf464
Parents: c7b450f a82f2aa
Author: Joe Williams <wi...@gmail.com>
Authored: Tue Mar 19 11:18:11 2013 -0700
Committer: Joe Williams <wi...@gmail.com>
Committed: Tue Mar 19 11:18:11 2013 -0700
----------------------------------------------------------------------
src/folsom_sample_slide_sup.erl | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
[12/50] folsom commit: updated refs/heads/import-master to 4824aec
Posted by da...@apache.org.
Fix histogram of type 'none'
* Before, after filling in the SIZE of the histogram, when adding new values the same element was deleted and updated all the time.
* Tests are included.
Project: http://git-wip-us.apache.org/repos/asf/couchdb-folsom/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-folsom/commit/19e5c24a
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-folsom/tree/19e5c24a
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-folsom/diff/19e5c24a
Branch: refs/heads/import-master
Commit: 19e5c24a77e62c136b91bf300c05352419fa8a39
Parents: e9be9f7
Author: Lastres <ra...@gmail.com>
Authored: Tue Jun 18 14:31:53 2013 +0100
Committer: Lastres <ra...@gmail.com>
Committed: Tue Jun 18 15:18:53 2013 +0100
----------------------------------------------------------------------
include/folsom.hrl | 2 +-
src/folsom_sample_none.erl | 8 +++-----
test/folsom_erlang_checks.erl | 19 +++++++++++++++++--
3 files changed, 21 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-folsom/blob/19e5c24a/include/folsom.hrl
----------------------------------------------------------------------
diff --git a/include/folsom.hrl b/include/folsom.hrl
index a999798..8be22d6 100644
--- a/include/folsom.hrl
+++ b/include/folsom.hrl
@@ -57,7 +57,7 @@
-record(none, {
size = ?DEFAULT_SIZE,
- n = 0,
+ n = 1,
reservoir = folsom_metrics_histogram_ets:new(folsom_none,[ordered_set, {write_concurrency, true}, public])
}).
http://git-wip-us.apache.org/repos/asf/couchdb-folsom/blob/19e5c24a/src/folsom_sample_none.erl
----------------------------------------------------------------------
diff --git a/src/folsom_sample_none.erl b/src/folsom_sample_none.erl
index 08b3ca7..c0ebc32 100644
--- a/src/folsom_sample_none.erl
+++ b/src/folsom_sample_none.erl
@@ -37,14 +37,12 @@ new(Size) ->
#none{size = Size}.
update(#none{size = Size, reservoir = Reservoir, n = N} = Sample, Value)
- when N < Size ->
+ when N =:= Size ->
ets:insert(Reservoir, {N, Value}),
- Sample#none{n = folsom_utils:get_ets_size(Reservoir) + 1};
+ Sample#none{n = 1};
update(#none{reservoir = Reservoir, n = N} = Sample, Value) ->
- Oldest = ets:first(Reservoir),
- ets:delete(Reservoir, Oldest),
ets:insert(Reservoir, {N, Value}),
- Sample#none{n = folsom_utils:get_ets_size(Reservoir) + 1}.
+ Sample#none{n = N + 1}.
get_values(#none{reservoir = Reservoir}) ->
{_, Values} = lists:unzip(ets:tab2list(Reservoir)),
http://git-wip-us.apache.org/repos/asf/couchdb-folsom/blob/19e5c24a/test/folsom_erlang_checks.erl
----------------------------------------------------------------------
diff --git a/test/folsom_erlang_checks.erl b/test/folsom_erlang_checks.erl
index 6ea9a5a..710344d 100644
--- a/test/folsom_erlang_checks.erl
+++ b/test/folsom_erlang_checks.erl
@@ -44,6 +44,7 @@
-define(HUGEDATA, lists:seq(1,10000)).
-define(DATA1, [0, 5, 10, 15, 20, 25, 30, 35, 40, 45, 50]).
+-define(DATA2, [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15]).
-include("folsom.hrl").
@@ -59,6 +60,9 @@ create_metrics() ->
ok = folsom_metrics:new_histogram(nonea, none, 5000),
+ ok = folsom_metrics:new_histogram(noneb, none, 10),
+ ok = folsom_metrics:new_histogram(nonec, none, 5),
+
ok = folsom_metrics:new_histogram(timed, none, 5000),
ok = folsom_metrics:new_histogram(timed2, none, 5000),
@@ -86,7 +90,7 @@ create_metrics() ->
%% check a server got started for the spiral metric
1 = length(supervisor:which_children(folsom_sample_slide_sup)),
- 15 = length(folsom_metrics:get_metrics()),
+ 17 = length(folsom_metrics:get_metrics()),
?debugFmt("~n~nmetrics: ~p~n", [folsom_metrics:get_metrics()]).
@@ -128,6 +132,10 @@ populate_metrics() ->
[ok = folsom_metrics:notify({nonea, Value}) || Value <- ?DATA1],
+ [ok = folsom_metrics:notify({noneb, Value}) || Value <- ?DATA2],
+
+ [ok = folsom_metrics:notify({nonec, Value}) || Value <- ?DATA2],
+
3.141592653589793 = folsom_metrics:histogram_timed_update(timed, math, pi, []),
Begin = folsom_metrics:histogram_timed_begin(timed2),
@@ -180,6 +188,10 @@ check_metrics() ->
2 = folsom_metrics:get_metric_value(<<"gauge">>),
+ [11,12,13,14,15,6,7,8,9,10] = folsom_metrics:get_metric_value(noneb),
+
+ [11,12,13,14,15] = folsom_metrics:get_metric_value(nonec),
+
Histogram1 = folsom_metrics:get_histogram_statistics(<<"uniform">>),
histogram_checks(Histogram1),
@@ -284,7 +296,7 @@ check_group_metrics() ->
{counter, 0} = lists:keyfind(counter,1,Metrics).
delete_metrics() ->
- 17 = length(ets:tab2list(?FOLSOM_TABLE)),
+ 19 = length(ets:tab2list(?FOLSOM_TABLE)),
ok = folsom_metrics:delete_metric(counter),
ok = folsom_metrics:delete_metric(counter2),
@@ -299,6 +311,9 @@ delete_metrics() ->
ok = folsom_metrics:delete_metric(historya),
ok = folsom_metrics:delete_metric(nonea),
+ ok = folsom_metrics:delete_metric(noneb),
+ ok = folsom_metrics:delete_metric(nonec),
+
ok = folsom_metrics:delete_metric(timed),
ok = folsom_metrics:delete_metric(timed2),
ok = folsom_metrics:delete_metric(testcounter),
[11/50] folsom commit: updated refs/heads/import-master to 4824aec
Posted by da...@apache.org.
Merge pull request #60 from puzza007/safe-histogram
Add safe histogram notify functions
Project: http://git-wip-us.apache.org/repos/asf/couchdb-folsom/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-folsom/commit/e9be9f7f
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-folsom/tree/e9be9f7f
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-folsom/diff/e9be9f7f
Branch: refs/heads/import-master
Commit: e9be9f7fb35e2ff7ea451372ec8a12495677a3bb
Parents: 3732005 31a348b
Author: Joe Williams <wi...@gmail.com>
Authored: Wed Jun 12 09:25:12 2013 -0700
Committer: Joe Williams <wi...@gmail.com>
Committed: Wed Jun 12 09:25:12 2013 -0700
----------------------------------------------------------------------
src/folsom_metrics.erl | 27 ++++++++++++++++++++++++++-
test/folsom_erlang_checks.erl | 5 +++++
2 files changed, 31 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
[34/50] folsom commit: updated refs/heads/import-master to 4824aec
Posted by da...@apache.org.
delete known_issues
Project: http://git-wip-us.apache.org/repos/asf/couchdb-folsom/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-folsom/commit/d3bed300
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-folsom/tree/d3bed300
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-folsom/diff/d3bed300
Branch: refs/heads/import-master
Commit: d3bed30080ff08b30469c41b8725a1bba55e65b5
Parents: 76c433e
Author: Joe Williams <jo...@github.com>
Authored: Tue Nov 5 16:21:50 2013 -0800
Committer: Joe Williams <jo...@github.com>
Committed: Tue Nov 5 16:21:50 2013 -0800
----------------------------------------------------------------------
KNOWN_ISSUES.md | 3 ---
1 file changed, 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-folsom/blob/d3bed300/KNOWN_ISSUES.md
----------------------------------------------------------------------
diff --git a/KNOWN_ISSUES.md b/KNOWN_ISSUES.md
deleted file mode 100644
index 0f22059..0000000
--- a/KNOWN_ISSUES.md
+++ /dev/null
@@ -1,3 +0,0 @@
-### Known Issues
-
-* erlang:system_info(cpu_topology) returns a proplist that has mutiple values with identical keys which causes mochijson2 to only take the last key/value pair.
[33/50] folsom commit: updated refs/heads/import-master to 4824aec
Posted by da...@apache.org.
delete roadmap
Project: http://git-wip-us.apache.org/repos/asf/couchdb-folsom/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-folsom/commit/76c433ee
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-folsom/tree/76c433ee
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-folsom/diff/76c433ee
Branch: refs/heads/import-master
Commit: 76c433ee6745d75b6b13fbc24344751f4dfad2a7
Parents: d4f5827
Author: Joe Williams <jo...@github.com>
Authored: Tue Nov 5 16:21:05 2013 -0800
Committer: Joe Williams <jo...@github.com>
Committed: Tue Nov 5 16:21:05 2013 -0800
----------------------------------------------------------------------
ROADMAP.md | 10 ----------
1 file changed, 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-folsom/blob/76c433ee/ROADMAP.md
----------------------------------------------------------------------
diff --git a/ROADMAP.md b/ROADMAP.md
deleted file mode 100644
index a6d25e3..0000000
--- a/ROADMAP.md
+++ /dev/null
@@ -1,10 +0,0 @@
-### Roadmap
-
-* Tag based query API
-* Metric metadata
-* Various API features (raw histogram values, multiple metric aggregates)
-* Better statistical functions test coverage
-* Sampling functions test coverage
-* More production testing
-* Regex history querying
-* Customizable geometric mean zero value substitution value
[27/50] folsom commit: updated refs/heads/import-master to 4824aec
Posted by da...@apache.org.
switch strings to atoms in vm metrics
Project: http://git-wip-us.apache.org/repos/asf/couchdb-folsom/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-folsom/commit/ffc18d2a
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-folsom/tree/ffc18d2a
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-folsom/diff/ffc18d2a
Branch: refs/heads/import-master
Commit: ffc18d2aefd2fbbdf902b0cc8e29ec4a0c837878
Parents: 7032b84
Author: Joe Williams <jo...@github.com>
Authored: Mon Nov 4 10:49:52 2013 -0800
Committer: Joe Williams <jo...@github.com>
Committed: Mon Nov 4 10:51:03 2013 -0800
----------------------------------------------------------------------
src/folsom_vm_metrics.erl | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-folsom/blob/ffc18d2a/src/folsom_vm_metrics.erl
----------------------------------------------------------------------
diff --git a/src/folsom_vm_metrics.erl b/src/folsom_vm_metrics.erl
index fab4ef0..8a42f40 100644
--- a/src/folsom_vm_metrics.erl
+++ b/src/folsom_vm_metrics.erl
@@ -70,17 +70,17 @@ get_dets_info() ->
convert_statistics({context_switches, {ContextSwitches, 0}}) ->
ContextSwitches;
convert_statistics({garbage_collection, {NumberofGCs, WordsReclaimed, 0}}) ->
- [{"number_of_gcs", NumberofGCs}, {"words_reclaimed", WordsReclaimed}];
+ [{number_of_gcs, NumberofGCs}, {words_reclaimed, WordsReclaimed}];
convert_statistics({io, {Input, Output}}) ->
[Input, Output];
convert_statistics({reductions, {TotalReductions, ReductionsSinceLastCall}}) ->
- [{"total_reductions", TotalReductions},
- {"reductions_since_last_call", ReductionsSinceLastCall}];
+ [{total_reductions, TotalReductions},
+ {reductions_since_last_call, ReductionsSinceLastCall}];
convert_statistics({runtime, {TotalRunTime, TimeSinceLastCall}}) ->
- [{"total_run_time", TotalRunTime}, {"time_since_last_call", TimeSinceLastCall}];
+ [{total_run_time, TotalRunTime}, {time_since_last_call, TimeSinceLastCall}];
convert_statistics({wall_clock, {TotalWallclockTime, WallclockTimeSinceLastCall}}) ->
- [{"Total_Wall_Clock_time", TotalWallclockTime},
- {"wall_clock_time_since_last_call", WallclockTimeSinceLastCall}];
+ [{total_wall_clock_time, TotalWallclockTime},
+ {wall_clock_time_since_last_call, WallclockTimeSinceLastCall}];
convert_statistics({_, Value}) ->
Value.
[23/50] folsom commit: updated refs/heads/import-master to 4824aec
Posted by da...@apache.org.
Add ability to pass tags to notify
Project: http://git-wip-us.apache.org/repos/asf/couchdb-folsom/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-folsom/commit/091ccfd7
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-folsom/tree/091ccfd7
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-folsom/diff/091ccfd7
Branch: refs/heads/import-master
Commit: 091ccfd7e547cecff9ee522b8e79702166c3a9c9
Parents: a5bb8fc
Author: Andrey Vasenin <va...@aboutecho.com>
Authored: Thu Oct 31 16:06:44 2013 +0400
Committer: Andrey Vasenin <va...@aboutecho.com>
Committed: Fri Nov 1 11:36:01 2013 +0400
----------------------------------------------------------------------
src/folsom_ets.erl | 33 ++++++++++++++++++++++++---------
src/folsom_metrics.erl | 12 ++++++++++++
test/folsom_erlang_checks.erl | 11 ++++++++++-
3 files changed, 46 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-folsom/blob/091ccfd7/src/folsom_ets.erl
----------------------------------------------------------------------
diff --git a/src/folsom_ets.erl b/src/folsom_ets.erl
index a7dfaf1..a59f130 100644
--- a/src/folsom_ets.erl
+++ b/src/folsom_ets.erl
@@ -36,6 +36,7 @@
notify/1,
notify/2,
notify/3,
+ tagged_notify/4,
notify_existing_metric/3,
get_handlers/0,
get_handlers_info/0,
@@ -43,7 +44,8 @@
get_values/1,
get_history_values/2,
get_group_values/1,
- get_group_values/2
+ get_group_values/2,
+ get_tags/1
]).
-record(metric, {
@@ -111,12 +113,16 @@ notify(Name, Event) ->
%% notify/3, makes sure metric exist, if not creates metric
notify(Name, Event, Type) ->
- case handler_exists(Name) of
- true ->
- notify(Name, Event, Type, true);
- false ->
- notify(Name, Event, Type, false)
- end.
+ notify(Name, Event, Type, handler_exists(Name)).
+
+tagged_notify(Name, Event, Type, Tags) ->
+ R = notify(Name, Event, Type),
+ case get_tags(Name) of
+ {error, _, _} -> skip;
+ CurrentTags ->
+ [add_tag(Name, T) || T <- Tags, not sets:is_element(T, CurrentTags)]
+ end,
+ R.
%% assumes metric already exists, bypasses above checks
notify_existing_metric(Name, Event, Type) ->
@@ -131,8 +137,8 @@ get_handlers_info() ->
get_info(Name) ->
case handler_exists(Name) of
true ->
- [{_, #metric{type = Type}}] = ets:lookup(?FOLSOM_TABLE, Name),
- {Name, [{type, Type}]};
+ [{_, #metric{type = Type, tags = Tags}}] = ets:lookup(?FOLSOM_TABLE, Name),
+ {Name, [{type, Type}, {tags, Tags}]};
false ->
{error, Name, nonexistent_metric}
end.
@@ -175,6 +181,15 @@ get_group_values(Tag, Type) ->
Metrics = ets:match(?FOLSOM_TABLE, {'$1', {metric, '$2', Type, '_'}}),
[{Name, get_values(Name)} || [Name, Tags] <- Metrics, sets:is_element(Tag, Tags)].
+get_tags(Name) ->
+ case handler_exists(Name) of
+ true ->
+ {_, Info} = get_info(Name),
+ proplists:get_value(tags, Info);
+ false ->
+ {error, Name, nonexistent_metric}
+ end.
+
%%%===================================================================
%%% Internal functions
%%%===================================================================
http://git-wip-us.apache.org/repos/asf/couchdb-folsom/blob/091ccfd7/src/folsom_metrics.erl
----------------------------------------------------------------------
diff --git a/src/folsom_metrics.erl b/src/folsom_metrics.erl
index f844d1f..428f7fd 100644
--- a/src/folsom_metrics.erl
+++ b/src/folsom_metrics.erl
@@ -46,9 +46,11 @@
notify/1,
notify/2,
notify/3,
+ notify/4,
safely_notify/1,
safely_notify/2,
safely_notify/3,
+ safely_notify/4,
notify_existing_metric/3,
get_metrics/0,
metric_exists/1,
@@ -60,6 +62,7 @@
get_histogram_statistics/1,
get_histogram_statistics/2,
get_history_values/2,
+ get_tags/1,
histogram_timed_update/2,
histogram_timed_update/3,
histogram_timed_update/4,
@@ -140,6 +143,9 @@ notify(Name, Event) ->
notify(Name, Event, Type) ->
folsom_ets:notify(Name, Event, Type).
+notify(Name, Event, Type, Tags) ->
+ folsom_ets:tagged_notify(Name, Event, Type, Tags).
+
safely_notify(Event) ->
catch notify(Event).
@@ -149,6 +155,9 @@ safely_notify(Name, Event) ->
safely_notify(Name, Event, Type) ->
catch notify(Name, Event, Type).
+safely_notify(Name, Event, Type, Tags) ->
+ catch notify(Name, Event, Type, Tags).
+
notify_existing_metric(Name, Event, Type) ->
folsom_ets:notify_existing_metric(Name, Event, Type).
@@ -185,6 +194,9 @@ get_histogram_statistics(Name1, Name2) ->
get_history_values(Name, Count) ->
folsom_ets:get_history_values(Name, Count).
+get_tags(Name) ->
+ folsom_ets:get_tags(Name).
+
histogram_timed_update(Name, Fun) ->
{Time, Value} = timer:tc(Fun),
ok = notify({Name, Time}),
http://git-wip-us.apache.org/repos/asf/couchdb-folsom/blob/091ccfd7/test/folsom_erlang_checks.erl
----------------------------------------------------------------------
diff --git a/test/folsom_erlang_checks.erl b/test/folsom_erlang_checks.erl
index 743a405..820b79e 100644
--- a/test/folsom_erlang_checks.erl
+++ b/test/folsom_erlang_checks.erl
@@ -140,6 +140,11 @@ populate_metrics() ->
[ok = folsom_metrics:notify({slide_sorted_a, Value}) || Value <- ?DATA2],
+ ok = folsom_metrics:notify(tagged_metric, 1, meter, [a, b]),
+ ok = folsom_metrics:notify(tagged_metric, 1, meter, [c]),
+
+ {error, _, unsupported_metric_type} = folsom_metrics:notify(tagged_unknown_metric, 1, unknown_metric, [tag]),
+
3.141592653589793 = folsom_metrics:histogram_timed_update(timed, math, pi, []),
Begin = folsom_metrics:histogram_timed_begin(timed2),
@@ -192,6 +197,8 @@ check_metrics() ->
2 = folsom_metrics:get_metric_value(<<"gauge">>),
+ true = sets:is_subset(sets:from_list([a,b,c]), folsom_metrics:get_tags(tagged_metric)),
+
[11,12,13,14,15,6,7,8,9,10] = folsom_metrics:get_metric_value(noneb),
[11,12,13,14,15] = folsom_metrics:get_metric_value(nonec),
@@ -302,7 +309,7 @@ check_group_metrics() ->
{counter, 0} = lists:keyfind(counter,1,Metrics).
delete_metrics() ->
- 20 = length(ets:tab2list(?FOLSOM_TABLE)),
+ 21 = length(ets:tab2list(?FOLSOM_TABLE)),
ok = folsom_metrics:delete_metric(counter),
ok = folsom_metrics:delete_metric(counter2),
@@ -320,6 +327,8 @@ delete_metrics() ->
ok = folsom_metrics:delete_metric(noneb),
ok = folsom_metrics:delete_metric(nonec),
+ ok = folsom_metrics:delete_metric(tagged_metric),
+
ok = folsom_metrics:delete_metric(slide_sorted_a),
ok = folsom_metrics:delete_metric(timed),
[46/50] folsom commit: updated refs/heads/import-master to 4824aec
Posted by da...@apache.org.
Supprt for spiral in application config.
Project: http://git-wip-us.apache.org/repos/asf/couchdb-folsom/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-folsom/commit/6593e88d
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-folsom/tree/6593e88d
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-folsom/diff/6593e88d
Branch: refs/heads/import-master
Commit: 6593e88d48fa796f703ba58c54547d9342f037ed
Parents: ca127d7
Author: Karolis Petrauskas <k....@gmail.com>
Authored: Thu Jan 16 13:47:08 2014 +0200
Committer: Karolis Petrauskas <k....@gmail.com>
Committed: Thu Jan 16 13:47:08 2014 +0200
----------------------------------------------------------------------
src/folsom.erl | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-folsom/blob/6593e88d/src/folsom.erl
----------------------------------------------------------------------
diff --git a/src/folsom.erl b/src/folsom.erl
index 9fbe2e0..250cebd 100644
--- a/src/folsom.erl
+++ b/src/folsom.erl
@@ -42,6 +42,7 @@ start(_Type, _Args) ->
{histogram, new_histogram},
{history, new_history},
{meter, new_meter},
+ {spiral, new_spiral},
{meter_reader, new_meter_reader}]),
{ok, Pid}.
[15/50] folsom commit: updated refs/heads/import-master to 4824aec
Posted by da...@apache.org.
Merge pull request #63 from Lastres/slide_sorted_histogram
Add histogram of type 'slide_sorted'
Project: http://git-wip-us.apache.org/repos/asf/couchdb-folsom/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-folsom/commit/497559db
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-folsom/tree/497559db
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-folsom/diff/497559db
Branch: refs/heads/import-master
Commit: 497559dbc7681edda652c906b48e8e42967ddbc2
Parents: 47a408a df263eb
Author: Joe Williams <wi...@gmail.com>
Authored: Sun Jul 21 22:09:32 2013 -0700
Committer: Joe Williams <wi...@gmail.com>
Committed: Sun Jul 21 22:09:32 2013 -0700
----------------------------------------------------------------------
include/folsom.hrl | 6 ++++
src/folsom_ets.erl | 5 ++++
src/folsom_sample.erl | 6 ++++
src/folsom_sample_slide_sorted.erl | 52 +++++++++++++++++++++++++++++++++
test/folsom_erlang_checks.erl | 12 ++++++--
5 files changed, 79 insertions(+), 2 deletions(-)
----------------------------------------------------------------------