-
Notifications
You must be signed in to change notification settings - Fork 38.6k
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
Lock across item expiration in the ttl store. #21856
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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -28,7 +28,7 @@ import ( | |
|
||
func TestTTLExpirationBasic(t *testing.T) { | ||
testObj := testStoreObject{id: "foo", val: "bar"} | ||
deleteChan := make(chan string) | ||
deleteChan := make(chan string, 1) | ||
ttlStore := NewFakeExpirationStore( | ||
testStoreKeyFunc, deleteChan, | ||
&FakeExpirationPolicy{ | ||
|
@@ -62,14 +62,67 @@ func TestTTLExpirationBasic(t *testing.T) { | |
close(deleteChan) | ||
} | ||
|
||
func TestReAddExpiredItem(t *testing.T) { | ||
deleteChan := make(chan string, 1) | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This is tricky to test. As is the test will always pass, but it will fail with the old code and a sleep in the goroutine that triggers the race. |
||
exp := &FakeExpirationPolicy{ | ||
NeverExpire: sets.NewString(), | ||
RetrieveKeyFunc: func(obj interface{}) (string, error) { | ||
return obj.(*timestampedEntry).obj.(testStoreObject).id, nil | ||
}, | ||
} | ||
ttlStore := NewFakeExpirationStore( | ||
testStoreKeyFunc, deleteChan, exp, util.RealClock{}) | ||
testKey := "foo" | ||
testObj := testStoreObject{id: testKey, val: "bar"} | ||
err := ttlStore.Add(testObj) | ||
if err != nil { | ||
t.Errorf("Unable to add obj %#v", testObj) | ||
} | ||
|
||
// This get will expire the item. | ||
item, exists, err := ttlStore.Get(testObj) | ||
if err != nil { | ||
t.Errorf("Failed to get from store, %v", err) | ||
} | ||
if exists || item != nil { | ||
t.Errorf("Got unexpected item %#v", item) | ||
} | ||
|
||
key, _ := testStoreKeyFunc(testObj) | ||
differentValue := "different_bar" | ||
err = ttlStore.Add( | ||
testStoreObject{id: testKey, val: differentValue}) | ||
if err != nil { | ||
t.Errorf("Failed to add second value") | ||
} | ||
|
||
select { | ||
case delKey := <-deleteChan: | ||
if delKey != key { | ||
t.Errorf("Unexpected delete for key %s", key) | ||
} | ||
case <-time.After(wait.ForeverTestTimeout): | ||
t.Errorf("Unexpected timeout waiting on delete") | ||
} | ||
exp.NeverExpire = sets.NewString(testKey) | ||
item, exists, err = ttlStore.GetByKey(testKey) | ||
if err != nil { | ||
t.Errorf("Failed to get from store, %v", err) | ||
} | ||
if !exists || item == nil || item.(testStoreObject).val != differentValue { | ||
t.Errorf("Got unexpected item %#v", item) | ||
} | ||
close(deleteChan) | ||
} | ||
|
||
func TestTTLList(t *testing.T) { | ||
testObjs := []testStoreObject{ | ||
{id: "foo", val: "bar"}, | ||
{id: "foo1", val: "bar1"}, | ||
{id: "foo2", val: "bar2"}, | ||
} | ||
expireKeys := sets.NewString(testObjs[0].id, testObjs[2].id) | ||
deleteChan := make(chan string) | ||
deleteChan := make(chan string, len(testObjs)) | ||
defer close(deleteChan) | ||
|
||
ttlStore := NewFakeExpirationStore( | ||
|
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
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.
Alternative solution: can you make a DeleteIfStillExpired function, and lock between that and the Add function? Then you don't need to take the write lock here in the access function, I think?
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.
This is just simpler? I think this cache is used usually for a small number of items (RC expectatios, assumed pods) so it won't turn into a performance bottleneck.
With DeleteIFStillExpired I'd have to either check expiration twice, or send everything through the DeleteIFStillExpired function.