Improve how existing-volume-id checks for mounting requirement

cmd/backup_perform.go

@@ -91,7 +91,7 @@ func backupMysqlPerform(backupType string, backupsBucket string, mysqlDataPath s
 
 	// - Start Percona XtraBackup
 	err = (func() error {
-		err = os.MkdirAll(backupDirectory, 0755)
+		err = os.MkdirAll(backupDirectory, 0700)
 		if err != nil {
 			pkg.AlertError(configStruct.Alerting, "Could not create backup directory.", err)
 			return err

cmd/backup_restore.go

@@ -72,6 +72,11 @@ func backupMysqlPerformRestore(fromHostname string, restoreTimestamp string, bac
 		existingBackupDirectory,
 	)
 
+	if err != nil {
+		pkg.ErrorLog.Println("Could not create mount volume.", err)
+		return nil
+	}
+
 	restoreDirectory := path.Join(mountDirectory, "really-simple-db-restore")
 	err = os.MkdirAll(restoreDirectory, 0755)
 	if err != nil {

cmd/prerequisites.go

@@ -27,7 +27,7 @@ func prerequisites(persistentStorageDirectory string) error {
 	dirInfo, err = os.Stat(persistentStorageDirectory)
 	if err != nil && os.IsNotExist(err) {
 		pkg.Log.Println("Persistent storage directory did not exist. Attempting to create", persistentStorageDirectory)
-		err = os.Mkdir(persistentStorageDirectory, 0755)
+		err = os.Mkdir(persistentStorageDirectory, 0700)
 		if err != nil {
 			pkg.ErrorLog.Fatalf("Could not create persistent storage directory at %s: %s", persistentStorageDirectory, err)
 		}

cmd/volume.go

@@ -1,6 +1,8 @@
 package cmd
 
 import (
+	"path"
+	"strings"
 	"time"
 
 	"github.com/digitalocean/godo"
@@ -55,19 +57,23 @@ func createAndMountVolumeForUse(volumePrefix string, sizeInGb int64, digitalOcea
 	pkg.Log.Println("Volume is being mounted.")
 
 	// - Mount that volume
-	var mountDirectory string
-	mountDirectory, err = pkg.MountVolume(volume.Name, volume.ID, thisHost.DropletID, digitalOceanClient)
+	mountDirectory := path.Join("/mnt/", strings.Replace(volume.Name, "-", "_", -1))
+	pkg.Log.Println("Volume is being mounted.", volume.DropletIDs)
 
-	if err != nil {
-		pkg.AlertError(configStruct.Alerting, "Could not mount volume "+volume.ID, err)
-		return volume, mountDirectory, err
-	}
+	if len(volume.DropletIDs) == 0 || volume.DropletIDs[0] != thisHost.DropletID {
+		err = pkg.MountVolume(volume.Name, mountDirectory, volume.ID, thisHost.DropletID, digitalOceanClient)
 
-	if len(volume.DropletIDs) == 0 {
-		volume.DropletIDs = append(volume.DropletIDs, thisHost.DropletID)
-	}
+		if err != nil {
+			pkg.AlertError(configStruct.Alerting, "Could not mount volume "+volume.ID, err)
+			return volume, mountDirectory, err
+		}
+
+		if len(volume.DropletIDs) == 0 {
+			volume.DropletIDs = append(volume.DropletIDs, thisHost.DropletID)
+		}
 
-	pkg.Log.Printf("Volume %s mounted on this host under %s.\n", volume.ID, mountDirectory)
+		pkg.Log.Printf("Volume %s mounted on this host under %s.\n", volume.ID, mountDirectory)
+	}
 
 	return volume, mountDirectory, nil
 }

pkg/volume_helper.go

@@ -3,7 +3,6 @@ package pkg
 import (
 	"errors"
 	"os"
-	"strings"
 	"time"
 
 	"github.com/digitalocean/godo"
@@ -30,24 +29,24 @@ func CreateVolume(createRequest *godo.VolumeCreateRequest, digitalOceanClient *D
 }
 
 // MountVolume mounts volume on machine and won't return until complete
-func MountVolume(volumeName string, volumeID string, dropletID int, digitalOceanClient *DigitalOceanClient) (string, error) {
+func MountVolume(volumeName string, mountPoint string, volumeID string, dropletID int, digitalOceanClient *DigitalOceanClient) error {
 	action, _, err := digitalOceanClient.Client.StorageActions.Attach(
 		digitalOceanClient.Context,
 		volumeID,
 		dropletID,
 	)
 
 	if err != nil {
-		return "", err
+		return err
 	}
 
 	if action.Status == "errored" {
-		return "", errors.New("Attach action had a status of errored")
+		return errors.New("Attach action had a status of errored")
 	}
 
 	err = digitalOceanWaitForAction(action, digitalOceanClient)
 	if err != nil {
-		return "", err
+		return err
 	}
 
 	// Wait for system to settle
@@ -57,11 +56,10 @@ func MountVolume(volumeName string, volumeID string, dropletID int, digitalOcean
 
 	// Volume is now available in /dev/disk/by-id/scsi-0DO_Volume_$VOLUME_NAME
 	diskLocation := "/dev/disk/by-id/scsi-0DO_Volume_" + volumeName
-	mountPoint := "/mnt/" + strings.Replace(volumeName, "-", "_", -1)
 
-	err = os.MkdirAll(mountPoint, 0755)
+	err = os.MkdirAll(mountPoint, 0700)
 	if err != nil {
-		return "", err
+		return err
 	}
 
 	_, err = PerformCommand("mount", "-o", "discard,defaults,noatime", diskLocation, mountPoint)
@@ -73,7 +71,7 @@ func MountVolume(volumeName string, volumeID string, dropletID int, digitalOcean
 
 		file, testErr := os.Create(mountPoint + "/test-mount")
 		if testErr != nil {
-			return mountPoint, testErr
+			return testErr
 		}
 		file.Close()
 
@@ -82,7 +80,7 @@ func MountVolume(volumeName string, volumeID string, dropletID int, digitalOcean
 		err = nil
 	}
 
-	return mountPoint, err
+	return err
 }
 
 // UnmountVolume unmounts a volume