fix: repair windows cni lock issue #1712
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
behzad-mir
force-pushed
the
behzadm-windows-cni-lock
branch
2 times, most recently
from
12b7b4c to
9d6145d
Compare
tamilmani1989
requested changes
Dec 5, 2022
tamilmani1989
requested changes
Dec 5, 2022
Member
tamilmani1989
left a comment
tamilmani1989
left a comment
There was a problem hiding this comment.
I'm also thinking..we should add these changes under a config field somethinng like "optimizeLock" so that we can release only to customers we want and also revert back easily for any mitigation
behzad-mir
force-pushed
the
behzadm-windows-cni-lock
branch
from
51bfd0d to
c9919e2
Compare
tamilmani1989
requested changes
Dec 12, 2022
behzad-mir
force-pushed
the
behzadm-windows-cni-lock
branch
from
e205c74 to
4146ac6
Compare
tamilmani1989
requested changes
Jan 5, 2023
behzad-mir
force-pushed
the
behzadm-windows-cni-lock
branch
from
ae3512f to
b44ff46
Compare
tamilmani1989
requested changes
Jan 5, 2023
cni/plugin.go
Outdated
|
|
||
| // Lock key-value store for Windows Runtime. This function is being used for locking access to TelemetryService start. | ||
| func (plugin *Plugin) LockKeyValueStore() error { | ||
| if runtime.GOOS == "windows" { |
Member
There was a problem hiding this comment.
can we move this condition to a place where we call LockKeyValueStore()
Contributor
Author
There was a problem hiding this comment.
addressed in the new commit
telemetry/telemetrybuffer.go
Outdated
| tb.Cleanup(FdName) | ||
| StartTelemetryService(path, args) | ||
| WaitForTelemetrySocket(telemetryNumRetries, time.Duration(telemetryWaitTimeInMilliseconds)) | ||
| if err = netPlugin.UnLockKeyValueStore(); err != nil { |
Contributor
Author
There was a problem hiding this comment.
addressed in the new commit
behzad-mir
force-pushed
the
behzadm-windows-cni-lock
branch
from
b44ff46 to
5915954
Compare
behzad-mir
force-pushed
the
behzadm-windows-cni-lock
branch
from
5915954 to
276d2cf
Compare
…ve functions to improve cni performance on windows.
…n startup for CRD and MultitenantCRD mode.
behzad-mir
force-pushed
the
behzadm-windows-cni-lock
branch
from
276d2cf to
47b69a3
Compare
rjdenney
pushed a commit
to rjdenney/azure-container-networking
that referenced
this pull request
Jan 19, 2023
* Moving the lock from InitializeKeyValueStore() function to restore/save functions to improve cni performance on windows. * fix: use defer function to unlock statefile. * fix: fixing the IPAM lock and defer func * fix: Optimizing cni file lock by moving SetSdnRemoteArpMacAddress() on startup for CRD and MultitenantCRD mode. * adding store lock on telemetry service start to avoid race condition on windows.
smittal22
pushed a commit
to smittal22/azure-container-networking
that referenced
this pull request
Jan 26, 2023
* Moving the lock from InitializeKeyValueStore() function to restore/save functions to improve cni performance on windows. * fix: use defer function to unlock statefile. * fix: fixing the IPAM lock and defer func * fix: Optimizing cni file lock by moving SetSdnRemoteArpMacAddress() on startup for CRD and MultitenantCRD mode. * adding store lock on telemetry service start to avoid race condition on windows.
smittal22
pushed a commit
to smittal22/azure-container-networking
that referenced
this pull request
Feb 3, 2023
* Moving the lock from InitializeKeyValueStore() function to restore/save functions to improve cni performance on windows. * fix: use defer function to unlock statefile. * fix: fixing the IPAM lock and defer func * fix: Optimizing cni file lock by moving SetSdnRemoteArpMacAddress() on startup for CRD and MultitenantCRD mode. * adding store lock on telemetry service start to avoid race condition on windows.
behzad-mir
added a commit
that referenced
this pull request
Feb 23, 2023
This reverts commit 7b647be.
behzad-mir
added a commit
that referenced
this pull request
Feb 24, 2023
This reverts commit 7b647be.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Moving the lock from InitializeKeyValueStore() function to restore/save functions to improve cni performance on windows.
Reason for Change:
In Windows CNI We are currently lock access to statefile in the init phase which may cause some CNI performance issue. This PR will move the lock to the exact point when we read/write from/to statefile.