Skip to content

Commit

Permalink
Merge branch 'mikers/BadgerVersions' of github.com:filecoin-project/l…
Browse files Browse the repository at this point in the history
…otus into mikers/BadgerVersions
  • Loading branch information
snissn committed Aug 13, 2024
2 parents 6d5d679 + ee737c9 commit 26610e7
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 2 deletions.
2 changes: 1 addition & 1 deletion blockstore/badger/versions/badger.go
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ func OpenBadgerDB(opts Options) (BadgerDB, error) {
db = BadgerDB(&BadgerV2{dbV2})
}
default:
return nil, errors.New("unsupported badger version")
err = fmt.Errorf("unsupported badger version: %v", opts.BadgerVersion)

Check failure on line 43 in blockstore/badger/versions/badger.go

View workflow job for this annotation

GitHub Actions / Build

undefined: fmt

Check failure on line 43 in blockstore/badger/versions/badger.go

View workflow job for this annotation

GitHub Actions / Check (gen-check)

undefined: fmt

Check failure on line 43 in blockstore/badger/versions/badger.go

View workflow job for this annotation

GitHub Actions / Test (itest-eth_block_hash)

undefined: fmt

Check failure on line 43 in blockstore/badger/versions/badger.go

View workflow job for this annotation

GitHub Actions / Test (itest-migration)

undefined: fmt

Check failure on line 43 in blockstore/badger/versions/badger.go

View workflow job for this annotation

GitHub Actions / Test (itest-eth_block_hash)

undefined: fmt

Check failure on line 43 in blockstore/badger/versions/badger.go

View workflow job for this annotation

GitHub Actions / Test (itest-migration)

undefined: fmt

Check failure on line 43 in blockstore/badger/versions/badger.go

View workflow job for this annotation

GitHub Actions / Test (itest-deadlines)

undefined: fmt

Check failure on line 43 in blockstore/badger/versions/badger.go

View workflow job for this annotation

GitHub Actions / Test (itest-deadlines)

undefined: fmt

Check failure on line 43 in blockstore/badger/versions/badger.go

View workflow job for this annotation

GitHub Actions / Test (itest-eth_legacy_transactions)

undefined: fmt

Check failure on line 43 in blockstore/badger/versions/badger.go

View workflow job for this annotation

GitHub Actions / Test (itest-eth_legacy_transactions)

undefined: fmt

Check failure on line 43 in blockstore/badger/versions/badger.go

View workflow job for this annotation

GitHub Actions / Test (itest-eth_hash_lookup)

undefined: fmt

Check failure on line 43 in blockstore/badger/versions/badger.go

View workflow job for this annotation

GitHub Actions / Test (itest-eth_hash_lookup)

undefined: fmt

Check failure on line 43 in blockstore/badger/versions/badger.go

View workflow job for this annotation

GitHub Actions / Test (itest-splitstore)

undefined: fmt

Check failure on line 43 in blockstore/badger/versions/badger.go

View workflow job for this annotation

GitHub Actions / Test (itest-splitstore)

undefined: fmt

Check failure on line 43 in blockstore/badger/versions/badger.go

View workflow job for this annotation

GitHub Actions / Test (itest-wdpost_config)

undefined: fmt

Check failure on line 43 in blockstore/badger/versions/badger.go

View workflow job for this annotation

GitHub Actions / Test (itest-wdpost_config)

undefined: fmt

Check failure on line 43 in blockstore/badger/versions/badger.go

View workflow job for this annotation

GitHub Actions / Test (itest-paych_api)

undefined: fmt

Check failure on line 43 in blockstore/badger/versions/badger.go

View workflow job for this annotation

GitHub Actions / Test (itest-paych_api)

undefined: fmt

Check failure on line 43 in blockstore/badger/versions/badger.go

View workflow job for this annotation

GitHub Actions / Test (itest-paych_cli)

undefined: fmt

Check failure on line 43 in blockstore/badger/versions/badger.go

View workflow job for this annotation

GitHub Actions / Test (itest-paych_cli)

undefined: fmt

