update ledger file path and migration (#1042)

algorand · Jun 22, 2022 · 5f5c7fe · 5f5c7fe
1 parent a6c85a4
commit 5f5c7fe
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 8 deletions.
diff --git a/cmd/algorand-indexer/daemon.go b/cmd/algorand-indexer/daemon.go
@@ -15,6 +15,7 @@ import (
 	"time"
 
 	"github.com/algorand/go-algorand/data/bookkeeping"
+	"github.com/algorand/go-algorand/ledger/ledgercore"
 	"github.com/algorand/go-algorand/logging"
 	"github.com/algorand/go-algorand/protocol"
 	"github.com/algorand/go-algorand/rpcs"
@@ -240,8 +241,17 @@ var daemonCmd = &cobra.Command{
 				maybeFail(err, "Error getting DB round")
 				if nextDBRound > 0 {
 					if catchpoint != "" {
-						err = localledger.RunMigrationFastCatchup(logging.NewLogger(), catchpoint, &opts)
-						maybeFail(err, "Error running ledger migration in fast catchup mode")
+						round, _, err := ledgercore.ParseCatchpointLabel(catchpoint)
+						if err != nil {
+							maybeFail(err, "catchpoint error")
+						}
+						if uint64(round) >= nextDBRound {
+							logger.Warnf("round for given catchpoint is ahead of db round. skip fast catchup")
+						} else {
+							err = localledger.RunMigrationFastCatchup(logging.NewLogger(), catchpoint, &opts)
+							maybeFail(err, "Error running ledger migration in fast catchup mode")
+						}
+
 					}
 					err = localledger.RunMigrationSimple(nextDBRound-1, &opts)
 					maybeFail(err, "Error running ledger migration")

diff --git a/migrations/local_ledger/migration.go b/migrations/local_ledger/migration.go
@@ -61,6 +61,10 @@ func RunMigrationSimple(round uint64, opts *idb.IndexerDbOptions) error {
 	if err != nil {
 		return fmt.Errorf("RunMigration() err: %w", err)
 	}
+	// ledger and db states are in sync
+	if proc.NextRoundToProcess()-1 == round {
+		return nil
+	}
 	bot.SetNextRound(proc.NextRoundToProcess())
 	handler := blockHandler(round, proc, cf, 1*time.Second)
 	bot.SetBlockHandler(handler)

diff --git a/migrations/local_ledger/migration_test.go b/migrations/local_ledger/migration_test.go
@@ -3,7 +3,6 @@ package localledger
 import (
 	"fmt"
 	"os"
-	"path"
 	"path/filepath"
 	"testing"
 
@@ -59,7 +58,7 @@ func TestRunMigration(t *testing.T) {
 	dname, err := os.MkdirTemp("", "indexer")
 	defer os.RemoveAll(dname)
 	opts := idb.IndexerDbOptions{
-		IndexerDatadir: dname + "/",
+		IndexerDatadir: dname,
 		AlgodAddr:      "localhost",
 		AlgodToken:     "AAAAA",
 	}
@@ -69,7 +68,7 @@ func TestRunMigration(t *testing.T) {
 	assert.NoError(t, err)
 	initState, err := util.CreateInitState(&genesis)
 	assert.NoError(t, err)
-	l, err := ledger.OpenLedger(logging.NewLogger(), filepath.Join(path.Dir(opts.IndexerDatadir), "ledger"), false, initState, algodConfig.GetDefaultLocal())
+	l, err := ledger.OpenLedger(logging.NewLogger(), filepath.Join(opts.IndexerDatadir, "ledger"), false, initState, algodConfig.GetDefaultLocal())
 	assert.NoError(t, err)
 	// check 3 rounds written to ledger
 	assert.Equal(t, uint64(3), uint64(l.Latest()))
@@ -79,7 +78,7 @@ func TestRunMigration(t *testing.T) {
 	err = RunMigrationSimple(6, &opts)
 	assert.NoError(t, err)
 
-	l, err = ledger.OpenLedger(logging.NewLogger(), filepath.Join(path.Dir(opts.IndexerDatadir), "ledger"), false, initState, algodConfig.GetDefaultLocal())
+	l, err = ledger.OpenLedger(logging.NewLogger(), filepath.Join(opts.IndexerDatadir, "ledger"), false, initState, algodConfig.GetDefaultLocal())
 	assert.NoError(t, err)
 	assert.Equal(t, uint64(6), uint64(l.Latest()))
 	l.Close()

diff --git a/processor/blockprocessor/block_processor.go b/processor/blockprocessor/block_processor.go
@@ -2,7 +2,6 @@ package blockprocessor
 
 import (
 	"fmt"
-	"path"
 	"path/filepath"
 
 	"github.com/algorand/go-algorand/config"
@@ -45,7 +44,7 @@ func MakeProcessor(genesis *bookkeeping.Genesis, dbRound uint64, datadir string,
 	if err != nil {
 		return nil, fmt.Errorf("MakeProcessor() err: %w", err)
 	}
-	l, err := ledger.OpenLedger(logging.NewLogger(), filepath.Join(path.Dir(datadir), prefix), false, initState, algodConfig.GetDefaultLocal())
+	l, err := ledger.OpenLedger(logging.NewLogger(), filepath.Join(datadir, prefix), false, initState, algodConfig.GetDefaultLocal())
 	if err != nil {
 		return nil, fmt.Errorf("MakeProcessor() err: %w", err)
 	}