diff options
| author | Joan Touzet <wohali@users.noreply.github.com> | 2020-03-20 18:31:55 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-20 22:31:55 +0000 |
| commit | f853acfd53519c447c52396e0d417fc72d260321 (patch) | |
| tree | bdca0559d97c02268a8ee57cb9767580906131df | |
| parent | 7d3f39335898252f9ad6b62c529b1b91611ee95e (diff) | |
| download | couchdb-f853acfd53519c447c52396e0d417fc72d260321.tar.gz | |
Update smoosh defaults, default.ini (#2678)
| -rw-r--r-- | rel/overlay/etc/default.ini | 28 | ||||
| -rw-r--r-- | src/smoosh/src/smoosh_server.erl | 10 |
2 files changed, 28 insertions, 10 deletions
diff --git a/rel/overlay/etc/default.ini b/rel/overlay/etc/default.ini index 246c17307..d64b88f32 100644 --- a/rel/overlay/etc/default.ini +++ b/rel/overlay/etc/default.ini @@ -523,11 +523,29 @@ writer = stderr ; Stats collection interval in seconds. Default 10 seconds. ;interval = 10 -[smoosh.ratio_dbs] -min_priority = 2.0 - -[smoosh.ratio_views] -min_priority = 2.0 +[smoosh] +; +; More documentation on these is in the Automatic Compaction +; section of the documentation. +; +;db_channels = upgrade_dbs,ratio_dbs,slack_dbs +;view_channels = upgrade_views,ratio_views,slack_views +; +;[smoosh.ratio_dbs] +;priority = ratio +;min_priority = 2.0 +; +;[smoosh.ratio_views] +;priority = ratio +;min_priority = 2.0 +; +;[smoosh.slack_dbs] +;priority = slack +;min_priority = 16777216 +; +;[smoosh.slack_views] +;priority = slack +;min_priority = 16777216 [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 f9c5210db..6269608eb 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"; _ -> "5.0" end, + DefaultMinPriority = case Priority of "slack" -> "16777216"; _ -> "2.0" end, MinPriority = to_number(Channel, "min_priority", DefaultMinPriority), MaxPriority = to_number(Channel, "max_priority", "infinity"), if Priority =:= "upgrade", NeedsUpgrade -> @@ -531,7 +531,7 @@ t_slack_view({ok, Shard, GroupId}) -> meck:expect(couch_index, get_info, fun(_) -> {ok, [{sizes, {[{file, 33554432}, {active, 16777215}]}}]} end), - ?assertEqual(0, get_priority("ratio_views", {Shard, GroupId})), + ?assertEqual(2.0000001192092967, get_priority("ratio_views", {Shard, GroupId})), ?assertEqual(16777217, get_priority("slack_views", {Shard, GroupId})), ?assertEqual(0, get_priority("upgrade_views", {Shard, GroupId})) end). @@ -541,9 +541,9 @@ t_no_data_view({ok, Shard, GroupId}) -> meck:expect(couch_index, get_info, fun(_) -> {ok, [{sizes, {[{file, 5242880}, {active, 0}]}}]} end), - ?assertEqual(5.0, get_priority("ratio_views", {Shard, GroupId})), + ?assertEqual(2.0, get_priority("ratio_views", {Shard, GroupId})), ?assertEqual(16777216, get_priority("slack_views", {Shard, GroupId})), - ?assertEqual(5.0, get_priority("upgrade_views", {Shard, GroupId})) + ?assertEqual(2.0, get_priority("upgrade_views", {Shard, GroupId})) end). t_below_min_priority_view({ok, Shard, GroupId}) -> @@ -551,7 +551,7 @@ t_below_min_priority_view({ok, Shard, GroupId}) -> meck:expect(couch_index, get_info, fun(_) -> {ok, [{sizes, {[{file, 5242880}, {active, 1048576}]}}]} end), - ?assertEqual(0, get_priority("ratio_views", {Shard, GroupId})), + ?assertEqual(5.0, get_priority("ratio_views", {Shard, GroupId})), ?assertEqual(0, get_priority("slack_views", {Shard, GroupId})), ?assertEqual(0, get_priority("upgrade_views", {Shard, GroupId})) end). |