diff options
| author | Joan Touzet <wohali@users.noreply.github.com> | 2021-06-03 19:31:10 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-06-03 19:31:10 -0400 |
| commit | a5656bae255141beb6e81ab4af64db5fec63b6c3 (patch) | |
| tree | 574eac48f3a0bad580eb38e7e578cca80e2c28c7 | |
| parent | ecd266b0e87f44e1080cabdb4c28e4758f5a4406 (diff) | |
| download | couchdb-a5656bae255141beb6e81ab4af64db5fec63b6c3.tar.gz | |
Improve smoosh defaults for slack channel (#3600)
| -rw-r--r-- | rel/overlay/etc/default.ini | 4 | ||||
| -rw-r--r-- | src/smoosh/src/smoosh_server.erl | 10 |
2 files changed, 7 insertions, 7 deletions
diff --git a/rel/overlay/etc/default.ini b/rel/overlay/etc/default.ini index 5f690764c..5ac8da600 100644 --- a/rel/overlay/etc/default.ini +++ b/rel/overlay/etc/default.ini @@ -626,11 +626,11 @@ writer = stderr ; ;[smoosh.slack_dbs] ;priority = slack -;min_priority = 16777216 +;min_priority = 536870912 ; ;[smoosh.slack_views] ;priority = slack -;min_priority = 16777216 +;min_priority = 536870912 [ioq] ; The maximum number of concurrent in-flight IO requests that diff --git a/src/smoosh/src/smoosh_server.erl b/src/smoosh/src/smoosh_server.erl index 6269608eb..f088c5455 100644 --- a/src/smoosh/src/smoosh_server.erl +++ b/src/smoosh/src/smoosh_server.erl @@ -364,7 +364,7 @@ get_priority(Channel, DiskSize, DataSize, NeedsUpgrade) -> Priority = get_priority(Channel), MinSize = to_number(Channel, "min_size", "1048576"), MaxSize = to_number(Channel, "max_size", "infinity"), - DefaultMinPriority = case Priority of "slack" -> "16777216"; _ -> "2.0" end, + DefaultMinPriority = case Priority of "slack" -> "536870912"; _ -> "2.0" end, MinPriority = to_number(Channel, "min_priority", DefaultMinPriority), MaxPriority = to_number(Channel, "max_priority", "infinity"), if Priority =:= "upgrade", NeedsUpgrade -> @@ -529,10 +529,10 @@ t_ratio_view({ok, Shard, GroupId}) -> t_slack_view({ok, Shard, GroupId}) -> ?_test(begin meck:expect(couch_index, get_info, fun(_) -> - {ok, [{sizes, {[{file, 33554432}, {active, 16777215}]}}]} + {ok, [{sizes, {[{file, 1073741824}, {active, 536870911}]}}]} end), - ?assertEqual(2.0000001192092967, get_priority("ratio_views", {Shard, GroupId})), - ?assertEqual(16777217, get_priority("slack_views", {Shard, GroupId})), + ?assertEqual(2.0000000037252903, get_priority("ratio_views", {Shard, GroupId})), + ?assertEqual(536870913, get_priority("slack_views", {Shard, GroupId})), ?assertEqual(0, get_priority("upgrade_views", {Shard, GroupId})) end). @@ -542,7 +542,7 @@ t_no_data_view({ok, Shard, GroupId}) -> {ok, [{sizes, {[{file, 5242880}, {active, 0}]}}]} end), ?assertEqual(2.0, get_priority("ratio_views", {Shard, GroupId})), - ?assertEqual(16777216, get_priority("slack_views", {Shard, GroupId})), + ?assertEqual(536870912, get_priority("slack_views", {Shard, GroupId})), ?assertEqual(2.0, get_priority("upgrade_views", {Shard, GroupId})) end). |