Skip to content

Conversation

@EricMountain
Copy link
Member

@EricMountain EricMountain commented May 29, 2020

Cherry-pick of kubernetes#70398

@EricMountain EricMountain force-pushed the eric.mountain/kube-proxy-ipvs-for-big-kernel branch from c6b4280 to 24262f5 Compare May 29, 2020 10:38
@EricMountain EricMountain marked this pull request as ready for review May 29, 2020 10:39
wantModules := sets.NewString()
loadModules := sets.NewString()
linuxKernelHandler := NewLinuxKernelHandler()
_, ipvsModules, _ := utilipvs.GetKernelVersionAndIPVSMods(linuxKernelHandler.executor)
Copy link

Choose a reason for hiding this comment

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

Check err ?

Copy link
Member Author

Choose a reason for hiding this comment

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

Interestingly upstream chose to explicitly ignore errors.

Basically we're only interested in the 2nd return value, and in error paths it is nil, so ipvsModules will be nil. This leads to wantModules being empty, and then potentially the len(modules) bit fails lower down. So there's something handling it it seems. Haven't looked at the details of mods, err := handle.GetModules(), however I not particularly tempted to deviate from upstream just for this.

Copy link

Choose a reason for hiding this comment

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

ok

wantModules := sets.NewString()
loadModules := sets.NewString()
linuxKernelHandler := NewLinuxKernelHandler()
_, ipvsModules, _ := utilipvs.GetKernelVersionAndIPVSMods(linuxKernelHandler.executor)
Copy link

Choose a reason for hiding this comment

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

ok

@EricMountain EricMountain merged commit 6eee45c into release-1.11.1-dd May 29, 2020
@EricMountain EricMountain deleted the eric.mountain/kube-proxy-ipvs-for-big-kernel branch May 29, 2020 13:15
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants