server: fix mysql error when list Shared templates for projects by weizhouapache · Pull Request #8020 · apache/cloudstack

weizhouapache · 2023-09-29T08:59:38Z

Description

This fixes the mysql error when list Shared templates for projects

without this PR

(localcloud) 🐱 > list templates listall=true templatefilter=shared showunique=true projectid=-1
🙈 Error: (HTTP 530, error code 4250) DB Exception on: com.mysql.cj.jdbc.ClientPreparedStatement: SELECT DISTINCT(template_view.id) FROM template_view WHERE template_view.account_type = 5  AND template_view.lp_account_id IN )  AND template_view.hypervisor_type='KVM' AND template_view.format != 'ISO'  AND template_view.template_state IN ('Active','UploadAbandoned','UploadError','NotUploaded','UploadInProgress')  AND template_view.removed IS NULL  ORDER BY template_view.sort_key ASC , template_view.temp_zone_pair ASC  LIMIT 0, 500

with this PR, it returns empty result

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

Screenshots (if appropriate):

How Has This Been Tested?

without this PR ``` (localcloud) 🐱 > list templates listall=true templatefilter=shared showunique=true projectid=-1 🙈 Error: (HTTP 530, error code 4250) DB Exception on: com.mysql.cj.jdbc.ClientPreparedStatement: SELECT DISTINCT(template_view.id) FROM template_view WHERE template_view.account_type = 5 AND template_view.lp_account_id IN ) AND template_view.hypervisor_type='KVM' AND template_view.format != 'ISO' AND template_view.template_state IN ('Active','UploadAbandoned','UploadError','NotUploaded','UploadInProgress') AND template_view.removed IS NULL ORDER BY template_view.sort_key ASC , template_view.temp_zone_pair ASC LIMIT 0, 500 ``` with this PR, it returns empty result

weizhouapache · 2023-09-29T09:01:32Z

screenshot

weizhouapache · 2023-09-29T09:01:51Z

@blueorangutan package

blueorangutan · 2023-09-29T09:04:04Z

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

DaanHoogland · 2023-09-29T09:24:50Z

+                if (permittedAccounts.isEmpty()) {
+                    return new Pair<>(new ArrayList<>(), 0);
+                }
                sc.addAnd("sharedAccountId", SearchCriteria.Op.IN, permittedAccountIds.toArray());


seems a bit like a hack on a hack, shouldn´t this be handled by the SearchCriteria<>.addAnd()?

@DaanHoogland
no idea. I just verified this change fixes the issue.
if you find another solution, it would be better, I will close this PR in that case.

I researched a little and the handling of an empty set is going to be just as ugly. Let's go with this.

blueorangutan · 2023-09-29T10:09:40Z

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

codecov · 2023-09-29T10:15:46Z

Codecov Report

Merging #8020 (925d181) into 4.18 (221f863) will decrease coverage by 0.01%.
The diff coverage is 0.00%.

@@             Coverage Diff              @@
##               4.18    #8020      +/-   ##
============================================
- Coverage     13.06%   13.06%   -0.01%     
  Complexity     9106     9106              
============================================
  Files          2720     2720              
  Lines        257506   257508       +2     
  Branches      40149    40150       +1     
============================================
  Hits          33649    33649              
- Misses       219627   219629       +2     
  Partials       4230     4230

Files	Coverage Δ
...ain/java/com/cloud/api/query/QueryManagerImpl.java	`3.03% <0.00%> (-0.01%)`	⬇️

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

DaanHoogland · 2023-10-02T05:59:14Z

@blueorangutan test

blueorangutan · 2023-10-02T06:00:03Z

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

blueorangutan · 2023-10-02T20:49:37Z

