Michal Skrivanek has uploaded a new change for review. Change subject: webadmin: fix 64 bit VM memory limit validation ......................................................................
webadmin: fix 64 bit VM memory limit validation The supported maximum for 64 bit VMs is 2TB Change-Id: I2a32b1e16adff67a5c4656106e10107d840a61fb Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=954021 Signed-off-by: Michal Skrivanek <michal.skriva...@redhat.com> --- M backend/manager/dbscripts/upgrade/pre_upgrade/0000_config.sql M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/config/ConfigValues.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/UnitVmModel.java 3 files changed, 5 insertions(+), 5 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/96/14196/1 diff --git a/backend/manager/dbscripts/upgrade/pre_upgrade/0000_config.sql b/backend/manager/dbscripts/upgrade/pre_upgrade/0000_config.sql index 2b679c0..61a8b46 100644 --- a/backend/manager/dbscripts/upgrade/pre_upgrade/0000_config.sql +++ b/backend/manager/dbscripts/upgrade/pre_upgrade/0000_config.sql @@ -500,9 +500,9 @@ --Handling Virtual Machine Domain Name select fn_db_add_config_value('VM32BitMaxMemorySizeInMB','20480','general'); select fn_db_add_config_value('VM64BitMaxMemorySizeInMB','524288','3.0'); -select fn_db_add_config_value('VM64BitMaxMemorySizeInMB','524288','3.1'); -select fn_db_add_config_value('VM64BitMaxMemorySizeInMB','524288','3.2'); -select fn_db_add_config_value('VM64BitMaxMemorySizeInMB','524288','3.3'); +select fn_db_add_config_value('VM64BitMaxMemorySizeInMB','2097152','3.1'); +select fn_db_add_config_value('VM64BitMaxMemorySizeInMB','2097152','3.2'); +select fn_db_add_config_value('VM64BitMaxMemorySizeInMB','2097152','3.3'); select fn_db_add_config_value('VmGracefulShutdownMessage','System Administrator has initiated shutdown of this Virtual Machine. Virtual Machine is shutting down.','general'); select fn_db_add_config_value('VmGracefulShutdownTimeout','30','general'); select fn_db_add_config_value('VMMinMemorySizeInMB','256','general'); diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/config/ConfigValues.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/config/ConfigValues.java index 8bbf9df..20346a2 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/config/ConfigValues.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/config/ConfigValues.java @@ -532,7 +532,7 @@ VM32BitMaxMemorySizeInMB(211), @Reloadable @TypeConverterAttribute(Integer.class) - @DefaultValueAttribute("524288") + @DefaultValueAttribute("268435456") VM64BitMaxMemorySizeInMB(212), @Reloadable @TypeConverterAttribute(Integer.class) diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/UnitVmModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/UnitVmModel.java index 1446f00..70671b2 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/UnitVmModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/UnitVmModel.java @@ -1016,7 +1016,7 @@ _maxMemSize32 = value; } - private int _maxMemSize64 = 524288; + private int _maxMemSize64 = 2097152; public int get_MaxMemSize64() { -- To view, visit http://gerrit.ovirt.org/14196 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I2a32b1e16adff67a5c4656106e10107d840a61fb Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Michal Skrivanek <michal.skriva...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
