Stat collector solidfire capacity fix by yadvr · Pull Request #4918 · apache/cloudstack

yadvr · 2021-04-13T12:09:27Z

Fixes regression introduced in 71c5dbcf492a023dbea5f8c34f8fd883c3ad653f
which would cause capacity bytes of certain pools to be update which
shouldn't get updated by StatsCollector such as solidfire.

Fixes #4911

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

Temporary repo builds here for testing purposes for community: http://download.cloudstack.org/testing/pr-4918/
(This will be removed after the PR is merged)

Fixes regression introduced in 71c5dbc which would cause capacity bytes of certain pools to be update which shouldn't get updated by StatsCollector such as solidfire. Fixes apache#4911 Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>

…fault Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>

yadvr · 2021-04-13T12:10:37Z

cc @ravening - pl review the regression was introduced in 71c5dbc
With the fix, anyone upgrading to 4.15 will be unable to use solidfire storage where the capacity bytes is 0.

yadvr · 2021-04-13T12:10:50Z

@blueorangutan package

blueorangutan · 2021-04-13T12:11:03Z

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

blueorangutan · 2021-04-13T12:32:27Z

Packaging result: ✔️ centos7 ✔️ centos8 ✔️ debian. SL-JID 405

yadvr · 2021-04-13T12:32:47Z

@blueorangutan test

blueorangutan · 2021-04-13T12:33:02Z

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

yadvr · 2021-04-13T12:40:57Z

@blueorangutan test centos7 vmware-67u3

blueorangutan · 2021-04-13T12:42:05Z

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

blueorangutan · 2021-04-13T13:18:50Z

Trillian Build Failed (tid-432)

blueorangutan · 2021-04-13T22:44:42Z

Trillian test result (tid-433)
Environment: vmware-67u3 (x2), Advanced Networking with Mgmt server 7
Total time taken: 35021 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr4918-t433-vmware-67u3.zip
Intermittent failure detected: /marvin/tests/smoke/test_diagnostics.py
Smoke tests completed. 86 look OK, 1 have error(s)
Only failed tests results shown below:

Test	Result	Time (s)	Test File
test_10_traceroute_in_vr	`Failure`	61.32	test_diagnostics.py

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>

yadvr · 2021-04-15T08:48:20Z

+                                    s_logger.warn("Received 0 capacity for pool ID " + poolId);
                                }
