Skip to content

Commit

Permalink
Merge pull request #6219 from onflow/fxamacker/update-v0.33-atree-inl…
Browse files Browse the repository at this point in the history
…ining

 Update v0.33-atree-inlining to v0.33.37
  • Loading branch information
fxamacker authored Jul 16, 2024
2 parents e002c6a + 3d2e3c2 commit 34eb095
Show file tree
Hide file tree
Showing 11 changed files with 462 additions and 49 deletions.
11 changes: 6 additions & 5 deletions cmd/execution_builder.go
Original file line number Diff line number Diff line change
Expand Up @@ -1391,6 +1391,7 @@ func (exeNode *ExecutionNode) LoadBootstrapper(node *NodeConfig) error {

// if the execution database does not exist, then we need to bootstrap the execution database.
if !bootstrapped {

err := wal.CheckpointHasRootHash(
node.Logger,
path.Join(node.BootstrapDir, bootstrapFilenames.DirnameExecutionState),
Expand Down Expand Up @@ -1498,16 +1499,16 @@ func copyBootstrapState(dir, trie string) error {
from, to := path.Join(dir, bootstrapFilenames.DirnameExecutionState), trie

log.Info().Str("dir", dir).Str("trie", trie).
Msgf("copying checkpoint file %v from directory: %v, to: %v", filename, from, to)
Msgf("linking checkpoint file %v from directory: %v, to: %v", filename, from, to)

copiedFiles, err := wal.CopyCheckpointFile(filename, from, to)
copiedFiles, err := wal.SoftlinkCheckpointFile(filename, from, to)
if err != nil {
return fmt.Errorf("can not copy checkpoint file %s, from %s to %s",
filename, from, to)
return fmt.Errorf("can not link checkpoint file %s, from %s to %s, %w",
filename, from, to, err)
}

for _, newPath := range copiedFiles {
fmt.Printf("copied root checkpoint file from directory: %v, to: %v\n", from, newPath)
fmt.Printf("linked root checkpoint file from directory: %v, to: %v\n", from, newPath)
}

return nil
Expand Down
Loading

0 comments on commit 34eb095

Please sign in to comment.