Fix global setting reference for max secondary storage by harikrishna-patnala · Pull Request #6496 · apache/cloudstack

harikrishna-patnala · 2022-06-24T11:09:01Z

This PR fixes issue #6411

There are two global settings max.account.secondary.storage and max.project.secondary.storage to specify maximum secondary storage space (in GiB) that can be used for an account and project respectively.

But during upload template from project is not considering max.project.secondary.storage but uses max.account.secondary.storage.

We have fixed this here to use max.project.secondary.storage in case of project.

Description

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?

Uploaded a template from both account and project and observed using appropriate global settings.

… account or project

sureshanaparti · 2022-06-24T11:22:20Z

I think, it's better to merge this in 4.16 branch as well (if so, change target to 4.16 and forward merge to 4.17 / main, your thoughts pls @nvazquez @harikrishna-patnala).

DaanHoogland · 2022-06-27T12:27:32Z

@harikrishna-patnala is it a big issue to change these to ConfigKeys? the Config calles are deprected and we do need to remove this old code sometime (sooner is better imho)

acs-robot · 2022-06-28T13:21:36Z

Found UI changes, kicking a new UI QA build
@blueorangutan ui

blueorangutan · 2022-06-28T13:22:03Z

@acs-robot a Jenkins job has been kicked to build UI QA env. I'll keep you posted as I make progress.

harikrishna-patnala · 2022-06-28T13:22:15Z

@harikrishna-patnala is it a big issue to change these to ConfigKeys? the Config calles are deprected and we do need to remove this old code sometime (sooner is better imho)

Replaced with configkeys, please review @DaanHoogland

DaanHoogland

clgtm

blueorangutan · 2022-06-28T13:29:45Z

UI build: ✔️
Live QA URL: http://qa.cloudstack.cloud:8080/client/pr/6496 (SL-JID-1864)

acs-robot · 2022-06-28T13:33:31Z

Found UI changes, kicking a new UI QA build
@blueorangutan ui

blueorangutan · 2022-06-28T13:34:03Z

@acs-robot a Jenkins job has been kicked to build UI QA env. I'll keep you posted as I make progress.

harikrishna-patnala · 2022-06-28T13:37:35Z

I think, it's better to merge this in 4.16 branch as well (if so, change target to 4.16 and forward merge to 4.17 / main, your thoughts pls @nvazquez @harikrishna-patnala).
It's not a critical or regularly hit issue so I think it's not that necessary to go into 4.16, we can treat this as a regular bug.

blueorangutan · 2022-06-28T13:42:18Z

UI build: ✔️
Live QA URL: http://qa.cloudstack.cloud:8080/client/pr/6496 (SL-JID-1865)

DaanHoogland

nitbots

acs-robot · 2022-06-29T01:55:38Z

Found UI changes, kicking a new UI QA build
@blueorangutan ui

blueorangutan · 2022-06-29T01:56:02Z

@acs-robot a Jenkins job has been kicked to build UI QA env. I'll keep you posted as I make progress.

blueorangutan · 2022-06-29T02:03:31Z

UI build: ✔️
Live QA URL: http://qa.cloudstack.cloud:8080/client/pr/6496 (SL-JID-1869)

sonarqubecloud · 2022-06-29T02:48:46Z

SonarCloud Quality Gate failed.

0 Bugs
0 Vulnerabilities
0 Security Hotspots
0 Code Smells

0.0% Coverage
0.0% Duplication

sureshanaparti · 2022-06-29T04:54:59Z

@blueorangutan package

blueorangutan · 2022-06-29T04:56:03Z

@sureshanaparti a 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 · 2022-06-29T06:41:33Z

Packaging result: ✖️ el7 ✔️ el8 ✖️ debian ✔️ suse15. SL-JID 3672

sureshanaparti · 2022-06-29T06:42:39Z

@blueorangutan package

blueorangutan · 2022-06-29T06:43:03Z

@sureshanaparti a 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 · 2022-06-29T08:31:14Z

