-
Notifications
You must be signed in to change notification settings - Fork 646
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
Add bbolt surgery revert-meta-page
command
#385
Merged
ahrtr
merged 2 commits into
etcd-io:master
from
ahrtr:add_surgery_revert_meta_page_20230116
Jan 16, 2023
Merged
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,171 @@ | ||
package main | ||
|
||
import ( | ||
"errors" | ||
"flag" | ||
"fmt" | ||
"io" | ||
"os" | ||
"strings" | ||
|
||
"go.etcd.io/bbolt/internal/surgeon" | ||
) | ||
|
||
// SurgeryCommand represents the "surgery" command execution. | ||
type SurgeryCommand struct { | ||
baseCommand | ||
} | ||
|
||
// newSurgeryCommand returns a SurgeryCommand. | ||
func newSurgeryCommand(m *Main) *SurgeryCommand { | ||
c := &SurgeryCommand{} | ||
c.baseCommand = m.baseCommand | ||
return c | ||
} | ||
|
||
// Run executes the `surgery` program. | ||
func (cmd *SurgeryCommand) Run(args ...string) error { | ||
// Require a command at the beginning. | ||
if len(args) == 0 || strings.HasPrefix(args[0], "-") { | ||
fmt.Fprintln(cmd.Stderr, cmd.Usage()) | ||
return ErrUsage | ||
} | ||
|
||
// Execute command. | ||
switch args[0] { | ||
case "help": | ||
fmt.Fprintln(cmd.Stderr, cmd.Usage()) | ||
return ErrUsage | ||
case "revert-meta-page": | ||
return newRevertMetaPageCommand(cmd).Run(args[1:]...) | ||
default: | ||
return ErrUnknownCommand | ||
} | ||
} | ||
|
||
// Usage returns the help message. | ||
func (cmd *SurgeryCommand) Usage() string { | ||
return strings.TrimLeft(` | ||
Surgery is a command for performing low level update on bbolt databases. | ||
|
||
Usage: | ||
|
||
bbolt surgery command [arguments] | ||
|
||
The commands are: | ||
|
||
help print this screen | ||
revert-meta-page revert the meta page change made by the last transaction | ||
|
||
Use "bbolt surgery [command] -h" for more information about a command. | ||
`, "\n") | ||
} | ||
|
||
// RevertMetaPageCommand represents the "surgery revert-meta-page" command execution. | ||
type RevertMetaPageCommand struct { | ||
baseCommand | ||
|
||
SrcPath string | ||
DstPath string | ||
} | ||
|
||
// newRevertMetaPageCommand returns a RevertMetaPageCommand. | ||
func newRevertMetaPageCommand(m *SurgeryCommand) *RevertMetaPageCommand { | ||
c := &RevertMetaPageCommand{} | ||
c.baseCommand = m.baseCommand | ||
return c | ||
} | ||
|
||
// Run executes the command. | ||
func (cmd *RevertMetaPageCommand) Run(args ...string) error { | ||
// Parse flags. | ||
fs := flag.NewFlagSet("", flag.ContinueOnError) | ||
help := fs.Bool("h", false, "") | ||
if err := fs.Parse(args); err != nil { | ||
return err | ||
} else if *help { | ||
fmt.Fprintln(cmd.Stderr, cmd.Usage()) | ||
return ErrUsage | ||
} | ||
|
||
// Require database paths. | ||
cmd.SrcPath = fs.Arg(0) | ||
if cmd.SrcPath == "" { | ||
return ErrPathRequired | ||
} | ||
|
||
cmd.DstPath = fs.Arg(1) | ||
if cmd.DstPath == "" { | ||
return errors.New("output file required") | ||
} | ||
|
||
// Ensure source file exists. | ||
_, err := os.Stat(cmd.SrcPath) | ||
if os.IsNotExist(err) { | ||
return ErrFileNotFound | ||
} else if err != nil { | ||
return err | ||
} | ||
|
||
// Ensure output file not exist. | ||
_, err = os.Stat(cmd.DstPath) | ||
if err == nil { | ||
return fmt.Errorf("output file %q already exists", cmd.DstPath) | ||
} else if !os.IsNotExist(err) { | ||
return err | ||
} | ||
|
||
// Copy database from SrcPath to DstPath | ||
ahrtr marked this conversation as resolved.
Show resolved
Hide resolved
|
||
if err := copyFile(cmd.SrcPath, cmd.DstPath); err != nil { | ||
return fmt.Errorf("failed to copy file: %w", err) | ||
} | ||
|
||
// revert the meta page | ||
if err = surgeon.RevertMetaPage(cmd.DstPath); err != nil { | ||
return err | ||
} | ||
|
||
fmt.Fprintln(cmd.Stdout, "The meta page is reverted.") | ||
return nil | ||
} | ||
|
||
func copyFile(srcPath, dstPath string) error { | ||
srcDB, err := os.Open(srcPath) | ||
if err != nil { | ||
return fmt.Errorf("failed to open source file %q: %w", srcPath, err) | ||
} | ||
defer srcDB.Close() | ||
dstDB, err := os.Create(dstPath) | ||
if err != nil { | ||
return fmt.Errorf("failed to create output file %q: %w", dstPath, err) | ||
} | ||
defer dstDB.Close() | ||
written, err := io.Copy(dstDB, srcDB) | ||
if err != nil { | ||
return fmt.Errorf("failed to copy database file from %q to %q: %w", srcPath, dstPath, err) | ||
} | ||
|
||
srcFi, err := srcDB.Stat() | ||
if err != nil { | ||
return fmt.Errorf("failed to get source file info %q: %w", srcPath, err) | ||
} | ||
initialSize := srcFi.Size() | ||
if initialSize != written { | ||
return fmt.Errorf("the byte copied (%q: %d) isn't equal to the initial db size (%q: %d)", dstPath, written, srcPath, initialSize) | ||
} | ||
|
||
return nil | ||
} | ||
|
||
// Usage returns the help message. | ||
func (cmd *RevertMetaPageCommand) Usage() string { | ||
return strings.TrimLeft(` | ||
usage: bolt surgery revert-meta-page -o DST SRC | ||
|
||
RevertMetaPage copies the database file at SRC to a newly created database | ||
file at DST. Afterwards, it reverts the meta page on the newly created | ||
database at DST. | ||
|
||
The original database is left untouched. | ||
`, "\n") | ||
} |
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,74 @@ | ||
package main_test | ||
|
||
import ( | ||
bolt "go.etcd.io/bbolt" | ||
"os" | ||
"path/filepath" | ||
"testing" | ||
|
||
"github.com/stretchr/testify/assert" | ||
"github.com/stretchr/testify/require" | ||
|
||
"go.etcd.io/bbolt/internal/btesting" | ||
"go.etcd.io/bbolt/internal/guts_cli" | ||
) | ||
|
||
func TestSurgery_RevertMetaPage(t *testing.T) { | ||
pageSize := 4096 | ||
db := btesting.MustCreateDBWithOption(t, &bolt.Options{PageSize: pageSize}) | ||
srcPath := db.Path() | ||
|
||
srcFile, err := os.Open(srcPath) | ||
require.NoError(t, err) | ||
defer srcFile.Close() | ||
|
||
// Read both meta0 and meta1 from srcFile | ||
srcBuf0, srcBuf1 := readBothMetaPages(t, srcPath, pageSize) | ||
meta0Page := guts_cli.LoadPageMeta(srcBuf0) | ||
meta1Page := guts_cli.LoadPageMeta(srcBuf1) | ||
|
||
// Get the non-active meta page | ||
nonActiveSrcBuf := srcBuf0 | ||
nonActiveMetaPageId := 0 | ||
if meta0Page.Txid() > meta1Page.Txid() { | ||
nonActiveSrcBuf = srcBuf1 | ||
nonActiveMetaPageId = 1 | ||
} | ||
t.Logf("non active meta page id: %d", nonActiveMetaPageId) | ||
|
||
// revert the meta page | ||
dstPath := filepath.Join(t.TempDir(), "dstdb") | ||
m := NewMain() | ||
err = m.Run("surgery", "revert-meta-page", srcPath, dstPath) | ||
require.NoError(t, err) | ||
|
||
// read both meta0 and meta1 from dst file | ||
dstBuf0, dstBuf1 := readBothMetaPages(t, dstPath, pageSize) | ||
|
||
// check result. Note we should skip the page ID | ||
assert.Equal(t, pageDataWithoutPageId(nonActiveSrcBuf), pageDataWithoutPageId(dstBuf0)) | ||
assert.Equal(t, pageDataWithoutPageId(nonActiveSrcBuf), pageDataWithoutPageId(dstBuf1)) | ||
} | ||
|
||
func pageDataWithoutPageId(buf []byte) []byte { | ||
return buf[8:] | ||
} | ||
|
||
func readBothMetaPages(t *testing.T, filePath string, pageSize int) ([]byte, []byte) { | ||
dbFile, err := os.Open(filePath) | ||
require.NoError(t, err) | ||
defer dbFile.Close() | ||
|
||
buf0 := make([]byte, pageSize) | ||
buf1 := make([]byte, pageSize) | ||
|
||
meta0Len, err := dbFile.ReadAt(buf0, 0) | ||
require.NoError(t, err) | ||
require.Equal(t, pageSize, meta0Len) | ||
|
||
meta1Len, err := dbFile.ReadAt(buf1, int64(pageSize)) | ||
require.NoError(t, err) | ||
require.Equal(t, pageSize, meta1Len) | ||
|
||
return buf0, buf1 | ||
} |
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
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think that all surgery commands should operate on SrcPath and DstPath.
I think with the next tool the code will be better structured if we have composition with
a common tool:
baseSurgeryToolCommand
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Let me do this when I add the next surgery command.