Skip to content

Re-add affinity group #4405

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.

Sign up for GitHub

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

Jump to bottom
Merged
DaanHoogland merged 1 commit into from
Oct 16, 2020
Merged

Re-add affinity group #4405

DaanHoogland merged 1 commit into from
Oct 16, 2020

Conversation

@GabrielBrascher
Copy link
Member

@GabrielBrascher GabrielBrascher commented Oct 14, 2020

Fix mistake from PR #4397 where I removed the affinity group ID when adding security group ID.

Description

Fixes: #4397

Types of changes

  • Breaking change (fix or feature that would cause existing functionality to change)
  • New feature (non-breaking change which adds functionality)
  • Bug fix (non-breaking change which fixes an issue)
  • Enhancement (improves an existing feature and functionality)
  • Cleanup (Code refactoring and cleanup, that may add test cases)

@GabrielBrascher
Re-add affinity group
89d86fa 
Fix mistake from PR apache#4397 List VMs by Security Group & HA
@GabrielBrascher GabrielBrascher self-assigned this Oct 14, 2020
@GabrielBrascher GabrielBrascher mentioned this pull request Oct 14, 2020
Merged
5 tasks
@DaanHoogland
Copy link
Contributor

DaanHoogland commented Oct 14, 2020

@blueorangutan package

DaanHoogland
DaanHoogland approved these changes Oct 14, 2020
View reviewed changes
Copy link
Contributor

@DaanHoogland DaanHoogland left a comment

Choose a reason for hiding this comment

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

code lgtm

@GabrielBrascher
Copy link
Member Author

GabrielBrascher commented Oct 14, 2020

@blueorangutan package

@blueorangutan
Copy link

blueorangutan commented Oct 14, 2020

@GabrielBrascher a Jenkins job has been kicked to build packages. I'll keep you posted as I make progress.

@blueorangutan
Copy link

blueorangutan commented Oct 14, 2020

Packaging result: ✔centos7 ✔centos8 ✔debian. JID-2181

Pearl1594
Pearl1594 approved these changes Oct 15, 2020
View reviewed changes
Copy link
Contributor

@Pearl1594 Pearl1594 left a comment

Choose a reason for hiding this comment

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

LGTM

sureshanaparti
sureshanaparti reviewed Oct 15, 2020
View reviewed changes
server/src/main/java/com/cloud/api/query/QueryManagerImpl.java
if (affinityGroupId != null) {
sb.and("affinityGroupId", sb.entity().getAffinityGroupId(), SearchCriteria.Op.EQ);
}

Copy link
Contributor

@sureshanaparti sureshanaparti Oct 15, 2020

Choose a reason for hiding this comment

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

Thanks @GabrielBrascher, for immediate fix. Changes LGTM.

@DaanHoogland
Copy link
Contributor

DaanHoogland commented Oct 15, 2020

@blueorangutan test

@blueorangutan
Copy link

blueorangutan commented Oct 15, 2020

@DaanHoogland a Trillian-Jenkins test job (centos7 mgmt + kvm-centos7) has been kicked to run smoke tests

@blueorangutan
Copy link

blueorangutan commented Oct 15, 2020

Trillian test result (tid-2970)
Environment: kvm-centos7 (x2), Advanced Networking with Mgmt server 7
Total time taken: 32963 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr4405-t2970-kvm-centos7.zip
Intermittent failure detected: /marvin/tests/smoke/test_hostha_kvm.py
Smoke tests completed. 84 look OK, 1 have error(s)
Only failed tests results shown below:

Test Result Time (s) Test File
test_hostha_kvm_host_fencing Error 173.41 test_hostha_kvm.py

@DaanHoogland DaanHoogland merged commit 4c936b4 into apache:master Oct 16, 2020
@DaanHoogland DaanHoogland added this to the 4.15.0.0 milestone Oct 21, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@DaanHoogland DaanHoogland DaanHoogland approved these changes

@Pearl1594 Pearl1594 Pearl1594 approved these changes

@sureshanaparti sureshanaparti sureshanaparti approved these changes

@wido wido Awaiting requested review from wido

Assignees

@GabrielBrascher GabrielBrascher

Labels

Severity:Minor type:bug

Projects

None yet

Milestone

4.15.0.0

Development

Successfully merging this pull request may close these issues.

5 participants

@GabrielBrascher @DaanHoogland @blueorangutan @Pearl1594 @sureshanaparti