Check failure on line 43 in blockstore/badger/versions/badger.go

View workflow job for this annotation

GitHub Actions / Test (itest-supply)

undefined: fmt

Check failure on line 43 in blockstore/badger/versions/badger.go

View workflow job for this annotation

GitHub Actions / Test (itest-supply)

undefined: fmt

Check failure on line 43 in blockstore/badger/versions/badger.go

View workflow job for this annotation

GitHub Actions / Test (itest-eth_filter)

undefined: fmt

Check failure on line 43 in blockstore/badger/versions/badger.go

View workflow job for this annotation

GitHub Actions / Test (itest-eth_filter)

undefined: fmt

Check failure on line 43 in blockstore/badger/versions/badger.go

View workflow job for this annotation

GitHub Actions / Test (itest-wdpost_dispute)

undefined: fmt

Check failure on line 43 in blockstore/badger/versions/badger.go

View workflow job for this annotation

GitHub Actions / Test (itest-wdpost_dispute)

undefined: fmt

Check failure on line 43 in blockstore/badger/versions/badger.go

View workflow job for this annotation

GitHub Actions / Test (itest-sector_terminate)

undefined: fmt

Check failure on line 43 in blockstore/badger/versions/badger.go

View workflow job for this annotation

GitHub Actions / Test (itest-sector_terminate)

undefined: fmt

Check failure on line 43 in blockstore/badger/versions/badger.go

View workflow job for this annotation

GitHub Actions / Test (itest-fevm)

undefined: fmt

Check failure on line 43 in blockstore/badger/versions/badger.go

View workflow job for this annotation

GitHub Actions / Test (itest-fevm)

undefined: fmt

Check failure on line 43 in blockstore/badger/versions/badger.go

View workflow job for this annotation

GitHub Actions / Test (itest-api)

undefined: fmt

Check failure on line 43 in blockstore/badger/versions/badger.go

View workflow job for this annotation

GitHub Actions / Test (itest-api)

undefined: fmt

Check failure on line 43 in blockstore/badger/versions/badger.go

View workflow job for this annotation

GitHub Actions / Test (itest-wdpost_worker_config)

undefined: fmt

Check failure on line 43 in blockstore/badger/versions/badger.go

View workflow job for this annotation

GitHub Actions / Test (itest-wdpost_worker_config)

undefined: fmt

Check failure on line 43 in blockstore/badger/versions/badger.go

View workflow job for this annotation

GitHub Actions / Test (itest-manual_onboarding)

undefined: fmt

Check failure on line 43 in blockstore/badger/versions/badger.go

View workflow job for this annotation

GitHub Actions / Test (itest-manual_onboarding)

undefined: fmt

Check failure on line 43 in blockstore/badger/versions/badger.go

View workflow job for this annotation

GitHub Actions / Test (itest-gateway)

undefined: fmt

Check failure on line 43 in blockstore/badger/versions/badger.go

View workflow job for this annotation

GitHub Actions / Test (itest-gateway)

undefined: fmt

Check failure on line 43 in blockstore/badger/versions/badger.go

View workflow job for this annotation

GitHub Actions / Test (itest-sector_unseal)

undefined: fmt

Check failure on line 43 in blockstore/badger/versions/badger.go

View workflow job for this annotation

GitHub Actions / Test (itest-sector_unseal)

undefined: fmt

Check failure on line 43 in blockstore/badger/versions/badger.go

View workflow job for this annotation

GitHub Actions / Test (itest-sector_import_full)

undefined: fmt

Check failure on line 43 in blockstore/badger/versions/badger.go

View workflow job for this annotation

GitHub Actions / Test (itest-sector_import_full)

undefined: fmt

Check failure on line 43 in blockstore/badger/versions/badger.go

View workflow job for this annotation

GitHub Actions / Test (itest-direct_data_onboard_verified)

undefined: fmt

Check failure on line 43 in blockstore/badger/versions/badger.go

View workflow job for this annotation

GitHub Actions / Test (itest-direct_data_onboard_verified)

undefined: fmt

Check failure on line 43 in blockstore/badger/versions/badger.go

