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

Warn in startup if dvv_enabled is false [JIRA: RCS-224] #1176

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

Warn in startup if dvv_enabled is false [JIRA: RCS-224] #1176

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
634a176
Warn in startup if dvv_enabled is false
kuenishi Jul 1, 2015
e67db50
Check props of default bucket type, not each major buckets
kuenishi Jul 13, 2015
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
80 changes: 39 additions & 41 deletions src/riak_cs_app.erl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,6 @@
%% application API
-export([start/2,
stop/1,
sanity_check/2,
check_bucket_props/2,
atoms_for_check_bucket_props/0]).

-include("riak_cs.hrl").
Expand Down Expand Up @@ -57,14 +55,11 @@ stop(_State) ->
sanity_check(true, {ok, true}) ->
riak_cs_sup:start_link();
sanity_check(false, _) ->
_ = lager:error("You must update your Riak CS app.config. Please see the"
_ = lager:error("You must update your Riak CS riak-cs.conf. Please see the"
"release notes for more information on updating you"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's better to add white spaces at the end of these two lines because concatenated string is shown in the log.

"configuration."),
{error, bad_config};
sanity_check(true, {ok, false}) ->
_ = lager:error("Invalid Riak bucket properties detected. Please "
"verify that allow_mult is set to true for all "
"buckets."),
{error, invalid_bucket_props};
sanity_check(true, {error, Reason}) ->
_ = lager:error("Could not verify bucket properties. Error was"
Expand All @@ -83,15 +78,28 @@ get_env_response_to_bool(_) ->

-spec check_bucket_props() -> {ok, boolean()} | {error, term()}.
check_bucket_props() ->
Buckets = [?USER_BUCKET,
?ACCESS_BUCKET,
?STORAGE_BUCKET,
?BUCKETS_BUCKET],
{ok, MasterPbc} = riak_connection(),
try
Results = [check_bucket_props(Bucket, MasterPbc) ||
Bucket <- Buckets],
lists:foldl(fun promote_errors/2, {ok, true}, Results)
case riakc_pb_socket:get_bucket_type(MasterPbc, <<"default">>) of
{ok, DefaultProps} ->
_ = lager:info("Checking default bucket props...", []),
_ = lager:debug("default bucket props: ~p", [DefaultProps]),
CheckResult = [check_prop(Property, DefaultProps)
|| Property <- [{dvv_enabled, true, false},
{allow_mult, true, true},
{last_write_wins, false, true}]],
case CheckResult of
[true, true, true] ->
_ = lager:debug("Default bucket type was"
" already configured correctly."),
{ok, true};
_ ->
_ = lager:error("Default bucket type is not properly configured"),
{ok, false}
end;
{error, _} = E ->
E
end
after
riakc_pb_socket:stop(MasterPbc)
end.
Expand All @@ -101,34 +109,24 @@ atoms_for_check_bucket_props() ->
[riak_core_util, chash_std_keyfun,
riak_kv_wm_link_walker, mapreduce_linkfun].

promote_errors(_Elem, {error, _Reason}=E) ->
E;
promote_errors({error, _Reason}=E, _Acc) ->
E;
promote_errors({ok, false}=F, _Acc) ->
F;
promote_errors({ok, true}, Acc) ->
Acc.

-spec check_bucket_props(binary(), pid()) -> {ok, boolean()} | {error, term()}.
check_bucket_props(Bucket, MasterPbc) ->
case catch riakc_pb_socket:get_bucket(MasterPbc, Bucket) of
{ok, Props} ->
case lists:keyfind(allow_mult, 1, Props) of
{allow_mult, true} ->
_ = lager:debug("~s bucket was"
" already configured correctly.",
[Bucket]),
{ok, true};
_ ->
_ = lager:warning("~p is misconfigured", [Bucket]),
{ok, false}
end;
{error, Reason}=E ->
_ = lager:warning(
"Unable to verify ~s bucket settings (~p).",
[Bucket, Reason]),
E
-spec check_prop({atom(), boolean(), boolean()}, proplists:proplist()) -> boolean().
check_prop({Key, ShouldBe, IsMust}, Props) ->
case lists:keyfind(Key, 1, Props) of
{Key, ShouldBe} ->
true;
{Key, Current} when not IsMust ->
_ = lager:warning("~p is strongly recommended to be ~p (currently ~p)",
[Key, ShouldBe, Current]),
true;
false ->
_ = lager:warning("~p is strongly recommended to be ~p (currently undefined)",
[Key, ShouldBe]),
true;
_ when IsMust ->
_ = lager:error("Invalid Riak bucket properties detected. Please "
"verify that riak.conf has `buckets.default.~p = ~p`.",
[Key, ShouldBe]),
false
end.

riak_connection() ->
Expand Down