Skip to content

fix: use correct duration for pool refresh #1094

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
Nov 15, 2021
Merged

fix: use correct duration for pool refresh #1094

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
9 changes: 4 additions & 5 deletions cns/configuration/configuration.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ import (
"io/ioutil"
"os"
"path/filepath"
"time"

"github.com/Azure/azure-container-networking/cns"
"github.com/Azure/azure-container-networking/cns/logger"
Expand All @@ -25,8 +24,8 @@ type CNSConfig struct {
InitializeFromCNI bool
ManagedSettings ManagedSettings
MetricsBindAddress string
SyncHostNCTimeoutMs time.Duration
SyncHostNCVersionIntervalMs time.Duration
SyncHostNCTimeoutMs int
SyncHostNCVersionIntervalMs int
TLSCertificatePath string
TLSEndpoint string
TLSPort string
Expand Down Expand Up @@ -151,9 +150,9 @@ func SetCNSConfigDefaults(config *CNSConfig) {
config.MetricsBindAddress = ":9090"
}
if config.SyncHostNCVersionIntervalMs == 0 {
config.SyncHostNCVersionIntervalMs = 1000 * time.Millisecond //nolint:gomnd // default times
config.SyncHostNCVersionIntervalMs = 1000 //nolint:gomnd // default times
}
if config.SyncHostNCTimeoutMs == 0 {
config.SyncHostNCTimeoutMs = 500 * time.Millisecond //nolint:gomnd // default times
config.SyncHostNCTimeoutMs = 500 //nolint:gomnd // default times
}
}
5 changes: 2 additions & 3 deletions cns/configuration/configuration_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ import (
"os"
"path/filepath"
"testing"
"time"

"github.com/Azure/azure-container-networking/common"
"github.com/stretchr/testify/assert"
Expand Down Expand Up @@ -188,8 +187,8 @@ func TestSetCNSConfigDefaults(t *testing.T) {
NodeSyncIntervalInSeconds: 30,
},
MetricsBindAddress: ":9090",
SyncHostNCTimeoutMs: 500 * time.Millisecond,
SyncHostNCVersionIntervalMs: 1000 * time.Millisecond,
SyncHostNCTimeoutMs: 500,
SyncHostNCVersionIntervalMs: 1000,
TelemetrySettings: TelemetrySettings{
TelemetryBatchSizeBytes: 32768,
TelemetryBatchIntervalInSecs: 30,
Expand Down
13 changes: 8 additions & 5 deletions cns/service/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -786,11 +786,11 @@ func InitializeMultiTenantController(ctx context.Context, httpRestService cns.HT
logger.Printf("Starting SyncHostNCVersion")
go func() {
// Periodically poll vfp programmed NC version from NMAgent
tickerChannel := time.Tick(cnsconfig.SyncHostNCVersionIntervalMs)
tickerChannel := time.Tick(time.Duration(cnsconfig.SyncHostNCVersionIntervalMs) * time.Millisecond)
for {
select {
case <-tickerChannel:
timedCtx, cancel := context.WithTimeout(ctx, cnsconfig.SyncHostNCTimeoutMs)
timedCtx, cancel := context.WithTimeout(ctx, time.Duration(cnsconfig.SyncHostNCVersionIntervalMs)*time.Millisecond)
httpRestServiceImpl.SyncHostNCVersion(timedCtx, cnsconfig.ChannelMode)
cancel()
case <-ctx.Done():
Expand Down Expand Up @@ -895,7 +895,10 @@ func InitializeCRDState(ctx context.Context, httpRestService cns.HTTPService, cn
scopedcli := kubecontroller.NewScopedClient(nnccli, types.NamespacedName{Namespace: "kube-system", Name: nodeName})

// initialize the ipam pool monitor
poolMonitor := ipampool.NewMonitor(httpRestServiceImplementation, scopedcli, &ipampool.Options{RefreshDelay: poolIPAMRefreshRateInMilliseconds})
poolOpts := ipampool.Options{
RefreshDelay: poolIPAMRefreshRateInMilliseconds * time.Millisecond,
}
poolMonitor := ipampool.NewMonitor(httpRestServiceImplementation, scopedcli, &poolOpts)
httpRestServiceImplementation.IPAMPoolMonitor = poolMonitor
logger.Printf("Starting IPAM Pool Monitor")
go func() {
Expand Down Expand Up @@ -951,11 +954,11 @@ func InitializeCRDState(ctx context.Context, httpRestService cns.HTTPService, cn
logger.Printf("Starting SyncHostNCVersion")
go func() {
// Periodically poll vfp programmed NC version from NMAgent
tickerChannel := time.Tick(cnsconfig.SyncHostNCVersionIntervalMs)
tickerChannel := time.Tick(time.Duration(cnsconfig.SyncHostNCVersionIntervalMs) * time.Millisecond)
for {
select {
case <-tickerChannel:
timedCtx, cancel := context.WithTimeout(ctx, cnsconfig.SyncHostNCTimeoutMs)
timedCtx, cancel := context.WithTimeout(ctx, time.Duration(cnsconfig.SyncHostNCVersionIntervalMs)*time.Millisecond)
httpRestServiceImplementation.SyncHostNCVersion(timedCtx, cnsconfig.ChannelMode)
cancel()
case <-ctx.Done():
Expand Down