Skip to content
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.

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

node, ir: rename morph config to fschain #3028

Merged
merged 6 commits into from
Nov 27, 2024

Conversation

End-rey
Copy link
Contributor

@End-rey End-rey commented Nov 25, 2024

Closes #3021.

Not sure about

persistateSideChainLastBlockKey = []byte("side_chain_last_processed_block")

and
var persistateSideChainLastBlockKey = []byte("side_chain_last_processed_block")

@End-rey End-rey force-pushed the 3021-rename-morph-config-to-fschain branch from 58241c9 to c4c54cd Compare November 25, 2024 15:44
Copy link

codecov bot commented Nov 25, 2024

Codecov Report

Attention: Patch coverage is 22.68908% with 184 lines in your changes missing coverage. Please review.

Project coverage is 22.65%. Comparing base (6f3ff4a) to head (67d82d2).
Report is 7 commits behind head on master.

Files with missing lines Patch % Lines
pkg/innerring/innerring.go 0.00% 71 Missing ⚠️
cmd/neofs-node/config.go 0.00% 39 Missing ⚠️
.../innerring/processors/governance/process_update.go 0.00% 11 Missing ⚠️
pkg/innerring/deploy.go 0.00% 10 Missing ⚠️
pkg/util/state/storage.go 0.00% 9 Missing ⚠️
cmd/neofs-adm/internal/modules/storagecfg/root.go 0.00% 6 Missing ⚠️
cmd/neofs-adm/internal/modules/root.go 0.00% 5 Missing ⚠️
pkg/innerring/notary.go 0.00% 5 Missing ⚠️
pkg/morph/client/constructor.go 0.00% 4 Missing ⚠️
cmd/neofs-node/cache.go 0.00% 3 Missing ⚠️
... and 13 more
Additional details and impacted files
@@            Coverage Diff             @@
##           master    #3028      +/-   ##
==========================================
+ Coverage   22.62%   22.65%   +0.02%     
==========================================
  Files         791      791              
  Lines       58531    58618      +87     
==========================================
+ Hits        13244    13277      +33     
- Misses      44389    44445      +56     
+ Partials      898      896       -2     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@roman-khimov
Copy link
Member

Not sure about

These are DB keys, not a big problem.

cmd/neofs-node/config.go Outdated Show resolved Hide resolved
pkg/innerring/state.go Outdated Show resolved Hide resolved
cmd/neofs-ir/defaults.go Show resolved Hide resolved
pkg/innerring/config.go Show resolved Hide resolved
pkg/innerring/innerring.go Outdated Show resolved Hide resolved
pkg/innerring/innerring.go Outdated Show resolved Hide resolved
CHANGELOG.md Outdated Show resolved Hide resolved
CHANGELOG.md Outdated Show resolved Hide resolved
Copy link
Member

@carpawell carpawell left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Shouldn't we drop cmd/neofs-node/config/morph?
My vote is for migration for all the db keys that have morph.

cmd/neofs-node/config/fschain/config.go Outdated Show resolved Hide resolved
pkg/innerring/config.go Show resolved Hide resolved
Signed-off-by: Andrey Butusov <[email protected]>
@End-rey End-rey force-pushed the 3021-rename-morph-config-to-fschain branch from c4c54cd to dd416b0 Compare November 26, 2024 13:14
// migration for deprecated DB key
if fromFSChainBlock == 0 && fromDeprectedSidechanBlock != fromFSChainBlock {
fromFSChainBlock = fromDeprectedSidechanBlock
err = server.persistate.SetUInt32(persistateFSChainLastBlockKey, fromFSChainBlock)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

should we drop the previous value? @roman-khimov

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why keeping it? No one cares, can be dropped.

Rename the `morph` section in the code, config and examples to `fschain`.
Maintain compatibility for the transition and warn if `morph` is used.
Migrate data for deprecated DB key to new.

Refs #3021.

Signed-off-by: Andrey Butusov <[email protected]>
@End-rey End-rey force-pushed the 3021-rename-morph-config-to-fschain branch from dd416b0 to 0d6d425 Compare November 26, 2024 17:35
@roman-khimov
Copy link
Member

Tests need to be fixed.

output: Error: unknown command "morph" for "neofs-adm"

We need to keep compatibility here as well.

Leave compatibility with the `morph` command and warn if it executes.

Refs #2702.

Signed-off-by: Andrey Butusov <[email protected]>
Rename the `morph` section in the code, config and examples to `fschain`.
Maintain compatibility for the transition and warn if `morph` is used.
Migrate data for deprecated DB key to new.

Closes #3021.

Signed-off-by: Andrey Butusov <[email protected]>
@End-rey End-rey force-pushed the 3021-rename-morph-config-to-fschain branch from 0d6d425 to 67d82d2 Compare November 27, 2024 13:11
End-rey added a commit to nspcc-dev/neofs-testcases that referenced this pull request Nov 27, 2024
After this nspcc-dev/neofs-node#3028, the `morph` was
renamed to `fschain`.

Signed-off-by: Andrey Butusov <[email protected]>
End-rey added a commit to nspcc-dev/neofs-testcases that referenced this pull request Nov 27, 2024
After this nspcc-dev/neofs-node#3028, the `morph` was
renamed to `fschain`.

Signed-off-by: Andrey Butusov <[email protected]>
@carpawell carpawell merged commit edc95f6 into master Nov 27, 2024
22 checks passed
@carpawell carpawell deleted the 3021-rename-morph-config-to-fschain branch November 27, 2024 21:56
End-rey added a commit to nspcc-dev/neofs-testcases that referenced this pull request Nov 28, 2024
After this nspcc-dev/neofs-node#3028, the `morph` was
renamed to `fschain`.

Signed-off-by: Andrey Butusov <[email protected]>
End-rey added a commit to nspcc-dev/neofs-testcases that referenced this pull request Nov 28, 2024
After this nspcc-dev/neofs-node#3028, the `morph` was
renamed to `fschain`.

Signed-off-by: Andrey Butusov <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Rename morph config to fschain
3 participants