Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Enable definition of multiple merge windows per node [JIRA: RIAK-2730] #111

Open
wants to merge 2 commits into
base: develop-3.0
Choose a base branch
from
Open

Enable definition of multiple merge windows per node [JIRA: RIAK-2730] #111

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9c26c60
Change meck repo to basho fork
jaredmorrow Aug 29, 2013
c8c2d52
Added ability to specify list of merge windows for added flexibility
Sep 30, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion rebar.config
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{port_specs, [{"priv/bitcask.so", ["c_src/*.c"]}]}.

{deps, [
{meck, ".*", {git, "git://github.com/eproxus/meck"}}
{meck, ".*", {git, "git://github.com/basho/meck", {tag, "0.8.1"}}}
]}.

{port_env, [
Expand Down
33 changes: 32 additions & 1 deletion src/bitcask_merge_worker.erl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,6 +151,12 @@ merge_window() ->
always;
{ok, never} ->
never;
{ok, []} ->
error_logger:error_msg("Empty bitcask_merge window list specified. "
"Defaulting to 'always'.\n"),
always;
{ok, WindowList} when is_list(WindowList) ->
WindowList;
{ok, {StartHour, EndHour}} when StartHour >= 0, StartHour =< 23,
EndHour >= 0, EndHour =< 23 ->
{StartHour, EndHour};
Expand All @@ -164,11 +170,36 @@ in_merge_window(_NowHour, always) ->
true;
in_merge_window(_NowHour, never) ->
false;
in_merge_window(NowHour, Windows) when is_list(Windows) ->
in_merge_window_list(NowHour, Windows);
in_merge_window(NowHour, {Start, End}) when Start =< End ->
(NowHour >= Start) and (NowHour =< End);
in_merge_window(NowHour, {Start, End}) when Start > End ->
(NowHour >= Start) or (NowHour =< End).

in_merge_window_list(_NowHour, []) ->
false;
in_merge_window_list(NowHour, [{Start, End} | List]) when Start >= 0, Start =< 23,
End >= 0, End =< 23,
Start =< End ->
case (NowHour >= Start) and (NowHour =< End) of
true ->
true;
false ->
in_merge_window_list(NowHour, List)
end;
in_merge_window_list(NowHour, [{Start, End} | List]) when Start >= 0, Start =< 23,
End >= 0, End =< 23,
Start > End ->
case (NowHour >= Start) or (NowHour =< End) of
true ->
true;
false ->
in_merge_window_list(NowHour, List)
end;
in_merge_window_list(_NowHour, [E | _List]) ->
error_logger:error_msg("Invalid bitcask_merge window specified in list: ~p. "
"Defaulting to 'always'.\n", [E]),
true.

%% ====================================================================
%% Unit tests
Expand Down