Fix tests

Author: timofey-barmin

acceptance_tests/Makefile

@@ -8,8 +8,8 @@ local-tests:
 
 .PHONY: basic-tests
 basic-tests:
-	./mzb_basic_tests.py -v --process-timeout=1200
 	./check_default_conf.erl
+	./mzb_basic_tests.py -v --process-timeout=1200
 
 .PHONY: migrations-tests
 migrations-tests:

bin/migrate.py

@@ -82,7 +82,7 @@ def migrate(data_dir, jobs):
 
 def benchmarks(data_dir):
     for d in os.listdir(data_dir):
-        if d[0] != '.':
+        if d[0] != '.' and os.path.isdir(os.path.join(data_dir, d)):
             yield d
 
 def apply_migration(script_path, data_dir, jobs):

server/server.config.example

@@ -48,7 +48,7 @@
     {metric_update_interval_ms, 10000},
     {max_bench_num, 1000},
     {final_metrics_percentiles, [min,50,90,95,max]},
-    {gc_sleep, 1000},
+    {gc_sleep, 10},
 
     % benchmark will crash if ntp time diff in cluster is greater than this value
     {ntp_max_timediff_s, undefined}, % in sec but if undefined - run ntp but do not crash in any case

server/src/mzb_api_endpoints.erl

@@ -143,29 +143,11 @@ handle(<<"GET">>, <<"/graphs">>, Req) ->
         {ok, cowboy_req:reply(302, Headers, <<>>, Req), #{}}
     end);
 
+%% obsolete endpoint, to be removed soon
 handle(<<"GET">>, <<"/report.json">>, Req) ->