[SF] Trillian test result (tid-7792)
Environment: kvm-centos7 (x2), Advanced Networking with Mgmt server 7
Total time taken: 51877 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr8020-t7792-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_invalid_upgrade_kubernetes_cluster	`Failure`	3615.62	test_kubernetes_clusters.py
test_02_upgrade_kubernetes_cluster	`Failure`	3623.37	test_kubernetes_clusters.py
test_03_deploy_and_scale_kubernetes_cluster	`Failure`	0.05	test_kubernetes_clusters.py
test_04_autoscale_kubernetes_cluster	`Failure`	0.04	test_kubernetes_clusters.py
test_05_basic_lifecycle_kubernetes_cluster	`Failure`	0.03	test_kubernetes_clusters.py
test_06_delete_kubernetes_cluster	`Failure`	0.04	test_kubernetes_clusters.py
test_07_deploy_kubernetes_ha_cluster	`Failure`	0.04	test_kubernetes_clusters.py
test_08_upgrade_kubernetes_ha_cluster	`Failure`	0.04	test_kubernetes_clusters.py
test_09_delete_kubernetes_ha_cluster	`Failure`	0.03	test_kubernetes_clusters.py
test_10_vpc_tier_kubernetes_cluster	`Failure`	48.67	test_kubernetes_clusters.py
ContextSuite context=TestKubernetesCluster>:teardown	`Error`	113.11	test_kubernetes_clusters.py

shwstppr

Code LGTM

DaanHoogland · 2023-10-03T08:45:31Z

tested; as reported:
before:

(localcloud) 🐱 > list templates listall=true templatefilter=shared showunique=true projectid=-1
🙈 Error: (HTTP 530, error code 4250) DB Exception on: com.mysql.cj.jdbc.ClientPreparedStatement: SELECT DISTINCT(template_view.id) FROM template_view WHERE template_view.account_type = 5  AND template_view.lp_account_id IN )  AND template_view.hypervisor_type='KVM' AND template_view.format != 'ISO'  AND template_view.template_state IN ('Active','UploadAbandoned','UploadError','NotUploaded','UploadInProgress')  AND template_view.removed IS NULL  ORDER BY template_view.sort_key ASC , template_view.temp_zone_pair ASC  LIMIT 0, 500
(localcloud) 🐱 >

after

(localcloud) 🐱 > list templates listall=true templatefilter=shared showunique=true projectid=-1
(localcloud) 🐱 >

merging

* 4.18: server: fix mysql error when list Shared templates for project (#8020)

…e#8020) (cherry picked from commit 3d8cc63) Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>

DaanHoogland reviewed Sep 29, 2023

View reviewed changes

DaanHoogland added this to the 4.18.2.0 milestone Sep 29, 2023

DaanHoogland added the component:database label Sep 29, 2023

DaanHoogland self-assigned this Sep 29, 2023

DaanHoogland approved these changes Oct 2, 2023

View reviewed changes

DaanHoogland requested a review from shwstppr October 2, 2023 13:58

shwstppr approved these changes Oct 3, 2023

View reviewed changes

DaanHoogland merged commit 3d8cc63 into apache:4.18 Oct 3, 2023

DaanHoogland deleted the 4.18-fix-list-shared-templates-for-project branch October 3, 2023 08:45

DaanHoogland added a commit that referenced this pull request Oct 3, 2023

Merge release branch 4.18 to main

2e9b3d8

* 4.18: server: fix mysql error when list Shared templates for project (#8020)

shwstppr pushed a commit to shapeblue/cloudstack that referenced this pull request Oct 12, 2023

server: fix mysql error when list Shared templates for project (apach…

24346b5

…e#8020) (cherry picked from commit 3d8cc63) Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>

DaanHoogland removed their assignment Nov 16, 2023

Conversation

weizhouapache commented Sep 29, 2023

Description

Types of changes

Feature/Enhancement Scale or Bug Severity

Feature/Enhancement Scale

Bug Severity

Screenshots (if appropriate):

How Has This Been Tested?

Uh oh!

weizhouapache commented Sep 29, 2023

Uh oh!

weizhouapache commented Sep 29, 2023

Uh oh!

blueorangutan commented Sep 29, 2023

Uh oh!

DaanHoogland Sep 29, 2023

Choose a reason for hiding this comment

Uh oh!

weizhouapache Sep 29, 2023

Choose a reason for hiding this comment

Uh oh!

DaanHoogland Oct 2, 2023

Choose a reason for hiding this comment

Uh oh!

blueorangutan commented Sep 29, 2023

Uh oh!

codecov bot commented Sep 29, 2023

Codecov Report

Uh oh!

DaanHoogland commented Oct 2, 2023

Uh oh!

blueorangutan commented Oct 2, 2023

Uh oh!

blueorangutan commented Oct 2, 2023

Uh oh!

shwstppr left a comment

Choose a reason for hiding this comment

Uh oh!

DaanHoogland commented Oct 3, 2023

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants