Add node_confirms default bucket props (#915)

* Added default (0) for new pd bucket option.
PD = Physical diversity. See changes in riak_kv for full details.

* Add pd option to prop resolve.

* Rename 'pd' bucket property to 'node_confirms'

* Move `node_confirms` to version specific props

See bug report nhs-riak/kv9. This commit moves the node_confirms
property into a version specific list/function. It changes the list
concatenation to be shortest list as the left-hand-operand (erlang docs
say this is faster
http://erlang.org/doc/efficiency_guide/listHandling.html). Why not,
since I was in here futzing around.

NOTE: I kept with the existing `defaults/0` and `defaults/1` rather than
the discussed "new_defaults" or "post_transition_defaults" as I was
unclear where, if anywhere, `defaults/1` was called. `defaults/0` is
implicitly "post-transition defaults" already.

* Update deps for upstream

Author: russelldb

src/riak_core_bucket_props.erl

@@ -168,6 +168,8 @@ resolve_prop({precommit, PC1}, {precommit, PC2}) ->
     resolve_hooks(PC1, PC2);
 resolve_prop({pw, PW1}, {pw, PW2}) ->
     max(PW1, PW2);
+resolve_prop({node_confirms, NodeConfirms1}, {node_confirms, NodeConfirms2}) ->
+    max(NodeConfirms1, NodeConfirms2);
 resolve_prop({r, R1}, {r, R2}) ->
     max(R1, R2);
 resolve_prop({rw, RW1}, {rw, RW2}) ->
@@ -206,6 +208,7 @@ simple_resolve_test() ->
               {pr,0},
               {precommit,[{a, b}]},
               {pw,0},
+              {node_confirms,0},
               {r,quorum},
               {rw,quorum},
               {small_vclock,50},
@@ -226,6 +229,7 @@ simple_resolve_test() ->
               {pr,1},
               {precommit,[{c, d}]},
               {pw,3},
+              {node_confirms,3},
               {r,3},
               {rw,3},
               {w,1},
@@ -245,6 +249,7 @@ simple_resolve_test() ->
                 {pr,1},
                 {precommit,[{a, b}, {c, d}]},
                 {pw,3},
+                {node_confirms,3},
                 {r,quorum},
                 {rw,quorum},
                 {small_vclock,50},

src/riak_core_bucket_type.erl

@@ -120,26 +120,31 @@
 %% @doc The hardcoded defaults for all bucket types.
 -spec defaults() -> bucket_type_props().
 defaults() ->
-    custom_type_defaults().
+    v225_defaults() ++ custom_type_defaults().
+
+%% @private default propeties added for v2.2.5
+-spec v225_defaults() -> bucket_type_props().
+v225_defaults() ->
+    [{node_confirms, 0}].
 
 %% @doc The hardcoded defaults for the legacy, default bucket
 %% type. These find their way into the `default_bucket_props'
 %% environment variable
 -spec defaults(default_type) -> bucket_type_props().
 defaults(default_type) ->
-    default_type_defaults().
+    v225_defaults() ++ default_type_defaults().
 
 default_type_defaults() ->
-    common_defaults() ++
-        [{dvv_enabled, false},
-         {allow_mult, false}].
+    [{dvv_enabled, false},
+     {allow_mult, false}] ++
+        common_defaults().
 
 custom_type_defaults() ->
-    common_defaults() ++
-        %% @HACK dvv is a riak_kv only thing, yet there is nowhere else
-        %% to put it (except maybe fixups?)
-        [{dvv_enabled, true},
-         {allow_mult, true}].
+    %% @HACK dvv is a riak_kv only thing, yet there is nowhere else
+    %% to put it (except maybe fixups?)
+    [{dvv_enabled, true},
+     {allow_mult, true}] ++
+        common_defaults().
 
 common_defaults() ->
     [{linkfun, {modfun, riak_kv_wm_link_walker, mapreduce_linkfun}},