Skip to content

fix: [NPM-WIN] do not refresh endpoints if pod cache is empty #1831

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 4 commits into from
Mar 6, 2023
Merged

fix: [NPM-WIN] do not refresh endpoints if pod cache is empty #1831

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f3831c9
do not refresh endpoints if pod cache is empty
ck319 Mar 2, 2023
e0d2089
moved cache lock up
ck319 Mar 2, 2023
a9c6e01
reposition cache lock
ck319 Mar 2, 2023
5e6e5b1
fixed incorrect logic
ck319 Mar 3, 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
8 changes: 8 additions & 0 deletions npm/pkg/dataplane/dataplane.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -216,6 +216,14 @@ func (dp *DataPlane) ApplyDataPlane() error {

// NOTE: ideally we won't refresh Pod Endpoints if the updatePodCache is empty
if dp.shouldUpdatePod() {
// do not refresh endpoints if the updatePodCache is empty
dp.updatePodCache.Lock()
if len(dp.updatePodCache.cache) == 0 {
Copy link
Contributor

@huntergregory huntergregory Mar 2, 2023

Choose a reason for hiding this comment

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

will need to lock the cache

Copy link
Contributor Author

@ck319 ck319 Mar 2, 2023

Choose a reason for hiding this comment

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

updated

Copy link
Contributor

@huntergregory huntergregory Mar 2, 2023

Choose a reason for hiding this comment

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

Locking the updatePodCache while refreshing Endpoints would be a regression in the sense that it would block Pod controller from doing any dataplane operations (e.g. AddToSets() and applyIPSets()).

Copy link
Contributor Author

@ck319 ck319 Mar 2, 2023

Choose a reason for hiding this comment

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

reconfigured locks

dp.updatePodCache.Unlock()
return nil
}
dp.updatePodCache.Unlock()

err := dp.refreshPodEndpoints()
if err != nil {
metrics.SendErrorLogAndMetric(util.DaemonDataplaneID, "[DataPlane] failed to refresh endpoints while updating pods. err: [%s]", err.Error())
Expand Down