Fix remote storage delete bug

bitpoke · Jun 14, 2019 · 103e6a9 · 103e6a9
1 parent 766484f
commit 103e6a9
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 10 deletions.
diff --git a/pkg/controller/mysqlbackup/internal/syncer/deletionjob.go b/pkg/controller/mysqlbackup/internal/syncer/deletionjob.go
@@ -35,6 +35,7 @@ import (
 	"github.com/presslabs/mysql-operator/pkg/internal/mysqlbackup"
 	"github.com/presslabs/mysql-operator/pkg/internal/mysqlcluster"
 	"github.com/presslabs/mysql-operator/pkg/options"
+	"github.com/presslabs/mysql-operator/pkg/util/constants"
 )
 
 const (
@@ -154,7 +155,9 @@ func (s *deletionJobSyncer) ensureContainers() []core.Container {
 			Image:           s.opt.SidecarImage,
 			ImagePullPolicy: s.opt.ImagePullPolicy,
 			Args: []string{
-				"rclone", "--config=/etc/rclone.conf", "delete",
+				"rclone",
+				constants.RcloneConfigArg,
+				"delete",
 				bucketForRclone(s.backup.Spec.BackupURL),
 			},
 			EnvFrom: []core.EnvFromSource{

diff --git a/pkg/sidecar/appclone.go b/pkg/sidecar/appclone.go
@@ -74,8 +74,7 @@ func cloneFromBucket(initBucket string) error {
 	// rclone --config={conf file} cat {bucket uri}
 	// writes to stdout the content of the bucket uri
 	// nolint: gosec
-	rclone := exec.Command("rclone", "-vv",
-		fmt.Sprintf("--config=%s", rcloneConfigFile), "cat", initBucket)
+	rclone := exec.Command("rclone", "-vv", rcloneConfigArg, "cat", initBucket)
 
 	// gzip reads from stdin decompress and then writes to stdout
 	// nolint: gosec

diff --git a/pkg/sidecar/apptakebackup.go b/pkg/sidecar/apptakebackup.go
@@ -42,8 +42,7 @@ func pushBackupFromTo(cfg *Config, srcHost, destBucket string) error {
 	gzip := exec.Command("gzip", "-c")
 
 	// nolint: gosec
-	rclone := exec.Command("rclone",
-		fmt.Sprintf("--config=%s", rcloneConfigFile), "rcat", tmpDestBucket)
+	rclone := exec.Command("rclone", rcloneConfigArg, "rcat", tmpDestBucket)
 
 	gzip.Stdin = response.Body
 	gzip.Stderr = os.Stderr
@@ -83,8 +82,7 @@ func pushBackupFromTo(cfg *Config, srcHost, destBucket string) error {
 	// the backup was a success
 	// remove .tmp extension
 	// nolint: gosec
-	rcMove := exec.Command("rclone",
-		fmt.Sprintf("--config=%s", rcloneConfigFile), "moveto", tmpDestBucket, destBucket)
+	rcMove := exec.Command("rclone", rcloneConfigArg, "moveto", tmpDestBucket, destBucket)
 
 	if err = rcMove.Start(); err != nil {
 		return fmt.Errorf("final move failed: %s", err)

diff --git a/pkg/sidecar/constants.go b/pkg/sidecar/constants.go
@@ -68,8 +68,9 @@ var (
 )
 
 const (
-	// RcloneConfigFile represents the path to the file that contains rclon
+	// RcloneConfigFile represents the path to the file that contains rclone
 	// configs. This path should be the same as defined in docker entrypoint
-	// script from mysql-operator-sidecar/docker-entrypoint.sh. /etc/rclone.conf
-	rcloneConfigFile = "/tmp/rclone.conf"
+	// script from mysql-operator-sidecar/docker-entrypoint.sh. /tmp/rclone.conf
+	rcloneConfigFile = constants.RcloneConfigFile
+	rcloneConfigArg  = constants.RcloneConfigArg
 )
diff --git a/pkg/util/constants/constants.go b/pkg/util/constants/constants.go
@@ -64,6 +64,14 @@ const (
 	// ConfHeartBeatPath the path where to put the heartbeat.conf file
 	// it's important to have a different extension than .cnf to be ignore by MySQL include
 	ConfHeartBeatPath = "/etc/mysql/heartbeat.conf"
+
+	// RcloneConfigFile represents the path to the file that contains rclone
+	// configs. This path should be the same as defined in docker entrypoint
+	// script from mysql-operator-sidecar/docker-entrypoint.sh. /tmp/rclone.conf
+	RcloneConfigFile = "/tmp/rclone.conf"
+
+	// RcloneConfigArg represents the config argument to rclone cmd
+	RcloneConfigArg = "--config=" + RcloneConfigFile
 )
 
 var (