upgrade: fix upgrade from 4.18.1.0 to 4.18.2.0-SNAPSHOT

[weizhouapache]

Description

The uprgade from 4.18.1.0 to 4.18.2.0-SNAPSHOT failed with error

2023-09-12 16:12:19,003 INFO  [c.c.u.DatabaseUpgradeChecker] (main:null) (logid:) DB version = 4.18.1.0 Code Version = 4.18.2.0
2023-09-12 16:12:19,004 INFO  [c.c.u.DatabaseUpgradeChecker] (main:null) (logid:) Database upgrade must be performed from 4.18.1.0 to 4.18.2.0
2023-09-12 16:12:19,036 DEBUG [c.c.u.DatabaseUpgradeChecker] (main:null) (logid:) Running upgrade Upgrade41800to41810 to upgrade from 4.18.0.0-4.18.1.0 to 4.18.1.0
...
2023-09-12 16:12:19,041 DEBUG [c.c.u.d.ScriptRunner] (main:null) (logid:) -- Schema upgrade from 4.18.0.0 to 4.18.1.0
...
2023-09-12 16:12:21,602 DEBUG [c.c.u.d.DatabaseAccessObject] (main:null) (logid:) Statement: CREATE INDEX i_cluster_details__name on cluster_details (name)
2023-09-12 16:12:21,663 DEBUG [c.c.u.d.DatabaseAccessObject] (main:null) (logid:) Created index i_cluster_details__name
2023-09-12 16:12:21,673 DEBUG [c.c.u.d.T.Transaction] (main:null) (logid:) Rolling back the transaction: Time = 2632 Name =  Upgrade; called by -TransactionLegacy.rollback:888-TransactionLegacy.removeUpTo:831-TransactionLegacy.close:655-TransactionContextInterceptor.invoke:36-ReflectiveMethodInvocation.proceed:175-ExposeInvocationInterceptor.invoke:97-ReflectiveMethodInvocation.proceed:186-JdkDynamicAopProxy.invoke:215-$Proxy30.persist:-1-DatabaseUpgradeChecker.upgrade:319-DatabaseUpgradeChecker.check:403-CloudStackExtendedLifeCycle.checkIntegrity:64

It succeeded with this change.

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?

[weizhouapache]

@blueorangutan package

[blueorangutan]

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

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

[codecov]

Codecov Report

Merging #7959 (0ecfb54) into 4.18 (b8c8e17) will increase coverage by 0.00%.
The diff coverage is 100.00%.

@@            Coverage Diff            @@
##               4.18    #7959   +/-   ##
=========================================
  Coverage     13.06%   13.06%           
- Complexity     9097     9101    +4     
=========================================
  Files          2720     2720           
  Lines        257465   257469    +4     
  Branches      40145    40146    +1     
=========================================
+ Hits          33635    33640    +5     
  Misses       219603   219603           
+ Partials       4227     4226    -1     

Files Changed	Coverage Δ
...java/com/cloud/upgrade/DatabaseUpgradeChecker.java	40.89% <100.00%> (+0.64%)	⬆️
...va/com/cloud/upgrade/DatabaseVersionHierarchy.java	85.10% <100.00%> (+1.01%)	⬆️

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

[weizhouapache]

@blueorangutan test

[blueorangutan]

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

[yadvr]

LGTM - but for this couldn't we add an (empty) upgrade path b/w 4.18.1.0->4.18.2.0{-SNAPSHOT} that should fix the issue?

[weizhouapache]

LGTM - but for this couldn't we add an (empty) upgrade path b/w 4.18.1.0->4.18.2.0{-SNAPSHOT} that should fix the issue?

yes @rohityadavcloud , it should also fix the issue.
with this PR, we do not need to add a uprgade path if there is no database changes between two versions.

[blueorangutan]

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

Test	Result	Time (s)	Test File