TrueCloudLab/frostfs-node
20
1
Fork 27
Code Issues 101 Pull requests 6 Projects Releases 1 Activity Actions

support: morph: Disable kludge by default #859

Merged
fyrchik merged 1 commit from acid-ant/frostfs-node:bugfix/disable-kludge into support/v0.37 2023-12-12 11:26:00 +00:00
Conversation 0 Commits 1 Files changed 5 +8 -8
5 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
cmd/frostfs-ir/config.go
View file

@ -68,7 +68,7 @@ func watchForSignal(cancel func()) {
if err != nil { if err != nil {
log.Error(logs.FrostFSNodeConfigurationReading, zap.Error(err)) log.Error(logs.FrostFSNodeConfigurationReading, zap.Error(err))
} }
client.KeepInvScript = cfg.GetBool("morph.keepinvscript") client.CleanInvScript = cfg.GetBool("morph.cleaninvscript")
log.Info(logs.FrostFSNodeConfigurationHasBeenReloadedSuccessfully) log.Info(logs.FrostFSNodeConfigurationHasBeenReloadedSuccessfully)
case syscall.SIGTERM, syscall.SIGINT: case syscall.SIGTERM, syscall.SIGINT:
log.Info(logs.FrostFSNodeTerminationSignalHasBeenReceivedStopping) log.Info(logs.FrostFSNodeTerminationSignalHasBeenReceivedStopping)

2
cmd/frostfs-ir/main.go
View file

@ -61,7 +61,7 @@ func main() {
var err error var err error
cfg, err = newConfig() cfg, err = newConfig()
exitErr(err) exitErr(err)
client.KeepInvScript = cfg.GetBool("morph.keepinvscript") client.CleanInvScript = cfg.GetBool("morph.cleaninvscript")
logPrm.MetricsNamespace = "frostfs_ir" logPrm.MetricsNamespace = "frostfs_ir"
err = logPrm.SetLevelString( err = logPrm.SetLevelString(

2
cmd/frostfs-node/config.go
View file

@ -214,7 +214,7 @@ func (a *applicationConfiguration) readConfig(c *config.Config) error {
a.EngineCfg.rebuildWorkers = engineconfig.EngineRebuildWorkersCount(c) a.EngineCfg.rebuildWorkers = engineconfig.EngineRebuildWorkersCount(c)
// Kludge // Kludge
client.KeepInvScript = morphconfig.KeepInvocationScript(c) client.CleanInvScript = morphconfig.CleanInvocationScript(c)
return engineconfig.IterateShards(c, false, func(sc *shardconfig.Config) error { return a.updateShardConfig(c, sc) }) return engineconfig.IterateShards(c, false, func(sc *shardconfig.Config) error { return a.updateShardConfig(c, sc) })
} }

6
cmd/frostfs-node/config/morph/config.go
View file

@ -98,7 +98,7 @@ func SwitchInterval(c *config.Config) time.Duration {
return SwitchIntervalDefault return SwitchIntervalDefault
} }
// KeepInvocationScript this is a kludge purely for update to work. // CleanInvocationScript this is a kludge purely for update to work.
func KeepInvocationScript(c *config.Config) bool { func CleanInvocationScript(c *config.Config) bool {
return config.Bool(c.Sub(subsection), "keepinvscript") return config.Bool(c.Sub(subsection), "cleaninvscript")
} }

4
pkg/morph/client/notary.go
View file

@ -68,7 +68,7 @@ const (
var errUnexpectedItems = errors.New("invalid number of NEO VM arguments on stack") var errUnexpectedItems = errors.New("invalid number of NEO VM arguments on stack")
// This is a kludge purely for update to work. // This is a kludge purely for update to work.
var KeepInvScript bool var CleanInvScript bool
func defaultNotaryConfig(c *Client) *notaryCfg { func defaultNotaryConfig(c *Client) *notaryCfg {
return &notaryCfg{ return &notaryCfg{
@ -421,7 +421,7 @@ func (c *Client) NotarySignAndInvokeTX(mainTx *transaction.Transaction) error {
return err return err
} }
if !KeepInvScript { if CleanInvScript {
// This is necessary to suppress this check on neo-go side: // This is necessary to suppress this check on neo-go side:
// https://github.com/nspcc-dev/neo-go/blob/8ed6d97085d3229d4faf56a47bbd6cf73c132a76/pkg/services/notary/notary.go#L538 // https://github.com/nspcc-dev/neo-go/blob/8ed6d97085d3229d4faf56a47bbd6cf73c132a76/pkg/services/notary/notary.go#L538
// This is a kludge purely for update to work. // This is a kludge purely for update to work.