Skip to content

chore: Removing CNI logs that are not useful #2065

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
Jul 20, 2023
Merged

chore: Removing CNI logs that are not useful #2065

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
cb7d746
removed logs that's spamming and not useful
tamilmani1989 Jul 19, 2023
dac639c
Merge branch 'master' into tamanoha/removeNwIfaceLogs
ramiro-gamarra Jul 20, 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
6 changes: 0 additions & 6 deletions cni/network/network.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,12 +153,6 @@ func (plugin *NetPlugin) Start(config *common.PluginConfig) error {
zap.String("version", plugin.Version),
zap.String("component", "cni-net"))

log.Logger.Info("Os Info",
zap.String("platform", platform.GetOSInfo()),
zap.String("component", "cni-net"))
platform.PrintDependencyPackageDetails()
common.LogNetworkInterfaces()

// Initialize network manager. rehyrdration not required on reboot for cni plugin
err = plugin.nm.Initialize(config, false)
if err != nil {
Expand Down
7 changes: 2 additions & 5 deletions network/endpoint.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,8 +133,7 @@ func (nw *network) newEndpoint(
}

nw.Endpoints[epInfo.Id] = ep
log.Printf("[net] Created endpoint %+v.", ep)

log.Printf("[net] Created endpoint %+v. Num of endpoints:%d", ep, len(nw.Endpoints))
return ep, nil
}

Expand Down Expand Up @@ -165,9 +164,7 @@ func (nw *network) deleteEndpoint(nl netlink.NetlinkInterface, plc platform.Exec

// Remove the endpoint object.
delete(nw.Endpoints, endpointID)

log.Printf("[net] Deleted endpoint %+v.", ep)

log.Printf("[net] Deleted endpoint %+v. Num of endpoints:%d", ep, len(nw.Endpoints))
return nil
}

Expand Down
6 changes: 0 additions & 6 deletions network/manager.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -214,12 +214,6 @@ func (nm *networkManager) restore(isRehydrationRequired bool) error {
}

log.Printf("[net] Restored state")
for _, extIf := range nm.ExternalInterfaces {
Copy link
Contributor

@vipul-21 vipul-21 Jul 19, 2023

Choose a reason for hiding this comment

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

Why do we need to remove this part ? Is this not used anymore?
My understanding is that number of endpoints after restoring the state is displayed in the logs.

Copy link
Member Author

@tamilmani1989 tamilmani1989 Jul 19, 2023

Choose a reason for hiding this comment

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

moved to a place where we create and delete endpoints.. this is causing spam for windows mulitenancy case where customer create network per vlan id and this log getting looped for all networks each time on add/del

for _, nw := range extIf.Networks {
log.Printf("Number of endpoints: %d", len(nw.Endpoints))
}
}

return nil
}

Expand Down
3 changes: 0 additions & 3 deletions platform/os_linux.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,9 +171,6 @@ func PrintDependencyPackageDetails() {
out, err := p.ExecuteCommand("iptables --version")
out = strings.TrimSuffix(out, "\n")
log.Printf("[cni-net] iptable version:%s, err:%v", out, err)
out, err = p.ExecuteCommand("ebtables --version")
out = strings.TrimSuffix(out, "\n")
log.Printf("[cni-net] ebtable version %s, err:%v", out, err)
}

func ReplaceFile(source, destination string) error {
Expand Down