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.
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
azure: remove disk locks per vm during attach/detach #85115
Merged
Merged
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
There are no files selected for viewing
This file contains 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
This file contains 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
This file contains 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
This file contains 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
71 changes: 71 additions & 0 deletions
71
staging/src/k8s.io/legacy-cloud-providers/azure/azure_utils.go
This file contains 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,71 @@ | ||
| // +build !providerless | ||
aramase marked this conversation as resolved.
Show resolved
Hide resolved
|
||
|
|
||
| /* | ||
| Copyright 2019 The Kubernetes Authors. | ||
|
|
||
| Licensed under the Apache License, Version 2.0 (the "License"); | ||
| you may not use this file except in compliance with the License. | ||
| You may obtain a copy of the License at | ||
|
|
||
| http://www.apache.org/licenses/LICENSE-2.0 | ||
|
|
||
| Unless required by applicable law or agreed to in writing, software | ||
| distributed under the License is distributed on an "AS IS" BASIS, | ||
| WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| See the License for the specific language governing permissions and | ||
| limitations under the License. | ||
| */ | ||
|
|
||
| package azure | ||
|
|
||
| import ( | ||
| "sync" | ||
| ) | ||
|
|
||
| // lockMap used to lock on entries | ||
| type lockMap struct { | ||
| sync.Mutex | ||
| mutexMap map[string]*sync.Mutex | ||
| } | ||
|
|
||
| // NewLockMap returns a new lock map | ||
| func newLockMap() *lockMap { | ||
| return &lockMap{ | ||
| mutexMap: make(map[string]*sync.Mutex), | ||
| } | ||
| } | ||
|
|
||
| // LockEntry acquires a lock associated with the specific entry | ||
| func (lm *lockMap) LockEntry(entry string) { | ||
| lm.Lock() | ||
aramase marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| // check if entry does not exists, then add entry | ||
| if _, exists := lm.mutexMap[entry]; !exists { | ||
| lm.addEntry(entry) | ||
| } | ||
|
|
||
| lm.Unlock() | ||
| lm.lockEntry(entry) | ||
| } | ||
|
|
||
| // UnlockEntry release the lock associated with the specific entry | ||
| func (lm *lockMap) UnlockEntry(entry string) { | ||
| lm.Lock() | ||
| defer lm.Unlock() | ||
|
|
||
| if _, exists := lm.mutexMap[entry]; !exists { | ||
| return | ||
| } | ||
| lm.unlockEntry(entry) | ||
| } | ||
|
|
||
| func (lm *lockMap) addEntry(entry string) { | ||
| lm.mutexMap[entry] = &sync.Mutex{} | ||
| } | ||
|
|
||
| func (lm *lockMap) lockEntry(entry string) { | ||
| lm.mutexMap[entry].Lock() | ||
| } | ||
|
|
||
| func (lm *lockMap) unlockEntry(entry string) { | ||
| lm.mutexMap[entry].Unlock() | ||
| } | ||
85 changes: 85 additions & 0 deletions
85
staging/src/k8s.io/legacy-cloud-providers/azure/azure_utils_test.go
This file contains 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,85 @@ | ||
| // +build !providerless | ||
|
|
||
| /* | ||
| Copyright 2019 The Kubernetes Authors. | ||
|
|
||
| Licensed under the Apache License, Version 2.0 (the "License"); | ||
| you may not use this file except in compliance with the License. | ||
| You may obtain a copy of the License at | ||
|
|
||
| http://www.apache.org/licenses/LICENSE-2.0 | ||
|
|
||
| Unless required by applicable law or agreed to in writing, software | ||
| distributed under the License is distributed on an "AS IS" BASIS, | ||
| WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| See the License for the specific language governing permissions and | ||
| limitations under the License. | ||
| */ | ||
|
|
||
| package azure | ||
|
|
||
| import ( | ||
| "testing" | ||
| "time" | ||
| ) | ||
|
|
||
| func TestSimpleLockEntry(t *testing.T) { | ||
| testLockMap := newLockMap() | ||
|
|
||
| callbackChan1 := make(chan interface{}) | ||
| go testLockMap.lockAndCallback(t, "entry1", callbackChan1) | ||
| ensureCallbackHappens(t, callbackChan1) | ||
| } | ||
|
|
||
| func TestSimpleLockUnlockEntry(t *testing.T) { | ||
| testLockMap := newLockMap() | ||
|
|
||
| callbackChan1 := make(chan interface{}) | ||
| go testLockMap.lockAndCallback(t, "entry1", callbackChan1) | ||
| ensureCallbackHappens(t, callbackChan1) | ||
| testLockMap.UnlockEntry("entry1") | ||
| } | ||
|
|
||
| func TestConcurrentLockEntry(t *testing.T) { | ||
| testLockMap := newLockMap() | ||
|
|
||
| callbackChan1 := make(chan interface{}) | ||
| callbackChan2 := make(chan interface{}) | ||
|
|
||
| go testLockMap.lockAndCallback(t, "entry1", callbackChan1) | ||
| ensureCallbackHappens(t, callbackChan1) | ||
|
|
||
| go testLockMap.lockAndCallback(t, "entry1", callbackChan2) | ||
| ensureNoCallback(t, callbackChan2) | ||
|
|
||
| testLockMap.UnlockEntry("entry1") | ||
| ensureCallbackHappens(t, callbackChan2) | ||
| testLockMap.UnlockEntry("entry1") | ||
| } | ||
|
|
||
| func (lm *lockMap) lockAndCallback(t *testing.T, entry string, callbackChan chan<- interface{}) { | ||
| lm.LockEntry(entry) | ||
| callbackChan <- true | ||
| } | ||
|
|
||
| var callbackTimeout = 2 * time.Second | ||
|
|
||
| func ensureCallbackHappens(t *testing.T, callbackChan <-chan interface{}) bool { | ||
| select { | ||
| case <-callbackChan: | ||
| return true | ||
| case <-time.After(callbackTimeout): | ||
| t.Fatalf("timed out waiting for callback") | ||
| return false | ||
| } | ||
| } | ||
|
|
||
| func ensureNoCallback(t *testing.T, callbackChan <-chan interface{}) bool { | ||
| select { | ||
| case <-callbackChan: | ||
| t.Fatalf("unexpected callback") | ||
| return false | ||
| case <-time.After(callbackTimeout): | ||
| return true | ||
| } | ||
| } |
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.
This comment was marked as outdated.
Sorry, something went wrong.
This comment was marked as off-topic.
Sorry, something went wrong.