Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

server: fix duplicated records for templates if there are multiple zones#8933

Merged
DaanHoogland merged 2 commits intoapache:4.19apache/cloudstack:4.19from
weizhouapache:4.19-fix-template-multiple-zonesweizhouapache/cloudstack:4.19-fix-template-multiple-zonesCopy head branch name to clipboard
Apr 23, 2024
Merged

server: fix duplicated records for templates if there are multiple zones#8933
DaanHoogland merged 2 commits intoapache:4.19apache/cloudstack:4.19from
weizhouapache:4.19-fix-template-multiple-zonesweizhouapache/cloudstack:4.19-fix-template-multiple-zonesCopy head branch name to clipboard

Conversation

@weizhouapache
Copy link
Contributor

@weizhouapache weizhouapache commented Apr 17, 2024

Description

This PR fixes #8928

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

  • BLOCKER
  • Critical
  • Major
  • Minor
  • Trivial

Screenshots (if appropriate):

How Has This Been Tested?

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

@weizhouapache weizhouapache added this to the 4.19.1.0 milestone Apr 17, 2024
@weizhouapache
Copy link
Contributor Author

weizhouapache commented Apr 17, 2024

This fixes a bug in #7659
cc @BryanMLima

@weizhouapache weizhouapache linked an issue Apr 17, 2024 that may be closed by this pull request
Template is not Ready if there are multiple zones #8928
Closed
@weizhouapache weizhouapache marked this pull request as ready for review April 17, 2024 14:57
BryanMLima
BryanMLima approved these changes Apr 17, 2024
View reviewed changes
Copy link
Contributor

@BryanMLima BryanMLima left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

CLGTM, I will try to manually test this today.

DaanHoogland
DaanHoogland approved these changes Apr 17, 2024
View reviewed changes
Copy link
Contributor

@DaanHoogland DaanHoogland left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

clgtm

@weizhouapache weizhouapache reopened this Apr 17, 2024
@weizhouapache
Copy link
Contributor Author

weizhouapache commented Apr 17, 2024

@blueorangutan package

@blueorangutan
Copy link

blueorangutan commented Apr 17, 2024

@weizhouapache 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.

@blueorangutan
Copy link

blueorangutan commented Apr 17, 2024

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

@weizhouapache
Copy link
Contributor Author

weizhouapache commented Apr 17, 2024

@blueorangutan test rocky8 kvm-rocky8

@blueorangutan
Copy link

blueorangutan commented Apr 17, 2024

@weizhouapache a [SL] Trillian-Jenkins test job (rocky8 mgmt + kvm-rocky8) has been kicked to run smoke tests

sureshanaparti
sureshanaparti approved these changes Apr 18, 2024
View reviewed changes
Copy link
Contributor

@sureshanaparti sureshanaparti left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

clgtm

@blueorangutan
Copy link

blueorangutan commented Apr 18, 2024

[SF] Trillian test result (tid-9887)
Environment: kvm-rocky8 (x2), Advanced Networking with Mgmt server r8
Total time taken: 46469 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr8933-t9887-kvm-rocky8.zip
Smoke tests completed. 126 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 299.22 test_events_resource.py
test_01_events_resource Error 299.23 test_events_resource.py
test_04_deploy_vm_for_other_user_and_test_vm_operations Failure 90.14 test_network_permissions.py
ContextSuite context=TestNetworkPermissions>:teardown Error 1.49 test_network_permissions.py
test_02_list_cpvm_vm Failure 0.05 test_ssvm.py
test_04_cpvm_internals Failure 0.05 test_ssvm.py

BryanMLima
BryanMLima approved these changes Apr 18, 2024
View reviewed changes
Copy link
Contributor

@BryanMLima BryanMLima left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I manually tested this patch in a local lab, working as intended.

Before two records were created:
image

After applying the patch, only one record was created:
image

server/src/main/java/com/cloud/template/HypervisorTemplateAdapter.java Outdated Show resolved Hide resolved
@DaanHoogland
Copy link
Contributor

DaanHoogland commented Apr 22, 2024

@blueorangutan package

@blueorangutan
Copy link

blueorangutan commented Apr 22, 2024

@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.

@blueorangutan
Copy link

blueorangutan commented Apr 22, 2024

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

@DaanHoogland
Copy link
Contributor

DaanHoogland commented Apr 22, 2024

@blueorangutan test

@blueorangutan
Copy link

blueorangutan commented Apr 22, 2024

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

@blueorangutan
Copy link

blueorangutan commented Apr 23, 2024

[SF] Trillian test result (tid-9951)
Environment: kvm-centos7 (x2), Advanced Networking with Mgmt server 7
Total time taken: 51237 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr8933-t9951-kvm-centos7.zip
Smoke tests completed. 127 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 290.88 test_events_resource.py
test_01_events_resource Error 290.89 test_events_resource.py
test_04_deploy_vm_for_other_user_and_test_vm_operations Failure 87.79 test_network_permissions.py
ContextSuite context=TestNetworkPermissions>:teardown Error 1.40 test_network_permissions.py

@DaanHoogland DaanHoogland merged commit f6802e9 into apache:4.19 Apr 23, 2024
@DaanHoogland DaanHoogland deleted the 4.19-fix-template-multiple-zones branch April 23, 2024 10:06
DaanHoogland added a commit that referenced this pull request Apr 23, 2024
@DaanHoogland
Merge release branch 4.19 to main
c31aebc 
* 4.19:
  server: fix duplicated records for templates if there are multiple zones (#8933)
dhslove pushed a commit to ablecloud-team/ablestack-cloud that referenced this pull request May 3, 2024
@weizhouapache @dhslove
server: fix duplicated records for templates if there are multiple zo…
e63beaf 
…nes (apache#8933)
dhslove pushed a commit to ablecloud-team/ablestack-cloud that referenced this pull request May 3, 2024
@DaanHoogland @dhslove
Merge release branch 4.19 to main
10f01d7 
* 4.19:
  server: fix duplicated records for templates if there are multiple zones (apache#8933)
@shwstppr shwstppr mentioned this pull request May 22, 2024
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@DaanHoogland DaanHoogland DaanHoogland approved these changes

@sureshanaparti sureshanaparti sureshanaparti approved these changes

@BryanMLima BryanMLima BryanMLima approved these changes

Assignees

No one assigned

Labels

None yet

Projects

No open projects
Apache CloudStack 4.19.1
Status: Done

Milestone

4.19.1.0

Development

Successfully merging this pull request may close these issues.

Template is not Ready if there are multiple zones

5 participants

@weizhouapache @blueorangutan @DaanHoogland @sureshanaparti @BryanMLima
Morty Proxy This is a proxified and sanitized view of the page, visit original site.