refactor!(storage-manager): remove replication to start-over #1406
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
J-Loudet
added
breaking-change
J-Loudet
force-pushed
the
refactor/storage-manager/remove-replication
branch
4 times, most recently
from
8222b03 to
50bd9e0
Compare
|
Relevant internal tests: https://github.com/ZettaScaleLabs/zenoh-tests/actions/runs/10923144776 |
|
This PR looks good. |
J-Loudet
force-pushed
the
refactor/storage-manager/remove-replication
branch
from
50bd9e0 to
e48c4bd
Compare
The methods `create_and_start_storage` and `start_storage` were in two separate files -- the former calling the latter. This commit regroups them in the same file. * plugins/zenoh-plugin-storage-manager/src/backends_mgt.rs: deleted the file, exporting its content to `storages_mgt.rs`. * plugins/zenoh-plugin-storage-manager/src/lib.rs: fixed the imports. * plugins/zenoh-plugin-storage-manager/src/replica/mod.rs: fixed the imports. * plugins/zenoh-plugin-storage-manager/src/replica/storage.rs: fixed the imports. * plugins/zenoh-plugin-storage-manager/src/storages_mgt.rs: imported the code contained in `backends_mgt.rs`. Signed-off-by: Julien Loudet <[email protected]>
…_storage` * plugins/zenoh-plugin-storage-manager/src/storages_mgt.rs: merged the two functions together. Signed-off-by: Julien Loudet <[email protected]>
This commit is a first step towards a clearer separation between the management of a storage and the replication feature. No internal logic or code was modified. This commit only offers a first, incomplete, level of separation between the two functionalities. * plugins/zenoh-plugin-storage-manager/src/replica/mod.rs: - fixed the import statements, - created a `service` module. * plugins/zenoh-plugin-storage-manager/src/replica/service.rs: - moved the `ReplicationService` structure there. * plugins/zenoh-plugin-storage-manager/src/storages_mgt/mod.rs: - fixed the import statements after the move, * plugins/zenoh-plugin-storage-manager/src/storages_mgt/service.rs: - moved the `StorageService` structure and implementation there, - fixed the import statements, - removed the `ReplicationService` structure. Signed-off-by: Julien Loudet <[email protected]>
BREAKING CHANGE: the replication feature no longer exists.
Sometimes, starting from scratch is easier…
The code of the storage functionality and of the replication were
completely entangled.
The main purpose of this commit is to clearly separate both. A second
objective is to bootstrap the rewrite of the replication.
Note that the code of the replication was not deleted from the
repository as it will be used as a basis for the rewrite.
* Cargo.lock: (see Cargo.toml).
* DEFAULT_CONFIG.json5: removed the `replica_config` section.
* plugins/zenoh-backend-traits/src/config.rs: removed the
`ReplicaConfig` structure.
* plugins/zenoh-plugin-storage-manager/Cargo.toml:
- removed the unused dependencies:
- crc
- derive-new
- serde
- sorted alphabetically `tracing`.
* plugins/zenoh-plugin-storage-manager/src/lib.rs: removed the `replica`
module.
* plugins/zenoh-plugin-storage-manager/src/storages_mgt/mod.rs: removed
the call to the Replica service.
* plugins/zenoh-plugin-storage-manager/src/storages_mgt/service.rs:
removed the replica related code
- removed the `replication` field of the `StorageService` structure,
- removed the `initialize_if_empty` method that was only used when a
storage was configured to replicate its data,
- removed the duplicated code in the main loop of the
`start_storage_queryable_subscriber`.
* plugins/zenoh-plugin-storage-manager/src/replica/align_queryable.rs:
deleted.
* plugins/zenoh-plugin-storage-manager/src/replica/aligner.rs: deleted.
* plugins/zenoh-plugin-storage-manager/src/replica/digest.rs: deleted.
* plugins/zenoh-plugin-storage-manager/src/replica/mod.rs: deleted.
* plugins/zenoh-plugin-storage-manager/src/replica/service.rs: deleted.
* plugins/zenoh-plugin-storage-manager/src/replica/snapshotter.rs:
deleted.
Signed-off-by: Julien Loudet <[email protected]>
Fixing the typos led to format changes. * plugins/zenoh-plugin-storage-manager/src/lib.rs: - voulme -> volume - admoin -> admin * plugins/zenoh-plugin-storage-manager/src/storages_mgt/service.rs: - ovderriding -> overriding - makeit -> make it Signed-off-by: Julien Loudet <[email protected]>
This structure was only created once to instantly be "split".
* plugins/zenoh-plugin-storage-manager/src/storages_mgt/mod.rs:
- removed the unused `Capability` import,
- removed the structure `StoreIntercept`,
* plugins/zenoh-plugin-storage-manager/src/storages_mgt/service.rs:
- removed the `StoreIntercept` import,
- changed the signature of the `start` method to take the `storage`
and the `capability` as argument instead of the `StoreIntercept`.
Signed-off-by: Julien Loudet <[email protected]>
The replication service needs to access the underlying `dyn Storage` in a separate task and mutate its internal state. This commit simply changes the location where the storage is wrapped inside an `Arc<Mutex<_>>`. * plugins/zenoh-plugin-storage-manager/src/storages_mgt/mod.rs: wrap the `dyn Storage` inside an `Arc<Mutex<_>>` before spawning the `StorageService`. * plugins/zenoh-plugin-storage-manager/src/storages_mgt/service.rs: update the signature of the method `start` to accept an `Arc<Mutex<Box dyn Storage>>` instead of a `Box<dyn Storage>`. Signed-off-by: Julien Loudet <[email protected]>
This is mainly to avoid confusion with the crate of the same name. * plugins/zenoh-plugin-storage-manager/src/storages_mgt/mod.rs: renamed `zenoh` into `zenoh_session`. Signed-off-by: Julien Loudet <[email protected]>
J-Loudet
force-pushed
the
refactor/storage-manager/remove-replication
branch
from
e48c4bd to
8eddaaa
Compare
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.
The purpose of this pull request is to remove the previous implementation of the Replication feature in order to facilitate its rewrite.
See individual commits for details.