+                            }
+                            if (pool.getUsedBytes() != ((StorageStats)answer).getByteUsed() && pool.getStorageProviderName().equalsIgnoreCase(DataStoreProvider.DEFAULT_PRIMARY) && !pool.isManaged()) {


@sureshanaparti I've added a check to not update when pool is managed, cc @skattoju4 @mike-tutkowski

@rhtyd I think managed pool(s) doesn't use DefaultPrimary as its provider, in that case managed pool check is not required.

That's a good point about managed-storage providers not using DefaultPrimary. Each of these storage providers probably provides its own plug-in.

yadvr · 2021-04-15T08:48:44Z

-                                    pool.setUsedBytes(((StorageStats) answer).getByteUsed());
-                                    pool.setUpdateTime(new Date());
+                            if (_storagePoolStats.get(poolId) != null && _storagePoolStats.get(poolId).getCapacityBytes() != ((StorageStats)answer).getCapacityBytes()) {
+                                if (((StorageStats)answer).getCapacityBytes() > 0) {


@sureshanaparti cc @DaanHoogland added check to log warning when capacity is reported 0; it's updated only when the value is > 0.

yadvr · 2021-04-15T08:49:00Z

@blueorangutan package

yadvr · 2021-04-15T11:22:26Z

@blueorangutan package

blueorangutan · 2021-04-15T11:23:03Z

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

blueorangutan · 2021-04-15T11:48:35Z

Packaging result: ✔️ centos7 ✔️ centos8 ✔️ debian. SL-JID 421

yadvr · 2021-04-15T12:10:30Z

@blueorangutan test matrix

blueorangutan · 2021-04-15T12:11:02Z

@rhtyd a Trillian-Jenkins matrix job (centos7 mgmt + xs71, centos7 mgmt + vmware65, centos7 mgmt + kvmcentos7) has been kicked to run smoke tests

blueorangutan · 2021-04-15T22:00:11Z

Trillian test result (tid-451)
Environment: xenserver-71 (x2), Advanced Networking with Mgmt server 7
Total time taken: 33430 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr4918-t451-xenserver-71.zip
Intermittent failure detected: /marvin/tests/smoke/test_scale_vm.py
Intermittent failure detected: /marvin/tests/smoke/test_host_maintenance.py
Smoke tests completed. 86 look OK, 1 have error(s)
Only failed tests results shown below:

Test	Result	Time (s)	Test File
test_01_scale_vm	`Failure`	9.23	test_scale_vm.py

blueorangutan · 2021-04-15T22:55:37Z

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

Test	Result	Time (s)	Test File

blueorangutan · 2021-04-16T00:48:08Z

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

Test	Result	Time (s)	Test File
test_03_ssvm_internals	`Failure`	3.12	test_ssvm.py

Co-authored-by: Nicolas Vazquez <nicovazquez90@gmail.com>

yadvr · 2021-04-16T06:29:20Z

+                                    s_logger.warn("Not setting capacity bytes, received " + ((StorageStats)answer).getCapacityBytes()  + " capacity for pool ID " + poolId);
                                }
+                            }
+                            if (pool.getUsedBytes() != ((StorageStats)answer).getByteUsed() && pool.getStorageProviderName().equalsIgnoreCase(DataStoreProvider.DEFAULT_PRIMARY)) {


Thanks @sureshanaparti @mike-tutkowski - I've addressed the comment, removed the check for managed storage.

yadvr · 2021-04-16T06:29:38Z

@blueorangutan package

blueorangutan · 2021-04-16T06:30:02Z

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

blueorangutan · 2021-04-16T06:54:23Z

Packaging result: ✔️ centos7 ✔️ centos8 ✔️ debian. SL-JID 423

yadvr · 2021-04-16T07:49:38Z

@blueorangutan test

blueorangutan · 2021-04-16T07:50:03Z

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

blueorangutan · 2021-04-16T17:18:56Z

Trillian test result (tid-465)
Environment: kvm-centos7 (x2), Advanced Networking with Mgmt server 7
Total time taken: 32515 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr4918-t465-kvm-centos7.zip
Smoke tests completed. 87 look OK, 0 have error(s)
Only failed tests results shown below:

Test	Result	Time (s)	Test File

blueorangutan · 2021-04-16T18:39:48Z

Trillian test result (tid-468)
Environment: vmware-65u2 (x2), Advanced Networking with Mgmt server 7
Total time taken: 35088 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr4918-t468-vmware-65u2.zip
Smoke tests completed. 87 look OK, 0 have error(s)
Only failed tests results shown below:

Test	Result	Time (s)	Test File

mike-tutkowski

LGTM

yadvr added 2 commits April 13, 2021 17:32

fix for case when value is 0, as many storage adapters return 0 as de…

a8b03d4

…fault Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>

yadvr requested a review from DaanHoogland April 13, 2021 12:09

yadvr added this to the 4.15.1.0 milestone Apr 13, 2021

yadvr requested review from mike-tutkowski, sureshanaparti, swill and weizhouapache April 13, 2021 12:09

sureshanaparti reviewed Apr 14, 2021

View reviewed changes

Comment thread server/src/main/java/com/cloud/server/StatsCollector.java Outdated

sureshanaparti reviewed Apr 14, 2021

View reviewed changes

Comment thread server/src/main/java/com/cloud/server/StatsCollector.java

address code review comments

589d5e5

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>

yadvr requested a review from sureshanaparti April 15, 2021 08:47

yadvr commented Apr 15, 2021

View reviewed changes

DaanHoogland approved these changes Apr 15, 2021

View reviewed changes

nvazquez reviewed Apr 15, 2021

View reviewed changes

Comment thread server/src/main/java/com/cloud/server/StatsCollector.java Outdated

Update server/src/main/java/com/cloud/server/StatsCollector.java

deb57ed

Co-authored-by: Nicolas Vazquez <nicovazquez90@gmail.com>

yadvr requested a review from nvazquez April 16, 2021 06:27

Update StatsCollector.java

2166d27

yadvr commented Apr 16, 2021

View reviewed changes

yadvr requested review from Pearl1594, Spaceman1984 and shwstppr April 16, 2021 10:34

mike-tutkowski approved these changes Apr 19, 2021

View reviewed changes

yadvr merged commit 5051fde into apache:4.15 Apr 21, 2021

yadvr mentioned this pull request Apr 21, 2021

solidfire primary capacity is reset to zero bytes #4911

Closed

Uh oh!

Conversation

yadvr commented Apr 13, 2021 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Types of changes

Feature/Enhancement Scale or Bug Severity

Feature/Enhancement Scale

Bug Severity

Uh oh!

yadvr commented Apr 13, 2021

Uh oh!

yadvr commented Apr 13, 2021

Uh oh!

blueorangutan commented Apr 13, 2021

Uh oh!

blueorangutan commented Apr 13, 2021

Uh oh!

yadvr commented Apr 13, 2021

Uh oh!

blueorangutan commented Apr 13, 2021

Uh oh!

yadvr commented Apr 13, 2021

Uh oh!

blueorangutan commented Apr 13, 2021

Uh oh!

blueorangutan commented Apr 13, 2021

Uh oh!

blueorangutan commented Apr 13, 2021

Uh oh!

Uh oh!

Uh oh!

yadvr Apr 15, 2021

Choose a reason for hiding this comment

Uh oh!

sureshanaparti Apr 15, 2021

Choose a reason for hiding this comment

Uh oh!

mike-tutkowski Apr 16, 2021

Choose a reason for hiding this comment

Uh oh!

yadvr Apr 15, 2021

Choose a reason for hiding this comment

Uh oh!

yadvr commented Apr 15, 2021

Uh oh!

yadvr commented Apr 15, 2021

Uh oh!

blueorangutan commented Apr 15, 2021

Uh oh!

blueorangutan commented Apr 15, 2021

Uh oh!

yadvr commented Apr 15, 2021

Uh oh!

blueorangutan commented Apr 15, 2021

Uh oh!

Uh oh!

blueorangutan commented Apr 15, 2021

Uh oh!

blueorangutan commented Apr 15, 2021

Uh oh!

blueorangutan commented Apr 16, 2021

Uh oh!

yadvr Apr 16, 2021

Choose a reason for hiding this comment

Uh oh!

yadvr commented Apr 16, 2021

Uh oh!

blueorangutan commented Apr 16, 2021

Uh oh!

blueorangutan commented Apr 16, 2021

Uh oh!

yadvr commented Apr 16, 2021

Uh oh!

blueorangutan commented Apr 16, 2021

Uh oh!

blueorangutan commented Apr 16, 2021

Uh oh!

blueorangutan commented Apr 16, 2021

Uh oh!

mike-tutkowski left a comment

yadvr commented Apr 13, 2021 •

edited

Loading