server: fix for wrong affinity group count by shwstppr · Pull Request #4154 · apache/cloudstack

shwstppr · 2020-06-18T08:28:34Z

Description

Fixes wrong count in listAffinityGroup API.
API was returning the count of AffinityGroupJoinVO records.

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)

Screenshots (if appropriate):

How Has This Been Tested?

With a running environment,
Before fix - count is equal to VM count for the affinity groups

(local) 🐱 > list affinitygroups 
{
  "affinitygroup": [
    {
      "account": "admin",
      "domain": "ROOT",
      "domainid": "1db59a3e-b131-11ea-94f6-645d8651f45a",
      "id": "b878f4e6-fbcd-44f3-9a95-ad8102fd14da",
      "name": "bvcn",
      "type": "host anti-affinity",
      "virtualmachineIds": [
        "0c6bee5e-2d50-4b7a-b26f-30bff5818777"
      ]
    },
    {
      "account": "admin",
      "domain": "ROOT",
      "domainid": "1db59a3e-b131-11ea-94f6-645d8651f45a",
      "id": "10b78b41-8fe4-47c1-8972-3bedd0690fd3",
      "name": "hfd",
      "type": "host anti-affinity",
      "virtualmachineIds": [
        "0c6bee5e-2d50-4b7a-b26f-30bff5818777",
        "f4ca8c20-4887-4bc1-a532-b39cf140c4e4"
      ]
    },
    {
      "account": "admin",
      "domain": "ROOT",
      "domainid": "1db59a3e-b131-11ea-94f6-645d8651f45a",
      "id": "63d02962-ac8a-419a-bb88-eabec223828d",
      "name": "dfsf",
      "type": "host anti-affinity",
      "virtualmachineIds": [
        "0c6bee5e-2d50-4b7a-b26f-30bff5818777",
        "f4ca8c20-4887-4bc1-a532-b39cf140c4e4",
        "cf8d9565-b1c5-40f0-a436-56a52fc86106"
      ]
    }
  ],
  "count": 6
}

After fix - actual count of affinity groups

{
  "affinitygroup": [
    {
      "account": "admin",
      "domain": "ROOT",
      "domainid": "1db59a3e-b131-11ea-94f6-645d8651f45a",
      "id": "b878f4e6-fbcd-44f3-9a95-ad8102fd14da",
      "name": "bvcn",
      "type": "host anti-affinity",
      "virtualmachineIds": [
        "0c6bee5e-2d50-4b7a-b26f-30bff5818777"
      ]
    },
    {
      "account": "admin",
      "domain": "ROOT",
      "domainid": "1db59a3e-b131-11ea-94f6-645d8651f45a",
      "id": "10b78b41-8fe4-47c1-8972-3bedd0690fd3",
      "name": "hfd",
      "type": "host anti-affinity",
      "virtualmachineIds": [
        "0c6bee5e-2d50-4b7a-b26f-30bff5818777",
        "f4ca8c20-4887-4bc1-a532-b39cf140c4e4"
      ]
    },
    {
      "account": "admin",
      "domain": "ROOT",
      "domainid": "1db59a3e-b131-11ea-94f6-645d8651f45a",
      "id": "63d02962-ac8a-419a-bb88-eabec223828d",
      "name": "dfsf",
      "type": "host anti-affinity",
      "virtualmachineIds": [
        "0c6bee5e-2d50-4b7a-b26f-30bff5818777",
        "f4ca8c20-4887-4bc1-a532-b39cf140c4e4",
        "cf8d9565-b1c5-40f0-a436-56a52fc86106"
      ]
    }
  ],
  "count": 3
}

Signed-off-by: Abhishek Kumar <abhishek.mrt22@gmail.com>

yadvr · 2020-06-18T08:31:18Z

@blueorangutan package

blueorangutan · 2020-06-18T08:31:34Z

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

blueorangutan · 2020-06-18T08:53:25Z

Packaging result: ✔centos7 ✔debian. JID-1416

blueorangutan · 2020-06-18T08:54:53Z

Packaging result: ✔centos7 ✔debian. JID-1417

yadvr · 2020-06-18T08:56:06Z

@blueorangutan test

blueorangutan · 2020-06-18T08:56:34Z

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

blueorangutan · 2020-06-18T18:14:11Z

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

Test	Result	Time (s)	Test File
test_02_vpc_privategw_static_routes	`Failure`	191.03	test_privategw_acl.py
test_03_vpc_privategw_restart_vpc_cleanup	`Failure`	179.04	test_privategw_acl.py
test_04_rvpc_privategw_static_routes	`Failure`	257.65	test_privategw_acl.py

yadvr · 2020-06-19T12:02:49Z

Request for review - @davidjumani @DaanHoogland @GabrielBrascher @ustcweizhou @nvazquez @Spaceman1984

davidjumani · 2020-06-19T12:23:19Z

server/src/main/java/com/cloud/api/query/QueryManagerImpl.java

                            affinityGroupName, affinityGroupType, keyword);
-
-                    affinityGroups.addAll(listDomainLevelAffinityGroups(scDomain, searchFilter, permittedAcct.getDomainId()));
+                    List<AffinityGroupJoinVO> groups = listDomainLevelAffinityGroups(scDomain, searchFilter, permittedAcct.getDomainId());


Could this return Ids that are already there in affinityGroups ?

@shwstppr ?

@davidjumani I think it might. Will check and fix if needed cc @rhtyd

Spaceman1984 · 2020-06-19T15:09:21Z

Tested by adding an affinity group from the ui and then running the list affinitygroups api from cloudmonkey. LGTM

