Skip to content

Allow modification of user vm details if user.vm.readonly.details is empty #10456

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
Parent: 4.19
wants to merge 1 commit into
base: 4.19
Choose a base branch
from
Draft

Allow modification of user vm details if user.vm.readonly.details is empty #10456

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions engine/schema/src/main/resources/META-INF/db/schema-420to421.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -242,3 +242,6 @@ INSERT IGNORE INTO `cloud`.`configuration` VALUES ('Advanced', 'DEFAULT', 'manag
INSERT IGNORE INTO `cloud`.`configuration` VALUES ('Advanced', 'DEFAULT', 'management-server', 'vmware.hung.wokervm.timeout', '7200', 'Worker VM timeout in seconds');
INSERT IGNORE INTO `cloud`.`configuration` VALUES ("Alert", 'DEFAULT', 'management-server', "alert.smtp.connectiontimeout", "30000", "Socket connection timeout value in milliseconds. -1 for infinite timeout.");
INSERT IGNORE INTO `cloud`.`configuration` VALUES ("Alert", 'DEFAULT', 'management-server', "alert.smtp.timeout", "30000", "Socket I/O timeout value in milliseconds. -1 for infinite timeout.");

-- Update the value of user.vm.readonly.details record in the configuration table to "" if it is NULL
UPDATE `cloud`.`configuration` SET value = '' WHERE name = 'user.vm.readonly.details' AND value IS NULL;
Comment on lines +245 to +247
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I believe that this is not the correct script for this update 😄

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@Pearl1594 I think we want this line in the (to be created) 4.19.2 -> 4.19.3 and in the 4.20.0 -> 4.20.1 scripts. We must also test if this upgrade will then work from 4.19.3 to 4.20.1 (it should according to theory but testing is still advised (by me))

code looks good btw

2 changes: 1 addition & 1 deletion server/src/main/java/com/cloud/configuration/ConfigurationManagerImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1006,7 +1006,7 @@ public Configuration updateConfiguration(final UpdateCfgCmd cmd) throws InvalidP
value = value.trim();

if (value.isEmpty() || value.equals("null")) {
value = (id == null) ? null : "";
value = (id == null && !name.equals("user.vm.readonly.details")) ? null : "";
}

final String updatedValue = updateConfiguration(userId, name, category, value, scope, id);
Expand Down
Loading