Commit183146e

authored

fix: add minor fix to reconciliation loop (#17454)

Follow-up PR to#17261I noticed that 1 metrics-related test fails in `dk/prebuilds` aftermerging my PR into `dk/prebuilds`.

1 parent144c60d commit183146eCopy full SHA for 183146e

File tree

+10

-4

lines changed

+10

-4

lines changed

Lines changed: 3 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -91,9 +91,10 @@ func (p PresetSnapshot) CalculateState() *ReconciliationState {`
`91`	`91`	`extraneousint32`
`92`	`92`	`)`
`93`	`93`
	`94`	`+// #nosec G115 - Safe conversion as p.Running slice length is expected to be within int32 range`
	`95`	`+actual=int32(len(p.Running))`
	`96`	`+`
`94`	`97`	`ifp.isActive() {`
`95`		`-// #nosec G115 - Safe conversion as p.Running slice length is expected to be within int32 range`
`96`		`-actual=int32(len(p.Running))`
`97`	`98`	`desired=p.Preset.DesiredInstances.Int32`
`98`	`99`	`eligible=p.countEligible()`
`99`	`100`	`extraneous=max(actual-desired,0)`

Lines changed: 7 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -146,7 +146,9 @@ func TestOutdatedPrebuilds(t *testing.T) {`
`146`	`146`	`state:=ps.CalculateState()`
`147`	`147`	`actions,err:=ps.CalculateActions(clock,backoffInterval)`
`148`	`148`	`require.NoError(t,err)`
`149`		`-validateState(t, prebuilds.ReconciliationState{},*state)`
	`149`	`+validateState(t, prebuilds.ReconciliationState{`
	`150`	`+Actual:1,`
	`151`	`+},*state)`
`150`	`152`	`validateActions(t, prebuilds.ReconciliationActions{`
`151`	`153`	`ActionType:prebuilds.ActionTypeDelete,`
`152`	`154`	`DeleteIDs: []uuid.UUID{outdated.prebuiltWorkspaceID},`
`@@ -208,6 +210,7 @@ func TestDeleteOutdatedPrebuilds(t *testing.T) {`
`208`	`210`	`actions,err:=ps.CalculateActions(clock,backoffInterval)`
`209`	`211`	`require.NoError(t,err)`
`210`	`212`	`validateState(t, prebuilds.ReconciliationState{`
	`213`	`+Actual:1,`
`211`	`214`	`Deleting:1,`
`212`	`215`	`},*state)`
`213`	`216`
`@@ -530,7 +533,9 @@ func TestDeprecated(t *testing.T) {`
`530`	`533`	`state:=ps.CalculateState()`
`531`	`534`	`actions,err:=ps.CalculateActions(clock,backoffInterval)`
`532`	`535`	`require.NoError(t,err)`
`533`		`-validateState(t, prebuilds.ReconciliationState{},*state)`
	`536`	`+validateState(t, prebuilds.ReconciliationState{`
	`537`	`+Actual:1,`
	`538`	`+},*state)`
`534`	`539`	`validateActions(t, prebuilds.ReconciliationActions{`
`535`	`540`	`ActionType:prebuilds.ActionTypeDelete,`
`536`	`541`	`DeleteIDs: []uuid.UUID{current.prebuiltWorkspaceID},`

Comments

(0)