Signed-off-by: Abhishek Kumar <abhishek.mrt22@gmail.com>

yadvr · 2020-06-22T05:52:17Z

@davidjumani can you test and review please
@blueorangutan package

blueorangutan · 2020-06-22T05:52:51Z

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

blueorangutan · 2020-06-22T06:13:39Z

Packaging result: ✔centos7 ✔debian. JID-1425

davidjumani · 2020-06-23T05:29:56Z

LGTM. Tested creating affinity groups across domains and querying them. The count was as expected

yadvr · 2020-06-23T05:50:49Z

@blueorangutan test

blueorangutan · 2020-06-23T06:39:23Z

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

blueorangutan · 2020-06-23T18:38:41Z

Trillian test result (tid-1818)
Environment: kvm-centos7 (x2), Advanced Networking with Mgmt server 7
Total time taken: 41435 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr4154-t1818-kvm-centos7.zip
Intermittent failure detected: /marvin/tests/smoke/test_privategw_acl.py
Intermittent failure detected: /marvin/tests/smoke/test_router_dhcphosts.py
Intermittent failure detected: /marvin/tests/smoke/test_router_dns.py
Intermittent failure detected: /marvin/tests/smoke/test_router_dnsservice.py
Intermittent failure detected: /marvin/tests/smoke/test_routers_iptables_default_policy.py
Intermittent failure detected: /marvin/tests/smoke/test_routers_network_ops.py
Intermittent failure detected: /marvin/tests/smoke/test_service_offerings.py
Intermittent failure detected: /marvin/tests/smoke/test_vm_life_cycle.py
Smoke tests completed. 70 look OK, 7 have error(s)
Only failed tests results shown below:

Test	Result	Time (s)	Test File
test_02_vpc_privategw_static_routes	`Failure`	194.35	test_privategw_acl.py
test_03_vpc_privategw_restart_vpc_cleanup	`Failure`	179.49	test_privategw_acl.py
test_04_rvpc_privategw_static_routes	`Failure`	247.06	test_privategw_acl.py
test_router_dhcphosts	`Failure`	216.60	test_router_dhcphosts.py
ContextSuite context=TestRouterDHCPHosts>:teardown	`Error`	227.90	test_router_dhcphosts.py
test_router_dns_guestipquery	`Failure`	613.62	test_router_dns.py
test_router_dns_guestipquery	`Failure`	613.75	test_router_dnsservice.py
test_01_single_VPC_iptables_policies	`Error`	932.10	test_routers_iptables_default_policy.py
test_01_isolate_network_FW_PF_default_routes_egress_true	`Failure`	268.27	test_routers_network_ops.py
test_02_isolate_network_FW_PF_default_routes_egress_false	`Failure`	267.17	test_routers_network_ops.py
test_01_RVR_Network_FW_PF_SSH_default_routes_egress_true	`Failure`	295.71	test_routers_network_ops.py
test_02_RVR_Network_FW_PF_SSH_default_routes_egress_false	`Failure`	299.61	test_routers_network_ops.py
test_01_service_offering_cpu_limit_use	`Error`	811.17	test_service_offerings.py

yadvr · 2020-06-24T01:31:38Z

Test lgtm, failure unrelated to the PR

server: fix for wrong affinity group count

f538db3

Signed-off-by: Abhishek Kumar <abhishek.mrt22@gmail.com>

yadvr added this to the 4.13.2.0 milestone Jun 18, 2020

yadvr approved these changes Jun 18, 2020

View reviewed changes

shwstppr mentioned this pull request Jun 18, 2020

[FIX] New Instance dialog apache/cloudstack-primate#401

Merged

2 tasks

yadvr requested a review from DaanHoogland June 19, 2020 11:24

davidjumani reviewed Jun 19, 2020

View reviewed changes

DaanHoogland approved these changes Jun 20, 2020

View reviewed changes

svenvogel added component:api type:bug labels Jun 20, 2020

fix for correct unique domain level AG count

d06e769

Signed-off-by: Abhishek Kumar <abhishek.mrt22@gmail.com>

yadvr merged commit 8010718 into apache:4.13 Jun 24, 2020

DaanHoogland added the Severity:Minor label Nov 10, 2020

Conversation

shwstppr commented Jun 18, 2020

Description

Types of changes

Screenshots (if appropriate):

How Has This Been Tested?

Uh oh!

yadvr commented Jun 18, 2020

Uh oh!

blueorangutan commented Jun 18, 2020

Uh oh!

blueorangutan commented Jun 18, 2020

Uh oh!

blueorangutan commented Jun 18, 2020

Uh oh!

yadvr commented Jun 18, 2020

Uh oh!

blueorangutan commented Jun 18, 2020

Uh oh!

blueorangutan commented Jun 18, 2020

Uh oh!

yadvr commented Jun 19, 2020

Uh oh!

davidjumani Jun 19, 2020

Choose a reason for hiding this comment

Uh oh!

yadvr Jun 20, 2020

Choose a reason for hiding this comment

Uh oh!

shwstppr Jun 20, 2020

Choose a reason for hiding this comment

Uh oh!

Spaceman1984 commented Jun 19, 2020

Uh oh!

yadvr commented Jun 22, 2020

Uh oh!

blueorangutan commented Jun 22, 2020

Uh oh!

blueorangutan commented Jun 22, 2020

Uh oh!

davidjumani commented Jun 23, 2020

Uh oh!

yadvr commented Jun 23, 2020

Uh oh!

blueorangutan commented Jun 23, 2020

Uh oh!

blueorangutan commented Jun 23, 2020

Uh oh!

yadvr commented Jun 24, 2020

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

7 participants