From 28f1baa610fe86f34cf20a4941b546bdc46b189c Mon Sep 17 00:00:00 2001 From: Gabriel Brascher Date: Wed, 21 Oct 2020 07:17:45 -0300 Subject: [PATCH 1/2] Create Error EVENT in case of oobm failure --- .../outofbandmanagement/PowerOperationTask.java | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/server/src/main/java/org/apache/cloudstack/outofbandmanagement/PowerOperationTask.java b/server/src/main/java/org/apache/cloudstack/outofbandmanagement/PowerOperationTask.java index 9c346d76c5f5..84b7f27b7eb1 100644 --- a/server/src/main/java/org/apache/cloudstack/outofbandmanagement/PowerOperationTask.java +++ b/server/src/main/java/org/apache/cloudstack/outofbandmanagement/PowerOperationTask.java @@ -17,7 +17,11 @@ package org.apache.cloudstack.outofbandmanagement; +import com.cloud.event.ActionEventUtils; +import com.cloud.event.EventTypes; +import com.cloud.event.EventVO; import com.cloud.host.Host; +import org.apache.cloudstack.context.CallContext; import org.apache.log4j.Logger; public class PowerOperationTask implements Runnable { @@ -43,8 +47,14 @@ public void run() { try { service.executePowerOperation(host, powerOperation, null); } catch (Exception e) { - LOG.warn(String.format("Out-of-band management background task operation=%s for host id=%d failed with: %s", - powerOperation.name(), host.getId(), e.getMessage())); + LOG.warn(String.format("Out-of-band management background task operation=%s for host id=%d name=%s failed with: %s", + powerOperation.name(), host.getId(), host.getName(), e.getMessage())); + + String eventMessage = String + .format("Error while issuing out-of-band management action (%s) for host (id: %d, name: %s)", powerOperation.name(), host.getId(), host.getName()); + + ActionEventUtils.onCreatedActionEvent(CallContext.current().getCallingUserId(), CallContext.current().getCallingAccountId(), EventVO.LEVEL_WARN, + EventTypes.EVENT_HOST_OUTOFBAND_MANAGEMENT_ACTION, true, eventMessage); } } } From 8de5434252473a94c814afa0b3b20f902a935e88 Mon Sep 17 00:00:00 2001 From: Gabriel Brascher Date: Thu, 22 Oct 2020 17:08:45 -0300 Subject: [PATCH 2/2] Choose host name over host id on messages --- .../cloudstack/outofbandmanagement/PowerOperationTask.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/server/src/main/java/org/apache/cloudstack/outofbandmanagement/PowerOperationTask.java b/server/src/main/java/org/apache/cloudstack/outofbandmanagement/PowerOperationTask.java index 84b7f27b7eb1..0bb197761e2c 100644 --- a/server/src/main/java/org/apache/cloudstack/outofbandmanagement/PowerOperationTask.java +++ b/server/src/main/java/org/apache/cloudstack/outofbandmanagement/PowerOperationTask.java @@ -47,11 +47,11 @@ public void run() { try { service.executePowerOperation(host, powerOperation, null); } catch (Exception e) { - LOG.warn(String.format("Out-of-band management background task operation=%s for host id=%d name=%s failed with: %s", - powerOperation.name(), host.getId(), host.getName(), e.getMessage())); + LOG.warn(String.format("Out-of-band management background task operation=%s for host %s failed with: %s", + powerOperation.name(), host.getName(), e.getMessage())); String eventMessage = String - .format("Error while issuing out-of-band management action (%s) for host (id: %d, name: %s)", powerOperation.name(), host.getId(), host.getName()); + .format("Error while issuing out-of-band management action %s for host: %s", powerOperation.name(), host.getName()); ActionEventUtils.onCreatedActionEvent(CallContext.current().getCallingUserId(), CallContext.current().getCallingAccountId(), EventVO.LEVEL_WARN, EventTypes.EVENT_HOST_OUTOFBAND_MANAGEMENT_ACTION, true, eventMessage);