Skip to content

Commit 3949dae

Browse files
committed
ING-1496: Return appropriate status when DocNotFound
1 parent 4799cb7 commit 3949dae

2 files changed

Lines changed: 6 additions & 13 deletions

File tree

gateway/dataimpl/server_v1/kvserver.go

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1392,7 +1392,9 @@ func (s *KvServer) GetAllReplicas(in *kv_v1.GetAllReplicasRequest, out kv_v1.KvS
13921392
}
13931393

13941394
if replicaError != nil {
1395-
if errors.Is(replicaError, memdx.ErrAccessError) {
1395+
if errors.Is(replicaError, memdx.ErrDocNotFound) {
1396+
return s.errorHandler.NewDocMissingStatus(out.Context(), replicaError, in.BucketName, in.ScopeName, in.CollectionName, in.Key).Err()
1397+
} else if errors.Is(replicaError, memdx.ErrAccessError) {
13961398
return s.errorHandler.NewCollectionNoReadAccessStatus(out.Context(), replicaError, in.BucketName, in.ScopeName, in.CollectionName).Err()
13971399
}
13981400

gateway/test/crud_test.go

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -4926,18 +4926,9 @@ func (s *GatewayOpsTestSuite) TestGetAllReplicas() {
49264926
}, grpc.PerRPCCredentials(s.basicRpcCreds))
49274927
requireRpcSuccess(s.T(), resp, err)
49284928

4929-
numResults := 0
4930-
for {
4931-
_, err := resp.Recv()
4932-
if err != nil {
4933-
break
4934-
}
4935-
4936-
numResults++
4937-
}
4938-
4939-
// This document does not exist on any node so resp.Recv should have immediately errored.
4940-
require.Zero(s.T(), numResults)
4929+
_, err = resp.Recv()
4930+
require.Error(s.T(), err)
4931+
assertRpcStatus(s.T(), err, codes.NotFound)
49414932
})
49424933

49434934
s.RunCommonErrorCases(func(ctx context.Context, opts *commonErrorTestData) (interface{}, error) {

0 commit comments

Comments
 (0)