Skip to content
This repository
Browse code

Merge pull request #244 from evanmcc/pevm_stale_ring

Clarify error message for stale ring failures.
  • Loading branch information...
commit 333169e8d4496a74acebb90919ef4765ed672451 2 parents 874ef21 + 0d13fca
Scott Lystig Fritchie slfritchie authored

Showing 1 changed file with 5 additions and 1 deletion. Show diff stats Hide diff stats

  1. +5 1 src/riak_core_capability.erl
6 src/riak_core_capability.erl
@@ -413,7 +413,11 @@ negotiate_capabilities(Node, Override, State=#state{registered=Registered,
413 413 renegotiate_capabilities(State=#state{supported=[]}) ->
414 414 State;
415 415 renegotiate_capabilities(State) ->
416   - Caps = orddict:fetch(node(), State#state.supported),
  416 + Caps =
  417 + case orddict:find(node(), State#state.supported) of
  418 + {ok, Val} -> Val;
  419 + error -> error("Node name mismatch, move or remove stale ring file")
  420 + end,
417 421 Overrides = get_overrides(Caps),
418 422 State2 = negotiate_capabilities(node(), Overrides, State),
419 423 process_capability_changes(State#state.negotiated,

0 comments on commit 333169e

Please sign in to comment.
Something went wrong with that request. Please try again.