@@ -88,22 +88,6 @@ func migrateTargetElement(targets []Target, idx int) {
8888 }
8989}
9090
91- // migrateStatuses used to migrate individual statuses and generate
92- // new current and target statuses.
93- func migrateStatuses (
94- currentStatus Status , targetStatus Status ,
95- ) (newCurrentStatus Status , newTargetStatus Status , updated bool ) {
96- // Target state of TXN_DROPPED has been removed, so push plans further along.
97- // Note: No version is required for this transition, since it will be valid
98- // for all releases.
99- if targetStatus == Status_ABSENT && currentStatus == Status_TXN_DROPPED {
100- return Status_PUBLIC , targetStatus , true
101- } else if targetStatus == Status_PUBLIC && currentStatus == Status_TXN_DROPPED {
102- return Status_ABSENT , targetStatus , true
103- }
104- return currentStatus , targetStatus , false
105- }
106-
10791// MigrateCurrentState migrates a current state by upgrading elements based
10892// on the current version number.
10993func MigrateCurrentState (version clusterversion.ClusterVersion , state * CurrentState ) bool {
@@ -119,12 +103,6 @@ func MigrateCurrentState(version clusterversion.ClusterVersion, state *CurrentSt
119103 migrateTargetElement (state .Targets , idx )
120104 targetsToRemove [idx ] = struct {}{}
121105 }
122- current , targetStatus , update := migrateStatuses (state .Current [idx ], target .TargetStatus )
123- if update {
124- state .Current [idx ] = current
125- target .TargetStatus = targetStatus
126- updated = true
127- }
128106 }
129107 if ! updated {
130108 return updated
@@ -192,12 +170,6 @@ func MigrateDescriptorState(
192170 newIndexes [descID ] = nil
193171 }
194172 }
195- current , targetStatus , update := migrateStatuses (state .CurrentStatuses [idx ], target .TargetStatus )
196- if update {
197- state .CurrentStatuses [idx ] = current
198- target .TargetStatus = targetStatus
199- updated = true
200- }
201173 if migrated , newTargets := migrateDeprecatedFields (version , target ); migrated {
202174 updated = true
203175 for i := range newTargets {
0 commit comments