-
Notifications
You must be signed in to change notification settings - Fork 133
Backport ccm main #1296
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
Backport ccm main #1296
Conversation
|
ad0c3aa
to
6e14276
Compare
Possible improvements / API changes after a brief glance at the code:
|
Notice that I implemented all of this when we had old certificates in the repository. We had to update them, because of the errors thrown by Why old certs worked for
|
Moving such workflows to CCM has 2 advantages:
If we move only part of it, we get neither. So I'll cherry pick commits that move auth, and skip TLS for now. We can do that in the future. Btw is it possible to use domain names instead of ip addresses with scylla? In other words, can we have domain names instead of ip addresses in system.peers in driver-relevant columns? |
scylla can use hostnames, but then you need a dns server to map them. I think generating certs as needed is the best approach, and also give the flexibility to try more variants as needed. |
Is there functionality in CCM to generate certs? Or do we have to do it other way? If Scylla can use hostnames, then we should test it too. @fruch one other question for you. Could you describe (or point to documentation if such exists) what exactly wait-related flags do in CCM, and how do they interact if I specify more than one? |
you are more then welcome to document it. |
I'd be happy to make a PR that improves descriptions, but I would have to first understand those options myself. |
6e14276
to
aeabc5e
Compare
I backported the commits that move auth to CCM. I also removed TLS support from CCM for now. |
Marking as ready. The way I see it the only improvement I can make here is better CCM API - which needs input from others, which is basically a review. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We hold nodes in Arc<RwLock<>>, and methods that give user nodes return that. Maybe we could return refs / mut refs and get rid of Arc<RwLock<>>? I'm not sure.
As of now, there is no use case for Arc<RwLock<>>
- I think we can return refs/mutrefs for now. We could always revert this in the future. It also simplifies the API - I believe NodeList
is no longer necessary then. Instead, we can expose nodes_iter_[mut]()
and get_node_[mut]_by_id
methods on Cluster
.
Currently, append_node()
and add_node()
methods return Arc<RwLock<>>
. They could return node id instead.
|
aeabc5e
to
d546b53
Compare
I have one more idea: we can split off another file from cluster.rs, I would call it |
d546b53
to
f05e4dc
Compare
I did this for 2 commands as an experiment, in additional commit. I like the new version, so unless anyone has different opinion I'll convert the rest of the command to this. @dkropachev I see that both |
b605f97
to
a02254c
Compare
I love the idea. The code in |
7c6d135
to
a939123
Compare
eadb748
to
b34fd43
Compare
Addressed most @wprzytula comments, and responded to rest. |
b34fd43
to
e157681
Compare
Please update the cover letter. |
pub(crate) async fn add_node( | ||
&mut self, | ||
datacenter_id: Option<u16>, | ||
) -> Result<&mut Node, Error> { | ||
let id = self.nodes.get_free_node_id().expect("No available node id"); | ||
let datacenter_id = datacenter_id.unwrap_or(1); | ||
let node_options = NodeOptions { | ||
id, | ||
datacenter_id, | ||
..NodeOptions::from_cluster_opts(&self.opts) | ||
}; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Then just a reminder here.
e157681
to
9701a5f
Compare
ccm module will contain tests that require ccm. It's lib submodule will contain the ccm integration. Why do it this way - which is different than what we did during a hackathon? - Old way required ugly hacks to share test utils between integration test targets, and those hacks did not work well with rust-analyzer. - One target means better compilation time CCM tests will be guardded by a cfg, so we will still be able to run the subset that we want: - All tests: run integration tests with the required cfg - Only CCM tests: as above, but filter by ccm folder - Only non-ccm test: run without the cfg
Co-authored-by: Mikołaj Uzarski <[email protected]> Co-authored-by: Dmitry Kropachev <[email protected]>
For now it will run on each PR. If at some point it becomes too slow we can switch it to running manually and before release.
Co-authored-by: Mikołaj Uzarski <[email protected]>
Auth tests are now run as a part of CCM test suite.
Dropped the commit with Makefile changes and rebased on main. Opened an issue for mixed-shards clusters: #1367 |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM!
This is a backport of the CCM test support developer during hackathon onto main branch.
I mostly took the current state from branch-hackathon. One important change I made is to remove separate
ccm-integration
test target. Instead ccm tests are now a module inintegration
.This avoids the problem with sharing utils. It should also be quicker to compile - no need to link 2 separate binaries.
logged_cmd and ip_allocator were copied with very little changes. In logged_cmd I added a support for non-async command running, needed for destroy_sync in CCM API.
I split CCM API code into two parts:
cli_wrapper
module, which contains a thin layer over CCM cli. It is meant only as way to translate CCM flags to Rust code.This code is fully internal to the crate, so we can change it freely, thus there is no need to spend too much time on it - we can always improve later.
Big parts of the test-API code are unused. This is intentional - I don't want to introduce more CCM tests than necessary, because it would increase CI time.
This code will become used when we introduce other tests.
Pre-review checklist
./docs/source/
.Fixes:
annotations to PR description.