Packaging result: ✔️ el7 ✔️ el8 ✔️ debian ✔️ suse15. SL-JID 3674

sureshanaparti · 2022-06-29T09:27:38Z

@blueorangutan test

blueorangutan · 2022-06-29T09:28:03Z

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

blueorangutan · 2022-06-29T21:55:16Z

Trillian test result (tid-4401)
Environment: kvm-centos7 (x2), Advanced Networking with Mgmt server 7
Total time taken: 43395 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr6496-t4401-kvm-centos7.zip
Smoke tests completed. 98 look OK, 0 have errors
Only failed tests results shown below:

Test	Result	Time (s)	Test File

Fix global setting reference for max secondary storage usage based on…

178cad4

… account or project

boring-cyborg Bot added component:secondary-storage component:ssvm component:storage labels Jun 24, 2022

sureshanaparti reviewed Jun 24, 2022

View reviewed changes

Comment thread core/src/main/java/org/apache/cloudstack/storage/command/TemplateOrVolumePostUploadCommand.java Outdated

sureshanaparti approved these changes Jun 24, 2022

View reviewed changes

Changed a variable naming

fe1b5a5

Replaced config enum usage with configkey class for global settings

be2a48d

boring-cyborg Bot added the component:api label Jun 28, 2022

DaanHoogland approved these changes Jun 28, 2022

View reviewed changes

Comment thread api/src/main/java/com/cloud/user/ResourceLimitService.java Outdated

Fixed grammar mistake

91917a7

DaanHoogland approved these changes Jun 28, 2022

View reviewed changes

Comment thread api/src/main/java/com/cloud/user/ResourceLimitService.java Outdated

Comment thread api/src/main/java/com/cloud/user/ResourceLimitService.java Outdated

Fixed code smells

fbc7d97

yadvr added this to the 4.17.1.0 milestone Jun 30, 2022

yadvr merged commit 089e964 into 4.17 Jun 30, 2022

yadvr mentioned this pull request Jun 30, 2022

secondary-storage: Failed to upload template when image size is larger than Global Settings max.account.secondary.storage #6411

Closed

DaanHoogland deleted the FixMaxSecondaryStorageForAccountAndProject branch March 14, 2023 14:53

Conversation

harikrishna-patnala commented Jun 24, 2022 • edited by yadvr Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

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!

Uh oh!

sureshanaparti commented Jun 24, 2022

Uh oh!

DaanHoogland commented Jun 27, 2022

Uh oh!

acs-robot commented Jun 28, 2022

Uh oh!

blueorangutan commented Jun 28, 2022

Uh oh!

harikrishna-patnala commented Jun 28, 2022

Uh oh!

DaanHoogland left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

blueorangutan commented Jun 28, 2022

Uh oh!

acs-robot commented Jun 28, 2022

Uh oh!

blueorangutan commented Jun 28, 2022

Uh oh!

harikrishna-patnala commented Jun 28, 2022

Uh oh!

blueorangutan commented Jun 28, 2022

Uh oh!

DaanHoogland left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

acs-robot commented Jun 29, 2022

Uh oh!

blueorangutan commented Jun 29, 2022

Uh oh!

blueorangutan commented Jun 29, 2022

Uh oh!

sonarqubecloud Bot commented Jun 29, 2022

Uh oh!

sureshanaparti commented Jun 29, 2022

Uh oh!

blueorangutan commented Jun 29, 2022

Uh oh!

blueorangutan commented Jun 29, 2022

Uh oh!

sureshanaparti commented Jun 29, 2022

Uh oh!

blueorangutan commented Jun 29, 2022

Uh oh!

blueorangutan commented Jun 29, 2022

Uh oh!

sureshanaparti commented Jun 29, 2022

Uh oh!

blueorangutan commented Jun 29, 2022

Uh oh!

blueorangutan commented Jun 29, 2022

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

harikrishna-patnala commented Jun 24, 2022 •

edited by yadvr

Loading