Search for resource type efficiently #6242

ravening · 2022-04-11T10:06:13Z

Description

Use hashmap to search for resource type rather than iterating over
all of them

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)

Feature/Enhancement Scale or Bug Severity

Feature/Enhancement Scale

Major
Minor

Bug Severity

Screenshots (if appropriate):

How Has This Been Tested?

rohityadavcloud

LGTM, subject to @Pearl1594 's review/testing who worked on the original feature

rohityadavcloud · 2022-04-12T09:25:02Z

@blueorangutan package

rohityadavcloud · 2022-04-12T09:26:15Z

api/src/main/java/com/cloud/server/ResourceTag.java

@@ -91,6 +96,53 @@ public boolean resourceMetadataSupport() {
        public boolean resourceIconSupport() {
            return resourceIconSupport;
        }
+
+        static {
+            resourceObjectTypeMap.put("uservm", UserVm);


@ravening is there any automatic way to have lowered-case object-type name map to the ResourceObjectType? Otherwise, this creates issue of manually maintaining this hashmap.

@rohityadavcloud didnt get your point. can you explain more?

For every ResourceObjectType, you're manually entering a map in resourceObjectTypeMap. Why not use reflections or other ways to generate this map automatically (essentially iterate all ResourceObjectType and set the "lowercaseclassname" to the Class) @ravening ?

@rohityadavcloud optimized it. review it again.

acs-robot · 2022-04-19T09:27:45Z

Found UI changes, kicking a new UI QA build
@blueorangutan ui

acs-robot · 2022-04-19T09:27:46Z

Found Java/XML changes, kicking packaging job
@blueorangutan package

blueorangutan · 2022-04-19T09:28:03Z

@acs-robot a Jenkins job has been kicked to build packages. It will be bundled with KVM, XenServer and VMware SystemVM templates. I'll keep you posted as I make progress.

blueorangutan · 2022-04-19T09:59:49Z

Packaging result: ✔️ el7 ✖️ el8 ✖️ debian ✖️ suse15. SL-JID 3211

acs-robot · 2022-04-19T10:17:37Z

PR Coverage Report

CLASS	INSTRUCTION MISSED	INSTRUCTION COVERED	BRANCH MISSED	BRANCH COVERED	LINE MISSED	LINE COVERED





ClusteredAgentManagerImpl	2361	0	242	0	536	0
DefaultVMSnapshotStrategy	486	677	52	30	100	140
LibvirtVMDef	37	114	6	4	11	36

VmwareManagerImpl	2613	528	296	38	615	117
VmwareStorageProcessor	9886	9	940	0	2121	2
NetScalerControlCenterResource	1943	0	144	0	468	0
NetscalerResource	6882	0	806	0	1623	0
DateraPrimaryDataStoreDriver	3195	0	283	0	748	0
CloudStackPrimaryDataStoreDriverImpl	903	0	114	0	229	0
LinstorPrimaryDataStoreDriverImpl	1442	0	91	0	348	0


ScaleIOPrimaryDataStoreDriver	2537	0	246	0	537	0
SolidFirePrimaryDataStoreDriver	3347	0	284	0	697	0
SAMLUtils	202	465	41	11	53	108
VolumeApiServiceImpl	10826	0	1498	0	2031	0
ResourceManagerUtilImpl	341	0	20	0	69	0
TaggedResourceManagerImpl	473	0	58	0	96	0




















PremiumSecondaryStorageManagerImpl	775	0	64	0	116	0
SecondaryStorageManagerImpl	3494	149	343	11	623	32

github-actions · 2022-04-25T12:18:24Z

This pull request has merge conflicts. Dear author, please fix the conflicts and sync your branch with the base branch.

Use hashmap to search for resource type rather than iterating over all of them

acs-robot · 2022-04-25T12:22:41Z

Found UI changes, kicking a new UI QA build
@blueorangutan ui

blueorangutan · 2022-04-25T12:23:02Z

@acs-robot a Jenkins job has been kicked to build UI QA env. I'll keep you posted as I make progress.

blueorangutan · 2022-04-25T12:28:04Z

UI build: ✔️
Live QA URL: http://qa.cloudstack.cloud:8080/client/pr/6242 (SL-JID-1463)

acs-robot · 2022-04-25T13:03:24Z

PR Coverage Report

CLASS	INSTRUCTION MISSED	INSTRUCTION COVERED	BRANCH MISSED	BRANCH COVERED	LINE MISSED	LINE COVERED

ResourceManagerUtilImpl	341	0	20	0	69	0

DaanHoogland · 2022-12-13T09:04:25Z

@blueorangutan package

blueorangutan · 2022-12-13T09:05:04Z

@DaanHoogland a Jenkins job has been kicked to build packages. It will be bundled with KVM, XenServer and VMware SystemVM templates. I'll keep you posted as I make progress.

blueorangutan · 2022-12-13T18:15:11Z

Packaging result: ✔️ el7 ✔️ el8 ✔️ debian ✖️ suse15. SL-JID 4903

DaanHoogland · 2022-12-16T08:42:28Z

@blueorangutan test

blueorangutan · 2022-12-16T08:43:03Z

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

blueorangutan · 2022-12-16T08:48:51Z

Trillian Build Failed (tid-5514)

blueorangutan · 2022-12-16T12:51:58Z

Trillian Build Failed (tid-5524)

DaanHoogland · 2022-12-16T16:30:23Z

@blueorangutan package

blueorangutan · 2022-12-16T16:31:03Z

@DaanHoogland a Jenkins job has been kicked to build packages. It will be bundled with KVM, XenServer and VMware SystemVM templates. I'll keep you posted as I make progress.

blueorangutan · 2022-12-19T11:14:01Z

Packaging result: ✔️ el7 ✔️ el8 ✔️ debian ✔️ suse15. SL-JID 5021

DaanHoogland · 2022-12-19T11:28:57Z

@blueorangutan test

DaanHoogland · 2022-12-19T11:29:57Z

@ravening can you add some tests? (or a #!human test description)

blueorangutan · 2022-12-19T11:30:03Z

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

blueorangutan · 2022-12-19T23:29:12Z

Trillian test result (tid-5571)
Environment: kvm-centos7 (x2), Advanced Networking with Mgmt server 7
Total time taken: 41771 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr6242-t5571-kvm-centos7.zip
Smoke tests completed. 105 look OK, 0 have errors, 0 did not run
Only failed and skipped tests results shown below:

Test	Result	Time (s)	Test File

DaanHoogland

clgtm

DaanHoogland · 2023-01-10T08:22:07Z

@blueorangutan package

blueorangutan · 2023-01-10T08:23:03Z

@DaanHoogland a Jenkins job has been kicked to build packages. It will be bundled with KVM, XenServer and VMware SystemVM templates. I'll keep you posted as I make progress.

blueorangutan · 2023-01-10T09:13:11Z

Packaging result: ✔️ el7 ✔️ el8 ✔️ el9 ✔️ debian ✔️ suse15. SL-JID 5222

DaanHoogland · 2023-01-10T11:05:18Z

@blueorangutan test

blueorangutan · 2023-01-10T11:06:04Z

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

blueorangutan · 2023-01-11T02:26:54Z

Trillian test result (tid-5789)
Environment: kvm-centos7 (x2), Advanced Networking with Mgmt server 7
Total time taken: 53933 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr6242-t5789-kvm-centos7.zip
Smoke tests completed. 104 look OK, 3 have errors, 0 did not run
Only failed and skipped tests results shown below:

Test	Result	Time (s)	Test File
test_08_upgrade_kubernetes_ha_cluster	`Failure`	565.56	test_kubernetes_clusters.py
test_01_verify_ipv6_vpc	`Failure`	927.22	test_vpc_ipv6.py
test_01_create_redundant_VPC_2tiers_4VMs_4IPs_4PF_ACL	`Failure`	657.93	test_vpc_redundant.py
test_05_rvpc_multi_tiers	`Failure`	600.08	test_vpc_redundant.py
test_05_rvpc_multi_tiers	`Error`	600.10	test_vpc_redundant.py

DaanHoogland · 2023-01-11T11:16:46Z

errors seem not related. making sure:
@blueorangutan test

blueorangutan · 2023-01-11T11:17:05Z

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

blueorangutan · 2023-01-12T00:36:35Z

Trillian test result (tid-5794)
Environment: kvm-centos7 (x2), Advanced Networking with Mgmt server 7
Total time taken: 46655 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr6242-t5794-kvm-centos7.zip
Smoke tests completed. 107 look OK, 0 have errors, 0 did not run
Only failed and skipped tests results shown below:

Test	Result	Time (s)	Test File

boring-cyborg bot added the component:api label Apr 11, 2022

rohityadavcloud approved these changes Apr 12, 2022

View reviewed changes

rohityadavcloud reviewed Apr 12, 2022

View reviewed changes

ravening force-pushed the optimize-code branch from 2c6c5e3 to c5dbac8 Compare April 19, 2022 09:25

github-actions bot added the status:has-conflicts label Apr 25, 2022

Rakesh Venkatesh added 2 commits April 25, 2022 14:21

Search for resource type efficiently

4e956d0

Use hashmap to search for resource type rather than iterating over all of them

use for loop to populate values

0cd9584

ravening force-pushed the optimize-code branch from c5dbac8 to 0cd9584 Compare April 25, 2022 12:21

github-actions bot removed the status:has-conflicts label Apr 25, 2022

rohityadavcloud closed this May 4, 2022

rohityadavcloud reopened this May 4, 2022

nvazquez force-pushed the main branch from c56220f to 0f4c3af Compare June 6, 2022 15:14

rohityadavcloud added this to the 4.18.0.0 milestone Oct 8, 2022

apache deleted a comment from rohityadavcloud Dec 13, 2022

apache deleted a comment from blueorangutan Dec 13, 2022

DaanHoogland approved these changes Jan 10, 2023

View reviewed changes

DaanHoogland merged commit aad0353 into apache:main Jan 12, 2023

Search for resource type efficiently #6242

Search for resource type efficiently #6242

Conversation

ravening commented Apr 11, 2022

Description

Types of changes

Feature/Enhancement Scale or Bug Severity

Feature/Enhancement Scale

Bug Severity

Screenshots (if appropriate):

How Has This Been Tested?

rohityadavcloud left a comment

Choose a reason for hiding this comment

rohityadavcloud commented Apr 12, 2022

rohityadavcloud Apr 12, 2022

Choose a reason for hiding this comment

ravening Apr 14, 2022

Choose a reason for hiding this comment

rohityadavcloud Apr 15, 2022

Choose a reason for hiding this comment

ravening Apr 19, 2022

Choose a reason for hiding this comment

acs-robot commented Apr 19, 2022

acs-robot commented Apr 19, 2022

blueorangutan commented Apr 19, 2022

blueorangutan commented Apr 19, 2022

acs-robot commented Apr 19, 2022

PR Coverage Report

github-actions bot commented Apr 25, 2022

acs-robot commented Apr 25, 2022

blueorangutan commented Apr 25, 2022

blueorangutan commented Apr 25, 2022

acs-robot commented Apr 25, 2022

PR Coverage Report

DaanHoogland commented Dec 13, 2022

blueorangutan commented Dec 13, 2022

blueorangutan commented Dec 13, 2022

DaanHoogland commented Dec 16, 2022

blueorangutan commented Dec 16, 2022

blueorangutan commented Dec 16, 2022

blueorangutan commented Dec 16, 2022

DaanHoogland commented Dec 16, 2022

blueorangutan commented Dec 16, 2022

blueorangutan commented Dec 19, 2022

DaanHoogland commented Dec 19, 2022

DaanHoogland commented Dec 19, 2022

blueorangutan commented Dec 19, 2022

blueorangutan commented Dec 19, 2022

DaanHoogland left a comment

Choose a reason for hiding this comment

DaanHoogland commented Jan 10, 2023

blueorangutan commented Jan 10, 2023

blueorangutan commented Jan 10, 2023

DaanHoogland commented Jan 10, 2023

blueorangutan commented Jan 10, 2023

blueorangutan commented Jan 11, 2023

DaanHoogland commented Jan 11, 2023

blueorangutan commented Jan 11, 2023

blueorangutan commented Jan 12, 2023