From 61ca06148e3761be2a2eedf61b17c4d629076348 Mon Sep 17 00:00:00 2001 From: Niels de Vos Date: Fri, 15 Apr 2022 10:31:07 +0200 Subject: [PATCH] nfs: return gRPC status from CephFS CreateVolume failure The NFS Controller returns a non-gRPC error in case the CreateVolume call for the CephFS volume fails. It is better to return the gRPC-error that the CephFS Controller passed along. Signed-off-by: Niels de Vos (cherry picked from commit 2b71aac752614182fb0ba5dd956307401d2920b1) --- internal/nfs/controller/controllerserver.go | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/internal/nfs/controller/controllerserver.go b/internal/nfs/controller/controllerserver.go index c49c95d7a..75a0c515c 100644 --- a/internal/nfs/controller/controllerserver.go +++ b/internal/nfs/controller/controllerserver.go @@ -18,7 +18,6 @@ package controller import ( "context" - "fmt" "github.com/ceph/ceph-csi/internal/cephfs" "github.com/ceph/ceph-csi/internal/cephfs/store" @@ -75,7 +74,7 @@ func (cs *Server) CreateVolume( req *csi.CreateVolumeRequest) (*csi.CreateVolumeResponse, error) { res, err := cs.backendServer.CreateVolume(ctx, req) if err != nil { - return res, fmt.Errorf("failed to create CephFS volume: %w", err) + return nil, err } backend := res.Volume