Merge pull request basho#498 from basho/bugfix/jrw/btypes-mixed-cluster

Fix a Couple Mixed Cluster Issues w/ Bucket Types
lpgauth · Jan 8, 2014 · c887065 · c887065
2 parents 1ccc935 + 13b42e5
commit c887065
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 6 deletions.
diff --git a/src/riak_core_app.erl b/src/riak_core_app.erl
@@ -94,6 +94,10 @@ start(_StartType, _StartArgs) ->
             riak_core_capability:register({riak_core, security},
                                           [true, false],
                                           false),
+            riak_core_capability:register({riak_core, bucket_types},
+                                          [true, false],
+                                          false),
+
             {ok, Pid};
         {error, Reason} ->
             {error, Reason}

diff --git a/src/riak_core_bucket_type.erl b/src/riak_core_bucket_type.erl
@@ -108,6 +108,11 @@
 -type bucket_type()       :: binary().
 -type bucket_type_props() :: [{term(), term()}].
 
+-define(IF_CAPABLE(X, E), case riak_core_capability:get({riak_core, bucket_types}) of
+                              true -> X;
+                              false -> E
+                          end).
+
 
 %% @doc The hardcoded defaults for all bucket types.
 -spec defaults() -> bucket_type_props().
@@ -141,23 +146,24 @@ defaults() ->
 create(?DEFAULT_TYPE, _Props) ->
     {error, default_type};
 create(BucketType, Props) when is_binary(BucketType) ->
-    riak_core_claimant:create_bucket_type(BucketType,
-                                          riak_core_bucket_props:merge(Props, defaults())).
+    ?IF_CAPABLE(riak_core_claimant:create_bucket_type(BucketType,
+                                                      riak_core_bucket_props:merge(Props, defaults())),
+                {error, not_capable}).
 
 %% @doc Returns the state the type is in.
 -spec status(bucket_type()) -> undefined | created | ready | active.
 status(?DEFAULT_TYPE) ->
     active;
 status(BucketType) when is_binary(BucketType) ->
-    riak_core_claimant:bucket_type_status(BucketType).
+    ?IF_CAPABLE(riak_core_claimant:bucket_type_status(BucketType), undefined).
 
 %% @doc Activate the type. This will succeed only if the type is in the `ready' state. Otherwise,
 %% an error is returned.
 -spec activate(bucket_type()) -> ok | {error, undefined | not_ready}.
 activate(?DEFAULT_TYPE) ->
     ok;
 activate(BucketType) when is_binary(BucketType) ->
-    riak_core_claimant:activate_bucket_type(BucketType).
+    ?IF_CAPABLE(riak_core_claimant:activate_bucket_type(BucketType), {error, undefined}).
 
 %% @doc Update an existing bucket type. Updates may only be performed
 %% on active types. Properties not provided will keep their existing
@@ -166,7 +172,7 @@ activate(BucketType) when is_binary(BucketType) ->
 update(?DEFAULT_TYPE, _Props) ->
     {error, no_default_update}; %% default props are in the app.config
 update(BucketType, Props) when is_binary(BucketType)->
-    riak_core_claimant:update_bucket_type(BucketType, Props).
+    ?IF_CAPABLE(riak_core_claimant:update_bucket_type(BucketType, Props), {error, not_capable}).
 
 %% @doc Return the properties associated with the given bucket type.
 -spec get(bucket_type()) -> undefined | bucket_type_props().

diff --git a/src/riak_core_claimant.erl b/src/riak_core_claimant.erl
@@ -710,7 +710,8 @@ get_remote_type_status(BucketType, Props) ->
                                          riak_core_metadata,
                                          get, [?BUCKET_TYPE_PREFIX, BucketType, [{default, []}]]),
     SortedProps = lists:ukeysort(1, Props),
-    DiffProps = [P || P <- AllProps, lists:ukeysort(1, P) =/= SortedProps],
+    %% P may be a {badrpc, ...} in addition to a list of properties when there are older nodes involved
+    DiffProps = [P || P <- AllProps, (not is_list(P) orelse lists:ukeysort(1, P) =/= SortedProps)],
     case {DiffProps, BadNodes} of
         {[], []} -> ready;
         %% unreachable nodes may or may not have correct value, so we assume they dont