TrueCloudLab/frostfs-node
18
1
Fork 27
Code Issues 94 Pull requests 5 Projects Releases 1 Activity Actions 3

shard: Use mode from config on reload #1182

Merged
fyrchik merged 1 commit from acid-ant/frostfs-node:bugfix/1173-use-mode-from-cfg-on-reload into master 2024-06-20 11:29:19 +00:00
Conversation 1 Commits 1 Files changed 2 +1 -4
2 changed files with 1 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
internal/logs/logs.go
View file

@ -247,7 +247,6 @@ const (
ShardCouldNotCloseShardComponent = "could not close shard component" ShardCouldNotCloseShardComponent = "could not close shard component"
ShardCantOpenMetabaseMoveToADegradedMode = "can't open metabase, move to a degraded mode" ShardCantOpenMetabaseMoveToADegradedMode = "can't open metabase, move to a degraded mode"
ShardCantInitializeMetabaseMoveToADegradedreadonlyMode = "can't initialize metabase, move to a degraded-read-only mode" ShardCantInitializeMetabaseMoveToADegradedreadonlyMode = "can't initialize metabase, move to a degraded-read-only mode"
ShardTryingToRestoreReadwriteMode = "trying to restore read-write mode"
ShardStopEventListenerByClosedEventChannel = "stop event listener by closed `event` channel" ShardStopEventListenerByClosedEventChannel = "stop event listener by closed `event` channel"
ShardStopEventListenerByClosedStopChannel = "stop event listener by closed `stop` channel" ShardStopEventListenerByClosedStopChannel = "stop event listener by closed `stop` channel"
ShardStopEventListenerByContext = "stop event listener by context" ShardStopEventListenerByContext = "stop event listener by context"

4
pkg/local_object_storage/shard/control.go
View file

@ -418,9 +418,7 @@ func (s *Shard) Reload(ctx context.Context, opts ...Option) error {
return err return err
} }
} }
return s.setMode(c.info.Mode)
s.log.Info(logs.ShardTryingToRestoreReadwriteMode)
return s.setMode(mode.ReadWrite)
} }
fyrchik commented 2024-06-18 12:02:30 +00:00
Outdated
Review
Copy link

Add zap.Stringer("mode", mode) ?

Add `zap.Stringer("mode", mode)` ?
fyrchik commented 2024-06-18 12:03:19 +00:00
Outdated
Review
Copy link

О in Gitea stays for "Отзывчивость"

О in Gitea stays for "Отзывчивость"
😆 1
acid-ant commented 2024-06-19 14:04:41 +00:00
Outdated
Review
Copy link

It's already done here, looks redundant.

It's already done [here](https://git.frostfs.info/TrueCloudLab/frostfs-node/src/commit/75eedf71f31c8d0d68500779954e708fa884c3ee/pkg/local_object_storage/shard/mode.go#L28), looks redundant.
fyrchik commented 2024-06-19 17:23:44 +00:00
Outdated
Review
Copy link

How about removing this line then? Seems redundant.

How about removing this line then? Seems redundant.
acid-ant commented 2024-06-20 05:56:17 +00:00
Outdated
Review
Copy link

Agree, updated.

Agree, updated.
fyrchik commented 2024-06-18 12:02:33 +00:00
Outdated
Review
Copy link

Add zap.Stringer("mode", mode) ?

Add `zap.Stringer("mode", mode)` ?
fyrchik commented 2024-06-18 12:02:39 +00:00
Outdated
Review
Copy link

Add zap.Stringer("mode", mode) ?

Add `zap.Stringer("mode", mode)` ?
fyrchik commented 2024-06-18 12:02:40 +00:00
Outdated
Review
Copy link

Add zap.Stringer("mode", mode) ?

Add `zap.Stringer("mode", mode)` ?
fyrchik commented 2024-06-18 12:02:40 +00:00
Outdated
Review
Copy link

Add zap.Stringer("mode", mode) ?

Add `zap.Stringer("mode", mode)` ?
fyrchik commented 2024-06-18 12:02:41 +00:00
Outdated
Review
Copy link

Add zap.Stringer("mode", mode) ?

Add `zap.Stringer("mode", mode)` ?
func (s *Shard) lockExclusive() func() { func (s *Shard) lockExclusive() func() {