IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

[unified-storage/apistore] Fix GuranteedUpdate skipping updates when tryUpdate is passed (#94557)

Browse Source 
`GuranteedUpdate` method of `apistore.Storage` had a bug, where it would
errorneously conclude that the object is unchanged, in case a
`tryUpdate` function is passed that modifies the existing object itself
(as it is the case in many core types in K8s upstream).

The modified `existingObj` was compared with `updatedObj`, which would
essentially be same and this lead to the update being skipped.

This patch fixes this by always passing a copy of the `existingObj`.

Signed-off-by: Prem Kumar <prem.saraswat@grafana.com>
This commit is contained in:
Prem Saraswat 2024-10-11 17:15:43 +05:30 committed by GitHub
parent 95afb3a112
commit e2672021bc
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/storage/unified/apistore/store.go
View File

@ -465,7 +465,7 @@ func (s *Storage) GuaranteedUpdate(
return apierrors.NewNotFound(s.gr, req.Key.Name)
}
updatedObj, _, err = tryUpdate(existingObj, res)
updatedObj, _, err = tryUpdate(existingObj.DeepCopyObject(), res)
if err != nil {
if attempt >= MaxUpdateAttempts {
return err

12
pkg/storage/unified/apistore/store_test.go
View File

@ -135,12 +135,12 @@ func TestDeleteWithSuggestion(t *testing.T) {
storagetesting.RunTestDeleteWithSuggestion(ctx, t, store)
}
//func TestDeleteWithSuggestionAndConflict(t *testing.T) {
// ctx, store, destroyFunc, err := testSetup(t)
// defer destroyFunc()
// assert.NoError(t, err)
// storagetesting.RunTestDeleteWithSuggestionAndConflict(ctx, t, store)
//}
func TestDeleteWithSuggestionAndConflict(t *testing.T) {
ctx, store, destroyFunc, err := testSetup(t)
defer destroyFunc()
assert.NoError(t, err)
storagetesting.RunTestDeleteWithSuggestionAndConflict(ctx, t, store)
}
// TODO: this test relies on update
//func TestDeleteWithSuggestionOfDeletedObject(t *testing.T) {