Merge pull request #760 from basho/develop

Forward merge develop-2.2 to develop

Reviewed-by: JeetKunDoug

Author: borshop

src/riak_repl_app.erl

@@ -47,6 +47,18 @@ start(_Type, _StartArgs) ->
     riak_core_capability:register({riak_repl, rtq_meta},
         [true, false], false),
 
+    %% Register capability for the default bucket properties hash.
+    riak_core_capability:register(
+        {riak_repl, default_bucket_props_hash},
+        [
+            %% 2.0.6, 2.1.2
+            [consistent, datatype, n_val, write_once],
+
+            %% 2.0.5, 2.1.1 and earlier
+            [consistent, datatype, n_val, allow_mult, last_write_wins]
+        ],
+        [consistent, datatype, n_val, allow_mult, last_write_wins]),
+
     %% skip Riak CS blocks
     case riak_repl_util:proxy_get_active() of
         true ->

src/riak_repl_bucket_type_util.erl

@@ -14,8 +14,6 @@
 
 -define(DEFAULT_BUCKET_TYPE, <<"default">>).
 
--define(DEFAULT_HASH_BUCKET_PROPS, [consistent, datatype, n_val, allow_mult, last_write_wins]).
-
 -spec bucket_props_match(proplists:proplist()) -> boolean().
 bucket_props_match(Props) ->
     case is_bucket_typed(Props) of
@@ -53,4 +51,7 @@ prop_get(Key, Default, Props) ->
 property_hash(undefined) ->
     undefined;
 property_hash(Type) ->
-    riak_core_bucket_type:property_hash(Type, ?DEFAULT_HASH_BUCKET_PROPS).
+    Defaults = riak_core_capability:get(
+            {riak_repl, default_bucket_props_hash},
+            [consistent, datatype, n_val, allow_mult, last_write_wins]),
+    riak_core_bucket_type:property_hash(Type, Defaults).

src/riak_repl_util.erl

@@ -826,12 +826,11 @@ safe_pid_to_list(NotAPid) ->
     NotAPid.
 
 safe_get_msg_q_len(Pid) when is_pid(Pid) ->
-    ProcInfo = erlang:process_info(Pid),
-    proplists:get_value(message_queue_len, ProcInfo);
+    {message_queue_len, Len} = erlang:process_info(Pid, message_queue_len),
+    Len;
 safe_get_msg_q_len(Other) ->
     Other.
 
-
 peername(Socket, Transport) ->
     case Transport:peername(Socket) of
         {ok, {Ip, Port}} ->