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

Merge master into py3 for coveralls #5776

Conversation

ashwin9390
Copy link
Contributor

@ashwin9390 ashwin9390 commented Jul 4, 2024

Based on feedback from #5774

Merge master into feature/py3. for coveralls

Author: Signed-off-by: Bernhard Kaindl [email protected]

Committed by: Signed-off-by: Ashwinh [email protected]

BengangY and others added 30 commits April 18, 2024 15:02
CP-47655: [Toolstack] - Associate/disassociate VM to/from anti-affinity group

Signed-off-by: Bengang Yuan <[email protected]>
…ffinity group

UT - CP-47304: [Toolstack] - Add data model for anti-affinity group

Signed-off-by: Bengang Yuan <[email protected]>
…P-47304

CP-47304: Add anti-affinity groups to the datamodel
In VM anti-affinity datamodel PR (xapi-project#5573),
there is many-many relation between VMs and VM groups.
 When changing the VM.groups manually, the VM_group.VMs will be updated automatically.
But when removing a VM group, the VM.groups will not be updated automatically.
This commit aims to update VM.groups for all VMs in a VM group when it is being removed.

Signed-off-by: Bengang Yuan <[email protected]>
…A-391880

CA-391880: Update related field 'groups' of VM when destroying VM group.
VM in an anti-affinity group will choose a host based on the following steps:
1. If the VM is associated with an anti-affinity group, compute the number
   of VMs associated with this anti-affinity group for each host.
2. Group these hosts based on the VM's count. The hosts in one group have the
   same number of VMs in one anti-affinity group. Sort all the host groups
   ascending based on the VM's count.
3. If a host is the affinity host of this VM, it will be treated as a single
   host group and be put on the head of the group list.
4. Choose a host randomly which the VM can run on it from each group.

Signed-off-by: Bengang Yuan <[email protected]>
…P-47302

CP-47302: VM start with anti-affinity
When reverting to a snapshot, "groups" needs to be in `do_not_copy`
to reserve the latest value of the VM.

Signed-off-by: Bengang Yuan <[email protected]>
…A-392177

CA-392177: Keep current group after reverting from snapshot
Resolve dependency cycling issue if we call Xapi_alerts inside pool_features.
Error: dependency cycle between modules in _build/default/ocaml/xapi:
   Xha_statefile
-> Sm
-> Sm_exec
-> Xapi_session
-> Pool_features
-> Xapi_vm_group_helpers
-> Xapi_alert
-> Xapi_http
-> Xapi_session

Signed-off-by: Lunfan Zhang <[email protected]>
The generation of breach alerts during operations on VMs or groups, triggered when all running VMs within a group are breached (i.e., placed on the same host).

The following may generate or dismiss alerts:

Starting and resuming a VM.
Stopping and suspending a VM.
Pausing and unpausing a VM.
Migrating a VM.
Moving a VM from one group to another.
Destroying a VM group.
Changing the license from Premium to Standard dismisses all breach alerts, while changing from Standard to Premium generates them.

In other scenarios, such as when a VM changes state from paused to shutdown, rebooting the VM will not trigger or dismiss alerts.

Signed-off-by: Lunfan Zhang <[email protected]>
…official/CP-47656

CP-47656 VM anti-affinity generate breach alert
The recommendations are read from files '/etc/xapi.pool-recommendations.d/*'
and exposed to clients. They are read-only and only for clients, hence they
don't impact the behavior of Xapi directly but only indirectly as they
inform a client's behavior.

Signed-off-by: Bengang Yuan <[email protected]>
The recommendations are read from '/etc/xapi.pool-recommendations.d/*.conf'.
When Xapi starts, it will read each file and update the recommendations into
the database. If we need to add recommendations to other type objects, e.g.
host, VM, etc in the future, just add a similar 'xapi.*-recommendations.d'
directory and define the path in xapi_globs.

Signed-off-by: Bengang Yuan <[email protected]>
…P-48570

CP-48570: Load recommendations from config file when Xapi starts
Check feature flag in these places:
1. VM start.
2. Host evacuation. When this PR is raised, the host evacuation PR is
   still in review. So this PR doesn't include the checking for host
   evacuation. It will be included in another new PR.
3. Create VM group.
4. VM.set_groups. Adding VMs to a group and removing VMs from a group
   are all forbidden. If customers need to remove VMs from a group,
   just destroy the group.
5. Send VM anti-affinity alerts.
Also, based on our discussion, the name of feature is changed from
`VM_anti_affinity` to `VM_group`.

Signed-off-by: Bengang Yuan <[email protected]>
…P-48011-review

CP-48011: XAPI Support anti-affinity feature check
Control domains, templates, and snapshots cannot be added to
VM groups.

Signed-off-by: Bengang Yuan <[email protected]>
…rom_master

Update feature/vm-anti-affinity by merging from master
Add func host_to_vm_count_map to be used, rename RefMap to HostMap

Signed-off-by: Gang Ji <[email protected]>
fixup review comments

Signed-off-by: Gang Ji <[email protected]>
…A-393421

CA-393421: Special VMs cannot be added to VM groups
Host evacuation plan with anti-affinity support will be carried out in 3
phases:

1. Try to get a "spread evenly" plan for anti-affinity VMs, done if
   all the rest VMs got planned using binpack, otherwise continue.
2. Try to get a "no breach" plan for anti-affinity VMs, done if all the
   rest VMs got planned using binpack, otherwise continue.
3. Carry out a binpack plan ignoring VM anti-affinity.

Signed-off-by: Gang Ji <[email protected]>
psafont and others added 23 commits June 28, 2024 15:06
Signed-off-by: Pau Ruiz Safont <[email protected]>
Signed-off-by: Rob Hoes <[email protected]>
Signed-off-by: Edwin Török <[email protected]>
- Use cbt_enabled flag from plugin responses, to allow that a snapshot
  of a CBT-enabled VDI will itself be CBT-enabled.
- As part of vdi-data-destroy, record the VDI type as a custom key, so
  that on a subsequent sr-scan it still shows up as a metadata-only
  snapshot.

Signed-off-by: Robin Newton <[email protected]>
Hugo docs: remaining API docs and release info
equivalents.

This allows support to be added to external_certificate_thumbprint_of_master for Sha1 fingerprints.

Signed-off-by: Steven Woods <[email protected]>
CI: Complete parallel Coveralls uploads
…-49116

CP-49116: Add Sha1 support to external_certificate_thumbprint_of_master.
…ivate/asultanov/uri-improvement

Revert "CP-49953: Remove parse_uri, switch to using Uri module instead'"
…A-386173

CA-386173: Update the message of WLB authentication issue
…m-anti-affinity-to-master

Merge `feature/vm-anti-affinity` to `master`
Conflict in .github/workflows/other.yml resolved like in xapi-project#5774

Signed-off-by: Bernhard Kaindl <[email protected]>
Copy link
Collaborator

@bernhardkaindl bernhardkaindl left a comment

Choose a reason for hiding this comment

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

Agreed with @psafont in #5774 (comment): Checked and approving:

The conflict was resolved with the .github/workflows/other.yml (link to the file on the this PR) from #5774.

@bernhardkaindl bernhardkaindl requested review from psafont and lindig July 4, 2024 13:38
@psafont psafont merged commit 94dc3cd into xapi-project:feature/py3 Jul 4, 2024
15 checks passed
@bernhardkaindl
Copy link
Collaborator

Success: Python3 coverage is uploaded to coveralls now:

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.