Use parameter dcId as wrapper to prevent NPE #8986

DaanHoogland · 2024-04-26T07:10:36Z

Description

This PR...

Fixes: #8956

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)
build/CI

Feature/Enhancement Scale or Bug Severity

Feature/Enhancement Scale

Major
Minor

Bug Severity

Screenshots (if appropriate):

How Has This Been Tested?

How did you try to break this feature and the system with this change?

weizhouapache

code lgtm

not tested yet

weizhouapache · 2024-04-26T07:43:53Z

@blueorangutan package

DaanHoogland · 2024-04-26T07:45:39Z

@rajujith, can you test your scenario with this?

DaanHoogland · 2024-04-26T10:15:26Z

@blueorangutan package

blueorangutan · 2024-04-26T10:16:03Z

@DaanHoogland a [SL] 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.

codecov-commenter · 2024-04-26T10:23:04Z

Codecov Report

Attention: Patch coverage is 0% with 1 lines in your changes are missing coverage. Please review.

Project coverage is 14.96%. Comparing base (e409c6d) to head (f053582).

Files	Patch %	Lines
...tack/storage/endpoint/DefaultEndPointSelector.java	0.00%	1 Missing ⚠️

Additional details and impacted files

@@            Coverage Diff             @@
##               4.19    #8986    +/-   ##
==========================================
  Coverage     14.96%   14.96%            
- Complexity    10995    10998     +3     
==========================================
  Files          5373     5373            
  Lines        468989   468989            
  Branches      61009    60699   -310     
==========================================
+ Hits          70191    70202    +11     
+ Misses       391019   391006    -13     
- Partials       7779     7781     +2

Flag	Coverage Δ
uitests	`4.31% <ø> (ø)`
unittests	`15.67% <0.00%> (+<0.01%)`	⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

blueorangutan · 2024-04-26T11:18:52Z

Packaging result [SF]: ✔️ el7 ✔️ el8 ✔️ el9 ✔️ debian ✔️ suse15. SL-JID 9442

JoaoJandre

CLGTM, I have no way to test the scenario on #8956.

sureshanaparti

clgtm

KlausDornsbach · 2024-04-26T17:44:25Z

CLGTM.

Also done some testing:

Remove NFS secondary storage.
Create AWS Bucket, generate access and secret keys.
Add the S3 secondary storage bucket to ACS with success and no errors on logs.

weizhouapache · 2024-04-26T18:09:11Z

@blueorangutan test matrix

blueorangutan · 2024-04-26T18:10:03Z

@weizhouapache a [SL] Trillian-Jenkins matrix job (centos7 mgmt + xenserver71, rocky8 mgmt + vmware67u3, centos7 mgmt + kvmcentos7) has been kicked to run smoke tests

blueorangutan · 2024-04-27T08:03:15Z

[SF] Trillian test result (tid-10055)
Environment: xenserver-71 (x2), Advanced Networking with Mgmt server 7
Total time taken: 48254 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr8986-t10055-xenserver-71.zip
Smoke tests completed. 129 look OK, 1 have errors, 0 did not run
Only failed and skipped tests results shown below:

Test	Result	Time (s)	Test File
test_01_events_resource	`Error`	348.66	test_events_resource.py

blueorangutan · 2024-04-27T08:08:38Z

[SF] Trillian test result (tid-10057)
Environment: kvm-centos7 (x2), Advanced Networking with Mgmt server 7
Total time taken: 48458 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr8986-t10057-kvm-centos7.zip
Smoke tests completed. 129 look OK, 1 have errors, 0 did not run
Only failed and skipped tests results shown below:

Test	Result	Time (s)	Test File
test_01_events_resource	`Error`	410.46	test_events_resource.py

blueorangutan · 2024-04-27T09:14:59Z

[SF] Trillian test result (tid-10056)
Environment: vmware-67u3 (x2), Advanced Networking with Mgmt server r8
Total time taken: 52438 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr8986-t10056-vmware-67u3.zip
Smoke tests completed. 127 look OK, 3 have errors, 0 did not run
Only failed and skipped tests results shown below:

Test	Result	Time (s)	Test File
test_01_events_resource	`Error`	344.92	test_events_resource.py
test_02_balanced_drs_algorithm	`Error`	438.45	test_cluster_drs.py
test_02_trigger_shutdown	`Failure`	341.66	test_safe_shutdown.py

DaanHoogland · 2024-04-29T07:41:34Z

@blueorangutan test alma9 vmware-80u1

blueorangutan · 2024-04-29T07:42:03Z

@DaanHoogland a [SL] Trillian-Jenkins test job (alma9 mgmt + vmware-80u1) has been kicked to run smoke tests

blueorangutan · 2024-04-29T07:50:41Z

[SF] Trillian Build Failed (tid-10069)

DaanHoogland · 2024-04-29T08:15:51Z

@blueorangutan test alma9 vmware-70u3

blueorangutan · 2024-04-29T08:18:03Z

@DaanHoogland a [SL] Trillian-Jenkins test job (alma9 mgmt + vmware-70u3) has been kicked to run smoke tests

rajujith

LGTM.
I can add the S3 bucket as a secondary storage along with an NFS staging storage. I used a Minio S3 bucket.

blueorangutan · 2024-04-29T22:38:24Z

[SF] Trillian test result (tid-10071)
Environment: vmware-70u3 (x2), Advanced Networking with Mgmt server a9
Total time taken: 49703 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr8986-t10071-vmware-70u3.zip
Smoke tests completed. 128 look OK, 2 have errors, 0 did not run
Only failed and skipped tests results shown below:

