-
Notifications
You must be signed in to change notification settings - Fork 1.4k
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
Added tracking for deleted namespace status check in restore flow #8233
Open
sangitaray2021
wants to merge
2
commits into
vmware-tanzu:main
Choose a base branch
from
sangitaray2021:fixrestore_ns
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+177
−65
Open
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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
Added tracking for deleted namespace status check in restore flow. |
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
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 @@ | ||
/* | ||
Copyright 2018 the Velero contributors. | ||
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 kube | ||
|
||
import ( | ||
"fmt" | ||
"sync" | ||
|
||
"k8s.io/apimachinery/pkg/util/sets" | ||
) | ||
|
||
// NamespaceDeletionStatusTracker keeps track of in-progress backups. | ||
type NamespaceDeletionStatusTracker interface { | ||
// Add informs the tracker that a polling is in progress to check namespace deletion status. | ||
Add(ns, name string) | ||
// Delete informs the tracker that a namespace deletion is completed. | ||
Delete(ns, name string) | ||
// Contains returns true if the tracker is tracking the namespace deletion progress. | ||
Contains(ns, name string) bool | ||
} | ||
|
||
type namespaceDeletionStatusTracker struct { | ||
lock sync.RWMutex | ||
isNameSpacePresentInPollingSet sets.Set[string] | ||
} | ||
|
||
// NewNamespaceDeletionStatusTracker returns a new NamespaceDeletionStatusTracker. | ||
func NewNamespaceDeletionStatusTracker() NamespaceDeletionStatusTracker { | ||
return &namespaceDeletionStatusTracker{ | ||
isNameSpacePresentInPollingSet: sets.New[string](), | ||
} | ||
} | ||
|
||
func (bt *namespaceDeletionStatusTracker) Add(ns, name string) { | ||
bt.lock.Lock() | ||
defer bt.lock.Unlock() | ||
|
||
bt.isNameSpacePresentInPollingSet.Insert(namespaceDeletionStatusTrackerKey(ns, name)) | ||
} | ||
|
||
func (bt *namespaceDeletionStatusTracker) Delete(ns, name string) { | ||
bt.lock.Lock() | ||
defer bt.lock.Unlock() | ||
|
||
bt.isNameSpacePresentInPollingSet.Delete(namespaceDeletionStatusTrackerKey(ns, name)) | ||
} | ||
|
||
func (bt *namespaceDeletionStatusTracker) Contains(ns, name string) bool { | ||
bt.lock.RLock() | ||
defer bt.lock.RUnlock() | ||
|
||
return bt.isNameSpacePresentInPollingSet.Has(namespaceDeletionStatusTrackerKey(ns, name)) | ||
} | ||
|
||
func namespaceDeletionStatusTrackerKey(ns, name string) string { | ||
return fmt.Sprintf("%s/%s", ns, name) | ||
} |
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
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Why are there both ns and name parameters?
What purpose does that serve other than duplicate value params?
Is this interface meant to be more generic? Perhaps
namespaceDeletionStatusTrackerKey(ns, name)
was meant to be more likeresourceDeletionStatusTrackerKey(kind, ns, name string) string
?