Block data migration #147
There are no files selected for viewing
This file contains hidden or 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 |
|---|---|---|
| @@ -1,92 +1,50 @@ | ||
| name: Docker Build Scan | ||
| on: | ||
| pull_request: | ||
| branches: | ||
| - "master" | ||
| - "celo*" | ||
| workflow_dispatch: | ||
|
|
||
| jobs: | ||
| detect-files-changed: | ||
| runs-on: ubuntu-latest | ||
| outputs: | ||
| files-changed: ${{ steps.detect-files-changed.outputs.all_changed_files }} | ||
| steps: | ||
| - uses: actions/checkout@v4 | ||
| - name: Detect files changed | ||
| id: detect-files-changed | ||
| uses: tj-actions/changed-files@v44 | ||
| with: | ||
| separator: ',' | ||
|
|
||
| build-cel2-migration-tool: | ||
| runs-on: ubuntu-latest | ||
| needs: detect-files-changed | ||
| if: | | ||
| contains(needs.detect-files-changed.outputs.files-changed, 'op-chain-ops/cmd/celo-dbmigrate') || | ||
| contains(needs.detect-files-changed.outputs.files-changed, 'op-chain-ops/cmd/celo-migrate') || | ||
| contains(needs.detect-files-changed.outputs.files-changed, 'op-chain-ops/Dockerfile') | ||
| permissions: | ||
| contents: read | ||
| id-token: write | ||
| security-events: write | ||
| steps: | ||
| - uses: actions/checkout@v4 | ||
| - name: Login at GCP Artifact Registry | ||
| uses: celo-org/reusable-workflows/.github/actions/auth-gcp-artifact-registry@v2.0 | ||
| with: | ||
| workload-id-provider: 'projects/1094498259535/locations/global/workloadIdentityPools/gh-optimism/providers/github-by-repos' | ||
| service-account: 'celo-optimism-gh@devopsre.iam.gserviceaccount.com' | ||
| docker-gcp-registries: us-west1-docker.pkg.dev | ||
| - name: Build and push container | ||
| uses: celo-org/reusable-workflows/.github/actions/build-container@v2.0 | ||
| with: | ||
| platforms: linux/amd64 | ||
| registry: us-west1-docker.pkg.dev/devopsre/dev-images/cel2-migration-tool | ||
| tags: ${{ github.sha }} | ||
| context: ./ | ||
| dockerfile: ./op-chain-ops/Dockerfile | ||
| push: true | ||
| trivy: false | ||
This file contains hidden or 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 hidden or 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 |
|---|---|---|
|
|
@@ -77,8 +77,8 @@ github.com/btcsuite/snappy-go v1.0.0/go.mod h1:8woku9dyThutzjeg+3xrA5iCpBRH8XEEg | |
| github.com/btcsuite/websocket v0.0.0-20150119174127-31079b680792/go.mod h1:ghJtEyQwv5/p4Mg4C0fgbePVuGr935/5ddU9Z3TmDRY= | ||
| github.com/btcsuite/winsvc v1.0.0/go.mod h1:jsenWakMcC0zFBFurPLEAyrnc/teJEM1O46fmI40EZs= | ||
| github.com/buger/jsonparser v0.0.0-20181115193947-bf1c66bbce23/go.mod h1:bbYlZJ7hK1yFx9hf58LP0zeX7UjIGs20ufpu3evjr+s= | ||
| github.com/celo-org/op-geth v0.0.0-20240612164035-ef9b9a19f53e h1:7KzqBAm9YmhrdtUG4dssU77za1ytBRuLIoqnzzJoBw8= | ||
| github.com/celo-org/op-geth v0.0.0-20240612164035-ef9b9a19f53e/go.mod h1:vObZmT4rKd8hjSblIktsJHtLX8SXbCoaIXEd42HMDB0= | ||
| github.com/cespare/cp v0.1.0 h1:SE+dxFebS7Iik5LK0tsi1k9ZCxEaFX4AjQmoyA+1dJk= | ||
| github.com/cespare/cp v0.1.0/go.mod h1:SOGHArjBr4JWaSDEVpWpo/hNg6RoKrls6Oh40hiwW+s= | ||
| github.com/cespare/xxhash v1.1.0 h1:a6HrQnmkObjyL+Gs60czilIUGqrzKutQD6XZog3p+ko= | ||
|
|
||
This file contains hidden or 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,30 @@ | ||
| FROM golang:1.21.1-alpine3.18 as builder | ||
|
|
||
| RUN apk --no-cache add make | ||
|
|
||
| COPY ./go.mod /app/go.mod | ||
| COPY ./go.sum /app/go.sum | ||
|
|
||
| WORKDIR /app | ||
|
|
||
| RUN go mod download | ||
|
|
||
| COPY ./op-bindings /app/op-bindings | ||
| COPY ./op-service /app/op-service | ||
| COPY ./op-node /app/op-node | ||
| COPY ./op-chain-ops /app/op-chain-ops | ||
| WORKDIR /app/op-chain-ops | ||
| RUN make celo-dbmigrate celo-migrate | ||
|
|
||
| FROM alpine:3.18 | ||
| RUN apk --no-cache add ca-certificates bash rsync | ||
|
|
||
| # RUN addgroup -S app && adduser -S app -G app | ||
| # USER app | ||
| WORKDIR /app | ||
|
|
||
| COPY --from=builder /app/op-chain-ops/bin/celo-dbmigrate /app | ||
| COPY --from=builder /app/op-chain-ops/bin/celo-migrate /app | ||
| ENV PATH="/app:${PATH}" | ||
|
|
||
| ENTRYPOINT ["/app/celo-dbmigrate"] |
This file contains hidden or 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 |
|---|---|---|
|
|
@@ -15,6 +15,9 @@ receipt-reference-builder: | |
| op-upgrade: | ||
| go build -o ./bin/op-upgrade ./cmd/op-upgrade/main.go | ||
|
|
||
| celo-dbmigrate: | ||
| go build -o ./bin/celo-dbmigrate ./cmd/celo-dbmigrate/*.go | ||
|
|
||
| celo-migrate: | ||
| go build -o ./bin/celo-migrate ./cmd/celo-migrate/*.go | ||
|
|
||
|
|
||
This file contains hidden or 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,191 @@ | ||
| package main | ||
|
|
||
| import ( | ||
| "context" | ||
| "fmt" | ||
| "path/filepath" | ||
|
|
||
| "github.com/ethereum/go-ethereum/common" | ||
| "github.com/ethereum/go-ethereum/core/rawdb" | ||
| "github.com/ethereum/go-ethereum/ethdb" | ||
| "github.com/ethereum/go-ethereum/log" | ||
| "golang.org/x/sync/errgroup" | ||
| ) | ||
|
|
||
| // RLPBlockRange is a range of blocks in RLP format | ||
| type RLPBlockRange struct { | ||
| start uint64 | ||
| hashes [][]byte | ||
| headers [][]byte | ||
| bodies [][]byte | ||
| receipts [][]byte | ||
| tds [][]byte | ||
| } | ||
|
|
||
| func migrateAncientsDb(oldDBPath, newDBPath string, batchSize uint64) (uint64, error) { | ||
| oldFreezer, err := rawdb.NewChainFreezer(filepath.Join(oldDBPath, "ancient"), "", false) // TODO can't be readonly because we need the .meta files to be created | ||
| if err != nil { | ||
| return 0, fmt.Errorf("failed to open old freezer: %w", err) | ||
| } | ||
| defer oldFreezer.Close() | ||
|
|
||
| newFreezer, err := rawdb.NewChainFreezer(filepath.Join(newDBPath, "ancient"), "", false) | ||
| if err != nil { | ||
| return 0, fmt.Errorf("failed to open new freezer: %w", err) | ||
| } | ||
| defer newFreezer.Close() | ||
|
|
||
| numAncientsOld, err := oldFreezer.Ancients() | ||
| if err != nil { | ||
| return 0, fmt.Errorf("failed to get number of ancients in old freezer: %w", err) | ||
| } | ||
|
|
||
| numAncientsNew, err := newFreezer.Ancients() | ||
| if err != nil { | ||
| return 0, fmt.Errorf("failed to get number of ancients in new freezer: %w", err) | ||
| } | ||
|
|
||
| log.Info("Migration Started", "process", "ancients migration", "startBlock", numAncientsNew, "endBlock", numAncientsOld, "count", numAncientsOld-numAncientsNew+1) | ||
| g, ctx := errgroup.WithContext(context.Background()) | ||
| readChan := make(chan RLPBlockRange, 10) | ||
| transformChan := make(chan RLPBlockRange, 10) | ||
|
|
||
| log.Info("Migrating data", "start", numAncientsNew, "end", numAncientsOld, "step", batchSize) | ||
|
|
||
| g.Go(func() error { | ||
| return readAncientBlocks(ctx, oldFreezer, numAncientsNew, numAncientsOld, batchSize, readChan) | ||
| }) | ||
| g.Go(func() error { return transformBlocks(ctx, readChan, transformChan) }) | ||
| g.Go(func() error { return writeAncientBlocks(ctx, newFreezer, transformChan) }) | ||
|
|
||
| if err = g.Wait(); err != nil { | ||
| return 0, fmt.Errorf("failed to migrate ancients: %w", err) | ||
| } | ||
|
|
||
| numAncientsNew, err = newFreezer.Ancients() | ||
| if err != nil { | ||
| return 0, fmt.Errorf("failed to get number of ancients in new freezer: %w", err) | ||
| } | ||
|
|
||
| log.Info("Migration End", "process", "ancients migration", "totalBlocks", numAncientsNew) | ||
| return numAncientsNew, nil | ||
| } | ||
|
|
||
| func readAncientBlocks(ctx context.Context, freezer *rawdb.Freezer, startBlock, endBlock, batchSize uint64, out chan<- RLPBlockRange) error { | ||
| defer close(out) | ||
|
|
||
| for i := startBlock; i < endBlock; i += batchSize { | ||
| select { | ||
| case <-ctx.Done(): | ||
| return ctx.Err() | ||
| default: | ||
| count := min(batchSize, endBlock-i+1) | ||
| start := i | ||
|
|
||
| blockRange := RLPBlockRange{ | ||
| start: start, | ||
| hashes: make([][]byte, count), | ||
| headers: make([][]byte, count), | ||
| bodies: make([][]byte, count), | ||
| receipts: make([][]byte, count), | ||
| tds: make([][]byte, count), | ||
| } | ||
| var err error | ||
|
|
||
| blockRange.hashes, err = freezer.AncientRange(rawdb.ChainFreezerHashTable, start, count, 0) | ||
| if err != nil { | ||
| return fmt.Errorf("failed to read hashes from old freezer: %w", err) | ||
| } | ||
| blockRange.headers, err = freezer.AncientRange(rawdb.ChainFreezerHeaderTable, start, count, 0) | ||
| if err != nil { | ||
| return fmt.Errorf("failed to read headers from old freezer: %w", err) | ||
| } | ||
| blockRange.bodies, err = freezer.AncientRange(rawdb.ChainFreezerBodiesTable, start, count, 0) | ||
| if err != nil { | ||
| return fmt.Errorf("failed to read bodies from old freezer: %w", err) | ||
| } | ||
| blockRange.receipts, err = freezer.AncientRange(rawdb.ChainFreezerReceiptTable, start, count, 0) | ||
| if err != nil { | ||
| return fmt.Errorf("failed to read receipts from old freezer: %w", err) | ||
| } | ||
| blockRange.tds, err = freezer.AncientRange(rawdb.ChainFreezerDifficultyTable, start, count, 0) | ||
| if err != nil { | ||
| return fmt.Errorf("failed to read tds from old freezer: %w", err) | ||
| } | ||
|
|
||
| out <- blockRange | ||
| } | ||
| } | ||
| return nil | ||
| } | ||
|
|
||
| func transformBlocks(ctx context.Context, in <-chan RLPBlockRange, out chan<- RLPBlockRange) error { | ||
| // Transform blocks from the in channel and send them to the out channel | ||
| defer close(out) | ||
| for blockRange := range in { | ||
| select { | ||
| case <-ctx.Done(): | ||
| return ctx.Err() | ||
| default: | ||
| for i := range blockRange.hashes { | ||
| blockNumber := blockRange.start + uint64(i) | ||
|
|
||
| newHeader, err := transformHeader(blockRange.headers[i]) | ||
| if err != nil { | ||
| return fmt.Errorf("can't transform header: %w", err) | ||
| } | ||
| newBody, err := transformBlockBody(blockRange.bodies[i]) | ||
| if err != nil { | ||
| return fmt.Errorf("can't transform body: %w", err) | ||
| } | ||
|
|
||
| if yes, newHash := hasSameHash(newHeader, blockRange.hashes[i]); !yes { | ||
| log.Error("Hash mismatch", "block", blockNumber, "oldHash", common.BytesToHash(blockRange.hashes[i]), "newHash", newHash) | ||
| return fmt.Errorf("hash mismatch at block %d", blockNumber) | ||
| } | ||
|
|
||
| blockRange.headers[i] = newHeader | ||
| blockRange.bodies[i] = newBody | ||
| } | ||
| out <- blockRange | ||
| } | ||
| } | ||
| return nil | ||
| } | ||
|
|
||
| func writeAncientBlocks(ctx context.Context, freezer *rawdb.Freezer, in <-chan RLPBlockRange) error { | ||
| // Write blocks from the in channel to the newDb | ||
| for blockRange := range in { | ||
| select { | ||
| case <-ctx.Done(): | ||
| return ctx.Err() | ||
| default: | ||
| _, err := freezer.ModifyAncients(func(aWriter ethdb.AncientWriteOp) error { | ||
| for i := range blockRange.hashes { | ||
| blockNumber := blockRange.start + uint64(i) | ||
| if err := aWriter.AppendRaw(rawdb.ChainFreezerHashTable, blockNumber, blockRange.hashes[i]); err != nil { | ||
| return fmt.Errorf("can't write hash to Freezer: %w", err) | ||
| } | ||
| if err := aWriter.AppendRaw(rawdb.ChainFreezerHeaderTable, blockNumber, blockRange.headers[i]); err != nil { | ||
| return fmt.Errorf("can't write header to Freezer: %w", err) | ||
| } | ||
| if err := aWriter.AppendRaw(rawdb.ChainFreezerBodiesTable, blockNumber, blockRange.bodies[i]); err != nil { | ||
| return fmt.Errorf("can't write body to Freezer: %w", err) | ||
| } | ||
| if err := aWriter.AppendRaw(rawdb.ChainFreezerReceiptTable, blockNumber, blockRange.receipts[i]); err != nil { | ||
| return fmt.Errorf("can't write receipts to Freezer: %w", err) | ||
| } | ||
| if err := aWriter.AppendRaw(rawdb.ChainFreezerDifficultyTable, blockNumber, blockRange.tds[i]); err != nil { | ||
| return fmt.Errorf("can't write td to Freezer: %w", err) | ||
| } | ||
| } | ||
| return nil | ||
| }) | ||
| if err != nil { | ||
| return fmt.Errorf("failed to write block range: %w", err) | ||
| } | ||
| log.Info("Wrote ancient blocks", "start", blockRange.start, "end", blockRange.start+uint64(len(blockRange.hashes)-1), "count", len(blockRange.hashes)) | ||
| } | ||
| } | ||
| return nil | ||
| } |
Oops, something went wrong.
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.
These changes added here c861c70