Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged

Conversation

weizhouapache
Copy link
Member

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
Member Author

This fixes a bug in #7659
cc @BryanMLima

@weizhouapache weizhouapache linked an issue Apr 17, 2024 that may be closed by this pull request
@weizhouapache weizhouapache marked this pull request as ready for review April 17, 2024 14:57
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.

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
Copy link
Member Author

@blueorangutan package

@blueorangutan
Copy link

@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

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

@weizhouapache
Copy link
Member Author

@blueorangutan test rocky8 kvm-rocky8

@blueorangutan
Copy link

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

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

[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

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

@DaanHoogland
Copy link
Contributor

@blueorangutan package

@blueorangutan
Copy link

@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

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

@DaanHoogland
Copy link
Contributor

@blueorangutan test

@blueorangutan
Copy link

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

@blueorangutan
Copy link

[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
5 of 24 checks passed
@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
* 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
dhslove pushed a commit to ablecloud-team/ablestack-cloud that referenced this pull request May 3, 2024
* 4.19:
  server: fix duplicated records for templates if there are multiple zones (apache#8933)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
No open projects
Status: Done
Development

Successfully merging this pull request may close these issues.

Template is not Ready if there are multiple zones
5 participants