Skip to content

Commit d9b770e

Browse files
committed
Merge remote-tracking branch 'apache/4.17' into main
2 parents 9717ed9 + 9410a70 commit d9b770e

File tree

4 files changed

+6
-2
lines changed

4 files changed

+6
-2
lines changed

api/src/main/java/org/apache/cloudstack/api/command/admin/config/UpdateCfgCmd.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ public class UpdateCfgCmd extends BaseCmd {
5050
@Parameter(name = ApiConstants.NAME, type = CommandType.STRING, required = true, description = "the name of the configuration")
5151
private String cfgName;
5252

53-
@Parameter(name = ApiConstants.VALUE, type = CommandType.STRING, description = "the value of the configuration", length = 4095)
53+
@Parameter(name = ApiConstants.VALUE, type = CommandType.STRING, description = "the value of the configuration", length = 4096)
5454
private String value;
5555

5656
@Parameter(name = ApiConstants.ZONE_ID,

engine/schema/src/main/java/com/cloud/user/AccountDetailVO.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ public class AccountDetailVO implements InternalIdentity {
4242
private String name;
4343

4444
@Encrypt
45-
@Column(name = "value")
45+
@Column(name = "value", length=4096)
4646
private String value;
4747

4848
protected AccountDetailVO() {

engine/schema/src/main/resources/META-INF/db/schema-41700to41710.sql

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -126,3 +126,6 @@ CREATE VIEW `cloud`.`domain_router_view` AS
126126
`cloud`.`async_job` ON async_job.instance_id = vm_instance.id
127127
and async_job.instance_type = 'DomainRouter'
128128
and async_job.job_status = 0;
129+
130+
-- PR #6080 Change column `value` size from 255 to 4096 characters, matching the API "updateConfiguration" "value" size
131+
ALTER TABLE `cloud`.`account_details` MODIFY `value` VARCHAR(4096) NOT NULL;

plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -536,6 +536,7 @@ public CPUStat getCPUStat() {
536536
}
537537

538538
public MemStat getMemStat() {
539+
_memStat.refresh();
539540
return _memStat;
540541
}
541542

0 commit comments

Comments
 (0)