Skip to content
Merged
Changes from all commits
Commits
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
use old object format by default on upgrade
also provide convenient config var instead of having to use
capability overrides
  • Loading branch information
jrwest committed May 23, 2013
commit 7bab78b94d907d7139939026d0fb8431077afda3
9 changes: 8 additions & 1 deletion src/riak_kv_app.erl
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@ start(_Type, _StartArgs) ->
encode_zlib),

riak_core_capability:register({riak_kv, object_format},
[v1, v0],
get_object_format_modes(),
v0),

riak_core_capability:register({riak_kv, vclock_data_encoding},
Expand Down Expand Up @@ -277,3 +277,10 @@ wait_for_put_fsms(N) ->

wait_for_put_fsms() ->
wait_for_put_fsms(?MAX_FLUSH_PUT_FSM_RETRIES).

get_object_format_modes() ->
%% TODO: clearly, this isn't ideal if we have more versions
case app_helper:get_env(riak_kv, object_format, v0) of
v0 -> [v0,v1];
v1 -> [v1,v0]
end.