Support multi-scope configuration settings #10300
Conversation
Signed-off-by: Abhishek Kumar <[email protected]>
Signed-off-by: Abhishek Kumar <[email protected]>
Codecov ReportAttention: Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## main #10300 +/- ##
============================================
+ Coverage 16.02% 16.07% +0.05%
- Complexity 13147 13180 +33
============================================
Files 5658 5658
Lines 496312 496523 +211
Branches 60109 60137 +28
============================================
+ Hits 79527 79829 +302
+ Misses 407943 407799 -144
- Partials 8842 8895 +53
Flags with carried forward coverage won't be shown. Click here to find out more. ☔ View full report in Codecov by Sentry. |
abh1sar
changed the title
|
@blueorangutan package |
|
@abh1sar 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. |
|
Packaging result [SF]: ✖️ el8 ✖️ el9 ✔️ debian ✖️ suse15. SL-JID 12277 |
|
@blueorangutan package |
|
@abh1sar 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. |
|
Packaging result [SF]: ✔️ el8 ✔️ el9 ✔️ debian ✔️ suse15. SL-JID 12278 |
|
@blueorangutan package |
|
@abh1sar 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. |
|
Packaging result [SF]: ✔️ el8 ✔️ el9 ✔️ debian ✔️ suse15. SL-JID 12282 |
|
Packaging result [SF]: ✔️ el8 ✔️ el9 ✔️ debian ✔️ suse15. SL-JID 12301 |
|
@blueorangutan test |
|
@abh1sar a [SL] Trillian-Jenkins test job (ol8 mgmt + kvm-ol8) has been kicked to run smoke tests |
|
[SF] Trillian test result (tid-12265)
|
|
|
||
| public static void changeTableColumnIfNotExist(Connection conn, String tableName, String oldColumnName, String newColumnName, String columnDefinition) { | ||
| if (dao.columnExists(conn, tableName, oldColumnName)) { | ||
| System.out.println("column exists------------------------" + oldColumnName); |
|
|
||
| protected void migrateConfigurationScopeToBitmask(Connection conn) { | ||
| String scopeDataType = DbUpgradeUtils.getTableColumnType(conn, "configuration", "scope"); | ||
| logger.info("------------------------{}", scopeDataType); |
There was a problem hiding this comment.
this can be removed or rephrased if needed
| @@ -183,10 +185,15 @@ public void setDescription(String description) { | |||
| } | |||
|
|
|||
| @Override | |||
| public String getScope() { | |||
| public int getScope() { | |||
There was a problem hiding this comment.
@abh1sar we have defined scope as Integer but returning int. Please check if this won't cause an issue
There was a problem hiding this comment.
It is not a problem as long as scope is not null which can't happen as the column is declared as not null.
|
@blueorangutan package |
|
@abh1sar 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. |
|
Packaging result [SF]: ✔️ el8 ✔️ el9 ✔️ debian ✔️ suse15. SL-JID 12321 |
|
@blueorangutan test |
|
@harikrishna-patnala a [SL] Trillian-Jenkins test job (ol8 mgmt + kvm-ol8) has been kicked to run smoke tests |
abh1sar
changed the title
|
[SF] Trillian test result (tid-12315)
|
|
@blueorangutan package |
|
@borisstoyanov 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. |
|
Packaging result [SF]: ✔️ el8 ✔️ el9 ✔️ debian ✔️ suse15. SL-JID 12399 |
|
@blueorangutan test matrix |
|
@borisstoyanov a [SL] Trillian-Jenkins matrix job (EL8 mgmt + EL8 KVM, Ubuntu22 mgmt + Ubuntu22 KVM, EL8 mgmt + VMware 7.0u3, EL9 mgmt + XCP-ng 8.2 ) has been kicked to run smoke tests |
|
[SF] Trillian test result (tid-12370)
|
|
[SF] Trillian test result (tid-12372)
|
|
[SF] Trillian test result (tid-12371)
|
|
[SF] Trillian test result (tid-12373)
|
Description
This PR introduces the concept of multi-scope configuration settings. In addition to the Global level, currently all configurations can be set at a single scope level.
It will be useful if a configuration can be set at multiple scopes. For example, a configuration set at the domain level
will apply for all accounts, but it can be set for an account as well. In which case the account level setting will override the domain level setting.
This is done by changing the column
scopeof tableconfigurationfrom string (single scope) to bitmask (multiple scopes).Each scope is also assigned a parent scope. When a configuration for a given scope is not defined but is available for multiple scope types, the value will be retrieved from the parent scope. If there is no parent scope or if the configuration is defined for a single scope only, the value will fall back to the global level.
Hierarchy for different scopes is defined as below :
This PR also updates the scope of the following configurations (Storage Pool scope is added in addition to the existing Zone scope):
Doc PR : apache/cloudstack-documentation#476
Types of changes
Feature/Enhancement Scale or Bug Severity
Feature/Enhancement Scale
Bug Severity
Screenshots (if appropriate):
How Has This Been Tested?
Tested Upgrade path
Tested that the configuration values are set correctly for all mentioned configurations at different scopes.
How did you try to break this feature and the system with this change?