Test	Result	Time (s)	Test File
test_01_events_resource	`Error`	330.87	test_events_resource.py
test_02_balanced_drs_algorithm	`Failure`	132.44	test_cluster_drs.py

DaanHoogland · 2024-04-30T08:50:23Z

/me investigating the test_02_balanced_drs_algorithm failure.

DaanHoogland · 2024-04-30T08:50:30Z

@blueorangutan test alma9 vmware-70u3 keepEnv

blueorangutan · 2024-04-30T08:52:03Z

@DaanHoogland a [SL] Trillian-Jenkins test job (alma9 mgmt + vmware-70u3) has been kicked to run smoke tests

blueorangutan · 2024-04-30T23:29:28Z

[SF] Trillian test result (tid-10082)
Environment: vmware-70u3 (x2), Advanced Networking with Mgmt server a9
Total time taken: 50727 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr8986-t10082-vmware-70u3.zip
Smoke tests completed. 128 look OK, 2 have errors, 0 did not run
Only failed and skipped tests results shown below:

Test	Result	Time (s)	Test File
test_01_events_resource	`Error`	369.36	test_events_resource.py
test_02_trigger_shutdown	`Failure`	346.47	test_safe_shutdown.py

* 4.19: linstor: disconnect-disk also search for resource name in Linstor (#9035) ui: add support to change Account role for admins (#9012) Use parameter dcId as wrapper to prevent NPE (#8986)

* 4.19: linstor: disconnect-disk also search for resource name in Linstor (apache#9035) ui: add support to change Account role for admins (apache#9012) Use parameter dcId as wrapper to prevent NPE (apache#8986)

auto unwrap was casuing an NPE

ab092c0

DaanHoogland requested review from JoaoJandre and rajujith April 26, 2024 07:10

boring-cyborg bot added the component:storage label Apr 26, 2024

DaanHoogland changed the base branch from main to 4.19 April 26, 2024 07:10

DaanHoogland changed the title ~~Use parameter dcId as wrapperto prevent NPE~~ Use parameter dcId as wrapper to prevent NPE Apr 26, 2024

DaanHoogland mentioned this pull request Apr 26, 2024

Adding S3 secondary storage fails with NPE #8956

Closed

weizhouapache approved these changes Apr 26, 2024

View reviewed changes

override

f053582

apache deleted a comment from blueorangutan Apr 26, 2024

JoaoJandre approved these changes Apr 26, 2024

View reviewed changes

DaanHoogland assigned rajujith Apr 26, 2024

DaanHoogland added the status:needs-testing label Apr 26, 2024

sureshanaparti approved these changes Apr 26, 2024

View reviewed changes

rajujith approved these changes Apr 29, 2024

View reviewed changes

rajujith mentioned this pull request Apr 29, 2024

Default systemVM template is not downloaded to S3 secondary storage #9002

Open

DaanHoogland merged commit e520525 into apache:4.19 May 1, 2024

DaanHoogland deleted the ghi8956-zoneIdAsWrapper branch May 1, 2024 07:12

DaanHoogland added this to the 4.19.1.0 milestone May 7, 2024

dhslove pushed a commit to ablecloud-team/ablestack-cloud that referenced this pull request May 17, 2024

Use parameter dcId as wrapper to prevent NPE (apache#8986)

716a6d0

rajujith removed the status:needs-testing label Aug 27, 2024

Use parameter dcId as wrapper to prevent NPE #8986

Use parameter dcId as wrapper to prevent NPE #8986

Uh oh!

Conversation

DaanHoogland commented Apr 26, 2024

Description

Types of changes

Feature/Enhancement Scale or Bug Severity

Feature/Enhancement Scale

Bug Severity

Screenshots (if appropriate):

How Has This Been Tested?

How did you try to break this feature and the system with this change?

Uh oh!

weizhouapache left a comment

Choose a reason for hiding this comment

Uh oh!

weizhouapache commented Apr 26, 2024

Uh oh!

DaanHoogland commented Apr 26, 2024

Uh oh!

DaanHoogland commented Apr 26, 2024

Uh oh!

blueorangutan commented Apr 26, 2024

Uh oh!

codecov-commenter commented Apr 26, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

blueorangutan commented Apr 26, 2024

Uh oh!

JoaoJandre left a comment

Choose a reason for hiding this comment

Uh oh!

sureshanaparti left a comment

Choose a reason for hiding this comment

Uh oh!

KlausDornsbach commented Apr 26, 2024

Uh oh!

weizhouapache commented Apr 26, 2024

Uh oh!

blueorangutan commented Apr 26, 2024

Uh oh!

blueorangutan commented Apr 27, 2024

Uh oh!

blueorangutan commented Apr 27, 2024

Uh oh!

blueorangutan commented Apr 27, 2024

Uh oh!

DaanHoogland commented Apr 29, 2024

Uh oh!

blueorangutan commented Apr 29, 2024

Uh oh!

blueorangutan commented Apr 29, 2024

Uh oh!

DaanHoogland commented Apr 29, 2024

Uh oh!

blueorangutan commented Apr 29, 2024

Uh oh!

rajujith left a comment

Choose a reason for hiding this comment

Uh oh!

blueorangutan commented Apr 29, 2024

Uh oh!

DaanHoogland commented Apr 30, 2024

Uh oh!

DaanHoogland commented Apr 30, 2024

Uh oh!

blueorangutan commented Apr 30, 2024

Uh oh!

blueorangutan commented Apr 30, 2024

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

8 participants

codecov-commenter commented Apr 26, 2024 •

edited

Loading