Merge pull request #4257 from ElrondNetwork/force-start-from-network

Added force-start-from-network flag
multiversx · Jul 4, 2022 · 84c9960 · 84c9960
2 parents 5ba9c12 + 92dde49
commit 84c9960
Show file tree

Hide file tree

Showing 8 changed files with 33 additions and 2 deletions.
diff --git a/cmd/node/flags.go b/cmd/node/flags.go
@@ -322,6 +322,11 @@ var (
 			"and by advanced users, as a too high memory ballast could lead to Out Of Memory panics. The memory ballast " +
 			"should not be higher than 20-25% of the machine's available RAM",
 	}
+	// forceStartFromNetwork defines a flag that will force the start from network bootstrap process
+	forceStartFromNetwork = cli.BoolFlag{
+		Name:  "force-start-from-network",
+		Usage: "Flag that will force the start from network bootstrap process",
+	}
 )
 
 func getFlags() []cli.Flag {
@@ -371,6 +376,7 @@ func getFlags() []cli.Flag {
 		fullArchive,
 		memBallast,
 		memoryUsageToCreateProfiles,
+		forceStartFromNetwork,
 	}
 }
 
@@ -393,6 +399,7 @@ func getFlagsConfig(ctx *cli.Context, log logger.Logger) *config.ContextFlagsCon
 	flagsConfig.EnablePprof = ctx.GlobalBool(profileMode.Name)
 	flagsConfig.UseLogView = ctx.GlobalBool(useLogView.Name)
 	flagsConfig.ValidatorKeyIndex = ctx.GlobalInt(validatorKeyIndex.Name)
+	flagsConfig.ForceStartFromNetwork = ctx.GlobalBool(forceStartFromNetwork.Name)
 	return flagsConfig
 }
 

diff --git a/config/contextFlagsConfig.go b/config/contextFlagsConfig.go
@@ -1,6 +1,6 @@
 package config
 