View workflow job for this annotation

GitHub Actions / Test (itest-sector_import_simple)

undefined: fmt

Check failure on line 43 in blockstore/badger/versions/badger.go

View workflow job for this annotation

GitHub Actions / Test (itest-sector_import_simple)

undefined: fmt

Check failure on line 43 in blockstore/badger/versions/badger.go

View workflow job for this annotation

GitHub Actions / Test (itest-harmonydb)

undefined: fmt

Check failure on line 43 in blockstore/badger/versions/badger.go

View workflow job for this annotation

GitHub Actions / Test (itest-harmonydb)

undefined: fmt

Check failure on line 43 in blockstore/badger/versions/badger.go

View workflow job for this annotation

GitHub Actions / Test (itest-direct_data_onboard)

undefined: fmt

Check failure on line 43 in blockstore/badger/versions/badger.go

View workflow job for this annotation

GitHub Actions / Test (itest-direct_data_onboard)

undefined: fmt

Check failure on line 43 in blockstore/badger/versions/badger.go

View workflow job for this annotation

GitHub Actions / Test (itest-wdpost_no_miner_storage)

undefined: fmt

Check failure on line 43 in blockstore/badger/versions/badger.go

View workflow job for this annotation

GitHub Actions / Test (itest-wdpost_no_miner_storage)

undefined: fmt

Check failure on line 43 in blockstore/badger/versions/badger.go

View workflow job for this annotation

GitHub Actions / Test (itest-sealing_resources)

undefined: fmt

Check failure on line 43 in blockstore/badger/versions/badger.go

View workflow job for this annotation

GitHub Actions / Test (itest-sealing_resources)

undefined: fmt

Check failure on line 43 in blockstore/badger/versions/badger.go

View workflow job for this annotation

GitHub Actions / Test (itest-wdpost)

undefined: fmt

Check failure on line 43 in blockstore/badger/versions/badger.go

View workflow job for this annotation

GitHub Actions / Test (itest-wdpost)

undefined: fmt

Check failure on line 43 in blockstore/badger/versions/badger.go

View workflow job for this annotation

GitHub Actions / Test (unit-cli)

undefined: fmt

Check failure on line 43 in blockstore/badger/versions/badger.go

View workflow job for this annotation

GitHub Actions / Test (unit-cli)

undefined: fmt

Check failure on line 43 in blockstore/badger/versions/badger.go

View workflow job for this annotation

GitHub Actions / Test (unit-rest)

undefined: fmt

Check failure on line 43 in blockstore/badger/versions/badger.go

View workflow job for this annotation

GitHub Actions / Test (unit-rest)

undefined: fmt

Check failure on line 43 in blockstore/badger/versions/badger.go

View workflow job for this annotation

GitHub Actions / Test (itest-decode_params)

undefined: fmt

Check failure on line 43 in blockstore/badger/versions/badger.go

View workflow job for this annotation

GitHub Actions / Test (itest-decode_params)

undefined: fmt

Check failure on line 43 in blockstore/badger/versions/badger.go

View workflow job for this annotation

GitHub Actions / Test (itest-niporep_manual)

undefined: fmt

Check failure on line 43 in blockstore/badger/versions/badger.go

View workflow job for this annotation

GitHub Actions / Test (itest-niporep_manual)

undefined: fmt

Check failure on line 43 in blockstore/badger/versions/badger.go

View workflow job for this annotation

GitHub Actions / Check (lint-all)

undefined: fmt (typecheck)

Check failure on line 43 in blockstore/badger/versions/badger.go

View workflow job for this annotation

GitHub Actions / Test (itest-eth_account_abstraction)

undefined: fmt

Check failure on line 43 in blockstore/badger/versions/badger.go

View workflow job for this annotation

GitHub Actions / Test (itest-eth_account_abstraction)

undefined: fmt

Check failure on line 43 in blockstore/badger/versions/badger.go

View workflow job for this annotation

GitHub Actions / Test (itest-dup_mpool_messages)

undefined: fmt

Check failure on line 43 in blockstore/badger/versions/badger.go

View workflow job for this annotation

