Merge pull request #1484 from kaleido-io/tokens-startup-retry

Fix AssetManager startup retry
hyperledger · Mar 22, 2024 · f328648 · f328648
2 parents 577e8c4 + 5c7a291
commit f328648
Show file tree

Hide file tree

Showing 50 changed files with 83 additions and 77 deletions.
diff --git a/internal/assets/manager.go b/internal/assets/manager.go
@@ -1,4 +1,4 @@
-// Copyright © 2023 Kaleido, Inc.
+// Copyright © 2024 Kaleido, Inc.
 //
 // SPDX-License-Identifier: Apache-2.0
 //
@@ -73,7 +73,7 @@ type Manager interface {
 	RunOperation(ctx context.Context, op *core.PreparedOperation) (outputs fftypes.JSONObject, phase core.OpPhase, err error)
 
 	// Starts the namespace on each of the configured token plugins
-	Start(ctx context.Context) error
+	Start() error
 }
 
 type assetManager struct {
@@ -173,9 +173,9 @@ func (am *assetManager) GetTokenConnectors(ctx context.Context) []*core.TokenCon
 	return connectors
 }
 
-func (am *assetManager) Start(ctx context.Context) error {
-	f := database.TokenPoolQueryFactory.NewFilter(ctx).And()
-	pools, _, err := am.database.GetTokenPools(ctx, am.namespace, f)
+func (am *assetManager) Start() error {
+	f := database.TokenPoolQueryFactory.NewFilter(am.ctx).And()
+	pools, _, err := am.database.GetTokenPools(am.ctx, am.namespace, f)
 	if err != nil {
 		return err
 	}
@@ -187,7 +187,7 @@ func (am *assetManager) Start(ctx context.Context) error {
 				activePools = append(activePools, pool)
 			}
 		}
-		err := plugin.StartNamespace(ctx, am.namespace, activePools)
+		err := plugin.StartNamespace(am.ctx, am.namespace, activePools)
 		if err != nil {
 			return err
 		}

diff --git a/internal/assets/manager_test.go b/internal/assets/manager_test.go
@@ -188,7 +188,7 @@ func TestStart(t *testing.T) {
 	txHelper, _ := txcommon.NewTransactionHelper(context.Background(), "ns1", mdi, mdm, cmi)
 	am, err := NewAssetManager(context.Background(), "ns1", "blockchain_plugin", mdi, map[string]tokens.Plugin{"magic-tokens": mti}, mim, msa, mbm, mpm, mm, mom, mcm, txHelper, cmi)
 	assert.NoError(t, err)
-	err = am.Start(context.Background())
+	err = am.Start()
 	assert.NoError(t, err)
 }
 
@@ -211,7 +211,7 @@ func TestStartDBError(t *testing.T) {
 	txHelper, _ := txcommon.NewTransactionHelper(context.Background(), "ns1", mdi, mdm, cmi)
 	am, err := NewAssetManager(context.Background(), "ns1", "blockchain_plugin", mdi, map[string]tokens.Plugin{"magic-tokens": mti}, mim, msa, mbm, mpm, mm, mom, mcm, txHelper, cmi)
 	assert.NoError(t, err)
-	err = am.Start(context.Background())
+	err = am.Start()
 	assert.Regexp(t, "pop", err)
 }
 
@@ -241,6 +241,6 @@ func TestStartError(t *testing.T) {
 	txHelper, _ := txcommon.NewTransactionHelper(context.Background(), "ns1", mdi, mdm, cmi)
 	am, err := NewAssetManager(context.Background(), "ns1", "blockchain_plugin", mdi, map[string]tokens.Plugin{"magic-tokens": mti}, mim, msa, mbm, mpm, mm, mom, mcm, txHelper, cmi)
 	assert.NoError(t, err)
-	err = am.Start(context.Background())
+	err = am.Start()
 	assert.Regexp(t, "pop", err)
 }
diff --git a/internal/orchestrator/orchestrator.go b/internal/orchestrator/orchestrator.go
@@ -297,6 +297,9 @@ func (or *orchestrator) Start() (err error) {
 	if err == nil {
 		or.txWriter.Start()
 	}
+	if err == nil {
+		err = or.assets.Start()
+	}
 
 	or.started = true
 	return err
@@ -544,9 +547,6 @@ func (or *orchestrator) initManagers(ctx context.Context) (err error) {
 		if err != nil {
 			return err
 		}
-		if err := or.assets.Start(ctx); err != nil {
-			return err
-		}
 	}
 
 	if or.defsender == nil {

diff --git a/internal/orchestrator/orchestrator_test.go b/internal/orchestrator/orchestrator_test.go
@@ -305,18 +305,6 @@ func TestInitMessagingComponentFail(t *testing.T) {
 	assert.Regexp(t, "FF10128", err)
 }
 
-func TestInitTokensFail(t *testing.T) {
-	or := newTestOrchestrator()
-	defer or.cleanup(t)
-	or.assets = nil
-	or.mom.On("RegisterHandler", mock.Anything, mock.Anything, mock.Anything)
-	or.mmp.On("ConfigureContract", mock.Anything).Return(nil)
-	or.mdi.On("GetTokenPools", mock.Anything, "ns", mock.Anything).Return([]*core.TokenPool{}, nil, nil)
-	or.mti.On("StartNamespace", mock.Anything, "ns", mock.Anything).Return(fmt.Errorf("pop"))
-	err := or.initManagers(context.Background())
-	assert.Regexp(t, "pop", err)
-}
-
 func TestInitEventsComponentFail(t *testing.T) {
 	or := newTestOrchestrator()
 	defer or.cleanup(t)
@@ -496,6 +484,7 @@ func TestStartStopOk(t *testing.T) {
 	or.msd.On("Start").Return(nil)
 	or.mom.On("Start").Return(nil)
 	or.mtw.On("Start").Return()
+	or.mam.On("Start").Return(nil)
 	or.mba.On("WaitStop").Return(nil)
 	or.mbm.On("WaitStop").Return(nil)
 	or.mdm.On("WaitStop").Return(nil)
@@ -518,6 +507,7 @@ func TestStartStopOk(t *testing.T) {
 	or.msd.On("Start").Return(nil)
 	or.mom.On("Start").Return(nil)
 	or.mtw.On("Start").Return()
+	or.mam.On("Start").Return(nil)
 	or.mba.On("WaitStop").Return(nil)
 	or.mbm.On("WaitStop").Return(nil)
 	or.mdm.On("WaitStop").Return(nil)

diff --git a/mocks/apiservermocks/ffi_swagger_gen.go b/mocks/apiservermocks/ffi_swagger_gen.go
diff --git a/mocks/apiservermocks/server.go b/mocks/apiservermocks/server.go
diff --git a/mocks/assetmocks/manager.go b/mocks/assetmocks/manager.go
diff --git a/mocks/batchmocks/manager.go b/mocks/batchmocks/manager.go
diff --git a/mocks/blockchaincommonmocks/firefly_subscriptions.go b/mocks/blockchaincommonmocks/firefly_subscriptions.go
diff --git a/mocks/blockchainmocks/callbacks.go b/mocks/blockchainmocks/callbacks.go
diff --git a/mocks/blockchainmocks/plugin.go b/mocks/blockchainmocks/plugin.go
diff --git a/mocks/broadcastmocks/manager.go b/mocks/broadcastmocks/manager.go
diff --git a/mocks/cachemocks/manager.go b/mocks/cachemocks/manager.go
diff --git a/mocks/contractmocks/manager.go b/mocks/contractmocks/manager.go
diff --git a/mocks/coremocks/operation_callbacks.go b/mocks/coremocks/operation_callbacks.go
diff --git a/mocks/databasemocks/callbacks.go b/mocks/databasemocks/callbacks.go
diff --git a/mocks/databasemocks/plugin.go b/mocks/databasemocks/plugin.go
diff --git a/mocks/dataexchangemocks/callbacks.go b/mocks/dataexchangemocks/callbacks.go
diff --git a/mocks/dataexchangemocks/dx_event.go b/mocks/dataexchangemocks/dx_event.go
diff --git a/mocks/dataexchangemocks/plugin.go b/mocks/dataexchangemocks/plugin.go
diff --git a/mocks/datamocks/manager.go b/mocks/datamocks/manager.go
diff --git a/mocks/definitionsmocks/handler.go b/mocks/definitionsmocks/handler.go
diff --git a/mocks/definitionsmocks/sender.go b/mocks/definitionsmocks/sender.go
diff --git a/mocks/eventmocks/event_manager.go b/mocks/eventmocks/event_manager.go
diff --git a/mocks/eventsmocks/callbacks.go b/mocks/eventsmocks/callbacks.go
diff --git a/mocks/eventsmocks/plugin.go b/mocks/eventsmocks/plugin.go
diff --git a/mocks/identitymanagermocks/manager.go b/mocks/identitymanagermocks/manager.go
diff --git a/mocks/identitymocks/callbacks.go b/mocks/identitymocks/callbacks.go
diff --git a/mocks/identitymocks/plugin.go b/mocks/identitymocks/plugin.go
diff --git a/mocks/metricsmocks/manager.go b/mocks/metricsmocks/manager.go
diff --git a/mocks/multipartymocks/manager.go b/mocks/multipartymocks/manager.go
diff --git a/mocks/namespacemocks/manager.go b/mocks/namespacemocks/manager.go
diff --git a/mocks/networkmapmocks/manager.go b/mocks/networkmapmocks/manager.go
diff --git a/mocks/operationmocks/manager.go b/mocks/operationmocks/manager.go
diff --git a/mocks/orchestratormocks/orchestrator.go b/mocks/orchestratormocks/orchestrator.go
diff --git a/mocks/privatemessagingmocks/manager.go b/mocks/privatemessagingmocks/manager.go
diff --git a/mocks/shareddownloadmocks/callbacks.go b/mocks/shareddownloadmocks/callbacks.go
diff --git a/mocks/shareddownloadmocks/manager.go b/mocks/shareddownloadmocks/manager.go
diff --git a/mocks/sharedstoragemocks/callbacks.go b/mocks/sharedstoragemocks/callbacks.go
diff --git a/mocks/sharedstoragemocks/plugin.go b/mocks/sharedstoragemocks/plugin.go
diff --git a/mocks/spieventsmocks/manager.go b/mocks/spieventsmocks/manager.go
diff --git a/mocks/syncasyncmocks/bridge.go b/mocks/syncasyncmocks/bridge.go
diff --git a/mocks/syncasyncmocks/sender.go b/mocks/syncasyncmocks/sender.go