Skip to content

Update poolmonitor to support batch size of 1 #1492

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 27, 2022
Merged

Update poolmonitor to support batch size of 1 #1492

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions cns/ipampool/monitor.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -433,14 +433,16 @@ func (pm *Monitor) clampScaler(scaler *v1alpha.Scaler) {

// CalculateMinFreeIPs calculates the minimum free IP quantity based on the Scaler
// in the passed NodeNetworkConfig.
// Half of odd batches are rounded up!
//nolint:gocritic // ignore hugeparam
func CalculateMinFreeIPs(scaler v1alpha.Scaler) int64 {
return int64(float64(scaler.BatchSize) * (float64(scaler.RequestThresholdPercent) / 100)) //nolint:gomnd // it's a percent
return int64(float64(scaler.BatchSize)*(float64(scaler.RequestThresholdPercent)/100) + .5) //nolint:gomnd // it's a percent
}

// CalculateMaxFreeIPs calculates the maximum free IP quantity based on the Scaler
// in the passed NodeNetworkConfig.
// Half of odd batches are rounded up!
//nolint:gocritic // ignore hugeparam
func CalculateMaxFreeIPs(scaler v1alpha.Scaler) int64 {
return int64(float64(scaler.BatchSize) * (float64(scaler.ReleaseThresholdPercent) / 100)) //nolint:gomnd // it's a percent
return int64(float64(scaler.BatchSize)*(float64(scaler.ReleaseThresholdPercent)/100) + .5) //nolint:gomnd // it's a percent
}
176 changes: 129 additions & 47 deletions cns/ipampool/monitor_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,36 +78,63 @@ func initFakes(state testState) (*fakes.HTTPServiceFake, *fakes.RequestControlle
}

func TestPoolSizeIncrease(t *testing.T) {
initState := testState{
batch: 10,
assigned: 8,
allocated: 10,
requestThresholdPercent: 50,
releaseThresholdPercent: 150,
max: 30,
tests := []struct {
name string
in testState
want int64
}{
{
name: "typ",
in: testState{
batch: 10,
assigned: 8,
allocated: 10,
requestThresholdPercent: 50,
releaseThresholdPercent: 150,
max: 30,
},
want: 20,
},
{
name: "starvation",
in: testState{
batch: 1,
assigned: 10,
allocated: 10,
requestThresholdPercent: 50,
releaseThresholdPercent: 150,
max: 30,
},
want: 11,
},
}

fakecns, fakerc, poolmonitor := initFakes(initState)
assert.NoError(t, fakerc.Reconcile(true))
for _, tt := range tests {
tt := tt
t.Run(tt.name, func(t *testing.T) {
fakecns, fakerc, poolmonitor := initFakes(tt.in)
assert.NoError(t, fakerc.Reconcile(true))

// When poolmonitor reconcile is called, trigger increase and cache goal state
assert.NoError(t, poolmonitor.reconcile(context.Background()))
// When poolmonitor reconcile is called, trigger increase and cache goal state
assert.NoError(t, poolmonitor.reconcile(context.Background()))

// ensure pool monitor has reached quorum with cns
assert.Equal(t, initState.allocated+(1*initState.batch), poolmonitor.spec.RequestedIPCount)
// ensure pool monitor has reached quorum with cns
assert.Equal(t, tt.want, poolmonitor.spec.RequestedIPCount)

// request controller reconciles, carves new IPs from the test subnet and adds to CNS state
assert.NoError(t, fakerc.Reconcile(true))
// request controller reconciles, carves new IPs from the test subnet and adds to CNS state
assert.NoError(t, fakerc.Reconcile(true))

// when poolmonitor reconciles again here, the IP count will be within the thresholds
// so no CRD update and nothing pending
assert.NoError(t, poolmonitor.reconcile(context.Background()))
// when poolmonitor reconciles again here, the IP count will be within the thresholds
// so no CRD update and nothing pending
assert.NoError(t, poolmonitor.reconcile(context.Background()))

// ensure pool monitor has reached quorum with cns
assert.Equal(t, initState.allocated+(1*initState.batch), poolmonitor.spec.RequestedIPCount)
// ensure pool monitor has reached quorum with cns
assert.Equal(t, tt.want, poolmonitor.spec.RequestedIPCount)

// make sure IPConfig state size reflects the new pool size
assert.Len(t, fakecns.GetPodIPConfigState(), int(initState.allocated+(1*initState.batch)))
// make sure IPConfig state size reflects the new pool size
assert.Len(t, fakecns.GetPodIPConfigState(), int(tt.want))
})
}
}

func TestPoolIncreaseDoesntChangeWhenIncreaseIsAlreadyInProgress(t *testing.T) {
Expand Down Expand Up @@ -237,37 +264,66 @@ func TestIncreaseWithPendingRelease(t *testing.T) {
}

func TestPoolDecrease(t *testing.T) {
initState := testState{
batch: 10,
allocated: 20,
assigned: 15,
requestThresholdPercent: 50,
releaseThresholdPercent: 150,
max: 30,
tests := []struct {
name string
in testState
want int64
wantReleased int
}{
{
name: "typ",
in: testState{
batch: 10,
allocated: 20,
assigned: 15,
requestThresholdPercent: 50,
releaseThresholdPercent: 150,
max: 30,
},
want: 10,
wantReleased: 10,
},
{
name: "starvation",
in: testState{
batch: 1,
allocated: 20,
assigned: 19,
requestThresholdPercent: 50,
releaseThresholdPercent: 150,
max: 30,
},
want: 19,
wantReleased: 1,
},
}
for _, tt := range tests {
tt := tt
t.Run(tt.name, func(t *testing.T) {
fakecns, fakerc, poolmonitor := initFakes(tt.in)
assert.NoError(t, fakerc.Reconcile(true))

fakecns, fakerc, poolmonitor := initFakes(initState)
assert.NoError(t, fakerc.Reconcile(true))
// Pool monitor does nothing, as the current number of IPs falls in the threshold
assert.NoError(t, poolmonitor.reconcile(context.Background()))

// Pool monitor does nothing, as the current number of IPs falls in the threshold
assert.NoError(t, poolmonitor.reconcile(context.Background()))
// Decrease the number of allocated IPs down to 5. This should trigger a scale down
assert.NoError(t, fakecns.SetNumberOfAssignedIPs(4))

// Decrease the number of allocated IPs down to 5. This should trigger a scale down
assert.NoError(t, fakecns.SetNumberOfAssignedIPs(4))
// Pool monitor will adjust the spec so the pool size will be 1 batch size smaller
assert.NoError(t, poolmonitor.reconcile(context.Background()))

// Pool monitor will adjust the spec so the pool size will be 1 batch size smaller
assert.NoError(t, poolmonitor.reconcile(context.Background()))
// ensure that the adjusted spec is smaller than the initial pool size
assert.Len(t, poolmonitor.spec.IPsNotInUse, tt.wantReleased)

// ensure that the adjusted spec is smaller than the initial pool size
assert.Len(t, poolmonitor.spec.IPsNotInUse, int(initState.allocated-initState.batch))
// reconcile the fake request controller
assert.NoError(t, fakerc.Reconcile(true))

// reconcile the fake request controller
assert.NoError(t, fakerc.Reconcile(true))

// CNS won't actually clean up the IPsNotInUse until it changes the spec for some other reason (i.e. scale up)
// so instead we should just verify that the CNS state has no more PendingReleaseIPConfigs,
// and that they were cleaned up.
assert.Empty(t, fakecns.GetPendingReleaseIPConfigs())
// CNS won't actually clean up the IPsNotInUse until it changes the spec for some other reason (i.e. scale up)
// so instead we should just verify that the CNS state has no more PendingReleaseIPConfigs,
// and that they were cleaned up.
assert.Empty(t, fakecns.GetPendingReleaseIPConfigs())
})
}
}

func TestPoolSizeDecreaseWhenDecreaseHasAlreadyBeenRequested(t *testing.T) {
Expand Down Expand Up @@ -504,11 +560,37 @@ func TestCalculateIPs(t *testing.T) {
wantMinFree: 16,
wantMaxFree: 32,
},
{
name: "odd batch",
in: v1alpha.Scaler{
BatchSize: 3,
RequestThresholdPercent: 50,
ReleaseThresholdPercent: 150,
MaxIPCount: 250,
},
wantMinFree: 2,
wantMaxFree: 5,
},
{
name: "starvation",
in: v1alpha.Scaler{
BatchSize: 1,
RequestThresholdPercent: 50,
ReleaseThresholdPercent: 150,
MaxIPCount: 250,
},
wantMinFree: 1,
wantMaxFree: 2,
},
}
for _, tt := range tests {
tt := tt
t.Run(tt.name, func(t *testing.T) {
t.Run(tt.name+" min free", func(t *testing.T) {
assert.Equal(t, tt.wantMinFree, CalculateMinFreeIPs(tt.in))
t.Parallel()
})
t.Run(tt.name+" max free", func(t *testing.T) {
t.Parallel()
assert.Equal(t, tt.wantMaxFree, CalculateMaxFreeIPs(tt.in))
})
}
Expand Down