From ce26247ea32cc6b87861ff7a98f86134a962ef1d Mon Sep 17 00:00:00 2001 From: Arvind Murty Date: Mon, 20 Dec 2021 17:25:23 -0800 Subject: [PATCH] replace master with primary Signed-off-by: Arvind Murty --- go/vt/topotools/utils.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/go/vt/topotools/utils.go b/go/vt/topotools/utils.go index 1f5f6a81756..41fecca68b0 100644 --- a/go/vt/topotools/utils.go +++ b/go/vt/topotools/utils.go @@ -117,20 +117,20 @@ func GetAllTabletsAcrossCells(ctx context.Context, ts *topo.Server) ([]*topo.Tab // SortedTabletMap returns two maps: // - The replicaMap contains all the non-primary non-scrapped hosts. // This can be used as a list of replicas to fix up for reparenting -// - The masterMap contains all the tablets without parents +// - The primaryMap contains all the tablets without parents // (scrapped or not). This can be used to special case // the old primary, and any tablet in a weird state, left over, ... func SortedTabletMap(tabletMap map[string]*topo.TabletInfo) (map[string]*topo.TabletInfo, map[string]*topo.TabletInfo) { replicaMap := make(map[string]*topo.TabletInfo) - masterMap := make(map[string]*topo.TabletInfo) + primaryMap := make(map[string]*topo.TabletInfo) for alias, ti := range tabletMap { if ti.Type == topodatapb.TabletType_PRIMARY { - masterMap[alias] = ti + primaryMap[alias] = ti } else { replicaMap[alias] = ti } } - return replicaMap, masterMap + return replicaMap, primaryMap } // CopyMapKeys copies keys from map m into a new slice with the