[Merged by Bors] - Add node merge tool #5685
Closed
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Codecov ReportAttention: Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## develop #5685 +/- ##
=========================================
- Coverage 79.8% 79.7% -0.1%
=========================================
Files 279 279
Lines 28510 28507 -3
=========================================
- Hits 22760 22739 -21
- Misses 4185 4199 +14
- Partials 1565 1569 +4 ☔ View full report in Codecov by Sentry. |
fasmat
force-pushed
the
merge-state-tools
branch
3 times, most recently
from
865b233
to
a666b7e
Compare
fasmat
commented
Mar 12, 2024
dshulyak
reviewed
Mar 13, 2024
dshulyak
reviewed
Mar 13, 2024
dshulyak
reviewed
Mar 13, 2024
dshulyak
reviewed
Mar 13, 2024
dshulyak
reviewed
Mar 13, 2024
dshulyak
approved these changes
Mar 13, 2024
fasmat
force-pushed
the
merge-state-tools
branch
from
be9c147
to
4386273
Compare
fasmat
force-pushed
the
merge-state-tools
branch
from
e9efc86
to
87649bb
Compare
|
bors merge |
spacemesh-bors bot
pushed a commit
that referenced
this pull request
Mar 13, 2024
## Motivation Adds a new command / tool for merging two nodes into one. Additionally the CI has been updated to include the new tool in a release and build docker images using the right version.
|
Build failed: |
|
bors merge |
spacemesh-bors bot
pushed a commit
that referenced
this pull request
Mar 13, 2024
## Motivation Adds a new command / tool for merging two nodes into one. Additionally the CI has been updated to include the new tool in a release and build docker images using the right version.
|
Pull request successfully merged into develop. Build succeeded: |
spacemesh-bors
bot
changed the title
4 tasks
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Motivation
Adds a new command / tool for merging two nodes into one. Additionally the CI has been updated to include the new tool in a release and build docker images using the right version.
Description
The CLI tool takes 2 parameters:
--fromwhich specifies thedata-dirof the source node which's identities shall be merged to the target node--towhich specifies thedata-dirof the target node that receives the identities and state of the source node, can be an empty directory (so that a user can setup a new node with all their existing identities merged)The tool only works with nodes that are set up for remote smeshing (i.e. have no
local.keyor supervised post service configuration). It will copy all identities from the source node to the target node while preserving their (file) names and will fail on conflicts (e.g. trying to merge the state of the same identity twice).Test Plan
Tests for the new tool have been added.
TODO