Skip to content

Commit 3e79fa0

Browse files
anuthananuthan
committed
Rename do_sanify_chain to sanify_chain.
Change-Id: I95f2d237aa9a845b093499e6b1a3e38f0606fa54 Reviewed-on: http://review.couchbase.org/106825 Reviewed-by: Aliaksey Artamonau <[email protected]> Tested-by: Abhijeeth Nuthan <[email protected]>
1 parent 593fc8e commit 3e79fa0

File tree

1 file changed

+56
-56
lines changed

1 file changed

+56
-56
lines changed

‎src/ns_janitor.erl‎

Lines changed: 56 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -352,7 +352,7 @@ compute_vbucket_map_fixup(Bucket, BucketConfig, States) ->
352352
FFMap = proplists:get_value(fastForwardMap, BucketConfig),
353353

354354
EnumeratedChains = enumerate_chains(Map, FFMap),
355-
MapUpdates = [do_sanify_chain(Bucket, States, Chain, FutureChain, VBucket)
355+
MapUpdates = [sanify_chain(Bucket, States, Chain, FutureChain, VBucket)
356356
|| {VBucket, Chain, FutureChain} <- EnumeratedChains],
357357

358358
MapLen = length(Map),
@@ -393,14 +393,14 @@ construct_vbucket_states(VBucket, Chain, States) ->
393393
{NodeStates, ChainStates, ExtraStates}.
394394

395395
%% this will decide what vbucket map chain is right for this vbucket
396-
do_sanify_chain(_Bucket, _States,
397-
[CurrentMaster | _] = CurrentChain,
398-
_FutureChain, _VBucket) when CurrentMaster =:= undefined ->
396+
sanify_chain(_Bucket, _States,
397+
[CurrentMaster | _] = CurrentChain,
398+
_FutureChain, _VBucket) when CurrentMaster =:= undefined ->
399399
%% We can get here on a hard-failover case.
400400
CurrentChain;
401-
do_sanify_chain(Bucket, States,
402-
[CurrentMaster | _] = CurrentChain,
403-
FutureChain, VBucket) ->
401+
sanify_chain(Bucket, States,
402+
[CurrentMaster | _] = CurrentChain,
403+
FutureChain, VBucket) ->
404404
NodeStates = [{N, S} || {N, VB, S} <- States, VB =:= VBucket],
405405
Actives = [{N, S} || {N, S} <- NodeStates, S =:= active],
406406

@@ -503,37 +503,37 @@ sanify_chain_one_active(Bucket, VBucket, ActiveNode, _States,
503503
-ifdef(TEST).
504504
sanify_basic_test() ->
505505
%% normal case when everything matches vb map
506-
[a, b] = do_sanify_chain("B", [{a, 0, active}, {b, 0, replica}],
507-
[a, b], [], 0),
506+
[a, b] = sanify_chain("B", [{a, 0, active}, {b, 0, replica}],
507+
[a, b], [], 0),
508508

509509
%% yes, the code will keep both masters as long as expected master
510510
%% is there. Possibly something to fix in future
511-
[a, b] = do_sanify_chain("B", [{a, 0, active}, {b, 0, active}],
512-
[a, b], [], 0),
511+
[a, b] = sanify_chain("B", [{a, 0, active}, {b, 0, active}],
512+
[a, b], [], 0),
513513

514514
%% main chain doesn't match but fast-forward chain does
515-
[b, c] = do_sanify_chain("B", [{a, 0, dead}, {b, 0, active}, {c, 0, replica}],
516-
[a, b], [b, c], 0),
515+
[b, c] = sanify_chain("B", [{a, 0, dead}, {b, 0, active}, {c, 0, replica}],
516+
[a, b], [b, c], 0),
517517

518518
%% main chain doesn't match but ff chain does. And old master is already deleted
519-
[b, c] = do_sanify_chain("B", [{b, 0, active}, {c, 0, replica}],
520-
[a, b], [b, c], 0),
519+
[b, c] = sanify_chain("B", [{b, 0, active}, {c, 0, replica}],
520+
[a, b], [b, c], 0),
521521

522522
%% lets make sure we touch all paths just in case
523523
%% this runs "there are >1 unexpected master" case
524-
ignore = do_sanify_chain("B", [{a, 0, active}, {b, 0, active}],
525-
[c, a, b], [], 0),
524+
ignore = sanify_chain("B", [{a, 0, active}, {b, 0, active}],
525+
[c, a, b], [], 0),
526526
%% this runs "master is one of replicas" case
527-
[b] = do_sanify_chain("B", [{b, 0, active}, {c, 0, replica}],
528-
[a, b], [], 0),
527+
[b] = sanify_chain("B", [{b, 0, active}, {c, 0, replica}],
528+
[a, b], [], 0),
529529
%% and this runs "master is some non-chain member node" case
530-
[c] = do_sanify_chain("B", [{c, 0, active}],
531-
[a, b], [], 0),
530+
[c] = sanify_chain("B", [{c, 0, active}],
531+
[a, b], [], 0),
532532

533533
%% lets also test rebalance stopped prior to complete takeover
534-
[a, b] = do_sanify_chain("B", [{a, 0, dead}, {b, 0, replica},
535-
{c, 0, pending}, {d, 0, replica}],
536-
[a, b], [c, d], 0),
534+
[a, b] = sanify_chain("B", [{a, 0, dead}, {b, 0, replica},
535+
{c, 0, pending}, {d, 0, replica}],
536+
[a, b], [c, d], 0),
537537
ok.
538538

539539
sanify_doesnt_lose_replicas_on_stopped_rebalance_test() ->
@@ -542,25 +542,25 @@ sanify_doesnt_lose_replicas_on_stopped_rebalance_test() ->
542542
%% vbmap. We have code in sanify to detect this condition using
543543
%% fast-forward map and is supposed to recover perfectly from this
544544
%% condition.
545-
[a, b] = do_sanify_chain("B", [{a, 0, active}, {b, 0, dead}],
546-
[b, a], [a, b], 0),
545+
[a, b] = sanify_chain("B", [{a, 0, active}, {b, 0, dead}],
546+
[b, a], [a, b], 0),
547547

548548
%% rebalance can be stopped after updating vbucket states but
549549
%% before vbucket map update
550-
[a, b] = do_sanify_chain("B", [{a, 0, active}, {b, 0, replica}],
551-
[b, a], [a, b], 0),
550+
[a, b] = sanify_chain("B", [{a, 0, active}, {b, 0, replica}],
551+
[b, a], [a, b], 0),
552552
%% same stuff but prior to takeover
553-
[a, b] = do_sanify_chain("B", [{a, 0, dead}, {b, 0, pending}],
554-
[a, b], [b, a], 0),
553+
[a, b] = sanify_chain("B", [{a, 0, dead}, {b, 0, pending}],
554+
[a, b], [b, a], 0),
555555
%% lets test more usual case too
556-
[c, d] = do_sanify_chain("B", [{a, 0, dead}, {b, 0, replica},
557-
{c, 0, active}, {d, 0, replica}],
558-
[a, b], [c, d], 0),
556+
[c, d] = sanify_chain("B", [{a, 0, dead}, {b, 0, replica},
557+
{c, 0, active}, {d, 0, replica}],
558+
[a, b], [c, d], 0),
559559
%% but without FF map we're (too) conservative (should be fixable
560560
%% someday)
561-
[c] = do_sanify_chain("B", [{a, 0, dead}, {b, 0, replica},
562-
{c, 0, active}, {d, 0, replica}],
563-
[a, b], [], 0).
561+
[c] = sanify_chain("B", [{a, 0, dead}, {b, 0, replica},
562+
{c, 0, active}, {d, 0, replica}],
563+
[a, b], [], 0).
564564

565565
enumerate_chains_test() ->
566566
Map = [[a, b, c], [b, c, a]],
@@ -572,28 +572,28 @@ enumerate_chains_test() ->
572572
[{0, [a, b, c], []}, {1, [b, c, a], []}] = EnumeratedChains2.
573573

574574
sanify_addition_of_replicas_test() ->
575-
[a, b] = do_sanify_chain("B", [{a, 0, active},
576-
{b, 0, replica}],
577-
[a, b], [a, b, c], 0),
578-
[a, b] = do_sanify_chain("B", [{a, 0, active},
579-
{b, 0, replica},
580-
{c, 0, replica}],
581-
[a, b], [a, b, c], 0),
575+
[a, b] = sanify_chain("B", [{a, 0, active},
576+
{b, 0, replica}],
577+
[a, b], [a, b, c], 0),
578+
[a, b] = sanify_chain("B", [{a, 0, active},
579+
{b, 0, replica},
580+
{c, 0, replica}],
581+
[a, b], [a, b, c], 0),
582582

583583
%% replica addition with possible move.
584-
[a, b] = do_sanify_chain("B", [{a, 0, dead},
584+
[a, b] = sanify_chain("B", [{a, 0, dead},
585+
{b, 0, replica},
586+
{c, 0, pending}],
587+
[a, b], [c, a, b], 0),
588+
[c, d, a] = sanify_chain("B", [{a, 0, dead},
589+
{b, 0, replica},
590+
{c, 0, active},
591+
{d, 0, replica}],
592+
[a, b], [c, d, a], 0),
593+
[c, d, a] = sanify_chain("B", [{a, 0, replica},
585594
{b, 0, replica},
586-
{c, 0, pending}],
587-
[a, b], [c, a, b], 0),
588-
[c, d, a] = do_sanify_chain("B", [{a, 0, dead},
589-
{b, 0, replica},
590-
{c, 0, active},
591-
{d, 0, replica}],
592-
[a, b], [c, d, a], 0),
593-
[c, d, a] = do_sanify_chain("B", [{a, 0, replica},
594-
{b, 0, replica},
595-
{c, 0, active},
596-
{d, 0, replica}],
597-
[a, b], [c, d, a], 0).
595+
{c, 0, active},
596+
{d, 0, replica}],
597+
[a, b], [c, d, a], 0).
598598

599599
-endif.

0 commit comments

Comments
 (0)