code cosmetics: rename variables for better readability and some comments
This commit is contained in:
parent
2ecf8914a1
commit
c25ed49f0d
@ -355,7 +355,7 @@ func (b *Blockstore) movingGC() error {
|
|||||||
panic(fmt.Errorf("error renaming old badger db dir from %s to %s: %w; USER ACTION REQUIRED", dbPath, backupPath, err)) //nolint
|
panic(fmt.Errorf("error renaming old badger db dir from %s to %s: %w; USER ACTION REQUIRED", dbPath, backupPath, err)) //nolint
|
||||||
}
|
}
|
||||||
|
|
||||||
if err = symlink(newPath, dbPath); err != nil {
|
if err = os.Symlink(newPath, dbPath); err != nil {
|
||||||
// same here; the db path is pointing to the void. panic and let the user fix.
|
// same here; the db path is pointing to the void. panic and let the user fix.
|
||||||
panic(fmt.Errorf("error symlinking new badger db dir from %s to %s: %w; USER ACTION REQUIRED", newPath, dbPath, err)) //nolint
|
panic(fmt.Errorf("error symlinking new badger db dir from %s to %s: %w; USER ACTION REQUIRED", newPath, dbPath, err)) //nolint
|
||||||
}
|
}
|
||||||
@ -367,26 +367,6 @@ func (b *Blockstore) movingGC() error {
|
|||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
// symlink creates a symlink from path to linkTo; the link is relative if the two are
|
|
||||||
// in the same directory
|
|
||||||
func symlink(path, linkTo string) error {
|
|
||||||
resolvedPathDir, err := filepath.EvalSymlinks(filepath.Dir(path))
|
|
||||||
if err != nil {
|
|
||||||
return fmt.Errorf("error resolving links in %s: %w", path, err)
|
|
||||||
}
|
|
||||||
|
|
||||||
resolvedLinkDir, err := filepath.EvalSymlinks(filepath.Dir(linkTo))
|
|
||||||
if err != nil {
|
|
||||||
return fmt.Errorf("error resolving links in %s: %w", linkTo, err)
|
|
||||||
}
|
|
||||||
|
|
||||||
if resolvedPathDir == resolvedLinkDir {
|
|
||||||
path = filepath.Base(path)
|
|
||||||
}
|
|
||||||
|
|
||||||
return os.Symlink(path, linkTo)
|
|
||||||
}
|
|
||||||
|
|
||||||
// doCopy copies a badger blockstore to another, with an optional filter; if the filter
|
// doCopy copies a badger blockstore to another, with an optional filter; if the filter
|
||||||
// is not nil, then only cids that satisfy the filter will be copied.
|
// is not nil, then only cids that satisfy the filter will be copied.
|
||||||
func (b *Blockstore) doCopy(from, to *badger.DB) error {
|
func (b *Blockstore) doCopy(from, to *badger.DB) error {
|
||||||
|
Loading…
Reference in New Issue
Block a user