From 62d502086ebc1701f43288eef347e2ab14c76964 Mon Sep 17 00:00:00 2001 From: Stephanie Hingtgen Date: Wed, 19 Feb 2025 11:40:17 -0700 Subject: [PATCH] K8s: Dualwriter mode3: Return error from unistore (#100992) --- pkg/apiserver/rest/dualwriter_mode3.go | 1 + pkg/apiserver/rest/dualwriter_mode3_test.go | 5 +---- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/pkg/apiserver/rest/dualwriter_mode3.go b/pkg/apiserver/rest/dualwriter_mode3.go index ecf0e21b80d..bd28ef3c31c 100644 --- a/pkg/apiserver/rest/dualwriter_mode3.go +++ b/pkg/apiserver/rest/dualwriter_mode3.go @@ -118,6 +118,7 @@ func (d *DualWriterMode3) Get(ctx context.Context, name string, options *metav1. d.recordStorageDuration(err != nil, mode3Str, d.resource, method, startStorage) if err != nil { log.Error(err, "unable to get object in storage") + return nil, err } //nolint:errcheck diff --git a/pkg/apiserver/rest/dualwriter_mode3_test.go b/pkg/apiserver/rest/dualwriter_mode3_test.go index bc8635b2fd7..f68287f4ead 100644 --- a/pkg/apiserver/rest/dualwriter_mode3_test.go +++ b/pkg/apiserver/rest/dualwriter_mode3_test.go @@ -107,10 +107,7 @@ func TestMode3_Get(t *testing.T) { }, }, { - name: "should return an error when getting an object in the unified store fails", - setupLegacyFn: func(m *mock.Mock, name string) { - m.On("Get", mock.Anything, name, mock.Anything).Return(exampleObj, nil) - }, + name: "should return an error when getting an object in the unified store fails, and should not go to legacy", setupStorageFn: func(m *mock.Mock, name string) { m.On("Get", mock.Anything, name, mock.Anything).Return(nil, errors.New("error")) },