Skip to content

fix: [NPM] wait for Azure network to be created in windows DP for 20 … #1155

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 3 commits into from
Dec 13, 2021
Merged

fix: [NPM] wait for Azure network to be created in windows DP for 20 … #1155

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0ff8b4f
fix: [NPM] wait for Azure network to be created in windows DP for 20 …
vakalapa Dec 3, 2021
b3feb01
calling getNetworkInfo in initialize
vakalapa Dec 3, 2021
133b6ec
Addressing comments
vakalapa Dec 8, 2021
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
40 changes: 37 additions & 3 deletions npm/pkg/dataplane/dataplane_windows.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@ package dataplane

import (
"fmt"
"strings"
"time"

"github.com/Azure/azure-container-networking/npm/pkg/dataplane/policies"
npmerrors "github.com/Azure/azure-container-networking/npm/util/errors"
Expand All @@ -10,8 +12,10 @@ import (
)

const (
policyWithSets policyMode = "policyWithSets"
policyWithIPs policyMode = "policyWithIPs"
policyWithSets policyMode = "policyWithSets"
policyWithIPs policyMode = "policyWithIPs"
maxNoNetRetryCount int = 240 // max wait time 240*5 == 20 mins
maxNoNetSleepTime int = 5 // in seconds
)

func (dp *DataPlane) setPolicyMode() {
Expand All @@ -30,7 +34,7 @@ func (dp *DataPlane) initializeDataPlane() error {
dp.setPolicyMode()
}

err := dp.setNetworkIDByName(AzureNetworkName)
err := dp.getNetworkInfo()
if err != nil {
return err
}
Expand All @@ -43,6 +47,32 @@ func (dp *DataPlane) initializeDataPlane() error {
return nil
}

func (dp *DataPlane) getNetworkInfo() error {
retryNumber := 0
ticker := time.NewTicker(time.Second * time.Duration(maxNoNetSleepTime))
defer ticker.Stop()

var err error
for ; true; <-ticker.C {
err = dp.setNetworkIDByName(AzureNetworkName)
if err == nil || !isNetworkNotFoundErr(err) {
return err
}
retryNumber++
if retryNumber >= maxNoNetRetryCount {
break
}
klog.Infof("[DataPlane Windows] Network with name %s not found. Retrying in %d seconds, Current retry number %d, max retries: %d",
AzureNetworkName,
maxNoNetSleepTime,
retryNumber,
maxNoNetRetryCount,
)
}

return fmt.Errorf("failed to get network info after %d retries with err %w", maxNoNetRetryCount, err)
}

func (dp *DataPlane) resetDataPlane() error {
// initialize the DP so the podendpoints will get updated.
if err := dp.initializeDataPlane(); err != nil {
Expand Down Expand Up @@ -292,3 +322,7 @@ func (dp *DataPlane) getAllEndpointIDs() []string {
}
return endpointIDs
}

func isNetworkNotFoundErr(err error) bool {
return strings.Contains(err.Error(), fmt.Sprintf("Network name \"%s\" not found", AzureNetworkName))
}