-    BenchInfo = mzb_api_server:get_info(),
-    SortedBenchInfo = lists:sort(fun ({IdA, _}, {IdB, _}) ->
-                                         IdA >= IdB
-                                 end, BenchInfo),
-    Body = lists:map(
-             fun({Id, #{status:= Status, config:= Config, start_time:= StartTime, finish_time:= FinishTime}}) ->
-                     ScriptName = case Config of
-                                      #{script:= #{name:= SN}} -> SN;
-                                      #{script:= SN} -> SN
-                                  end,
-                     Duration = case FinishTime of
-                                    undefined ->
-                                        mzb_api_bench:seconds() - StartTime;
-                                    Time when is_number(Time) ->
-                                        FinishTime - StartTime
-                                end,
-                     [Id, list_to_binary(iso_8601_fmt(StartTime)), list_to_binary(ScriptName),
-                      Status, Duration];
-                ({Id, #{status:= failed, reason:= {crashed, _}}}) ->
-                     [Id, <<"n/a">>, <<"n/a">>, crashed, 0]
-             end, SortedBenchInfo),
-    {ok, reply_json(200, #{data => Body}, Req), #{}};
+    Filter = fun (I) -> mzb_api_ws_handler:normalize([I]) end,
+    {_BenchInfo, _, _} = mzb_api_server:get_info(Filter, undefined, undefined, undefined, 1),
+    {ok, reply_json(200, #{}, Req), #{}};
 
 handle(<<"GET">>, <<"/clusters_info">>, Req) ->
     List = mzb_api_cloud:clusters_info(),

server/src/mzb_api_ws_handler.erl

@@ -234,11 +234,11 @@ dispatch_request(#{<<"cmd">> := <<"get_benchset">>} = Cmd, State) ->
     {BenchInfos0, Min, _} = mzb_api_server:get_info(Filter, undefined, undefined, undefined, _MaxBenchsetSize = 200),
 
     Sets = lists:map(fun(Chart) ->
-              Kind = binary_to_list(mzb_bc:maps_get(<<"kind">>, Chart, undefined)),
-              Metric = binary_to_list(mzb_bc:maps_get(<<"metric">>, Chart, undefined)),
+              Kind = binary_to_list(mzb_bc:maps_get(<<"kind">>, Chart, <<"undefined">>)),
+              Metric = binary_to_list(mzb_bc:maps_get(<<"metric">>, Chart, <<"undefined">>)),
               Size = list_to_integer(binary_to_list(mzb_bc:maps_get(<<"size">>, Chart, <<"0">>))),
-              GroupEnv = binary_to_list(mzb_bc:maps_get(<<"group_env">>, Chart, undefined)),
-              XEnv = binary_to_list(mzb_bc:maps_get(<<"x_env">>, Chart, undefined)),
+              GroupEnv = binary_to_list(mzb_bc:maps_get(<<"group_env">>, Chart, <<"undefined">>)),
+              XEnv = binary_to_list(mzb_bc:maps_get(<<"x_env">>, Chart, <<"undefined">>)),
               benchset(BenchInfos0, Metric, Kind, Size, GroupEnv, XEnv)
              end, mzb_bc:maps_get(<<"charts">>, Cmd, [])),
 
@@ -441,8 +441,8 @@ get_all_tags() ->
 benchset(BenchInfos, Metric, Kind, Size, GroupEnv, XEnv) ->
     benchset(BenchInfos, Metric, Kind, Size, GroupEnv, XEnv, []).
 
-benchset(_, Metric, Kind, _, _, _, Acc) when (Metric == undefined) or (Kind == undefined) -> Acc;
-benchset(_, _, _, Size, _, _, Acc) when (Size > 0) and (size(Acc) >= Size) -> Acc;
+benchset(_, Metric, Kind, _, _, _, Acc) when (Metric == "undefined") or (Kind == "undefined") -> Acc;
+benchset(_, _, _, Size, _, _, Acc) when (Size > 0) and (length(Acc) >= Size) -> Acc;
 benchset([], _, _, _, _, _, Acc) -> Acc;
 benchset([BenchInfo | Rest], Metric, Kind, Size, GroupEnv, XEnv, Acc) ->
     NewAcc = case has_metric(Metric, Kind, BenchInfo) of
@@ -602,7 +602,7 @@ apply_filter(Query, BenchInfos) ->
     end.
 
 get_searchable_fields(BenchInfo) ->
-    SearchFields = mzb_bc:maps_with([id, status, benchmark_name, script_name, start_time, finish_time], BenchInfo),
+    SearchFields = mzb_bc:maps_with([id, status, name, script_name, start_time, finish_time], BenchInfo),
     Values = maps:values(SearchFields),
     Tags = [ "#" ++ erlang:atom_to_list(T) || T <- mzb_bc:maps_get(tags, BenchInfo, [])],
     lists:map(fun (X) when is_atom(X) -> atom_to_list(X);

server/test/mzb_api_ws_handler_tests.erl

@@ -17,15 +17,17 @@ normalize_test() ->
                start_time => 1437549842,
                finish_time => 1437549842,
                config => #{script => #{body => script_body1, name => "another_name.erl"},
-                           benchmark_name => "Test bench", nodes_arg => "1", cloud => "", vm_args => [], env => [], tags => ["tag1", "tag2"]}}}
+                           benchmark_name => "Test bench", nodes_arg => "1", cloud => "",
+                           vm_args => [], env => [], tags => ["tag1", "tag2"]},
+               results => [{key, value}]}}
     ],
 
     Normalized = mzb_api_ws_handler:normalize(BenchInfos),
 
     ?assertEqual([
         #{finish_time => "2015-07-22T07:24:02Z",
           id => 2,
-          benchmark_name => "Test bench",
+          name => "Test bench",
           metrics => metrics,
           script_body => script_body1,
           script_name => "another_name.erl",
@@ -34,9 +36,10 @@ normalize_test() ->
           cloud => "",
           env => #{vm_args => []},
           status => success,
-          tags => [tag1, tag2]},
+          tags => [tag1, tag2],
+          results => #{key => value}},
         #{id => 1,
-          benchmark_name => "Test bench",
+          name => "Test bench",
           metrics => metrics,
           script_body => script_body,
           script_name => "script_name.erl",
@@ -45,7 +48,8 @@ normalize_test() ->
           cloud => "",
           env => #{vm_args => []},
           status => failed,
-          tags => []}],
+          tags => [],
+          results => #{}}],
         Normalized).
 
 filter_test() ->