fix(Backup/Restore): Keep all versions (#1462) (#1509)

Do not drop any versions while doing a backup and restore. (cherry picked from commit 5d8aee6) Co-authored-by: Ibrahim Jarif <[email protected]>
hypermodeinc · Sep 10, 2020 · e3c326e · e3c326e
1 parent 058a414
commit e3c326e
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 4 deletions.
diff --git a/badger/cmd/backup.go b/badger/cmd/backup.go
@@ -18,6 +18,7 @@ package cmd
 
 import (
 	"bufio"
+	"math"
 	"os"
 
 	"github.com/dgraph-io/badger"
@@ -27,6 +28,7 @@ import (
 
 var backupFile string
 var truncate bool
+var numVersions int
 
 // backupCmd represents the backup command
 var backupCmd = &cobra.Command{
@@ -47,13 +49,22 @@ func init() {
 		"badger.bak", "File to backup to")
 	backupCmd.Flags().BoolVarP(&truncate, "truncate", "t",
 		false, "Allow value log truncation if required.")
+	backupCmd.Flags().IntVarP(&numVersions, "num-versions", "n",
+		0, "Number of versions to keep. A value <= 0 means keep all versions.")
 }
 
 func doBackup(cmd *cobra.Command, args []string) error {
-	// Open DB
-	db, err := badger.Open(badger.DefaultOptions(sstDir).
+	opt := badger.DefaultOptions(sstDir).
 		WithValueDir(vlogDir).
-		WithTruncate(truncate))
+		WithTruncate(truncate).
+		WithNumVersionsToKeep(math.MaxUint32)
+
+	if numVersions > 0 {
+		opt.NumVersionsToKeep = numVersions
+	}
+
+	// Open DB
+	db, err := badger.Open(opt)
 	if err != nil {
 		return err
 	}

diff --git a/badger/cmd/restore.go b/badger/cmd/restore.go
@@ -18,6 +18,7 @@ package cmd
 
 import (
 	"errors"
+	"math"
 	"os"
 	"path"
 
@@ -65,7 +66,9 @@ func doRestore(cmd *cobra.Command, args []string) error {
 	}
 
 	// Open DB
-	db, err := badger.Open(badger.DefaultOptions(sstDir).WithValueDir(vlogDir))
+	db, err := badger.Open(badger.DefaultOptions(sstDir).
+		WithValueDir(vlogDir).
+		WithNumVersionsToKeep(math.MaxUint32))
 	if err != nil {
 		return err
 	}