Skip to content

Conversation

@DaanHoogland
Copy link
Contributor

Description

This PR...

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
  • test (unit or integration test code)

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?

@codecov
Copy link

codecov bot commented Jul 12, 2024

Codecov Report

Attention: Patch coverage is 1.23457% with 80 lines in your changes missing coverage. Please review.

Project coverage is 15.07%. Comparing base (54c8b71) to head (2925511).

Files Patch % Lines
...java/com/cloud/upgrade/DatabaseUpgradeChecker.java 1.23% 80 Missing ⚠️
Additional details and impacted files
@@             Coverage Diff              @@
##               4.19    #9385      +/-   ##
============================================
- Coverage     15.07%   15.07%   -0.01%     
  Complexity    11169    11169              
============================================
  Files          5405     5405              
  Lines        472677   472708      +31     
  Branches      60049    61718    +1669     
============================================
+ Hits          71269    71271       +2     
- Misses       393479   393509      +30     
+ Partials       7929     7928       -1     
Flag Coverage Δ
uitests 4.27% <ø> (ø)
unittests 15.79% <1.23%> (-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
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.

@GutoVeronezi
Copy link
Contributor

GutoVeronezi commented Jul 12, 2024

Nice work @DaanHoogland!

I believe we could do the same for the cloud_usage stored procedures.

Should we separate the cloud_usage in different files?

@blueorangutan
Copy link

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

@DaanHoogland
Copy link
Contributor Author

Nice work @DaanHoogland!

I believe we could do the same for the cloud_usage stored procedures.

Should we separate the cloud_usage in different files?

I thought of that but wanted to check versions against each other. I will make that change.

A change I won't make but what we need to do in another PR is cleaning the views from the schema update files. I encoutered a couple.

@DaanHoogland
Copy link
Contributor Author

@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-10821)
Environment: kvm-centos7 (x2), Advanced Networking with Mgmt server 7
Total time taken: 43258 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr9385-t10821-kvm-centos7.zip
Smoke tests completed. 131 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_condensed_drs_algorithm Failure 173.39 test_cluster_drs.py

@DaanHoogland
Copy link
Contributor Author

@blueorangutan test matrix

@blueorangutan
Copy link

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

@blueorangutan
Copy link

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

Test Result Time (s) Test File

@DaanHoogland
Copy link
Contributor Author

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

@DaanHoogland
Copy link
Contributor Author

@blueorangutan test matrix

@blueorangutan
Copy link

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

@blueorangutan
Copy link

[SF] Trillian Build Failed (tid-10849)

@GutoVeronezi
Copy link
Contributor

Nice work @DaanHoogland!
I believe we could do the same for the cloud_usage stored procedures.
Should we separate the cloud_usage in different files?

I thought of that but wanted to check versions against each other. I will make that change.

@DaanHoogland
I was thinking a little bit more about this, and, except for ADD_GUEST_OS_AND_HYPERVISOR_MAPPING, the other procedures are valid for both cloud and cloud_usage. Perhaps we could execute the script once for each schema instead of duplicating the code. What do you think?

@DaanHoogland
Copy link
Contributor Author

Nice work @DaanHoogland!
I believe we could do the same for the cloud_usage stored procedures.
Should we separate the cloud_usage in different files?

I thought of that but wanted to check versions against each other. I will make that change.

@DaanHoogland I was thinking a little bit more about this, and, except for ADD_GUEST_OS_AND_HYPERVISOR_MAPPING, the other procedures are valid for both cloud and cloud_usage. Perhaps we could execute the script once for each schema instead of duplicating the code. What do you think?

that sounds good, but so far creating envs with this code doesn't work. I am not sure why yet, but giving that priority.

(will keep it in mind though)

@apache apache deleted a comment from blueorangutan Jul 16, 2024
@apache apache deleted a comment from blueorangutan Jul 16, 2024
@apache apache deleted a comment from blueorangutan Jul 16, 2024
@apache apache deleted a comment from blueorangutan Jul 16, 2024
@apache apache deleted a comment from blueorangutan Jul 16, 2024
@apache apache deleted a comment from blueorangutan Jul 16, 2024
@apache apache deleted a comment from blueorangutan Jul 16, 2024
@apache apache deleted a comment from blueorangutan Jul 16, 2024
@DaanHoogland
Copy link
Contributor Author

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

@blueorangutan
Copy link

[SF] Trillian Build Failed (tid-10900)

@blueorangutan
Copy link

[SF] Trillian Build Failed (tid-10904)

@blueorangutan
Copy link

[SF] Trillian Build Failed (tid-10908)

@blueorangutan
Copy link

[LL] Trillian Build Failed (tid-6958)

@blueorangutan
Copy link

[SF] Trillian Build Failed (tid-10918)

@blueorangutan
Copy link

[SF] Trillian Build Failed (tid-10921)

@DaanHoogland DaanHoogland force-pushed the procedures branch 2 times, most recently from c20be12 to bd3512f Compare July 19, 2024 13:27
@blueorangutan
Copy link

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

@blueorangutan
Copy link

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

Test Result Time (s) Test File
test_05_rvpc_multi_tiers Failure 527.03 test_vpc_redundant.py
test_05_rvpc_multi_tiers Error 527.05 test_vpc_redundant.py

@DaanHoogland DaanHoogland marked this pull request as ready for review July 22, 2024 07:47
@DaanHoogland
Copy link
Contributor Author

@GutoVeronezi i got this working and did some investigating on iterating over databases but all solutions so far seem overcomplicated. Let's revisist later, ok?

@blueorangutan
Copy link

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

Test Result Time (s) Test File

Copy link
Member

@weizhouapache weizhouapache left a comment

Choose a reason for hiding this comment

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

code lgtm

just a tip for those who want to create the procedures manually
the SQLs do not work in mysql CLI as the default delimiter is ";", need to change to other value like "||"

DROP PROCEDURE IF EXISTS ...

DELIMITER ||

CREATE PROCEDURE ...
||

DELIMITER ;

Copy link
Contributor

@vladimirpetrov vladimirpetrov left a comment

Choose a reason for hiding this comment

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

LGTM based on manual testing, I did some upgrade and smoke testing and found no issues.

@DaanHoogland DaanHoogland merged commit 6e6a276 into apache:4.19 Aug 12, 2024
@DaanHoogland DaanHoogland deleted the procedures branch August 12, 2024 12:47
dhslove pushed a commit to ablecloud-team/ablestack-cloud that referenced this pull request Aug 22, 2024
@DaanHoogland DaanHoogland added this to the 4.19.2.0 milestone Sep 6, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

7 participants