Skip to content

NPE guard - #7691

Merged
DaanHoogland merged 1 commit into
apache:4.18from
shapeblue:templateSizeFix
Jul 6, 2023
Merged

DaanHoogland merged 1 commit into
apache:4.18from
shapeblue:templateSizeFix

Conversation

@DaanHoogland

@DaanHoogland DaanHoogland commented Jun 26, 2023 •

Copy link
Copy Markdown
Contributor

Description

This PR fixes an NPE incase a template has no size

Fixes: #7474

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

  • BLOCKER
  • Critical
  • Major
  • Minor
  • Trivial

Screenshots (if appropriate):

How Has This Been Tested?

@codecov

codecov Bot commented Jun 26, 2023

Copy link
Copy Markdown

Codecov Report

Merging #7691 (079c0db) into 4.18 (c809201) will decrease coverage by 0.01%.
The diff coverage is 0.00%.

@@             Coverage Diff              @@
##               4.18    #7691      +/-   ##
============================================
- Coverage     13.01%   13.00%   -0.01%     
- Complexity     9013     9014       +1     
============================================
  Files          2716     2719       +3     
  Lines        256690   256854     +164     
  Branches      40026    40048      +22     
============================================
+ Hits          33413    33414       +1     
- Misses       219091   219252     +161     
- Partials       4186     4188       +2     
Impacted Files Coverage Δ
...tack/storage/datastore/db/TemplateDataStoreVO.java 17.74% <0.00%> (-0.81%) ⬇️

... and 8 files with indirect coverage changes

📣 We’re building smart automated test selection to slash your CI/CD build times. Learn more

@DaanHoogland

Copy link
Copy Markdown
Contributor Author

@blueorangutan package

@blueorangutan

Copy link
Copy Markdown

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

Copy link
Copy Markdown

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

@DaanHoogland

Copy link
Copy Markdown
Contributor Author

@blueorangutan test

@blueorangutan

Copy link
Copy Markdown

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

@blueorangutan

Copy link
Copy Markdown

[SF] Trillian Build Failed (tid-6867)

@yadvr

yadvr commented Jun 27, 2023

Copy link
Copy Markdown
Member

LGTM, simple enough null check
@blueorangutan test

@blueorangutan

Copy link
Copy Markdown

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

@blueorangutan

Copy link
Copy Markdown

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

Test Result Time (s) Test File
ContextSuite context=TestCpuCapServiceOfferings>:setup Error 0.00 test_service_offerings.py
ContextSuite context=TestServiceOfferings>:setup Error 0.22 test_service_offerings.py
ContextSuite context=TestRouterIpTablesPolicies>:setup Error 0.00 test_routers_iptables_default_policy.py
ContextSuite context=TestVPCIpTablesPolicies>:setup Error 0.00 test_routers_iptables_default_policy.py
ContextSuite context=TestVMWareStoragePolicies>:setup Error 0.00 test_storage_policy.py
test_01_migrate_VM_and_root_volume Error 78.62 test_vm_life_cycle.py
test_02_migrate_VM_with_two_data_disks Error 58.40 test_vm_life_cycle.py
test_10_attachAndDetach_iso Error 0.07 test_vm_life_cycle.py
test_06_download_detached_volume Error 303.80 test_volumes.py
test_13_migrate_volume_and_change_offering Error 131.00 test_volumes.py
ContextSuite context=TestIpv6Vpc>:setup Error 0.00 test_vpc_ipv6.py
ContextSuite context=TestVPCRedundancy>:setup Error 0.00 test_vpc_redundant.py
ContextSuite context=TestVPCNics>:setup Error 0.00 test_vpc_router_nics.py
ContextSuite context=TestRVPCSite2SiteVpn>:setup Error 0.00 test_vpc_vpn.py
ContextSuite context=TestVPCSite2SiteVPNMultipleOptions>:setup Error 0.00 test_vpc_vpn.py
ContextSuite context=TestVpcRemoteAccessVpn>:setup Error 0.00 test_vpc_vpn.py
ContextSuite context=TestVpcSite2SiteVpn>:setup Error 0.00 test_vpc_vpn.py
test_disable_oobm_ha_state_ineligible Error 0.45 test_hostha_kvm.py

@rajujith

Copy link
Copy Markdown
Contributor

I am unable to reproduce the original issue anymore.

@DaanHoogland
DaanHoogland marked this pull request as ready for review July 3, 2023 07:18
@DaanHoogland

Copy link
Copy Markdown
Contributor Author

I am unable to reproduce the original issue anymore.

That might be a timing issue or a strange corner-case prerequisite. I think we should merge this anyway.

@DaanHoogland

Copy link
Copy Markdown
Contributor Author

I am unable to reproduce the original issue anymore.

That might be a timing issue or a strange corner-case prerequisite. I think we should merge this anyway.

Or do you mean this PR solved the issue, @rajujith ?

@DaanHoogland

Copy link
Copy Markdown
Contributor Author

@blueorangutan package

@blueorangutan

Copy link
Copy Markdown

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

Copy link
Copy Markdown

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

@DaanHoogland

Copy link
Copy Markdown
Contributor Author

@blueorangutan test

@blueorangutan

Copy link
Copy Markdown

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

@rajujith

rajujith commented Jul 4, 2023

Copy link
Copy Markdown
Contributor

@DaanHoogland I couldn't verify this PR since the reported issue couldn't be reproduced.

@blueorangutan

Copy link
Copy Markdown

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

Test Result Time (s) Test File
test_create_pvlan_network Error 0.05 test_pvlan.py
test_01_migrate_VM_and_root_volume Error 79.67 test_vm_life_cycle.py
test_02_migrate_VM_with_two_data_disks Error 57.43 test_vm_life_cycle.py

@DaanHoogland

Copy link
Copy Markdown
Contributor Author

@blueorangutan test

@blueorangutan

Copy link
Copy Markdown

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

@blueorangutan

Copy link
Copy Markdown

[SF] Trillian test result (tid-6984)
Environment: kvm-centos7 (x2), Advanced Networking with Mgmt server 7
Total time taken: 49078 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr7691-t6984-kvm-centos7.zip
Smoke tests completed. 107 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_migrate_VM_and_root_volume Error 78.69 test_vm_life_cycle.py
test_02_migrate_VM_with_two_data_disks Error 52.35 test_vm_life_cycle.py

@DaanHoogland
DaanHoogland merged commit acc6f4e into apache:4.18 Jul 6, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

SystemVMs won't start with error "no usable volumes found for the VM" after upgrading to 4.17.2

5 participants