public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(unified-storage): Fix dualwriter DELETE mode3 not returning error from legacy (#101728)

Browse Source 
* Fix dualwrite package not returning error when getting a non-not found error from legacy storage in mode
This commit is contained in:
Will Assis
2025-03-07 07:04:59 -05:00
committed by GitHub
parent f0d260ba5b
commit 6544674011
2 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/storage/legacysql/dualwrite/dualwriter.go
+4 -3
View File
@@ -95,7 +95,7 @@ func (d *dualWriter) Create(ctx context.Context, in runtime.Object, createValida
storageObj, errObjectSt := d.unified.Create(ctx, createdCopy, createValidation, options)
if errObjectSt != nil {
log.Error("unable to create object in unified storage", "err", err)
log.Error("unable to create object in unified storage", "err", errObjectSt)
if d.errorIsOK {
return createdFromLegacy, nil
}
@@ -105,12 +105,13 @@ func (d *dualWriter) Create(ctx context.Context, in runtime.Object, createValida
if err != nil {
log.Error("unable to cleanup object in legacy storage", "err", err)
}
return storageObj, errObjectSt
}
if d.readUnified {
return storageObj, errObjectSt
}
return createdFromLegacy, errObjectSt
return createdFromLegacy, err
}
func (d *dualWriter) Delete(ctx context.Context, name string, deleteValidation rest.ValidateObjectFunc, options *metav1.DeleteOptions) (runtime.Object, bool, error) {
@@ -121,7 +122,7 @@ func (d *dualWriter) Delete(ctx context.Context, name string, deleteValidation r
// but legacy failed, the user would get a failure, but not be able to retry the delete
// as they would not be able to see the object in unistore anymore.
objFromLegacy, asyncLegacy, err := d.legacy.Delete(ctx, name, deleteValidation, options)
if err != nil && !d.readUnified {
if err != nil && (!d.readUnified || !d.errorIsOK && !apierrors.IsNotFound(err)) {
return objFromLegacy, asyncLegacy, err
}
pkg/storage/legacysql/dualwrite/dualwriter_mode3_test.go
+10
View File
@@ -256,6 +256,16 @@ func TestMode3_Delete(t *testing.T) {
},
wantErr: true,
},
{
name: "should return an error when deleting an object in the LegacyStorage fails",
setupLegacyFn: func(m *mock.Mock, input string) {
m.On("Delete", mock.Anything, input, mock.Anything, mock.Anything).Return(nil, false, apierrors.NewInternalError(errors.New("error")))
},
setupStorageFn: func(m *mock.Mock, input string) {
m.On("Delete", mock.Anything, input, mock.Anything, mock.Anything).Panic("i should not be called")
},
wantErr: true,
},
}
name := "foo"