Fix percona-xtradb backup & restore (#6)

chart/stash-percona-xtradb/values.yaml

@@ -5,7 +5,7 @@
 replicaCount: 1
 # we are declaring these values as global so that parent chart can overwrite them
 docker:
-  registry: appscode
+  registry: stashed
   image: stash-percona-xtradb
   tag: 5.7
 

docs/_index.md

@@ -0,0 +1,10 @@
+---
+title: Percona XtraDB {{ .subproject_version }} Backup Guides | Stash
+menu:
+  product_stash_{{ .version }}:
+    identifier: stash-percona-xtradb-guides-{{ .subproject_version }}
+    name: {{ .subproject_version }}
+    parent: stash-percona-xtradb-guides
+    weight: 10
+menu_name: product_stash_{{ .version }}
+---

docs/clustered.md

@@ -0,0 +1,63 @@
+---
+title: Backup & Restore Clustered Percona XtraDB Database | Stash
+description: Backup Clustered Percona XtraDB Database database using Stash
+menu:
+  product_stash_{{ .version }}:
+    identifier: percona-xtradb-clustered-guide-{{ .subproject_version }}
+    name: Backup & Restore Clustered Percona XtraDB
+    parent: stash-percona-xtradb-guides-{{ .subproject_version }}
+    weight: 10
+product_name: stash
+menu_name: product_stash_{{ .version }}
+section_menu_id: stash-addons
+---
+
+**Deploy Database:**
+
+```bash
+$ kubectl apply -f ./docs/examples/clustered/backup/sample-xtradb-cluster.yaml
+perconaxtradb.kubedb.com/sample-xtradb-cluster created
+```
+
+**Create Secret:**
+```bash
+$ kubectl create secret generic -n demo gcs-secret \
+                --from-file=./RESTIC_PASSWORD \
+                --from-file=./GOOGLE_PROJECT_ID \
+                --from-file=./GOOGLE_SERVICE_ACCOUNT_JSON_KEY
+```
+
+**Create Repository:**
+
+```bash
+$ kubectl apply -f ./docs/examples/clustered/backup/repository.yaml
+repositories.stash.appscode.com/gcs-repo-xtradb-cluster created
+```
+
+**Install Chart:**
+
+```console
+$ helm template chart/stash-percona-xtradb --name=percona-xtradb-5.7  --set docker.registry=appscodeci --set docker.tag=refactor_linux_amd64 | kubectl apply -f -
+```
+
+**Create BackupConfiguration:**
+
+```bash
+$ kubectl apply -f ./docs/examples/clustered/backup/backupconfiguration.yaml 
+backupconfiguration.stash.appscode.com/sample-xtradb-cluster-backup created
+```
+
+## Restore
+
+**Create Restored Database:**
+
+```bash
+$ kubectl apply -f ./docs/examples/clustered/restore/restored-xtradb-cluster.yaml 
+perconaxtradb.kubedb.com/restored-xtradb-cluster created
+```
+
+**Create RestoreSession:**
+```bash
+$ kubectl apply -f ./docs/examples/clustered/restore/restoresession.yaml
+restoresession.stash.appscode.com/restored-xtradb-cluster-restore created
+```

docs/examples/clustered/backup/backupconfiguration.yaml

@@ -0,0 +1,20 @@
+apiVersion: stash.appscode.com/v1beta1
+kind: BackupConfiguration
+metadata:
+  name: sample-xtradb-cluster-backup
+  namespace: demo
+spec:
+  schedule: "*/5 * * * *"
+  task:
+    name: percona-xtradb-backup-5.7
+  repository:
+    name: gcs-repo-xtradb-cluster
+  target:
+    ref:
+      apiVersion: appcatalog.appscode.com/v1alpha1
+      kind: AppBinding
+      name: sample-xtradb-cluster
+  retentionPolicy:
+    name: keep-last-5
+    keepLast: 5
+    prune: true

docs/examples/clustered/backup/repository.yaml

@@ -0,0 +1,11 @@
+apiVersion: stash.appscode.com/v1alpha1
+kind: Repository
+metadata:
+  name: gcs-repo-xtradb-cluster
+  namespace: demo
+spec:
+  backend:
+    gcs:
+      bucket: appscode-qa
+      prefix: /demo/xtradb/sample-xtradb-cluster
+    storageSecretName: gcs-secret

docs/examples/clustered/backup/sample-xtradb-cluster.yaml

@@ -0,0 +1,17 @@
+apiVersion: kubedb.com/v1alpha1
+kind: PerconaXtraDB
+metadata:
+  name: sample-xtradb-cluster
+  namespace: demo
+spec:
+  version: "5.7"
+  replicas: 3
+  storageType: Durable
+  storage:
+    storageClassName: "standard"
+    accessModes:
+    - ReadWriteOnce
+    resources:
+      requests:
+        storage: 1Gi
+  terminationPolicy: WipeOut

docs/examples/clustered/restore/restored-xtradb-cluster.yaml

@@ -0,0 +1,22 @@
+apiVersion: kubedb.com/v1alpha1
+kind: PerconaXtraDB
+metadata:
+  name: restored-xtradb-cluster
+  namespace: demo
+spec:
+  version: "5.7"
+  replicas: 3
+  databaseSecret:
+    secretName: sample-xtradb-cluster-auth
+  storageType: Durable
+  storage:
+    storageClassName: "standard"
+    accessModes:
+    - ReadWriteOnce
+    resources:
+      requests:
+        storage: 1Gi
+  init:
+    stashRestoreSession:
+      name: restored-xtradb-cluster-restore
+  terminationPolicy: WipeOut

docs/examples/clustered/restore/restoresession.yaml

@@ -0,0 +1,34 @@
+apiVersion: stash.appscode.com/v1beta1
+kind: RestoreSession
+metadata:
+  name: restored-xtradb-cluster-restore
+  namespace: demo
+  labels:
+    kubedb.com/kind: PerconaXtraDB # this label is mandatory if you are using KubeDB to deploy the database.
+spec:
+  task:
+    name: percona-xtradb-restore-5.7
+  repository:
+    name: gcs-repo-xtradb-cluster
+  target:
+    replicas: 3
+    ref:
+      apiVersion: appcatalog.appscode.com/v1alpha1
+      kind: AppBinding
+      name: restored-xtradb-cluster
+    volumeMounts:
+    - name: data-restored-xtradb-cluster
+      mountPath: /var/lib/mysql
+    volumeClaimTemplates:
+    - metadata:
+        name: data-restored-xtradb-cluster-${POD_ORDINAL}
+      spec:
+        accessModes: [ "ReadWriteOnce" ]
+        storageClassName: "standard"
+        resources:
+          requests:
+            storage: 1Gi
+  rules:
+  - targetHosts: [] # empty host match all hosts
+    sourceHost: "host-0" # restore same data on all pvc
+    snapshots: ["latest"]

pkg/backup.go

@@ -4,6 +4,7 @@ import (
 	"encoding/json"
 	"fmt"
 	"path/filepath"
+	"strings"
 
 	api_v1beta1 "stash.appscode.dev/stash/apis/stash/v1beta1"
 	"stash.appscode.dev/stash/pkg/restic"
@@ -75,7 +76,7 @@ func NewCmdBackup() *cobra.Command {
 		},
 	}
 
-	cmd.Flags().StringVar(&opt.dumpArgs, "xtradb-args", defaultDumpArgs, "Additional arguments")
+	cmd.Flags().StringVar(&opt.xtradbArgs, "xtradb-args", defaultDumpArgs, "Additional arguments")
 	cmd.Flags().Int32Var(&opt.socatRetry, "socat-retry", kubedbconfig_api.SOCATOptionRetry, "Additional arguments")
 
 	cmd.Flags().StringVar(&masterURL, "master", masterURL, "The address of the Kubernetes API server (overrides any value in kubeconfig)")
@@ -159,8 +160,8 @@ func (opt *perconaOptions) backupPerconaXtraDB() (*restic.BackupOutput, error) {
 				"-h", appBinding.Spec.ClientConfig.Service.Name,
 			},
 		}
