few fix

ophum · Mar 3, 2021 · 001979a · 001979a
1 parent 8598e16
commit 001979a
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 11 deletions.
diff --git a/pkg/agents/system/blockstorage/agent.go b/pkg/agents/system/blockstorage/agent.go
@@ -252,7 +252,7 @@ func (a *BlockStorageAgent) Run(pollingDuration time.Duration) {
 								err = a.syncCephBlockStorage(bs)
 								if err != nil {
 									a.logger.Error(
-										"sync local blockstorage",
+										"sync ceph blockstorage",
 										zap.String("msg", err.Error()),
 										zap.Time("time", time.Now()),
 									)

diff --git a/pkg/agents/system/blockstorage/agent_ceph.go b/pkg/agents/system/blockstorage/agent_ceph.go
@@ -9,6 +9,7 @@ import (
 	"os/exec"
 	"path/filepath"
 	"strconv"
+	"strings"
 
 	"github.com/ceph/go-ceph/rados"
 	"github.com/ceph/go-ceph/rbd"
@@ -360,24 +361,26 @@ func (a *BlockStorageAgent) syncCephBlockStorage(bs *system.BlockStorage) error
 			imageName := imageEntity.Annotations["imageentityv0/ceph-imagename"]
 			cephImage, err := rbd.OpenImageReadOnly(ioctx, imageName, rbd.NoSnapshot)
 			if err != nil {
-				return err
+				return errors.Wrapf(err, "Failed to open image read only `%s`", imageName)
 			}
 			defer cephImage.Close()
-			rbd.CloneFromImage(cephImage, snapName, ioctx, imageNameWithGroupAndNS, rbd.NewRbdImageOptions())
+			if err := rbd.CloneFromImage(cephImage, snapName, ioctx, imageNameWithGroupAndNS, rbd.NewRbdImageOptions()); err != nil {
+				return errors.Wrapf(err, "Failed to clone from image `%s` from `%s@%s`", imageNameWithGroupAndNS, cephImage, snapName)
+			}
 			// ceph image のリサイズ
 			if image, err := rbd.OpenImage(ioctx, imageNameWithGroupAndNS, ""); err != nil {
-				return err
+				return errors.Wrapf(err, "Failed to open image `%s`", imageNameWithGroupAndNS)
 			} else {
 				defer image.Close()
 				size, err := strconv.ParseUint(withUnitToWithoutUnit(bs.Spec.LimitSize), 10, 64)
 				if err != nil {
 					if err := a.setStateError(bs); err != nil {
 						return err
 					}
-					return err
+					return errors.Wrapf(err, "Failed to parse uint limit size`%s`", bs.Spec.LimitSize)
 				}
 				if err := image.Resize(size); err != nil {
-					return err
+					return errors.Wrapf(err, "Failed to resize rbd image `%s`", bs.ID)
 				}
 			}
 			// ceph image内のqcow2リサイズ
@@ -391,9 +394,9 @@ func (a *BlockStorageAgent) syncCephBlockStorage(bs *system.BlockStorage) error
 			cmd := exec.Command(command, args...)
 			if _, err := cmd.CombinedOutput(); err != nil {
 				if err := a.setStateError(bs); err != nil {
-					return err
+					return errors.Wrapf(err, "Failed to exec `%s %s` but cannot update state", command, strings.Join(args, " "))
 				}
-				return err
+				return errors.Wrapf(err, "Failed to exec `%s %s`", command, strings.Join(args, " "))
 			}
 
 		}

diff --git a/pkg/agents/system/virtualmachine/agent.go b/pkg/agents/system/virtualmachine/agent.go
@@ -304,9 +304,11 @@ func (a *VirtualMachineAgent) powerOnVirtualMachine(
 		return nil
 	}
 
-	vm.Status.State = system.VirtualMachineStatePending
-	if _, err = a.client.SystemV0().VirtualMachine().Update(vm); err != nil {
-		return err
+	if vm.Status.State != system.VirtualMachineStatePending {
+		vm.Status.State = system.VirtualMachineStatePending
+		if _, err = a.client.SystemV0().VirtualMachine().Update(vm); err != nil {
+			return err
+		}
 	}
 
 	disks := []string{}