-//ContextFlagsConfig will keep the values for the cli.Context flags
+// ContextFlagsConfig will keep the values for the cli.Context flags
 type ContextFlagsConfig struct {
 	WorkingDir                   string
 	EnableGops                   bool
@@ -20,6 +20,7 @@ type ContextFlagsConfig struct {
 	ValidatorKeyIndex            int
 	EnableRestAPIServerDebugMode bool
 	Version                      string
+	ForceStartFromNetwork        bool
 }
 
 // ImportDbConfig will hold the import-db parameters

diff --git a/epochStart/bootstrap/process.go b/epochStart/bootstrap/process.go
@@ -85,6 +85,7 @@ type epochStartBootstrap struct {
 	messenger                  Messenger
 	generalConfig              config.Config
 	prefsConfig                config.PreferencesConfig
+	flagsConfig                config.ContextFlagsConfig
 	economicsData              process.EconomicsDataHandler
 	shardCoordinator           sharding.Coordinator
 	genesisNodesConfig         sharding.GenesisNodesSetupHandler
@@ -152,6 +153,7 @@ type ArgsEpochStartBootstrap struct {
 	GeneralConfig              config.Config
 	PrefsConfig                config.PreferencesConfig
 	EnableEpochs               config.EnableEpochs
+	FlagsConfig                config.ContextFlagsConfig
 	EconomicsData              process.EconomicsDataHandler
 	GenesisNodesConfig         sharding.GenesisNodesSetupHandler
 	GenesisShardCoordinator    sharding.Coordinator
@@ -187,6 +189,7 @@ func NewEpochStartBootstrap(args ArgsEpochStartBootstrap) (*epochStartBootstrap,
 		messenger:                  args.Messenger,
 		generalConfig:              args.GeneralConfig,
 		prefsConfig:                args.PrefsConfig,
+		flagsConfig:                args.FlagsConfig,
 		economicsData:              args.EconomicsData,
 		genesisNodesConfig:         args.GenesisNodesConfig,
 		genesisShardCoordinator:    args.GenesisShardCoordinator,
@@ -299,7 +302,12 @@ func (e *epochStartBootstrap) isNodeInGenesisNodesConfig() bool {
 func (e *epochStartBootstrap) Bootstrap() (Parameters, error) {
 	defer e.closeTrieComponents()
 
-	if !e.generalConfig.GeneralSettings.StartInEpochEnabled {
+	if e.flagsConfig.ForceStartFromNetwork {
+		log.Warn("epochStartBootstrap.Bootstrap: forcing start from network")
+	}
+
+	shouldStartFromNetwork := e.generalConfig.GeneralSettings.StartInEpochEnabled || e.flagsConfig.ForceStartFromNetwork
+	if !shouldStartFromNetwork {
 		return e.bootstrapFromLocalStorage()
 	}
 
@@ -325,6 +333,7 @@ func (e *epochStartBootstrap) Bootstrap() (Parameters, error) {
 	}
 
 	params, shouldContinue, err := e.startFromSavedEpoch()
+	shouldContinue = shouldContinue || e.flagsConfig.ForceStartFromNetwork
 	if !shouldContinue {
 		return params, err
 	}

diff --git a/epochStart/bootstrap/process_test.go b/epochStart/bootstrap/process_test.go
@@ -208,6 +208,9 @@ func createMockEpochStartBootstrapArgs(
 				}, nil
 			},
 		},
+		FlagsConfig: config.ContextFlagsConfig{
+			ForceStartFromNetwork: false,
+		},
 	}
 }
 

diff --git a/factory/bootstrapComponents.go b/factory/bootstrapComponents.go
@@ -31,6 +31,7 @@ type BootstrapComponentsFactoryArgs struct {
 	RoundConfig       config.RoundConfig
 	PrefConfig        config.Preferences
 	ImportDbConfig    config.ImportDbConfig
+	FlagsConfig       config.ContextFlagsConfig
 	WorkingDir        string
 	CoreComponents    CoreComponentsHolder
 	CryptoComponents  CryptoComponentsHolder
@@ -43,6 +44,7 @@ type bootstrapComponentsFactory struct {
 	roundConfig       config.RoundConfig
 	prefConfig        config.Preferences
 	importDbConfig    config.ImportDbConfig
+	flagsConfig       config.ContextFlagsConfig
 	workingDir        string
 	coreComponents    CoreComponentsHolder
 	cryptoComponents  CryptoComponentsHolder
@@ -81,6 +83,7 @@ func NewBootstrapComponentsFactory(args BootstrapComponentsFactoryArgs) (*bootst
 		roundConfig:       args.RoundConfig,
 		prefConfig:        args.PrefConfig,
 		importDbConfig:    args.ImportDbConfig,
+		flagsConfig:       args.FlagsConfig,
 		workingDir:        args.WorkingDir,
 		coreComponents:    args.CoreComponents,
 		cryptoComponents:  args.CryptoComponents,
@@ -167,6 +170,7 @@ func (bcf *bootstrapComponentsFactory) Create() (*bootstrapComponents, error) {
 		GeneralConfig:              bcf.config,
 		PrefsConfig:                bcf.prefConfig.Preferences,
 		EnableEpochs:               bcf.epochConfig.EnableEpochs,
+		FlagsConfig:                bcf.flagsConfig,
 		EconomicsData:              bcf.coreComponents.EconomicsData(),
 		GenesisNodesConfig:         bcf.coreComponents.GenesisNodesSetup(),
 		GenesisShardCoordinator:    genesisShardCoordinator,

diff --git a/factory/bootstrapComponents_test.go b/factory/bootstrapComponents_test.go
@@ -164,6 +164,9 @@ func getBootStrapArgs() factory.BootstrapComponentsFactoryArgs {
 			IsImportDBMode: false,
 		},
 		RoundConfig: config.RoundConfig{},
+		FlagsConfig: config.ContextFlagsConfig{
+			ForceStartFromNetwork: false,
+		},
 	}
 }
 

diff --git a/integrationTests/multiShard/endOfEpoch/startInEpoch/startInEpoch_test.go b/integrationTests/multiShard/endOfEpoch/startInEpoch/startInEpoch_test.go
@@ -242,6 +242,9 @@ func testNodeStartsInEpoch(t *testing.T, shardID uint32, expectedHighestRound ui
 			},
 		},
 		ScheduledSCRsStorer: genericMocks.NewStorerMock("path", 0),
+		FlagsConfig: config.ContextFlagsConfig{
+			ForceStartFromNetwork: false,
+		},
 	}
 
 	epochStartBootstrap, err := bootstrap.NewEpochStartBootstrap(argsBootstrapHandler)

diff --git a/node/nodeRunner.go b/node/nodeRunner.go
@@ -1150,6 +1150,7 @@ func (nr *nodeRunner) CreateManagedBootstrapComponents(
 		RoundConfig:       *nr.configs.RoundConfig,
 		PrefConfig:        *nr.configs.PreferencesConfig,
 		ImportDbConfig:    *nr.configs.ImportDbConfig,
+		FlagsConfig:       *nr.configs.FlagsConfig,
 		WorkingDir:        nr.configs.FlagsConfig.WorkingDir,
 		CoreComponents:    coreComponents,
 		CryptoComponents:  cryptoComponents,