conduit: pipeline run loop implementation

conduit/pipeline.go

@@ -131,13 +131,33 @@ type pipelineImpl struct {
 	importer   *importers.Importer
 	processors []*processors.Processor
 	exporter   *exporters.Exporter
+	round      basics.Round
 }
 
 func (p *pipelineImpl) Start() error {
 	p.logger.Infof("Starting Pipeline Initialization")
 
 	// TODO Need to change interfaces to accept config of map[string]interface{}
 
+	exporterLogger := log.New()
+	exporterLogger.SetFormatter(
+		PluginLogFormatter{
+			Formatter: &log.JSONFormatter{
+				DisableHTMLEscape: true,
+			},
+			Type: "Exporter",
+			Name: (*p.exporter).Metadata().Name(),
+		},
+	)
+
+	jsonEncode := string(json.Encode(p.cfg.Exporter.Config))
+	err := (*p.exporter).Init(plugins.PluginConfig(jsonEncode), exporterLogger)
+	exporterName := (*p.exporter).Metadata().Name()
+	if err != nil {
+		return fmt.Errorf("Pipeline.Start(): could not initialize Exporter (%s): %w", exporterName, err)
+	}
+	p.logger.Infof("Initialized Exporter: %s", exporterName)
+
 	importerLogger := log.New()
 	importerLogger.SetFormatter(
 		PluginLogFormatter{
@@ -150,25 +170,28 @@ func (p *pipelineImpl) Start() error {
 	)
 
 	// TODO modify/fix ?
-	jsonEncode := string(json.Encode(p.cfg.Importer.Config))
+	jsonEncode = string(json.Encode(p.cfg.Importer.Config))
 	genesis, err := (*p.importer).Init(p.ctx, plugins.PluginConfig(jsonEncode), importerLogger)
 
-	currentRound := basics.Round(0)
+	importerName := (*p.importer).Metadata().Name()
+	if err != nil {
+		return fmt.Errorf("Pipeline.Start(): could not initialize importer (%s): %w", importerName, err)
+	}
+	p.round = basics.Round((*p.exporter).Round())
+	err = (*p.exporter).HandleGenesis(*genesis)
+	if err != nil {
+		return fmt.Errorf("Pipeline.Start(): exporter could not handle genesis (%s): %w", exporterName, err)
+	}
+	p.logger.Infof("Initialized Importer: %s", importerName)
 
 	var initProvider data.InitProvider = &PipelineInitProvider{
-		currentRound: &currentRound,
+		currentRound: &p.round,
 		genesis:      genesis,
 	}
 
 	p.initProvider = &initProvider
 
-	importerName := (*p.importer).Metadata().Name()
-	if err != nil {
-		return fmt.Errorf("Pipeline.Start(): could not initialize importer (%s): %w", importerName, err)
-	}
-	p.logger.Infof("Initialized Importer: %s", importerName)
-
-	for _, processor := range p.processors {
+	for idx, processor := range p.processors {
 
 		processorLogger := log.New()
 		processorLogger.SetFormatter(
@@ -180,8 +203,8 @@ func (p *pipelineImpl) Start() error {
 				Name: (*processor).Metadata().Name(),
 			},
 		)
-
-		err := (*processor).Init(p.ctx, *p.initProvider, "")
+		jsonEncode = string(json.Encode(p.cfg.Processors[idx].Config))
+		err := (*processor).Init(p.ctx, *p.initProvider, plugins.PluginConfig(jsonEncode), processorLogger)
 		processorName := (*processor).Metadata().Name()
 		if err != nil {
 			return fmt.Errorf("Pipeline.Start(): could not initialize processor (%s): %w", processorName, err)
@@ -190,25 +213,7 @@ func (p *pipelineImpl) Start() error {
 
 	}
 
-	exporterLogger := log.New()
-	exporterLogger.SetFormatter(
-		PluginLogFormatter{
-			Formatter: &log.JSONFormatter{
-				DisableHTMLEscape: true,
-			},
-			Type: "Exporter",
-			Name: (*p.exporter).Metadata().Name(),
-		},
-	)
-
-	err = (*p.exporter).Init("", p.logger)
-	ExporterName := (*p.exporter).Metadata().Name()
-	if err != nil {
-		return fmt.Errorf("Pipeline.Start(): could not initialize Exporter (%s): %w", ExporterName, err)
-	}
-	p.logger.Infof("Initialized Exporter: %s", ExporterName)
-
-	return nil
+	return p.RunPipeline()
 }
 
 func (p *pipelineImpl) Stop() error {
@@ -231,6 +236,44 @@ func (p *pipelineImpl) Stop() error {
 	return nil
 }
 
+// RunPipeline pushes block data through the pipeline
+func (p *pipelineImpl) RunPipeline() error {
+	for {
+		// TODO Retries?
+		p.logger.Infof("Pipeline round: %v", p.round)
+		// fetch block
+		blkData, err := (*p.importer).GetBlock(uint64(p.round))
+		if err != nil {
+			p.logger.Errorf("%v\n", err)
+			return err
+		}
+		// run through processors
+		for _, proc := range p.processors {
+			blkData, err = (*proc).Process(blkData)
+			if err != nil {
+				p.logger.Errorf("%v\n", err)
+				return err
+			}
+		}
+		// run through exporter
+		err = (*p.exporter).Receive(blkData)
+		if err != nil {
+			p.logger.Errorf("%v\n", err)
+			return err
+		}
+		// Callback Processors
+		for _, proc := range p.processors {
+			err = (*proc).OnComplete(blkData)
+			if err != nil {
+				p.logger.Errorf("%v\n", err)
+				return err
+			}
+		}
+		// Increment Round
+		p.round++
+	}
+}
+
 // MakePipeline creates a Pipeline
 func MakePipeline(cfg *PipelineConfig, logger *log.Logger) (Pipeline, error) {
 

exporters/postgresql/postgresql_exporter.go

@@ -2,15 +2,20 @@ package postgresql
 
 import (
 	"fmt"
+
+	"github.com/sirupsen/logrus"
+	"gopkg.in/yaml.v3"
+
 	"github.com/algorand/go-algorand/data/bookkeeping"
 	"github.com/algorand/go-algorand/ledger/ledgercore"
+
 	"github.com/algorand/indexer/data"
 	"github.com/algorand/indexer/exporters"
 	"github.com/algorand/indexer/idb"
+	// Necessary to ensure the postgres implementation has been registered in the idb factory
+	_ "github.com/algorand/indexer/idb/postgres"
 	"github.com/algorand/indexer/importer"
 	"github.com/algorand/indexer/plugins"
-	"github.com/sirupsen/logrus"
-	"gopkg.in/yaml.v3"
 )
 
 const exporterName = "postgresql"

importers/algod/algod_importer.go

@@ -2,7 +2,6 @@ package algodimporter
 
 import (
 	"context"
-	"encoding/json"
 	"fmt"
 	"github.com/algorand/go-algorand/data/bookkeeping"
 	"net/url"
@@ -84,7 +83,7 @@ func (algodImp *algodImporter) Init(ctx context.Context, cfg plugins.PluginConfi
 
 	genesis := bookkeeping.Genesis{}
 
-	err = json.Unmarshal([]byte(genesisResponse), &genesis)
+	err = protocol.DecodeJSON([]byte(genesisResponse), &genesis)
 	if err != nil {
 		return nil, err
 	}

processors/blockprocessor/block_processor.go

@@ -69,15 +69,17 @@ func (proc *blockProcessor) Config() plugins.PluginConfig {
 	return proc.cfg
 }
 
-func (proc *blockProcessor) Init(ctx context.Context, initProvider data.InitProvider, cfg plugins.PluginConfig) error {
+func (proc *blockProcessor) Init(ctx context.Context, initProvider data.InitProvider, cfg plugins.PluginConfig, logger *log.Logger) error {
+	proc.ctx = ctx
+	proc.logger = logger
 
 	// First get the configuration from the string
 	var pCfg processors.BlockProcessorConfig
 	err := yaml.Unmarshal([]byte(cfg), &pCfg)
-
 	if err != nil {
 		return fmt.Errorf("blockprocessor init error: %w", err)
 	}
+	proc.cfg = cfg
 
 	genesis := initProvider.Genesis()
 	round := uint64(initProvider.NextDBRound())
@@ -94,51 +96,35 @@ func (proc *blockProcessor) Init(ctx context.Context, initProvider data.InitProv
 	if l == nil {
 		return fmt.Errorf("ledger was created with nil pointer")
 	}
+	proc.ledger = l
 
 	if uint64(l.Latest()) > round {
 		return fmt.Errorf("the ledger cache is ahead of the required round (%d > %d) and must be re-initialized", l.Latest(), round)
 	}
 
-	if l.Latest() == 0 {
-		blk, cert, err := l.BlockCert(0)
-		if err != nil {
-			return fmt.Errorf("error getting block and certificate: %w", err)
-		}
-		vb := ledgercore.MakeValidatedBlock(blk, ledgercore.StateDelta{})
-
-		blockData := data.MakeBlockDataFromValidatedBlock(vb)
-		blockData.Certificate = &cert
-
-		proc.saveLastValidatedInformation(vb, blk.Round(), cert)
-		err = proc.OnComplete(data.BlockData{})
-
-		if err != nil {
-			return fmt.Errorf("error adding gensis block: %w", err)
-		}
-	}
-
-	proc.ledger = l
-	proc.ctx = ctx
-	proc.cfg = cfg
-
 	return nil
 }
 
 func (proc *blockProcessor) extractValidatedBlockAndPayset(blockCert *rpcs.EncodedBlockCert) (ledgercore.ValidatedBlock, transactions.Payset, error) {
-
+	var vb ledgercore.ValidatedBlock
+	var payset transactions.Payset
 	if blockCert == nil {
-		return ledgercore.ValidatedBlock{}, transactions.Payset{}, fmt.Errorf("cannot process a nil block")
+		return vb, payset, fmt.Errorf("cannot process a nil block")
+	}
+	if blockCert.Block.Round() == 0 && proc.ledger.Latest() == 0 {
+		vb = ledgercore.MakeValidatedBlock(blockCert.Block, ledgercore.StateDelta{})
+		return vb, blockCert.Block.Payset, nil
 	}
 	if blockCert.Block.Round() != (proc.ledger.Latest() + 1) {
-		return ledgercore.ValidatedBlock{}, transactions.Payset{}, fmt.Errorf("invalid round blockCert.Block.Round(): %d nextRoundToProcess: %d", blockCert.Block.Round(), uint64(proc.ledger.Latest())+1)
+		return vb, payset, fmt.Errorf("invalid round blockCert.Block.Round(): %d nextRoundToProcess: %d", blockCert.Block.Round(), uint64(proc.ledger.Latest())+1)
 	}
 
 	// Make sure "AssetCloseAmount" is enabled. If it isn't, override the
 	// protocol and update the blocks to include transactions with modified
 	// apply data.
 	proto, ok := config.Consensus[blockCert.Block.BlockHeader.CurrentProtocol]
 	if !ok {
-		return ledgercore.ValidatedBlock{}, transactions.Payset{}, fmt.Errorf(
+		return vb, payset, fmt.Errorf(
 			"cannot find proto version %s", blockCert.Block.BlockHeader.CurrentProtocol)
 	}
 	protoChanged := !proto.EnableAssetCloseAmount
@@ -152,13 +138,11 @@ func (proc *blockProcessor) extractValidatedBlockAndPayset(blockCert *rpcs.Encod
 	}
 
 	delta, payset, err := ledger.EvalForIndexer(ledgerForEval, &blockCert.Block, proto, resources)
-
 	if err != nil {
-		return ledgercore.ValidatedBlock{}, transactions.Payset{}, fmt.Errorf("eval err: %w", err)
+		return vb, transactions.Payset{}, fmt.Errorf("eval err: %w", err)
 	}
 
 	// validated block
-	var vb ledgercore.ValidatedBlock
 	if protoChanged {
 		block := bookkeeping.Block{
 			BlockHeader: blockCert.Block.BlockHeader,
@@ -255,6 +239,9 @@ func (proc *blockProcessor) Process(input data.BlockData) (data.BlockData, error
 
 func (proc *blockProcessor) OnComplete(_ data.BlockData) error {
 
+	if proc.lastValidatedBlockRound == basics.Round(0) {
+		return nil
+	}
 	// write to ledger
 	err := proc.ledger.AddValidatedBlock(proc.lastValidatedBlock, proc.lastValidatedBlockCertificate)
 	if err != nil {

processors/blockprocessor/block_processor_test.go

@@ -68,7 +68,7 @@ func TestFailedProcess(t *testing.T) {
 	proc := blockprocessor.MakeBlockProcessorHandlerAdapter(&pr, nil)
 	assert.Nil(t, err)
 	err = proc(nil)
-	assert.Contains(t, err.Error(), "invalid round")
+	assert.Nil(t, err)
 
 	genesisBlock, err := l.Block(basics.Round(0))
 	assert.Nil(t, err)

processors/noop/noop_processor.go

@@ -2,6 +2,9 @@ package noop
 
 import (
 	"context"
+
+	"github.com/sirupsen/logrus"
+
 	"github.com/algorand/indexer/data"
 	"github.com/algorand/indexer/plugins"
 	"github.com/algorand/indexer/processors"
@@ -36,7 +39,7 @@ func (p *Processor) Config() plugins.PluginConfig {
 }
 
 // Init noop
-func (p *Processor) Init(_ context.Context, _ data.InitProvider, _ plugins.PluginConfig) error {
+func (p *Processor) Init(_ context.Context, _ data.InitProvider, _ plugins.PluginConfig, _ *logrus.Logger) error {
 	return nil
 }
 

processors/processor.go

@@ -2,6 +2,9 @@ package processors
 
 import (
 	"context"
+
+	"github.com/sirupsen/logrus"
+
 	"github.com/algorand/indexer/data"
 	"github.com/algorand/indexer/plugins"
 )
@@ -18,7 +21,7 @@ type Processor interface {
 	// Typically, used for things like initializing network connections.
 	// The Context passed to Init() will be used for deadlines, cancel signals and other early terminations
 	// The Config passed to Init() will contain the unmarshalled config file specific to this plugin.
-	Init(ctx context.Context, initProvider data.InitProvider, cfg plugins.PluginConfig) error
+	Init(ctx context.Context, initProvider data.InitProvider, cfg plugins.PluginConfig, logger *logrus.Logger) error
 
 	// Close will be called during termination of the Indexer process.
 	Close() error

processors/processor_factory.go

@@ -42,7 +42,7 @@ func ProcessorByName(ctx context.Context, name string, dataDir string, initProvi
 	}
 	processor := constructor.New()
 	cfg := plugins.LoadConfig(logger, dataDir, processor.Metadata())
-	if err := processor.Init(ctx, initProvider, cfg); err != nil {
+	if err := processor.Init(ctx, initProvider, cfg, logger); err != nil {
 		return nil, err
 	}
 	return processor, nil