Roy Golan has uploaded a new change for review. Change subject: core: allow upgrading cluster level when there are running VMs (#856172) ......................................................................
core: allow upgrading cluster level when there are running VMs (#856172) Removing the restriction of upgrading a cluster level when there are running VMs (but CPU level stays the same). Its obvious that running VMs do no gain the new compatibility level functionality until VM is restarted. e.g. VM going from 3.0 to 3.1 will have a memballon device, payload and so on only when its being run again. Change-Id: Id6676ddf8c28cec9e611bd0b35b335c4c0102f7d Signed-off-by: Roy Golan <[email protected]> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVdsGroupCommand.java M backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dal/VdcBllMessages.java M backend/manager/modules/dal/src/main/resources/bundles/AppErrors.properties M frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/AppErrors.java M frontend/webadmin/modules/userportal-gwtp/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors.properties M frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors.properties 6 files changed, 1 insertion(+), 12 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/87/7987/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVdsGroupCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVdsGroupCommand.java index 266a929..b53e337 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVdsGroupCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVdsGroupCommand.java @@ -235,11 +235,7 @@ notDownVms++; } } - if (notDownVms > 0 - && !oldGroup.getcompatibility_version().equals(getVdsGroup().getcompatibility_version())) { - result = false; - addCanDoActionMessage(VdcBllMessages.VDS_GROUP_CANNOT_UPDATE_COMPATIBILITY_VERSION_WITH_RUNNING_VMS); - } + boolean sameCpuNames = StringUtils.equals(oldGroup.getcpu_name(), getVdsGroup().getcpu_name()); if (result && !sameCpuNames) { if (suspendedVms > 0) { diff --git a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dal/VdcBllMessages.java b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dal/VdcBllMessages.java index c015d83..977048b 100644 --- a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dal/VdcBllMessages.java +++ b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dal/VdcBllMessages.java @@ -561,7 +561,6 @@ USER_FAILED_TO_AUTHENTICATE_WRONG_USERNAME_OR_PASSWORD, VDS_GROUP_CANNOT_UPDATE_CPU_WITH_SUSPENDED_VMS, VDS_GROUP_CANNOT_LOWER_CPU_LEVEL, - VDS_GROUP_CANNOT_UPDATE_COMPATIBILITY_VERSION_WITH_RUNNING_VMS, USER_FAILED_TO_AUTHENTICATE_ACCOUNT_IS_LOCKED_OR_DISABLED, USER_FAILED_TO_AUTHENTICATE_DNS_ERROR, USER_FAILED_TO_AUTHENTICATE_NO_KDCS_FOUND, diff --git a/backend/manager/modules/dal/src/main/resources/bundles/AppErrors.properties b/backend/manager/modules/dal/src/main/resources/bundles/AppErrors.properties index 431cbe7..44ee232 100644 --- a/backend/manager/modules/dal/src/main/resources/bundles/AppErrors.properties +++ b/backend/manager/modules/dal/src/main/resources/bundles/AppErrors.properties @@ -591,7 +591,6 @@ USER_FAILED_TO_AUTHENTICATE_WRONG_USERNAME_OR_PASSWORD=The user name or password is incorrect. VDS_GROUP_CANNOT_UPDATE_CPU_WITH_SUSPENDED_VMS=Cannot update Cluster and change CPU Cluster level if there are suspended VMs in the Cluster VDS_GROUP_CANNOT_LOWER_CPU_LEVEL=Cannot update Cluster and lower CPU Cluster level if not all virtual machines in Cluster are down -VDS_GROUP_CANNOT_UPDATE_COMPATIBILITY_VERSION_WITH_RUNNING_VMS=Cannot update Cluster and change its compatibility version if there are running VMs CUSTOM_VM_PROPERTIES_INVALID_VALUES_NOT_ALLOWED_IN_CURRENT_CLUSTER=Cannot update Cluster, custom properties are not supported under current Cluster version USER_FAILED_TO_AUTHENTICATE_ACCOUNT_IS_LOCKED_OR_DISABLED=Authentication failed. The user is either locked or disabled USER_FAILED_TO_AUTHENTICATE_DNS_ERROR=Authentication Failed. Error in DNS configuration. Please verify the oVirt Engine Host has a valid reverse DNS (PTR) record. diff --git a/frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/AppErrors.java b/frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/AppErrors.java index a2575ac..89e9e6d 100644 --- a/frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/AppErrors.java +++ b/frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/AppErrors.java @@ -1570,9 +1570,6 @@ @DefaultStringValue("Cannot update Cluster and lower CPU Cluster level if not all virtual machines in Cluster are down") String VDS_GROUP_CANNOT_LOWER_CPU_LEVEL(); - @DefaultStringValue("Cannot update Cluster and change its compatibility version if there are running VMs") - String VDS_GROUP_CANNOT_UPDATE_COMPATIBILITY_VERSION_WITH_RUNNING_VMS(); - @DefaultStringValue("Cannot update Cluster, custom properties are not supported under current Cluster version") String CUSTOM_VM_PROPERTIES_INVALID_VALUES_NOT_ALLOWED_IN_CURRENT_CLUSTER(); diff --git a/frontend/webadmin/modules/userportal-gwtp/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors.properties b/frontend/webadmin/modules/userportal-gwtp/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors.properties index 5f2fd99..4ca21b0 100644 --- a/frontend/webadmin/modules/userportal-gwtp/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors.properties +++ b/frontend/webadmin/modules/userportal-gwtp/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors.properties @@ -586,7 +586,6 @@ USER_FAILED_TO_AUTHENTICATE_WRONG_USERNAME_OR_PASSWORD=The user name or password is incorrect. VDS_GROUP_CANNOT_UPDATE_CPU_WITH_SUSPENDED_VMS=Cannot update Cluster and change CPU Cluster level if there are suspended VMs in the Cluster VDS_GROUP_CANNOT_LOWER_CPU_LEVEL=Cannot update Cluster and lower CPU Cluster level if not all virtual machines in Cluster are down -VDS_GROUP_CANNOT_UPDATE_COMPATIBILITY_VERSION_WITH_RUNNING_VMS=Cannot update Cluster and change its compatibility version if there are running VMs CUSTOM_VM_PROPERTIES_INVALID_VALUES_NOT_ALLOWED_IN_CURRENT_CLUSTER=Cannot update Cluster, custom properties are not supported under current Cluster version USER_FAILED_TO_AUTHENTICATE_ACCOUNT_IS_LOCKED_OR_DISABLED=Authentication failed. The user is either locked or disabled USER_FAILED_TO_AUTHENTICATE_DNS_ERROR=Authentication Failed. Error in DNS configuration. Please verify the oVirt Engine Host has a valid reverse DNS (PTR) record. diff --git a/frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors.properties b/frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors.properties index 3872daa..0c13aea 100644 --- a/frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors.properties +++ b/frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors.properties @@ -585,7 +585,6 @@ USER_FAILED_TO_AUTHENTICATE_WRONG_USERNAME_OR_PASSWORD=The user name or password is incorrect. VDS_GROUP_CANNOT_UPDATE_CPU_WITH_SUSPENDED_VMS=Cannot update Cluster and change CPU Cluster level if there are suspended VMs in the Cluster VDS_GROUP_CANNOT_LOWER_CPU_LEVEL=Cannot update Cluster and lower CPU Cluster level if not all virtual machines in Cluster are down -VDS_GROUP_CANNOT_UPDATE_COMPATIBILITY_VERSION_WITH_RUNNING_VMS=Cannot update Cluster and change its compatibility version if there are running VMs CUSTOM_VM_PROPERTIES_INVALID_VALUES_NOT_ALLOWED_IN_CURRENT_CLUSTER=Cannot update Cluster, custom properties are not supported under current Cluster version USER_FAILED_TO_AUTHENTICATE_ACCOUNT_IS_LOCKED_OR_DISABLED=Authentication failed. The user is either locked or disabled USER_FAILED_TO_AUTHENTICATE_DNS_ERROR=Authentication Failed. Error in DNS configuration. Please verify the oVirt Engine Host has a valid reverse DNS (PTR) record. -- To view, visit http://gerrit.ovirt.org/7987 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Id6676ddf8c28cec9e611bd0b35b335c4c0102f7d Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Roy Golan <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
