feat(backup backing image): add websocket for backup backing image

ref: longhorn/longhorn 8849 Signed-off-by: Jack Lin <jack.lin@suse.com>
longhorn · Jul 3, 2024 · dcd240f · dcd240f
1 parent da06e14
commit dcd240f
Show file tree

Hide file tree

Showing 3 changed files with 43 additions and 12 deletions.
diff --git a/api/backupbackingimage.go b/api/backupbackingimage.go
@@ -7,8 +7,17 @@ import (
 	"github.com/pkg/errors"
 
 	"github.com/rancher/go-rancher/api"
+	"github.com/rancher/go-rancher/client"
 )
 
+func (s *Server) backupBackingImageList(apiContext *api.ApiContext) (*client.GenericCollection, error) {
+	bbiList, err := s.m.ListBackupBackingImagesSorted()
+	if err != nil {
+		return nil, errors.Wrap(err, "failed to list backup backing image")
+	}
+	return toBackupBackingImageCollection(bbiList, apiContext), nil
+}
+
 func (s *Server) BackupBackingImageList(rw http.ResponseWriter, req *http.Request) (err error) {
 	apiContext := api.GetApiContext(req)
 	backupBackingImages, err := s.m.ListBackupBackingImagesSorted()

diff --git a/api/router.go b/api/router.go
@@ -248,6 +248,10 @@ func NewRouter(s *Server) *mux.Router {
 	r.Path("/v1/ws/backingimages").Handler(f(schemas, backingImageStream))
 	r.Path("/v1/ws/{period}/backingimages").Handler(f(schemas, backingImageStream))
 
+	backupBackingImageStream := NewStreamHandlerFunc("backupbackingimages", s.wsc.NewWatcher("backupBackingImage"), s.backupBackingImageList)
+	r.Path("/v1/ws/backingimages").Handler(f(schemas, backupBackingImageStream))
+	r.Path("/v1/ws/{period}/backingimages").Handler(f(schemas, backupBackingImageStream))
+
 	backupVolumeStream := NewStreamHandlerFunc("backupvolumes", s.wsc.NewWatcher("backupVolume"), s.backupVolumeList)
 	r.Path("/v1/ws/backupvolumes").Handler(f(schemas, backupVolumeStream))
 	r.Path("/v1/ws/{period}/backupvolumes").Handler(f(schemas, backupVolumeStream))

diff --git a/manager/backupbackingimage.go b/manager/backupbackingimage.go
@@ -1,6 +1,8 @@
 package manager
 
 import (
+	"fmt"
+
 	longhorn "github.com/longhorn/longhorn-manager/k8s/pkg/apis/longhorn/v1beta2"
 	"github.com/longhorn/longhorn-manager/util"
 	"github.com/pkg/errors"
@@ -36,6 +38,20 @@ func (m *VolumeManager) DeleteBackupBackingImage(name string) error {
 }
 
 func (m *VolumeManager) RestoreBackupBackingImage(name string) error {
+	if name == "" {
+		return fmt.Errorf("restore backing image name is not given")
+	}
+	bi, err := m.ds.GetBackingImageRO(name)
+	if err != nil {
+		if !apierrors.IsNotFound(err) {
+			return errors.Wrapf(err, "failed to get backing image %v to check if it exists", name)
+		}
+	}
+
+	if bi != nil {
+		return errors.Wrapf(err, "backing image %v already exists", name)
+	}
+
 	return m.restoreBackingImage(name)
 }
 
@@ -52,18 +68,20 @@ func (m *VolumeManager) CreateBackupBackingImage(name string) error {
 		}
 	}
 
-	if backupBackingImage == nil {
-		backupBackingImage := &longhorn.BackupBackingImage{
-			ObjectMeta: metav1.ObjectMeta{
-				Name: name,
-			},
-			Spec: longhorn.BackupBackingImageSpec{
-				UserCreated: true,
-			},
-		}
-		if _, err = m.ds.CreateBackupBackingImage(backupBackingImage); err != nil && !apierrors.IsAlreadyExists(err) {
-			return errors.Wrapf(err, "failed to create backup backing image %s in the cluster", name)
-		}
+	if backupBackingImage != nil {
+		return fmt.Errorf("backup backing image %v already exists", name)
+	}
+
+	backupBackingImage = &longhorn.BackupBackingImage{
+		ObjectMeta: metav1.ObjectMeta{
+			Name: name,
+		},
+		Spec: longhorn.BackupBackingImageSpec{
+			UserCreated: true,
+		},
+	}
+	if _, err = m.ds.CreateBackupBackingImage(backupBackingImage); err != nil && !apierrors.IsAlreadyExists(err) {
+		return errors.Wrapf(err, "failed to create backup backing image %s in the cluster", name)
 	}
 
 	return nil