Skip to content
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

Jump to bottom

perf: [WIN-NPM] fast bootup #1900

Merged
merged 12 commits into from
Jun 2, 2023
Merged

perf: [WIN-NPM] fast bootup #1900

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
8f517d6
wip
huntergregory Apr 7, 2023
7773307
wip2
huntergregory Apr 7, 2023
6dae5be
Merge branch 'master' into hgregory/04-07-sleep-pod-controller
huntergregory Apr 19, 2023
cb91397
use other apply DP func
huntergregory Apr 21, 2023
3c478fd
address comment about if statement
huntergregory Apr 26, 2023
6177f2c
finish bootup for both DPs
huntergregory Apr 26, 2023
859409b
fix lint
huntergregory Apr 26, 2023
089f152
fix lint 2
huntergregory Apr 26, 2023
c2c3786
fix lint 3
huntergregory Apr 26, 2023
d652bf9
longer UT timeout and add missing UTs for apply in background
huntergregory Apr 26, 2023
265c2b9
Merge branch 'master' into hgregory/04-07-sleep-pod-controller
huntergregory Apr 26, 2023
c14289c
Merge branch 'master' into hgregory/04-07-sleep-pod-controller
huntergregory May 17, 2023
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
17 changes: 16 additions & 1 deletion npm/npm.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ package npm
import (
"encoding/json"
"fmt"
"time"

npmconfig "github.com/Azure/azure-container-networking/npm/config"
"github.com/Azure/azure-container-networking/npm/ipsm"
Expand All @@ -13,6 +14,7 @@ import (
controllersv2 "github.com/Azure/azure-container-networking/npm/pkg/controlplane/controllers/v2"
"github.com/Azure/azure-container-networking/npm/pkg/dataplane"
"github.com/Azure/azure-container-networking/npm/pkg/models"
"github.com/Azure/azure-container-networking/npm/util"
"github.com/pkg/errors"
"k8s.io/apimachinery/pkg/version"
"k8s.io/client-go/informers"
Expand All @@ -23,6 +25,11 @@ import (

var aiMetadata string //nolint // aiMetadata is set in Makefile

// waitDurationAfterStartingNetPolController is used when configured to apply dataplane in the background
// Worst case, SetPolicy SysCalls take ~30 seconds.
// So with a 3 minute wait, the dataplane can process about 600 (6*maxBatches) NetworkPolicies before starting the Pod controller
var waitDurationAfterStartingNetPolController = 3 * time.Minute

// NetworkPolicyManager contains informers for pod, namespace and networkpolicy.
type NetworkPolicyManager struct {
config npmconfig.Config
Expand Down Expand Up @@ -195,9 +202,17 @@ func (npMgr *NetworkPolicyManager) Start(config npmconfig.Config, stopCh <-chan

// start v2 NPM controllers after synced
if config.Toggles.EnableV2NPM {
go npMgr.NetPolControllerV2.Run(stopCh)

if util.IsWindowsDP() && config.Toggles.ApplyInBackground {
klog.Infof("optimizing NPM bootup by letting NetPol controller process changes first. waiting %v before starting pod and namespace controllers", waitDurationAfterStartingNetPolController)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

have if only around this section, use finishbootup for both DPs,

time.Sleep(waitDurationAfterStartingNetPolController)
}

npMgr.Dataplane.FinishBootupPhase()

go npMgr.PodControllerV2.Run(stopCh)
go npMgr.NamespaceControllerV2.Run(stopCh)
go npMgr.NetPolControllerV2.Run(stopCh)

return nil
}
Expand Down
Loading
Loading