Skip to content

Only start each plugin once #901

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 13, 2022
Merged

Only start each plugin once #901

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 14 additions & 13 deletions internal/namespace/manager.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -219,23 +219,24 @@ func (nm *namespaceManager) Start() error {
// Ensure metrics are registered
metrics.Registry()
}
// Orchestrators must be started before plugins so as not to miss events
for _, ns := range nm.namespaces {
if ns.plugins.Blockchain.Plugin != nil {
if err := ns.plugins.Blockchain.Plugin.Start(); err != nil {
return err
}
if err := ns.orchestrator.Start(); err != nil {
return err
}
if ns.plugins.DataExchange.Plugin != nil {
if err := ns.plugins.DataExchange.Plugin.Start(); err != nil {
return err
}
}
for _, plugin := range nm.plugins.blockchain {
if err := plugin.plugin.Start(); err != nil {
return err
}
for _, plugin := range ns.plugins.Tokens {
if err := plugin.Plugin.Start(); err != nil {
return err
}
}
for _, plugin := range nm.plugins.dataexchange {
if err := plugin.plugin.Start(); err != nil {
return err
}
if err := ns.orchestrator.Start(); err != nil {
}
for _, plugin := range nm.plugins.tokens {
if err := plugin.plugin.Start(); err != nil {
return err
}
}
Expand Down
31 changes: 15 additions & 16 deletions internal/namespace/manager_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ import (
"github.com/hyperledger/firefly/internal/database/difactory"
"github.com/hyperledger/firefly/internal/dataexchange/dxfactory"
"github.com/hyperledger/firefly/internal/identity/iifactory"
"github.com/hyperledger/firefly/internal/orchestrator"
"github.com/hyperledger/firefly/internal/sharedstorage/ssfactory"
"github.com/hyperledger/firefly/internal/tokens/tifactory"
"github.com/hyperledger/firefly/mocks/blockchainmocks"
Expand Down Expand Up @@ -1117,6 +1116,9 @@ func TestStart(t *testing.T) {
nm.namespaces = map[string]*namespace{
"ns": {orchestrator: mo},
}
nm.plugins.blockchain = nil
nm.plugins.dataexchange = nil
nm.plugins.tokens = nil
nm.metricsEnabled = true

mo.On("Start").Return(nil)
Expand All @@ -1131,16 +1133,14 @@ func TestStartBlockchainFail(t *testing.T) {
nm := newTestNamespaceManager(true)
defer nm.cleanup(t)

mo := &orchestratormocks.Orchestrator{}
nm.namespaces = map[string]*namespace{
"ns": {
plugins: orchestrator.Plugins{
Blockchain: orchestrator.BlockchainPlugin{
Plugin: nm.mbi,
},
},
orchestrator: mo,
},
}

mo.On("Start").Return(nil)
nm.mbi.On("Start").Return(fmt.Errorf("pop"))

err := nm.Start()
Expand All @@ -1152,16 +1152,15 @@ func TestStartDataExchangeFail(t *testing.T) {
nm := newTestNamespaceManager(true)
defer nm.cleanup(t)

mo := &orchestratormocks.Orchestrator{}
nm.namespaces = map[string]*namespace{
"ns": {
plugins: orchestrator.Plugins{
DataExchange: orchestrator.DataExchangePlugin{
Plugin: nm.mdx,
},
},
orchestrator: mo,
},
}
nm.plugins.blockchain = nil

mo.On("Start").Return(nil)
nm.mdx.On("Start").Return(fmt.Errorf("pop"))

err := nm.Start()
Expand All @@ -1173,16 +1172,16 @@ func TestStartTokensFail(t *testing.T) {
nm := newTestNamespaceManager(true)
defer nm.cleanup(t)

mo := &orchestratormocks.Orchestrator{}
nm.namespaces = map[string]*namespace{
"ns": {
plugins: orchestrator.Plugins{
Tokens: []orchestrator.TokensPlugin{{
Plugin: nm.mti,
}},
},
orchestrator: mo,
},
}
nm.plugins.blockchain = nil
nm.plugins.dataexchange = nil

mo.On("Start").Return(nil)
nm.mti.On("Start").Return(fmt.Errorf("pop"))

err := nm.Start()
Expand Down