GitHub Actions / Test (itest-dup_mpool_messages)

undefined: fmt

Check failure on line 43 in blockstore/badger/versions/badger.go

View workflow job for this annotation

GitHub Actions / Test (itest-eth_balance)

undefined: fmt

Check failure on line 43 in blockstore/badger/versions/badger.go

View workflow job for this annotation

GitHub Actions / Test (itest-eth_balance)

undefined: fmt

Check failure on line 43 in blockstore/badger/versions/badger.go

View workflow job for this annotation

GitHub Actions / Test (itest-eth_api)

undefined: fmt

Check failure on line 43 in blockstore/badger/versions/badger.go

View workflow job for this annotation

GitHub Actions / Test (itest-eth_api)

undefined: fmt

Check failure on line 43 in blockstore/badger/versions/badger.go

View workflow job for this annotation

GitHub Actions / Test (itest-eth_bytecode)

undefined: fmt

Check failure on line 43 in blockstore/badger/versions/badger.go

View workflow job for this annotation

GitHub Actions / Test (itest-eth_bytecode)

undefined: fmt

Check failure on line 43 in blockstore/badger/versions/badger.go

View workflow job for this annotation

GitHub Actions / Test (itest-deals_invalid_utf8_label)

undefined: fmt

Check failure on line 43 in blockstore/badger/versions/badger.go

View workflow job for this annotation

GitHub Actions / Test (itest-deals_invalid_utf8_label)

undefined: fmt

Check failure on line 43 in blockstore/badger/versions/badger.go

View workflow job for this annotation

GitHub Actions / Test (itest-eth_config)

undefined: fmt

Check failure on line 43 in blockstore/badger/versions/badger.go

View workflow job for this annotation

GitHub Actions / Test (itest-eth_config)

undefined: fmt

Check failure on line 43 in blockstore/badger/versions/badger.go

View workflow job for this annotation

GitHub Actions / Test (itest-eth_fee_history)

undefined: fmt

Check failure on line 43 in blockstore/badger/versions/badger.go

View workflow job for this annotation

GitHub Actions / Test (itest-eth_fee_history)

undefined: fmt

Check failure on line 43 in blockstore/badger/versions/badger.go

View workflow job for this annotation

GitHub Actions / Test (itest-sector_pledge)

undefined: fmt

Check failure on line 43 in blockstore/badger/versions/badger.go

View workflow job for this annotation

GitHub Actions / Test (itest-sector_pledge)

undefined: fmt

Check failure on line 43 in blockstore/badger/versions/badger.go

View workflow job for this annotation

GitHub Actions / Test (itest-eth_deploy)

undefined: fmt

Check failure on line 43 in blockstore/badger/versions/badger.go

View workflow job for this annotation

GitHub Actions / Test (itest-eth_deploy)

undefined: fmt

Check failure on line 43 in blockstore/badger/versions/badger.go

View workflow job for this annotation

GitHub Actions / Test (itest-gas_estimation)

undefined: fmt

Check failure on line 43 in blockstore/badger/versions/badger.go

View workflow job for this annotation

GitHub Actions / Test (itest-gas_estimation)

undefined: fmt

Check failure on line 43 in blockstore/badger/versions/badger.go

View workflow job for this annotation

GitHub Actions / Test (itest-lite_migration)

undefined: fmt

Check failure on line 43 in blockstore/badger/versions/badger.go

View workflow job for this annotation

GitHub Actions / Test (itest-lite_migration)

undefined: fmt

Check failure on line 43 in blockstore/badger/versions/badger.go

View workflow job for this annotation

GitHub Actions / Test (itest-fevm_address)

undefined: fmt

Check failure on line 43 in blockstore/badger/versions/badger.go

View workflow job for this annotation

GitHub Actions / Test (itest-fevm_address)

undefined: fmt

Check failure on line 43 in blockstore/badger/versions/badger.go

View workflow job for this annotation

GitHub Actions / Test (itest-get_messages_in_ts)

undefined: fmt

Check failure on line 43 in blockstore/badger/versions/badger.go

View workflow job for this annotation

