Skip to content

Wait until caps renegotiation completes on node upgrade #33

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

Open
hmmr wants to merge 3 commits into
base: openriak-3.4
Choose a base branch
from
+36 −12
Open

Wait until caps renegotiation completes on node upgrade #33

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1f380e5
don't try to look up backend in test_runner metadata
Jul 24, 2026
841115c
bring back verify_build_cluster_caps_race into group core_all
Jul 24, 2026
118d7fa
verify_dt_upgrade: wait to allow caps to propagate on node upgrade
Jul 25, 2026
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
1 change: 1 addition & 0 deletions groups/core_all
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ location_upgrade
node_repair_big
node_repair_nval
verify_build_cluster
verify_build_cluster_caps_race
verify_claimant
verify_dynamic_ring
verify_leave
Expand Down
16 changes: 9 additions & 7 deletions src/rt.erl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2706,14 +2706,16 @@ make_multi_backend_config(Other) ->
get_backends() ->
Backends = ?HARNESS:get_backends(),
case Backends of
[riak_kv_bitcask_backend] -> bitcask;
[riak_kv_eleveldb_backend] -> eleveldb;
[riak_kv_memory_backend] -> memory;
[riak_kv_leveled_backend] -> leveled;
[Other] -> Other;
MoreThanOne -> MoreThanOne
[Single] -> known_backend(Single);
MoreThanOne -> [known_backend(A) || A <- MoreThanOne]
end.

known_backend(riak_kv_bitcask_backend) -> bitcask;
known_backend(riak_kv_eleveldb_backend) -> eleveldb;
known_backend(riak_kv_memory_backend) -> memory;
known_backend(riak_kv_leveled_backend) -> leveled;
known_backend(X) -> X.

-spec get_backend(rtt:app_config()) -> rtt:backend() | error.
get_backend(AppConfigProplist) ->
case kvc:path('riak_kv.storage_backend', AppConfigProplist) of
Expand Down Expand Up @@ -3402,4 +3404,4 @@ product_test_() ->
?_test(verify_product([kernel], unknown))
]}.

-endif.
-endif.
14 changes: 10 additions & 4 deletions tests/verify_basic_upgrade.erl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,8 +111,8 @@

confirm() ->

KVBackend = get_backend(),
TestMetaData = riak_test_runner:metadata(),
KVBackend = proplists:get_value(backend, TestMetaData),
OldVsn = proplists:get_value(upgrade_version, TestMetaData, previous),

?LOG_INFO("*****************************"),
Expand Down Expand Up @@ -181,8 +181,7 @@ upgrade(Node, NewVsn) ->
ok.

backend_size(Node) ->
TestMetaData = riak_test_runner:metadata(),
KVBackend = proplists:get_value(backend, TestMetaData),
KVBackend = get_backend(),
{ok, DataDir} =
rpc:call(Node, application, get_env, [riak_core, platform_data_dir]),
BackendDir = filename:join(DataDir, base_dir_for_backend(KVBackend)),
Expand All @@ -192,6 +191,13 @@ backend_size(Node) ->
re:run(SzTxt, "(?<SzOnly>[0-9]+)M.*", [{capture, all_names, list}]),
list_to_integer(SzOnly).

get_backend() ->
case rt:get_backends() of
[B1|_] ->
B1;
B -> B
end.

base_dir_for_backend(leveled) ->
"leveled";
base_dir_for_backend(bitcask) ->
Expand Down Expand Up @@ -227,4 +233,4 @@ validate_value(Node, Bucket, StartKey, EndKey, Value, CheckPerc) ->
value_matches(<<N:32/integer, CommonValBin/binary>>, N, CommonValBin) ->
true;
value_matches(_WrongVal, _N, _CommonValBin) ->
false.
false.
17 changes: 16 additions & 1 deletion tests/verify_dt_upgrade.erl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,9 @@ populate_counters(Node) ->
verify_counters(Node) ->
?LOG_INFO("Verifying counters on ~0p", [Node]),
RHC = rt:httpc(Node),
?assertMatch({ok, 4}, rhc:counter_val(RHC, ?COUNTER_BUCKET, <<"pbkey">>)),
PBKey = <<"pbkey">>,
rt:wait_until(not_503(RHC, PBKey)),
?assertMatch({ok, 4}, rhc:counter_val(RHC, ?COUNTER_BUCKET, PBKey)),

PBC = rt:pbc(Node),
?assertEqual({ok, 2}, riakc_pb_socket:counter_val(PBC, ?COUNTER_BUCKET, <<"httpkey">>)),
Expand All @@ -83,6 +85,19 @@ verify_counters(Node) ->
end,
ok.

not_503(Client, Key) ->
fun() ->
Res = rhc:counter_val(Client, ?COUNTER_BUCKET, Key),
case Res of
%% expect 503 for a brief while
{error, {ok, "503", _Headers, <<"Counters are not supported.">>}} ->
?LOG_INFO("\"Counters are not supported\" pending caps negotiation post upgrade", []),
false;
_ ->
true
end
end.

upgrade(Node, NewVsn) ->
?LOG_INFO("Upgrading ~0p to ~0p", [Node, NewVsn]),
rt:upgrade(Node, NewVsn),
Expand Down
Loading