Merge pull request #51 from taku-k/feat/option-default-mycnf

Add --defaults-file option for backup and restore commands
hatena · Jul 25, 2017 · 0a11fbe · 0a11fbe
2 parents bf5bf87 + 630cae3
commit 0a11fbe
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 3 deletions.
diff --git a/pkg/base/xtrabackup.go b/pkg/base/xtrabackup.go
@@ -25,6 +25,7 @@ type XtrabackupConfig struct {
 	InsecureAuth        bool
 	Parallel            int
 	UseMemory           string
+	DefaultsFile        string
 }
 
 type RestoreXtrabackupConfig struct {
@@ -35,6 +36,7 @@ type RestoreXtrabackupConfig struct {
 	IncDir              string
 	Parallel            int
 	UseMemory           string
+	DefaultsFile        string
 }
 
 func MakeXtrabackupConfig() *XtrabackupConfig {

diff --git a/pkg/cli/flags.go b/pkg/cli/flags.go
@@ -101,6 +101,7 @@ func init() {
 
 		f.StringVarP(&db, "db", "d", "", "DB name")
 		f.BoolVar(&useInnobackupex, "use-innobackupex", false, "Using innobackupex binary instead of xtrabackup.")
+		f.StringVar(&xtrabackupCfg.DefaultsFile, "defaults-file", xtrabackupCfg.DefaultsFile, "Read default MySQL options from the given file.")
 	}
 
 	// Backup commands flags

diff --git a/pkg/utils/exec/xtrabackup.go b/pkg/utils/exec/xtrabackup.go
@@ -21,7 +21,9 @@ type backupCmd struct {
 
 var xtrabackup = backupCmd{
 	fullTmpl: strings.TrimSpace(`
-{{ .XtrabackupBinPath }} \
+{{ .XtrabackupBinPath }} \{{ if .DefaultsFile }}
+  --defaults-file={{ .DefaultsFile }} \
+  {{- end }}
   --host {{ .Host }} \
   --port {{ .Port }} \
   --user {{ .User }} \{{ if .Password }}
@@ -38,7 +40,9 @@ var xtrabackup = backupCmd{
   --parallel {{ .Parallel }}
 `),
 	incTmpl: strings.TrimSpace(`
-{{ .XtrabackupBinPath }} \
+{{ .XtrabackupBinPath }} \{{ if .DefaultsFile }}
+  --defaults-file={{ .DefaultsFile }} \
+  {{- end }}
   --host {{ .Host }} \
   --port {{ .Port }} \
   --user {{ .User }} \{{ if .Password }}
@@ -56,7 +60,9 @@ var xtrabackup = backupCmd{
   --parallel {{ .Parallel }}
 `),
 	restoreTmpl: strings.TrimSpace(`
-{{ .XtrabackupBinPath }} \
+{{ .XtrabackupBinPath }} \{{ if .DefaultsFile }}
+  --defaults-file={{ .DefaultsFile }} \
+  {{- end }}
   --target-dir base \{{ if not .IsLast }}
   --apply-log-only \
   {{- end }}{{ if .IncDir }}
@@ -145,6 +151,7 @@ func PrepareBaseBackup(
 		UseInnobackupex:     cfg.UseInnobackupex,
 		IsLast:              isLast,
 		UseMemory:           cfg.UseMemory,
+		DefaultsFile:        cfg.DefaultsFile,
 	}
 	return _prepareBackup(ctx, rcfg)
 }
@@ -163,6 +170,7 @@ func PrepareIncBackup(
 		IsLast:              isLast,
 		IncDir:              fmt.Sprintf("inc%d", inc),
 		UseMemory:           cfg.UseMemory,
+		DefaultsFile:        cfg.DefaultsFile,
 	}
 	return _prepareBackup(ctx, rcfg)
 }

diff --git a/pkg/utils/exec/xtrabackup_test.go b/pkg/utils/exec/xtrabackup_test.go
@@ -24,9 +24,11 @@ func TestBuildFullBackupCmd(t *testing.T) {
 				LsnTempDir:        "/tmp/test",
 				InsecureAuth:      true,
 				Parallel:          1,
+				DefaultsFile:      "/etc/mysql/my.cnf",
 			},
 			[]string{"sh", "-c", strings.TrimSpace(`
 xtrabackup \
+  --defaults-file=/etc/mysql/my.cnf \
   --host 127.0.0.1 \
   --port 3306 \
   --user user \
@@ -47,9 +49,11 @@ xtrabackup \
 				User:              "user",
 				LsnTempDir:        "/tmp/test",
 				Parallel:          1,
+				DefaultsFile:      "/etc/mysql/my.cnf",
 			},
 			[]string{"sh", "-c", strings.TrimSpace(`
 /usr/bin/xtrabackup \
+  --defaults-file=/etc/mysql/my.cnf \
   --host 127.0.0.1 \
   --port 3306 \
   --user user \
@@ -85,11 +89,13 @@ func TestBuildIncBackupCmd(t *testing.T) {
 		LsnTempDir:        "/tmp/test",
 		ToLsn:             "100",
 		Parallel:          1,
+		DefaultsFile:      "/etc/mysql/my.cnf",
 	}
 	cmd, err := BuildIncBackupCmd(context.Background(), cfg)
 
 	expected := []string{"sh", "-c", strings.TrimSpace(`
 xtrabackup \
+  --defaults-file=/etc/mysql/my.cnf \
   --host 127.0.0.1 \
   --port 3306 \
   --user user \
@@ -120,19 +126,23 @@ func TestPrepareBackupCmd(t *testing.T) {
 				XtrabackupBinPath: "xtrabackup",
 				IsLast:            true,
 				Parallel:          4,
+				DefaultsFile:      "/etc/mysql/my.cnf",
 			},
 			[]string{"sh", "-c", strings.TrimSpace(`
 xtrabackup \
+  --defaults-file=/etc/mysql/my.cnf \
   --target-dir base \
   --parallel 4 \
   --prepare`)},
 		}, {
 			&base.RestoreXtrabackupConfig{
 				XtrabackupBinPath: "xtrabackup",
 				IsLast:            false,
+				DefaultsFile:      "/etc/mysql/my.cnf",
 			},
 			[]string{"sh", "-c", strings.TrimSpace(`
 xtrabackup \
+  --defaults-file=/etc/mysql/my.cnf \
   --target-dir base \
   --apply-log-only \
   --prepare`)},
@@ -141,9 +151,11 @@ xtrabackup \
 				XtrabackupBinPath: "xtrabackup",
 				IsLast:            true,
 				IncDir:            "inc1",
+				DefaultsFile:      "/etc/mysql/my.cnf",
 			},
 			[]string{"sh", "-c", strings.TrimSpace(`
 xtrabackup \
+  --defaults-file=/etc/mysql/my.cnf \
   --target-dir base \
   --incremental-dir inc1 \
   --prepare`)},
@@ -153,9 +165,11 @@ xtrabackup \
 				IsLast:            false,
 				IncDir:            "inc1",
 				UseMemory:         "2GB",
+				DefaultsFile:      "/etc/mysql/my.cnf",
 			},
 			[]string{"sh", "-c", strings.TrimSpace(`
 xtrabackup \
+  --defaults-file=/etc/mysql/my.cnf \
   --target-dir base \
   --apply-log-only \
   --incremental-dir inc1 \