GitHub Actions / Test (itest-get_messages_in_ts)

undefined: fmt

Check failure on line 43 in blockstore/badger/versions/badger.go

View workflow job for this annotation

GitHub Actions / Test (itest-eth_transactions)

undefined: fmt

Check failure on line 43 in blockstore/badger/versions/badger.go

View workflow job for this annotation

GitHub Actions / Test (itest-eth_transactions)

undefined: fmt

Check failure on line 43 in blockstore/badger/versions/badger.go

View workflow job for this annotation

GitHub Actions / Test (itest-lookup_robust_address)

undefined: fmt

Check failure on line 43 in blockstore/badger/versions/badger.go

View workflow job for this annotation

GitHub Actions / Test (itest-lookup_robust_address)

undefined: fmt

Check failure on line 43 in blockstore/badger/versions/badger.go

View workflow job for this annotation

GitHub Actions / Test (itest-fevm_events)

undefined: fmt

Check failure on line 43 in blockstore/badger/versions/badger.go

View workflow job for this annotation

GitHub Actions / Test (itest-fevm_events)

undefined: fmt

Check failure on line 43 in blockstore/badger/versions/badger.go

View workflow job for this annotation

GitHub Actions / Test (itest-worker)

undefined: fmt

Check failure on line 43 in blockstore/badger/versions/badger.go

View workflow job for this annotation

GitHub Actions / Test (itest-worker)

undefined: fmt

Check failure on line 43 in blockstore/badger/versions/badger.go

View workflow job for this annotation

GitHub Actions / Test (itest-mempool)

undefined: fmt

Check failure on line 43 in blockstore/badger/versions/badger.go

View workflow job for this annotation

GitHub Actions / Test (itest-mempool)

undefined: fmt

Check failure on line 43 in blockstore/badger/versions/badger.go

View workflow job for this annotation

GitHub Actions / Test (itest-mpool_msg_uuid)

undefined: fmt

Check failure on line 43 in blockstore/badger/versions/badger.go

View workflow job for this annotation

GitHub Actions / Test (itest-mpool_msg_uuid)

undefined: fmt

Check failure on line 43 in blockstore/badger/versions/badger.go

View workflow job for this annotation

GitHub Actions / Test (itest-multisig)

undefined: fmt

Check failure on line 43 in blockstore/badger/versions/badger.go

View workflow job for this annotation

GitHub Actions / Test (itest-multisig)

undefined: fmt

Check failure on line 43 in blockstore/badger/versions/badger.go

View workflow job for this annotation

GitHub Actions / Test (itest-eth_conformance)

undefined: fmt

Check failure on line 43 in blockstore/badger/versions/badger.go

View workflow job for this annotation

GitHub Actions / Test (itest-eth_conformance)

undefined: fmt

Check failure on line 43 in blockstore/badger/versions/badger.go

View workflow job for this annotation

GitHub Actions / Test (itest-msgindex)

undefined: fmt

Check failure on line 43 in blockstore/badger/versions/badger.go

View workflow job for this annotation

GitHub Actions / Test (itest-msgindex)

undefined: fmt

Check failure on line 43 in blockstore/badger/versions/badger.go

View workflow job for this annotation

GitHub Actions / Test (itest-path_detach_redeclare)

undefined: fmt

Check failure on line 43 in blockstore/badger/versions/badger.go

View workflow job for this annotation

GitHub Actions / Test (itest-path_detach_redeclare)

undefined: fmt

Check failure on line 43 in blockstore/badger/versions/badger.go

View workflow job for this annotation

GitHub Actions / Test (itest-mpool_push_with_uuid)

undefined: fmt

Check failure on line 43 in blockstore/badger/versions/badger.go

View workflow job for this annotation

GitHub Actions / Test (itest-mpool_push_with_uuid)

undefined: fmt

Check failure on line 43 in blockstore/badger/versions/badger.go

View workflow job for this annotation

GitHub Actions / Test (itest-pending_deal_allocation)

undefined: fmt

Check failure on line 43 in blockstore/badger/versions/badger.go

