feat: use options instead of many arguments

Signed-off-by: Manan Gupta <manan@planetscale.com>

Author: GuptaManan100

go/vt/vtctl/reparentutil/planned_reparenter.go

@@ -182,7 +182,7 @@ func (pr *PlannedReparenter) preflightChecks(
 	}
 
 	event.DispatchUpdate(ev, "electing a primary candidate")
-	opts.NewPrimaryAlias, err = ElectNewPrimary(ctx, pr.tmc, &ev.ShardInfo, tabletMap, innodbBufferPoolData, opts.NewPrimaryAlias, opts.AvoidPrimaryAlias, opts.WaitReplicasTimeout, opts.TolerableReplLag, opts.durability, opts.AllowCrossCellPromotion, pr.logger)
+	opts.NewPrimaryAlias, err = ElectNewPrimary(ctx, pr.tmc, &ev.ShardInfo, tabletMap, innodbBufferPoolData, opts, pr.logger)
 	if err != nil {
 		return true, err
 	}

go/vt/vtctl/reparentutil/util.go

@@ -69,12 +69,7 @@ func ElectNewPrimary(
 	shardInfo *topo.ShardInfo,
 	tabletMap map[string]*topo.TabletInfo,
 	innodbBufferPoolData map[string]int,
-	newPrimaryAlias *topodatapb.TabletAlias,
-	avoidPrimaryAlias *topodatapb.TabletAlias,
-	waitReplicasTimeout time.Duration,
-	tolerableReplLag time.Duration,
-	durability Durabler,
-	allowCrossCellPromotion bool,
+	opts *PlannedReparentOptions,
 	// (TODO:@ajm188) it's a little gross we need to pass this, maybe embed in the context?
 	logger logutil.Logger,
 ) (*topodatapb.TabletAlias, error) {
@@ -99,16 +94,16 @@ func ElectNewPrimary(
 	reasonsToInvalidate := strings.Builder{}
 	for _, tablet := range tabletMap {
 		switch {
-		case newPrimaryAlias != nil:
+		case opts.NewPrimaryAlias != nil:
 			// If newPrimaryAlias is provided, then that is the only valid tablet, even if it is not of type replica or in a different cell.
-			if !topoproto.TabletAliasEqual(tablet.Alias, newPrimaryAlias) {
+			if !topoproto.TabletAliasEqual(tablet.Alias, opts.NewPrimaryAlias) {
 				reasonsToInvalidate.WriteString(fmt.Sprintf("\n%v does not match the new primary alias provided", topoproto.TabletAliasString(tablet.Alias)))
 				continue
 			}
-		case !allowCrossCellPromotion && primaryCell != "" && tablet.Alias.Cell != primaryCell:
+		case !opts.AllowCrossCellPromotion && primaryCell != "" && tablet.Alias.Cell != primaryCell:
 			reasonsToInvalidate.WriteString(fmt.Sprintf("\n%v is not in the same cell as the previous primary", topoproto.TabletAliasString(tablet.Alias)))
 			continue
-		case avoidPrimaryAlias != nil && topoproto.TabletAliasEqual(tablet.Alias, avoidPrimaryAlias):
+		case opts.AvoidPrimaryAlias != nil && topoproto.TabletAliasEqual(tablet.Alias, opts.AvoidPrimaryAlias):
 			reasonsToInvalidate.WriteString(fmt.Sprintf("\n%v matches the primary alias to avoid", topoproto.TabletAliasString(tablet.Alias)))
 			continue
 		case tablet.Tablet.Type != topodatapb.TabletType_REPLICA:
@@ -123,18 +118,18 @@ func ElectNewPrimary(
 	// then we don't need to find the position of the said tablet for sorting.
 	// We can just return the tablet quickly.
 	// This check isn't required, but it saves us an RPC call that is otherwise unnecessary.
-	if len(candidates) == 1 && tolerableReplLag == 0 {
+	if len(candidates) == 1 && opts.TolerableReplLag == 0 {
 		return candidates[0].Alias, nil
 	}
 
 	for _, tablet := range candidates {
 		tb := tablet
 		errorGroup.Go(func() error {
 			// find and store the positions for the tablet
-			pos, replLag, err := findPositionAndLagForTablet(groupCtx, tb, logger, tmc, waitReplicasTimeout)
+			pos, replLag, err := findPositionAndLagForTablet(groupCtx, tb, logger, tmc, opts.WaitReplicasTimeout)
 			mu.Lock()
 			defer mu.Unlock()
-			if err == nil && (tolerableReplLag == 0 || tolerableReplLag >= replLag) {
+			if err == nil && (opts.TolerableReplLag == 0 || opts.TolerableReplLag >= replLag) {
 				validTablets = append(validTablets, tb)
 				tabletPositions = append(tabletPositions, pos)
 				innodbBufferPool = append(innodbBufferPool, innodbBufferPoolData[topoproto.TabletAliasString(tb.Alias)])
@@ -156,7 +151,7 @@ func ElectNewPrimary(
 	}
 
 	// sort the tablets for finding the best primary
-	err = sortTabletsForReparent(validTablets, tabletPositions, innodbBufferPool, durability)
+	err = sortTabletsForReparent(validTablets, tabletPositions, innodbBufferPool, opts.durability)
 	if err != nil {
 		return nil, err
 	}

go/vt/vtctl/reparentutil/util_test.go

@@ -71,7 +71,7 @@ func TestElectNewPrimary(t *testing.T) {
 		tmc                     *chooseNewPrimaryTestTMClient
 		shardInfo               *topo.ShardInfo
 		tabletMap               map[string]*topo.TabletInfo
-		innodbBufferPoolData map[string]int
+		innodbBufferPoolData    map[string]int
 		newPrimaryAlias         *topodatapb.TabletAlias
 		avoidPrimaryAlias       *topodatapb.TabletAlias
 		tolerableReplLag        time.Duration
@@ -853,7 +853,15 @@ zone1-0000000100 is not a replica`,
 		t.Run(tt.name, func(t *testing.T) {
 			t.Parallel()
 
-			actual, err := ElectNewPrimary(ctx, tt.tmc, tt.shardInfo, tt.tabletMap, tt.innodbBufferPoolData, tt.newPrimaryAlias, tt.avoidPrimaryAlias, time.Millisecond*50, tt.tolerableReplLag, durability, tt.allowCrossCellPromotion, logger)
+			options := &PlannedReparentOptions{
+				NewPrimaryAlias:         tt.newPrimaryAlias,
+				AvoidPrimaryAlias:       tt.avoidPrimaryAlias,
+				TolerableReplLag:        tt.tolerableReplLag,
+				durability:              durability,
+				AllowCrossCellPromotion: tt.allowCrossCellPromotion,
+				WaitReplicasTimeout:     time.Millisecond * 50,
+			}
+			actual, err := ElectNewPrimary(ctx, tt.tmc, tt.shardInfo, tt.tabletMap, tt.innodbBufferPoolData, options, logger)
 			if len(tt.errContains) > 0 {
 				for _, errC := range tt.errContains {
 					assert.ErrorContains(t, err, errC)