Vered Volansky has uploaded a new change for review.

Change subject: core: Elaborate on maintenance err msg (#862440)
......................................................................

core: Elaborate on maintenance err msg (#862440)

VDS_CANNOT_MAINTENANCE_VDS_IS_NOT_RESPONDING_AND_SPM raised some
questions with users and is now more elaborate, specifically, how to
overcome.

Change-Id: Ic5e0e3f85d2f1ff1a94b152d6d739308fb970113
Bug-Url: https://bugzilla.redhat.com/862440
Signed-off-by: Vered Volansky <vvola...@redhat.com>
---
M backend/manager/modules/dal/src/main/resources/bundles/AppErrors.properties
M backend/manager/modules/utils/src/test/resources/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
5 files changed, 24 insertions(+), 9 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/99/10599/1

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 4a78e78..392227a 100644
--- 
a/backend/manager/modules/dal/src/main/resources/bundles/AppErrors.properties
+++ 
b/backend/manager/modules/dal/src/main/resources/bundles/AppErrors.properties
@@ -60,8 +60,10 @@
 USER_FAILED_SET_USER_ROLE=Failed set User Role, operation canceled
 VDS_CANNOT_MAINTENANCE_VDS_IS_NOT_RESPONDING_WITH_VMS=Cannot switch Host to 
Maintenance mode.\n\
        Host still has running VMs on it and is in Non-Responsive state.
-VDS_CANNOT_MAINTENANCE_VDS_IS_NOT_RESPONDING_AND_SPM=Cannot switch Host to 
Maintenance mode.\n\
-       Host is Storage Pool Manager and is in Non-Responsive state.
+VDS_CANNOT_MAINTENANCE_VDS_IS_NOT_RESPONDING_AND_SPM=Cannot switch Host to 
Maintenance mode.\nHost is Storage Pool Manager and is in Non-Responsive 
state.\n
+            - If power management is configured, engine will fence 
automatically.\n
+            - Otherwise, either bring the node back up, or release the SPM 
resource.\n
+              To do so, verify the node is really down, right click the host 
and confirm the node was shutdown manually.
 VDS_CANNOT_MAINTENANCE_VDS_IS_NOT_OPERATIONAL=Cannot switch Host to 
Maintenance mode, Host is not operational.
 VDS_CANNOT_MAINTENANCE_VDS_IS_IN_MAINTENANCE=Cannot switch Host to Maintenance 
mode. Host is already in Maintenance mode.
 VDS_CANNOT_MAINTENANCE_SPM_WITH_RUNNING_TASKS=Cannot switch Host to 
Maintenance mode. Host has asynchronous running tasks,\n\
diff --git 
a/backend/manager/modules/utils/src/test/resources/AppErrors.properties 
b/backend/manager/modules/utils/src/test/resources/AppErrors.properties
index d44c741..f7bd660 100644
--- a/backend/manager/modules/utils/src/test/resources/AppErrors.properties
+++ b/backend/manager/modules/utils/src/test/resources/AppErrors.properties
@@ -1,4 +1,4 @@
-DIRECTORY_GROUP_CANNOT_REMOVE_DIRECTORY_GROUP_ATTACHED_TO_VM_POOL=Cannot 
remove Directory Group attached to VM Pool
++DIRECTORY_GROUP_CANNOT_REMOVE_DIRECTORY_GROUP_ATTACHED_TO_VM_POOL=Cannot 
remove Directory Group attached to VM Pool
 DB=Database error
 DB_INIT=Database initialization error
 DB_NO_SUCH_VM=VM not found
@@ -44,7 +44,10 @@
 USER_FAILED_SET_USER_ROLE=Failed set User role, operation canceled
 ENGINE=oVirt Engine error
 VDS_CANNOT_MAINTENANCE_VDS_IS_NOT_RESPONDING_WITH_DESKTOPS=Cannot switch Host 
to Maintenance mode, Host still has running VMs on it and it is non-responsive.
-VDS_CANNOT_MAINTENANCE_VDS_IS_NOT_RESPONDING_AND_SPM=Cannot switch Host to 
Maintenance mode, Host is Storage Pool Manager and it is non-responsive.
+VDS_CANNOT_MAINTENANCE_VDS_IS_NOT_RESPONDING_AND_SPM=Cannot switch Host to 
Maintenance mode.\nHost is Storage Pool Manager and is in Non-Responsive 
state.\n
+            - If power management is configured, engine will fence 
automatically.\n
+            - Otherwise, either bring the node back up, or release the SPM 
resource.\n
+              To do so, verify the node is really down, right click the host 
and confirm the node was shutdown manually.
 VDS_CANNOT_MAINTENANCE_VDS_IS_NOT_OPERATIONAL=Cannot switch Host to 
Maintenance mode, Host is not operational.
 VDS_CANNOT_MAINTENANCE_SPM_WITH_RUNNING_TASKS=Cannot switch Host to 
Maintenance mode, Host has running tasks, please wait all tasks are done.
 VDS_CANNOT_MAINTENANCE_SPM_CONTENDING=Cannot switch Host to Maintenance mode, 
Host is contending for Storage Pool Manager.
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 1dc232d..b9a146b 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
@@ -140,7 +140,13 @@
     @DefaultStringValue("Cannot switch Host to Maintenance mode.\nHost still 
has running VMs on it and is in Non-Responsive state.")
     String VDS_CANNOT_MAINTENANCE_VDS_IS_NOT_RESPONDING_WITH_VMS();
 
-    @DefaultStringValue("Cannot switch Host to Maintenance mode.\nHost is 
Storage Pool Manager and is in Non-Responsive state.")
+    @DefaultStringValue("Cannot switch Host to Maintenance mode.\nHost is 
Storage Pool Manager and is in Non-Responsive state.\n"
+            +
+            "- If power management is configured, engine will fence 
automatically.\n"
+            +
+            "- Otherwise, either bring the node back up, or release the SPM 
resource.\n"
+            +
+            "  To do so, verify the node is really down, right click the host 
and confirm the node was shutdown manually.")
     String VDS_CANNOT_MAINTENANCE_VDS_IS_NOT_RESPONDING_AND_SPM();
 
     @DefaultStringValue("Cannot switch Host to Maintenance mode, Host is not 
operational.")
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 5453d32..ac769a5 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
@@ -60,8 +60,10 @@
 USER_FAILED_SET_USER_ROLE=Failed set User Role, operation canceled
 VDS_CANNOT_MAINTENANCE_VDS_IS_NOT_RESPONDING_WITH_VMS=Cannot switch Host to 
Maintenance mode.\n\
        Host still has running VMs on it and is in Non-Responsive state.
-VDS_CANNOT_MAINTENANCE_VDS_IS_NOT_RESPONDING_AND_SPM=Cannot switch Host to 
Maintenance mode.\n\
-       Host is Storage Pool Manager and is in Non-Responsive state.
+VDS_CANNOT_MAINTENANCE_VDS_IS_NOT_RESPONDING_AND_SPM=Cannot switch Host to 
Maintenance mode.\nHost is Storage Pool Manager and is in Non-Responsive 
state.\n
+            - If power management is configured, engine will fence 
automatically.\n
+            - Otherwise, either bring the node back up, or release the SPM 
resource.\n
+              To do so, verify the node is really down, right click the host 
and confirm the node was shutdown manually.
 VDS_CANNOT_MAINTENANCE_VDS_IS_NOT_OPERATIONAL=Cannot switch Host to 
Maintenance mode, Host is not operational.
 VDS_CANNOT_MAINTENANCE_VDS_IS_IN_MAINTENANCE=Cannot switch Host to Maintenance 
mode. Host is already in Maintenance mode.
 VDS_CANNOT_MAINTENANCE_SPM_WITH_RUNNING_TASKS=Cannot switch Host to 
Maintenance mode. Host has asynchronous running tasks,\n\
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 806b5fa..3828bca 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
@@ -60,8 +60,10 @@
 USER_FAILED_SET_USER_ROLE=Failed set User Role, operation canceled
 VDS_CANNOT_MAINTENANCE_VDS_IS_NOT_RESPONDING_WITH_VMS=Cannot switch Host to 
Maintenance mode.\n\
        Host still has running VMs on it and is in Non-Responsive state.
-VDS_CANNOT_MAINTENANCE_VDS_IS_NOT_RESPONDING_AND_SPM=Cannot switch Host to 
Maintenance mode.\n\
-       Host is Storage Pool Manager and is in Non-Responsive state.
+VDS_CANNOT_MAINTENANCE_VDS_IS_NOT_RESPONDING_AND_SPM=Cannot switch Host to 
Maintenance mode.\nHost is Storage Pool Manager and is in Non-Responsive 
state.\n
+            - If power management is configured, engine will fence 
automatically.\n
+            - Otherwise, either bring the node back up, or release the SPM 
resource.\n
+              To do so, verify the node is really down, right click the host 
and confirm the node was shutdown manually.
 VDS_CANNOT_MAINTENANCE_VDS_IS_NOT_OPERATIONAL=Cannot switch Host to 
Maintenance mode, Host is not operational.
 VDS_CANNOT_MAINTENANCE_VDS_IS_IN_MAINTENANCE=Cannot switch Host to Maintenance 
mode. Host is already in Maintenance mode.
 VDS_CANNOT_MAINTENANCE_SPM_WITH_RUNNING_TASKS=Cannot switch Host to 
Maintenance mode. Host has asynchronous running tasks,\n\


--
To view, visit http://gerrit.ovirt.org/10599
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic5e0e3f85d2f1ff1a94b152d6d739308fb970113
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Vered Volansky <vvola...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches

Reply via email to