Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: Restore zstd-compressed database backup #273

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 20 additions & 2 deletions pkg/sloop/ingress/dbrestore.go
Original file line number Diff line number Diff line change
@@ -1,9 +1,12 @@
package ingress

import (
"io"
"os"
"runtime"

"github.com/golang/glog"
"github.com/klauspost/compress/zstd"
"github.com/pkg/errors"

"github.com/salesforce/sloop/pkg/sloop/store/untyped/badgerwrap"
Expand All @@ -17,10 +20,25 @@ func DatabaseRestore(db badgerwrap.DB, filename string) error {
}
defer file.Close()

err = db.Load(file, runtime.NumCPU())
zr, err := zstd.NewReader(file)
if err != nil {
return errors.Wrapf(err, "failed to restore database from file: %q", filename)
return errors.Wrapf(err, "failed to initialize zstd reader")
}
defer zr.Close()

err = db.Load(zr, runtime.NumCPU())
if errors.Is(err, zstd.ErrMagicMismatch) {
glog.V(2).Infof("database file is not compressed with zstd, will load without decompressing")

// We already loaded the database, advancing the file offset. To load the database again,
// we must reset the offset to the start.
if _, err := file.Seek(0, io.SeekStart); err != nil {
return errors.Wrapf(err, "failed to to rewind to start of database restore file: %q", filename)
}
err = db.Load(file, runtime.NumCPU())
}
if err != nil {
Comment on lines +29 to +40
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I wanted to check if the file is compressed or not before loading the database, but could not find a way to do that using the zstd package. Attempting to load the database is the best alternative I found.

return errors.Wrapf(err, "failed to restore database from file: %q", filename)
}
return nil
}
135 changes: 135 additions & 0 deletions pkg/sloop/ingress/dbrestore_test.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,135 @@
package ingress

import (
"fmt"
"os"
"path/filepath"
"testing"
"time"

"github.com/golang/protobuf/ptypes/timestamp"
"github.com/klauspost/compress/zstd"
"github.com/pkg/errors"
"github.com/salesforce/sloop/pkg/sloop/store/typed"
"github.com/salesforce/sloop/pkg/sloop/store/untyped"
"github.com/salesforce/sloop/pkg/sloop/store/untyped/badgerwrap"
)

func TestDatabaseRestore(t *testing.T) {
tests := []struct {
name string
backupFn func(db badgerwrap.DB, path string) error
wantErr error
}{
{
name: "restore uncompressed database backup",
backupFn: backupUncompressed,
},
{
name: "restore zstd-compressed database backup",
backupFn: backupZstdCompressed,
},
}

tmpDir, err := os.MkdirTemp("", "")
if err != nil {
t.Fatalf("failed to create temporary directory: %s", err)
}

for i, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
db, err := createExampleDatabase()
if err != nil {
t.Fatalf("failed to create example database: %s", err)
}
defer db.Close()

dbPath := filepath.Join(tmpDir, fmt.Sprintf("test-%d.db", i))
err = tt.backupFn(db, dbPath)
if err != nil {
t.Fatalf("failed to backup example database: %s", err)
}

if err := DatabaseRestore(db, dbPath); err != tt.wantErr {
t.Errorf("DatabaseRestore() error = %v, wantErr %v", err, tt.wantErr)
}
})
}
}

func backupUncompressed(db badgerwrap.DB, path string) error {
w, err := os.Create(path)
if err != nil {
return errors.Wrapf(err, "failed to create file")
}
defer w.Close()

_, err = db.Backup(w, 0)
if err != nil {
return errors.Wrapf(err, "failed to backup database")
}

return nil
}

func backupZstdCompressed(db badgerwrap.DB, path string) error {
cf, err := os.Create(path)
if err != nil {
return errors.Wrapf(err, "failed to create file")
}
defer cf.Close()

zw, err := zstd.NewWriter(cf)
if err != nil {
return errors.Wrapf(err, "failed to create zstd writer")
}

_, err = db.Backup(zw, 0)
if err != nil {
return errors.Wrapf(err, "failed to backup database")
}
zw.Close()

return nil
}

func createExampleDatabase() (badgerwrap.DB, error) {
rootPath, err := os.MkdirTemp("", "")
if err != nil {
return nil, errors.Wrapf(err, "failed to create temporary directory for database:")
}

factory := &badgerwrap.BadgerFactory{}
storeConfig := &untyped.Config{
RootPath: rootPath,
ConfigPartitionDuration: time.Hour,
}
db, err := untyped.OpenStore(factory, storeConfig)
if err != nil {
return nil, errors.Wrapf(err, "failed to init untyped store:")
}

wt := typed.OpenKubeWatchResultTable()
err = db.Update(func(txn badgerwrap.Txn) error {
txerr := wt.Set(txn,
typed.NewWatchTableKey(
"somePartition",
"someKind",
"someNamespace",
"someName",
time.UnixMicro(0)).String(),
&typed.KubeWatchResult{Timestamp: &timestamp.Timestamp{
Seconds: 0,
Nanos: 0,
}, Kind: "test", Payload: "test"})
if txerr != nil {
return txerr
}
return nil
})
if err != nil {
return nil, errors.Wrapf(err, "error updating database:")
}

return db, nil
}
Loading