feat(Dgraph): Add badger.compression to Dgraph restore #6987
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
ajeetdsouza
requested review from
manishrjain and
vvbalaji-dgraph
as code owners
github-actions
bot
added
area/bulk-loader
|
Deploy preview for dgraph-docs ready! Built with commit 239336b |
ajeetdsouza
commented
Nov 25, 2020
| @@ -158,10 +158,6 @@ func run() { | |||
| if opt.Version { | |||
| os.Exit(0) | |||
| } | |||
| if opt.BadgerCompressionLevel < 0 { | |||
There was a problem hiding this comment.
This has been removed because this is derived from x.ParseCompression, which calls glog.Fatal in case of a negative compression level. Thus, there is no need to check over here.
| @@ -111,6 +112,10 @@ $ dgraph restore -p . -l /var/backups/dgraph -z localhost:5080 | |||
| } | |||
|
|
|||
| flag := Restore.Cmd.Flags() | |||
| flag.StringVar(&opt.compression, "badger.compression", "snappy", | |||
There was a problem hiding this comment.
This is the third place in the code where this exact description has been duplicated. Perhaps we could extract it out elsewhere.
| @@ -35,7 +36,7 @@ import ( | |||
| ) | |||
|
|
|||
| // RunRestore calls badger.Load and tries to load data into a new DB. | |||
| func RunRestore(pdir, location, backupId string, key x.SensitiveByteSlice) LoadResult { | |||
| func RunRestore(pdir, location, backupId string, key x.SensitiveByteSlice, ctype options.CompressionType, clevel int) LoadResult { | |||
There was a problem hiding this comment.
Seems like too many arguments. Should this function be changed to take in the entire opt struct instead?
| @@ -354,7 +355,7 @@ func runFailingRestore(t *testing.T, backupLocation, lastDir string, commitTs ui | |||
| require.NotNil(t, k) | |||
| require.NoError(t, err) | |||
|
|
|||
| result := worker.RunRestore("./data/restore", backupLocation, lastDir, k) | |||
| result := worker.RunRestore("./data/restore", backupLocation, lastDir, k, options.Snappy, 0) | |||
There was a problem hiding this comment.
Note: these tests did not use any form of compression earlier, but I've changed them to use snappy by default.
ajeetdsouza
changed the title
jarifibrahim
approved these changes
Nov 30, 2020
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
dgraph restoredoes not currently use any form of compression. This PR adds a--badger.compressionflag (similar to other Dgraph subcommands) and defaults all compression tosnappy.This change is