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

CP-48027: Corosync upgrade add cluster_stack_version datamodel change #5567

Open
wants to merge 4 commits into
base: master
Choose a base branch
from

Conversation

Vincent-lau
Copy link
Contributor

@Vincent-lau Vincent-lau commented Apr 17, 2024

This is the core part of the corosync upgrade, mainly deal with the cluster_stack_version datamodel field, and the switching logic for corosync binary and libraries.

The multi-link support will be done in a separte PR.

Best reviewed by commit

@lindig
Copy link
Contributor

lindig commented Apr 18, 2024

Something is wrong here? 5000+ files changed? You might want to split automated tests into a different commit so we can ignore them.

@lindig lindig self-requested a review April 18, 2024 09:00
@Vincent-lau
Copy link
Contributor Author

Vincent-lau commented Apr 18, 2024

Something is wrong here? 5000+ files changed? You might want to split automated tests into a different commit so we can ignore them.

There are autogenerated test files due to the interface change. I could do a separate commit, but that would mean some of the commits will fail the test though. But it looks like even that would not make the CI happy....

@psafont
Copy link
Member

psafont commented Apr 18, 2024

The review dog thing failing is really not good :/

I'll try to make time to reduce complexity in CI so it doesn't fail because of a valid change

@Vincent-lau Vincent-lau force-pushed the private/shul2/corosync3-basic branch 2 times, most recently from 67ff66f to f1c0c2b Compare April 19, 2024 16:04
.github/workflows/main.yml Outdated Show resolved Hide resolved
.github/workflows/main.yml Outdated Show resolved Hide resolved
@psafont
Copy link
Member

psafont commented Apr 29, 2024

Can the conflicts be solved first?

ocaml/idl/datamodel_cluster.ml Show resolved Hide resolved
ocaml/xapi/xapi_clustering.ml Outdated Show resolved Hide resolved
@Vincent-lau Vincent-lau force-pushed the private/shul2/corosync3-basic branch 2 times, most recently from 2ff971f to 99d77a9 Compare May 1, 2024 11:21
@Vincent-lau Vincent-lau force-pushed the private/shul2/corosync3-basic branch from 99d77a9 to cbbc21c Compare May 8, 2024 14:12
ocaml/xapi-idl/cluster/cluster_interface.ml Outdated Show resolved Hide resolved
ocaml/xapi-idl/cluster/cluster_interface.ml Outdated Show resolved Hide resolved
ocaml/xapi/xapi_cluster.ml Outdated Show resolved Hide resolved
ocaml/xapi/xapi_clustering.ml Outdated Show resolved Hide resolved
@Vincent-lau Vincent-lau force-pushed the private/shul2/corosync3-basic branch from d402f1c to d00c393 Compare May 14, 2024 11:20
Add a new field `cluster_stack_version` to the cluster datamodel to
track the version of corosync currently in use. This version will
always be set to 3. Also add logic to switch corosync binary and
associated library versions when a cluster is created, if needed.

Signed-off-by: Vincent Liu <shuntian.liu2@cloud.com>
Signed-off-by: Vincent Liu <shuntian.liu2@cloud.com>
This is purely for testing purpose. Normal user is not allowed to create
a corosync2 cluster.

Signed-off-by: Vincent Liu <shuntian.liu2@cloud.com>
Signed-off-by: Vincent Liu <shuntian.liu2@cloud.com>
@Vincent-lau
Copy link
Contributor Author

hold off merging as there are non-trivial changes after the review. I would like to do some xenrt testing before merging it.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants