Added restore cmd arg, set dynamic cassandra data dir in path utils

Author: alexbarta

cmd/cain.go

@@ -42,11 +42,11 @@ type backupCmd struct {
 	namespace        string
 	selector         string
 	container        string
-	cassandraDataDir string
 	keyspace         string
 	dst              string
 	parallel         int
 	bufferSize       float64
+	cassandraDataDir string
 
 	out io.Writer
 }
@@ -102,16 +102,17 @@ func NewBackupCmd(out io.Writer) *cobra.Command {
 }
 
 type restoreCmd struct {
-	src        string
-	keyspace   string
-	tag        string
-	schema     string
-	namespace  string
-	selector   string
-	container  string
-	parallel   int
-	bufferSize float64
-	userGroup  string
+	src              string
+	keyspace         string
+	tag              string
+	schema           string
+	namespace        string
+	selector         string
+	container        string
+	parallel         int
+	bufferSize       float64
+	userGroup        string
+	cassandraDataDir string
 
 	out io.Writer
 }
@@ -141,16 +142,17 @@ func NewRestoreCmd(out io.Writer) *cobra.Command {
 		},
 		Run: func(cmd *cobra.Command, args []string) {
 			options := cain.RestoreOptions{
-				Src:        r.src,
-				Keyspace:   r.keyspace,
-				Tag:        r.tag,
-				Schema:     r.schema,
-				Namespace:  r.namespace,
-				Selector:   r.selector,
-				Container:  r.container,
-				Parallel:   r.parallel,
-				BufferSize: r.bufferSize,
-				UserGroup:  r.userGroup,
+				Src:              r.src,
+				Keyspace:         r.keyspace,
+				Tag:              r.tag,
+				Schema:           r.schema,
+				Namespace:        r.namespace,
+				Selector:         r.selector,
+				Container:        r.container,
+				Parallel:         r.parallel,
+				BufferSize:       r.bufferSize,
+				UserGroup:        r.userGroup,
+				CassandraDataDir: r.cassandraDataDir,
 			}
 			if err := cain.Restore(options); err != nil {
 				log.Fatal(err)
@@ -169,6 +171,7 @@ func NewRestoreCmd(out io.Writer) *cobra.Command {
 	f.IntVarP(&r.parallel, "parallel", "p", 1, "number of files to copy in parallel. set this flag to 0 for full parallelism")
 	f.Float64VarP(&r.bufferSize, "buffer-size", "b", 6.75, "in memory buffer size (MB) to use for files copy (buffer per file)")
 	f.StringVar(&r.userGroup, "user-group", "cassandra:cassandra", "user and group who should own restored files")
+	f.StringVarP(&r.cassandraDataDir, "cassandra-data-dir", "", "/var/lib/cassandra/data", "cassandra data directory")
 
 	return cmd
 }

pkg/cain/cain.go

@@ -52,7 +52,7 @@ func Backup(o BackupOptions) (string, error) {
 	tag := TakeSnapshots(k8sClient, pods, o.Namespace, o.Container, o.Keyspace)
 
 	log.Println("Calculating paths. This may take a while...")
-	fromToPathsAllPods, err := utils.GetFromAndToPathsFromK8s(k8sClient, pods, o.Namespace, o.Container, o.Keyspace, tag, dstBasePath)
+	fromToPathsAllPods, err := utils.GetFromAndToPathsFromK8s(k8sClient, pods, o.Namespace, o.Container, o.Keyspace, tag, dstBasePath, o.CassandraDataDir)
 	if err != nil {
 		return "", err
 	}
@@ -71,16 +71,17 @@ func Backup(o BackupOptions) (string, error) {
 
 // RestoreOptions are the options to pass to Restore
 type RestoreOptions struct {
-	Src        string
-	Keyspace   string
-	Tag        string
-	Schema     string
-	Namespace  string
-	Selector   string
-	Container  string
-	Parallel   int
-	BufferSize float64
-	UserGroup  string
+	Src              string
+	Keyspace         string
+	Tag              string
+	Schema           string
+	Namespace        string
+	Selector         string
+	Container        string
+	Parallel         int
+	BufferSize       float64
+	UserGroup        string
+	CassandraDataDir string
 }
 
 // Restore performs restore
@@ -122,7 +123,7 @@ func Restore(o RestoreOptions) error {
 
 	log.Println("Calculating paths. This may take a while...")
 	srcPath := filepath.Join(srcBasePath, o.Keyspace, sum, o.Tag)
-	fromToPaths, podsToBeRestored, tablesToRefresh, err := utils.GetFromAndToPathsSrcToK8s(srcClient, k8sClient, srcPrefix, srcPath, srcBasePath, o.Namespace, o.Container)
+	fromToPaths, podsToBeRestored, tablesToRefresh, err := utils.GetFromAndToPathsSrcToK8s(srcClient, k8sClient, srcPrefix, srcPath, srcBasePath, o.Namespace, o.Container, o.CassandraDataDir)
 	if err != nil {
 		return err
 	}
@@ -147,7 +148,7 @@ func Restore(o RestoreOptions) error {
 	}
 
 	log.Println("Changing files ownership")
-	if err := utils.ChangeFilesOwnership(k8sClient, existingPods, o.Namespace, o.Container, o.UserGroup); err != nil {
+	if err := utils.ChangeFilesOwnership(k8sClient, existingPods, o.Namespace, o.Container, o.UserGroup, o.CassandraDataDir); err != nil {
 		return err
 	}
 

pkg/utils/path.go

@@ -8,15 +8,13 @@ import (
 	"github.com/nuvo/skbn/pkg/skbn"
 )
 
-const cassandraDataDir = "/var/lib/cassandra/data"
-
 // GetFromAndToPathsFromK8s aggregates paths from all pods
-func GetFromAndToPathsFromK8s(iClient interface{}, pods []string, namespace, container, keyspace, tag, dstBasePath string) ([]skbn.FromToPair, error) {
+func GetFromAndToPathsFromK8s(iClient interface{}, pods []string, namespace, container, keyspace, tag, dstBasePath, cassandraDataDir string) ([]skbn.FromToPair, error) {
 	k8sClient := iClient.(*skbn.K8sClient)
 	var fromToPathsAllPods []skbn.FromToPair
 	for _, pod := range pods {
 
-		fromToPaths, err := GetFromAndToPathsK8sToDst(k8sClient, namespace, pod, container, keyspace, tag, dstBasePath)
+		fromToPaths, err := GetFromAndToPathsK8sToDst(k8sClient, namespace, pod, container, keyspace, tag, dstBasePath, cassandraDataDir)
 		if err != nil {
 			return nil, err
 		}
@@ -27,7 +25,7 @@ func GetFromAndToPathsFromK8s(iClient interface{}, pods []string, namespace, con
 }
 
 // GetFromAndToPathsSrcToK8s performs a path mapping between a source and Kubernetes
-func GetFromAndToPathsSrcToK8s(srcClient, k8sClient interface{}, srcPrefix, srcPath, srcBasePath, namespace, container string) ([]skbn.FromToPair, []string, []string, error) {
+func GetFromAndToPathsSrcToK8s(srcClient, k8sClient interface{}, srcPrefix, srcPath, srcBasePath, namespace, container, cassandraDataDir string) ([]skbn.FromToPair, []string, []string, error) {
 	var fromToPaths []skbn.FromToPair
 
 	filesToCopyRelativePaths, err := skbn.GetListOfFiles(srcClient, srcPrefix, srcPath)
@@ -56,7 +54,7 @@ func GetFromAndToPathsSrcToK8s(srcClient, k8sClient interface{}, srcPrefix, srcP
 }
 
 // GetFromAndToPathsK8sToDst performs a path mapping between Kubernetes and a destination
-func GetFromAndToPathsK8sToDst(k8sClient interface{}, namespace, pod, container, keyspace, tag, dstBasePath string) ([]skbn.FromToPair, error) {
+func GetFromAndToPathsK8sToDst(k8sClient interface{}, namespace, pod, container, keyspace, tag, dstBasePath, cassandraDataDir string) ([]skbn.FromToPair, error) {
 	var fromToPaths []skbn.FromToPair
 
 	pathPrfx := filepath.Join(namespace, pod, container, cassandraDataDir)
@@ -146,7 +144,7 @@ func PathFromSrcToK8s(k8sClient interface{}, fromPath, cassandraDataDir, srcBase
 }
 
 // ChangeFilesOwnership changes the ownership of files after restoring them
-func ChangeFilesOwnership(iK8sClient interface{}, pods []string, namespace, container, userGroup string) error {
+func ChangeFilesOwnership(iK8sClient interface{}, pods []string, namespace, container, userGroup, cassandraDataDir string) error {
 	k8sClient := iK8sClient.(*skbn.K8sClient)
 	command := []string{"chown", "-R", userGroup, cassandraDataDir}
 	for _, pod := range pods {