fix(server): return 404 if get backing image and backup not found

ref: longhorn/longhorn 6266 Signed-off-by: Jack Lin <jack.lin@suse.com>
longhorn · Jul 11, 2023 · 872307f · 872307f
1 parent 6f809b3
commit 872307f
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 2 deletions.
diff --git a/api/backingimage.go b/api/backingimage.go
@@ -8,6 +8,8 @@ import (
 	"github.com/pkg/errors"
 	"github.com/rancher/go-rancher/api"
 	"github.com/rancher/go-rancher/client"
+
+	"github.com/longhorn/longhorn-manager/datastore"
 )
 
 func (s *Server) BackingImageList(rw http.ResponseWriter, req *http.Request) (err error) {
@@ -36,6 +38,10 @@ func (s *Server) BackingImageGet(rw http.ResponseWriter, req *http.Request) erro
 
 	bi, err := s.m.GetBackingImage(id)
 	if err != nil {
+		if datastore.ErrorIsNotFound(err) {
+			rw.WriteHeader(http.StatusNotFound)
+			return nil
+		}
 		return errors.Wrapf(err, "failed to get backing image '%s'", id)
 	}
 

diff --git a/api/backup.go b/api/backup.go
@@ -8,6 +8,8 @@ import (
 	"github.com/rancher/go-rancher/api"
 	"github.com/rancher/go-rancher/client"
 	"github.com/sirupsen/logrus"
+
+	"github.com/longhorn/longhorn-manager/datastore"
 )
 
 func (s *Server) BackupTargetList(w http.ResponseWriter, req *http.Request) error {
@@ -47,6 +49,10 @@ func (s *Server) BackupVolumeGet(w http.ResponseWriter, req *http.Request) error
 
 	bv, err := s.m.GetBackupVolume(volName)
 	if err != nil {
+		if datastore.ErrorIsNotFound(err) {
+			w.WriteHeader(http.StatusNotFound)
+			return nil
+		}
 		return errors.Wrapf(err, "failed to get backup volume '%s'", volName)
 	}
 	apiContext.Write(toBackupVolumeResource(bv, apiContext))
@@ -97,6 +103,10 @@ func (s *Server) BackupGet(w http.ResponseWriter, req *http.Request) error {
 
 	backup, err := s.m.GetBackup(input.Name, volName)
 	if err != nil {
+		if datastore.ErrorIsNotFound(err) {
+			w.WriteHeader(http.StatusNotFound)
+			return nil
+		}
 		return errors.Wrapf(err, "failed to get backup '%v' of volume '%v'", input.Name, volName)
 	}
 	if backup == nil {

diff --git a/api/snapshot.go b/api/snapshot.go
@@ -13,6 +13,7 @@ import (
 	apierrors "k8s.io/apimachinery/pkg/api/errors"
 
 	bsutil "github.com/longhorn/backupstore/util"
+	"github.com/longhorn/longhorn-manager/datastore"
 	longhorn "github.com/longhorn/longhorn-manager/k8s/pkg/apis/longhorn/v1beta2"
 	"github.com/longhorn/longhorn-manager/types"
 	"github.com/longhorn/longhorn-manager/util"
@@ -272,6 +273,10 @@ func (s *Server) SnapshotCRGet(w http.ResponseWriter, req *http.Request) (err er
 
 	snapRO, err := s.m.GetSnapshotCR(input.Name)
 	if err != nil {
+		if datastore.ErrorIsNotFound(err) {
+			w.WriteHeader(http.StatusNotFound)
+			return nil
+		}
 		return err
 	}
 

diff --git a/csi/controller_server.go b/csi/controller_server.go
@@ -980,7 +980,11 @@ func (cs *ControllerServer) cleanupSnapshot(sourceVolumeName, id string) error {
 	if err != nil {
 		return err
 	}
-	if volume != nil {
+	snapshot, err := cs.apiClient.SnapshotCR.ById(id)
+	if err != nil {
+		return err
+	}
+	if volume != nil && snapshot != nil {
 		if _, err := cs.apiClient.Volume.ActionSnapshotCRDelete(volume, &longhornclient.SnapshotCRInput{
 			Name: id,
 		}); err != nil {
@@ -996,7 +1000,11 @@ func (cs *ControllerServer) cleanupBackupVolume(sourceVolumeName, id string) err
 	if err != nil {
 		return err
 	}
-	if backupVolume != nil && backupVolume.Name != "" {
+	backup, err := cs.apiClient.Backup.ById(backupName)
+	if err != nil {
+		return err
+	}
+	if backupVolume != nil && backupVolume.Name != "" && backup != nil {
 		if _, err = cs.apiClient.BackupVolume.ActionBackupDelete(backupVolume, &longhornclient.BackupInput{
 			Name: backupName,
 		}); err != nil {