View workflow job for this annotation

GitHub Actions / Test (itest-pending_deal_allocation)

undefined: fmt

Check failure on line 43 in blockstore/badger/versions/badger.go

View workflow job for this annotation

GitHub Actions / Test (itest-self_sent_txn)

undefined: fmt

Check failure on line 43 in blockstore/badger/versions/badger.go

View workflow job for this annotation

GitHub Actions / Test (itest-self_sent_txn)

undefined: fmt

Check failure on line 43 in blockstore/badger/versions/badger.go

View workflow job for this annotation

GitHub Actions / Test (itest-nonce)

undefined: fmt

Check failure on line 43 in blockstore/badger/versions/badger.go

View workflow job for this annotation

GitHub Actions / Test (itest-nonce)

undefined: fmt

Check failure on line 43 in blockstore/badger/versions/badger.go

View workflow job for this annotation

GitHub Actions / Test (itest-net)

undefined: fmt

Check failure on line 43 in blockstore/badger/versions/badger.go

View workflow job for this annotation

GitHub Actions / Test (itest-net)

undefined: fmt

Check failure on line 43 in blockstore/badger/versions/badger.go

View workflow job for this annotation

GitHub Actions / Test (itest-remove_verifreg_datacap)

undefined: fmt

Check failure on line 43 in blockstore/badger/versions/badger.go

View workflow job for this annotation

GitHub Actions / Test (itest-remove_verifreg_datacap)

undefined: fmt

Check failure on line 43 in blockstore/badger/versions/badger.go

View workflow job for this annotation

GitHub Actions / Test (itest-sector_miner_collateral)

undefined: fmt

Check failure on line 43 in blockstore/badger/versions/badger.go

View workflow job for this annotation

GitHub Actions / Test (itest-sector_miner_collateral)

undefined: fmt

Check failure on line 43 in blockstore/badger/versions/badger.go

View workflow job for this annotation

GitHub Actions / Test (itest-sector_numassign)

undefined: fmt

Check failure on line 43 in blockstore/badger/versions/badger.go

View workflow job for this annotation

GitHub Actions / Test (itest-sector_numassign)

undefined: fmt

Check failure on line 43 in blockstore/badger/versions/badger.go

View workflow job for this annotation

GitHub Actions / Test (unit-storage)

undefined: fmt

Check failure on line 43 in blockstore/badger/versions/badger.go

View workflow job for this annotation

GitHub Actions / Test (unit-storage)

undefined: fmt

Check failure on line 43 in blockstore/badger/versions/badger.go

View workflow job for this annotation

GitHub Actions / Test (itest-verifreg)

undefined: fmt

Check failure on line 43 in blockstore/badger/versions/badger.go

View workflow job for this annotation

GitHub Actions / Test (itest-verifreg)

undefined: fmt

Check failure on line 43 in blockstore/badger/versions/badger.go

View workflow job for this annotation

GitHub Actions / Test (unit-node)

undefined: fmt

Check failure on line 43 in blockstore/badger/versions/badger.go

View workflow job for this annotation

GitHub Actions / Test (unit-node)

undefined: fmt
}

if err != nil {
Expand Down
10 changes: 9 additions & 1 deletion node/config/types.go
Original file line number Diff line number Diff line change
Expand Up @@ -482,9 +482,17 @@ type Pubsub struct {
}

type Chainstore struct {
// EXPERIMENTAL FEATURE. USE WITH CAUTION
// BadgerVersion switches the version of the Badger database engine. The default is 2 which has
// been well-tested and widely deployed. Switching this to version 4 will enable the new version
// of Badger, but the blockstore will be incompatible with Lotus running with version 2. Switching
// versions can only be done when the blockstore is empty and will be repopulated from a snapshot
// or chain sync. It cannot be upgraded or downgraded with existing data and there is currently
// no automatic migration tooling.
// This is an experimental feature and should not be used in production.
BadgerVersion int
EnableSplitstore bool
Splitstore Splitstore
BadgerVersion int
}

type Splitstore struct {
Expand Down

0 comments on commit 26610e7

Please sign in to comment.