-		if opt.dumpArgs != "" {
-			opt.backupOptions.StdinPipeCommand.Args = append(opt.backupOptions.StdinPipeCommand.Args, opt.dumpArgs)
+		for _, arg := range strings.Fields(opt.xtradbArgs) {
+			opt.backupOptions.StdinPipeCommand.Args = append(opt.backupOptions.StdinPipeCommand.Args, arg)
 		}
 	} else { // clustered database
 		opt.backupOptions.StdinFileName = xtraBackupStreamFile

pkg/restore.go

@@ -2,6 +2,7 @@ package pkg
 
 import (
 	"path/filepath"
+	"strings"
 
 	api_v1beta1 "stash.appscode.dev/stash/apis/stash/v1beta1"
 	"stash.appscode.dev/stash/pkg/restic"
@@ -73,7 +74,7 @@ func NewCmdRestore() *cobra.Command {
 		},
 	}
 
-	cmd.Flags().StringVar(&opt.mysqlArgs, "xtradb-args", opt.mysqlArgs, "Additional arguments")
+	cmd.Flags().StringVar(&opt.xtradbArgs, "xtradb-args", opt.xtradbArgs, "Additional arguments")
 	cmd.Flags().Int32Var(&opt.targetAppReplicas, "target-app-replicas", opt.targetAppReplicas, "Additional arguments")
 
 	cmd.Flags().StringVar(&masterURL, "master", masterURL, "The address of the Kubernetes API server (overrides any value in kubeconfig)")
@@ -144,10 +145,9 @@ func (opt *perconaOptions) restorePerconaXtraDB() (*restic.RestoreOutput, error)
 				"-h", appBinding.Spec.ClientConfig.Service.Name,
 			},
 		}
-		if opt.mysqlArgs != "" {
-			opt.dumpOptions.StdoutPipeCommand.Args = append(opt.dumpOptions.StdoutPipeCommand.Args, opt.mysqlArgs)
+		for _, arg := range strings.Fields(opt.xtradbArgs) {
+			opt.dumpOptions.StdoutPipeCommand.Args = append(opt.dumpOptions.StdoutPipeCommand.Args, arg)
 		}
-
 		// wait for DB ready
 		waitForDBReady(appBinding.Spec.ClientConfig.Service.Name, appBinding.Spec.ClientConfig.Service.Port)
 	} else {

pkg/utils.go

@@ -33,8 +33,7 @@ type perconaOptions struct {
 	namespace         string
 	appBindingName    string
 	outputDir         string
-	dumpArgs          string
-	mysqlArgs         string
+	xtradbArgs        string
 	garbdCnf          kubedbconfig_api.GaleraArbitratorConfiguration
 	socatRetry        int32
 	targetAppReplicas int32