Skip to content

log: [NPM-WIN] clean up some logs #1807

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 2 commits into from
Feb 24, 2023
Merged

log: [NPM-WIN] clean up some logs #1807

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8cbf201
clean up some logs
huntergregory Feb 16, 2023
833c2b1
Merge branch 'master' into hgregory/npm-pmgr-win-logs
vakalapa Feb 23, 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
3 changes: 0 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 @@ -317,9 +317,6 @@ func (dp *DataPlane) getPodEndpoints(includeRemoteEndpoints bool) ([]*hcn.HostCo
if includeRemoteEndpoints || e.Flags == hcn.EndpointFlagsNone {
// having EndpointFlagsNone means it is a local endpoint
localEndpoints = append(localEndpoints, e)
} else {
// TODO remove for GA
klog.Infof("ignoring remote endpoint. ID: %s, IP configs: %+v", e.Id, e.IpConfigurations)
}
}
return localEndpoints, nil
Expand Down
5 changes: 3 additions & 2 deletions npm/pkg/dataplane/policies/policymanager_windows.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,8 @@ func newStaleChains() *staleChains {
func (pMgr *PolicyManager) bootup(epIDs []string) error {
var aggregateErr error
for _, epID := range epIDs {
err := pMgr.removePolicyByEndpointID("", epID, 0, resetAllACLs)
// ruleID="RESET-ALL" is only used for logging when specifying shouldResetACLs=resestAllACLs
err := pMgr.removePolicyByEndpointID("RESET-ALL", epID, 0, resetAllACLs)
if err != nil {
if aggregateErr == nil {
aggregateErr = fmt.Errorf("skipping resetting policies on %s ID Endpoint with err: %w", epID, err)
Expand Down Expand Up @@ -178,7 +179,7 @@ func (pMgr *PolicyManager) removePolicyByEndpointID(ruleID, epID string, noOfRul
if err != nil {
// IsNotFound check is being skipped at times. So adding a redundant check here.
if isNotFoundErr(err) || strings.Contains(err.Error(), "endpoint was not found") {
klog.Infof("[PolicyManagerWindows] ignoring remove policy since the endpoint wasn't found. the corresponding pod might be deleted. policy: %s, endpoint: %s, err: %s", ruleID, epID, err.Error())
klog.Infof("[PolicyManagerWindows] ignoring remove policy since the endpoint wasn't found. the corresponding pod might be deleted. policy: %s, endpoint: %s, HNS response: %s", ruleID, epID, err.Error())
return nil
}
return fmt.Errorf("[PolicyManagerWindows] failed to remove policy while getting the endpoint. policy: %s, endpoint: %s, err: %w", ruleID, epID, err)
Expand Down