You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by hu...@apache.org on 2014/11/18 14:32:03 UTC
[1/4] git commit: updated refs/heads/master to 302d519
Repository: cloudstack
Updated Branches:
refs/heads/master e1d4a329c -> 302d5195d
CID-1254835 proxy can only be null in a special case
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/8560cc3b
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/8560cc3b
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/8560cc3b
Branch: refs/heads/master
Commit: 8560cc3b012cfc8d1c4cf8dbbd5a4c6c06dc88e8
Parents: 3176068
Author: Hugo Trippaers <ht...@schubergphilis.com>
Authored: Tue Nov 18 09:30:37 2014 +0100
Committer: Hugo Trippaers <ht...@schubergphilis.com>
Committed: Tue Nov 18 09:30:37 2014 +0100
----------------------------------------------------------------------
.../cloud/alert/ConsoleProxyAlertAdapter.java | 103 ++++++++++---------
1 file changed, 54 insertions(+), 49 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8560cc3b/server/src/com/cloud/alert/ConsoleProxyAlertAdapter.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/alert/ConsoleProxyAlertAdapter.java b/server/src/com/cloud/alert/ConsoleProxyAlertAdapter.java
index 4ca5f4a..ba1dca4 100644
--- a/server/src/com/cloud/alert/ConsoleProxyAlertAdapter.java
+++ b/server/src/com/cloud/alert/ConsoleProxyAlertAdapter.java
@@ -31,6 +31,7 @@ import com.cloud.dc.DataCenterVO;
import com.cloud.dc.dao.DataCenterDao;
import com.cloud.utils.component.AdapterBase;
import com.cloud.utils.events.SubscriptionMgr;
+import com.cloud.utils.exception.CloudRuntimeException;
import com.cloud.vm.ConsoleProxyVO;
import com.cloud.vm.dao.ConsoleProxyDao;
@@ -57,87 +58,91 @@ public class ConsoleProxyAlertAdapter extends AdapterBase implements AlertAdapte
if (proxy == null && args.getProxyId() != 0)
proxy = _consoleProxyDao.findById(args.getProxyId());
+ if (proxy == null && args.getType() != ConsoleProxyAlertEventArgs.PROXY_CREATE_FAILURE) {
+ throw new CloudRuntimeException("Invalid alert arguments, proxy must be set");
+ }
+
switch (args.getType()) {
- case ConsoleProxyAlertEventArgs.PROXY_CREATED:
- if (s_logger.isDebugEnabled())
- s_logger.debug("New console proxy created, zone: " + dc.getName() + ", proxy: " + proxy.getHostName() + ", public IP: " + proxy.getPublicIpAddress() +
+ case ConsoleProxyAlertEventArgs.PROXY_CREATED:
+ if (s_logger.isDebugEnabled())
+ s_logger.debug("New console proxy created, zone: " + dc.getName() + ", proxy: " + proxy.getHostName() + ", public IP: " + proxy.getPublicIpAddress() +
", private IP: " + proxy.getPrivateIpAddress());
- break;
+ break;
- case ConsoleProxyAlertEventArgs.PROXY_UP:
- if (s_logger.isDebugEnabled())
- s_logger.debug("Console proxy is up, zone: " + dc.getName() + ", proxy: " + proxy.getHostName() + ", public IP: " + proxy.getPublicIpAddress() +
+ case ConsoleProxyAlertEventArgs.PROXY_UP:
+ if (s_logger.isDebugEnabled())
+ s_logger.debug("Console proxy is up, zone: " + dc.getName() + ", proxy: " + proxy.getHostName() + ", public IP: " + proxy.getPublicIpAddress() +
", private IP: " + proxy.getPrivateIpAddress());
- _alertMgr.sendAlert(AlertManager.AlertType.ALERT_TYPE_CONSOLE_PROXY, args.getZoneId(), proxy.getPodIdToDeployIn(),
+ _alertMgr.sendAlert(AlertManager.AlertType.ALERT_TYPE_CONSOLE_PROXY, args.getZoneId(), proxy.getPodIdToDeployIn(),
"Console proxy up in zone: " + dc.getName() +
- ", proxy: " + proxy.getHostName() + ", public IP: " + proxy.getPublicIpAddress() + ", private IP: " +
- (proxy.getPrivateIpAddress() == null ? "N/A" : proxy.getPrivateIpAddress()), "Console proxy up (zone " + dc.getName() + ")");
- break;
+ ", proxy: " + proxy.getHostName() + ", public IP: " + proxy.getPublicIpAddress() + ", private IP: " +
+ (proxy.getPrivateIpAddress() == null ? "N/A" : proxy.getPrivateIpAddress()), "Console proxy up (zone " + dc.getName() + ")");
+ break;
- case ConsoleProxyAlertEventArgs.PROXY_DOWN:
- if (s_logger.isDebugEnabled())
- s_logger.debug("Console proxy is down, zone: " + dc.getName() + ", proxy: " + proxy.getHostName() + ", public IP: " + proxy.getPublicIpAddress() +
+ case ConsoleProxyAlertEventArgs.PROXY_DOWN:
+ if (s_logger.isDebugEnabled())
+ s_logger.debug("Console proxy is down, zone: " + dc.getName() + ", proxy: " + proxy.getHostName() + ", public IP: " + proxy.getPublicIpAddress() +
", private IP: " + (proxy.getPrivateIpAddress() == null ? "N/A" : proxy.getPrivateIpAddress()));
- _alertMgr.sendAlert(AlertManager.AlertType.ALERT_TYPE_CONSOLE_PROXY, args.getZoneId(), proxy.getPodIdToDeployIn(),
+ _alertMgr.sendAlert(AlertManager.AlertType.ALERT_TYPE_CONSOLE_PROXY, args.getZoneId(), proxy.getPodIdToDeployIn(),
"Console proxy down in zone: " + dc.getName() +
- ", proxy: " + proxy.getHostName() + ", public IP: " + proxy.getPublicIpAddress() + ", private IP: " +
- (proxy.getPrivateIpAddress() == null ? "N/A" : proxy.getPrivateIpAddress()), "Console proxy down (zone " + dc.getName() + ")");
- break;
+ ", proxy: " + proxy.getHostName() + ", public IP: " + proxy.getPublicIpAddress() + ", private IP: " +
+ (proxy.getPrivateIpAddress() == null ? "N/A" : proxy.getPrivateIpAddress()), "Console proxy down (zone " + dc.getName() + ")");
+ break;
- case ConsoleProxyAlertEventArgs.PROXY_REBOOTED:
- if (s_logger.isDebugEnabled())
- s_logger.debug("Console proxy is rebooted, zone: " + dc.getName() + ", proxy: " + proxy.getHostName() + ", public IP: " + proxy.getPublicIpAddress() +
+ case ConsoleProxyAlertEventArgs.PROXY_REBOOTED:
+ if (s_logger.isDebugEnabled())
+ s_logger.debug("Console proxy is rebooted, zone: " + dc.getName() + ", proxy: " + proxy.getHostName() + ", public IP: " + proxy.getPublicIpAddress() +
", private IP: " + (proxy.getPrivateIpAddress() == null ? "N/A" : proxy.getPrivateIpAddress()));
- _alertMgr.sendAlert(AlertManager.AlertType.ALERT_TYPE_CONSOLE_PROXY, args.getZoneId(), proxy.getPodIdToDeployIn(),
+ _alertMgr.sendAlert(AlertManager.AlertType.ALERT_TYPE_CONSOLE_PROXY, args.getZoneId(), proxy.getPodIdToDeployIn(),
"Console proxy rebooted in zone: " + dc.getName() + ", proxy: " + proxy.getHostName() + ", public IP: " + proxy.getPublicIpAddress() +
- ", private IP: " + (proxy.getPrivateIpAddress() == null ? "N/A" : proxy.getPrivateIpAddress()), "Console proxy rebooted (zone " + dc.getName() +
- ")");
- break;
-
- case ConsoleProxyAlertEventArgs.PROXY_CREATE_FAILURE:
- if (s_logger.isDebugEnabled())
- s_logger.debug("Console proxy creation failure, zone: " + dc.getName());
- _alertMgr.sendAlert(AlertManager.AlertType.ALERT_TYPE_CONSOLE_PROXY, args.getZoneId(), null,
+ ", private IP: " + (proxy.getPrivateIpAddress() == null ? "N/A" : proxy.getPrivateIpAddress()), "Console proxy rebooted (zone " + dc.getName() +
+ ")");
+ break;
+
+ case ConsoleProxyAlertEventArgs.PROXY_CREATE_FAILURE:
+ if (s_logger.isDebugEnabled())
+ s_logger.debug("Console proxy creation failure, zone: " + dc.getName());
+ _alertMgr.sendAlert(AlertManager.AlertType.ALERT_TYPE_CONSOLE_PROXY, args.getZoneId(), null,
"Console proxy creation failure. zone: " + dc.getName() + ", error details: " + args.getMessage(),
"Console proxy creation failure (zone " + dc.getName() + ")");
- break;
+ break;
- case ConsoleProxyAlertEventArgs.PROXY_START_FAILURE:
- if (s_logger.isDebugEnabled())
- s_logger.debug("Console proxy startup failure, zone: " + dc.getName() + ", proxy: " + proxy.getHostName() + ", public IP: " +
+ case ConsoleProxyAlertEventArgs.PROXY_START_FAILURE:
+ if (s_logger.isDebugEnabled())
+ s_logger.debug("Console proxy startup failure, zone: " + dc.getName() + ", proxy: " + proxy.getHostName() + ", public IP: " +
proxy.getPublicIpAddress() + ", private IP: " + (proxy.getPrivateIpAddress() == null ? "N/A" : proxy.getPrivateIpAddress()));
- _alertMgr.sendAlert(AlertManager.AlertType.ALERT_TYPE_CONSOLE_PROXY, args.getZoneId(), proxy.getPodIdToDeployIn(),
+ _alertMgr.sendAlert(AlertManager.AlertType.ALERT_TYPE_CONSOLE_PROXY, args.getZoneId(), proxy.getPodIdToDeployIn(),
"Console proxy startup failure. zone: " + dc.getName() + ", proxy: " + proxy.getHostName() + ", public IP: " + proxy.getPublicIpAddress() +
- ", private IP: " + (proxy.getPrivateIpAddress() == null ? "N/A" : proxy.getPrivateIpAddress()) + ", error details: " + args.getMessage(),
+ ", private IP: " + (proxy.getPrivateIpAddress() == null ? "N/A" : proxy.getPrivateIpAddress()) + ", error details: " + args.getMessage(),
"Console proxy startup failure (zone " + dc.getName() + ")");
- break;
+ break;
- case ConsoleProxyAlertEventArgs.PROXY_FIREWALL_ALERT:
- if (s_logger.isDebugEnabled())
- s_logger.debug("Console proxy firewall alert, zone: " + dc.getName() + ", proxy: " + proxy.getHostName() + ", public IP: " +
+ case ConsoleProxyAlertEventArgs.PROXY_FIREWALL_ALERT:
+ if (s_logger.isDebugEnabled())
+ s_logger.debug("Console proxy firewall alert, zone: " + dc.getName() + ", proxy: " + proxy.getHostName() + ", public IP: " +
proxy.getPublicIpAddress() + ", private IP: " + (proxy.getPrivateIpAddress() == null ? "N/A" : proxy.getPrivateIpAddress()));
- _alertMgr.sendAlert(
+ _alertMgr.sendAlert(
AlertManager.AlertType.ALERT_TYPE_CONSOLE_PROXY,
args.getZoneId(),
proxy.getPodIdToDeployIn(),
"Failed to open console proxy firewall port. zone: " + dc.getName() + ", proxy: " + proxy.getHostName() + ", public IP: " +
- proxy.getPublicIpAddress() + ", private IP: " + (proxy.getPrivateIpAddress() == null ? "N/A" : proxy.getPrivateIpAddress()),
- "Console proxy alert (zone " + dc.getName() + ")");
- break;
+ proxy.getPublicIpAddress() + ", private IP: " + (proxy.getPrivateIpAddress() == null ? "N/A" : proxy.getPrivateIpAddress()),
+ "Console proxy alert (zone " + dc.getName() + ")");
+ break;
- case ConsoleProxyAlertEventArgs.PROXY_STORAGE_ALERT:
- if (s_logger.isDebugEnabled())
- s_logger.debug("Console proxy storage alert, zone: " + dc.getName() + ", proxy: " + proxy.getHostName() + ", public IP: " +
+ case ConsoleProxyAlertEventArgs.PROXY_STORAGE_ALERT:
+ if (s_logger.isDebugEnabled())
+ s_logger.debug("Console proxy storage alert, zone: " + dc.getName() + ", proxy: " + proxy.getHostName() + ", public IP: " +
proxy.getPublicIpAddress() + ", private IP: " + proxy.getPrivateIpAddress() + ", message: " + args.getMessage());
- _alertMgr.sendAlert(AlertManager.AlertType.ALERT_TYPE_STORAGE_MISC, args.getZoneId(), proxy.getPodIdToDeployIn(),
+ _alertMgr.sendAlert(AlertManager.AlertType.ALERT_TYPE_STORAGE_MISC, args.getZoneId(), proxy.getPodIdToDeployIn(),
"Console proxy storage issue. zone: " + dc.getName() + ", message: " + args.getMessage(), "Console proxy alert (zone " + dc.getName() + ")");
- break;
+ break;
}
}
[3/4] git commit: updated refs/heads/master to 302d519
Posted by hu...@apache.org.
CID-1116546 Fix resource leak
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/fe0168f6
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/fe0168f6
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/fe0168f6
Branch: refs/heads/master
Commit: fe0168f6d2d1ee144a1a6e0580464420f1dfa5fe
Parents: e1d4a32
Author: Hugo Trippaers <ht...@schubergphilis.com>
Authored: Tue Nov 18 14:30:55 2014 +0100
Committer: Hugo Trippaers <ht...@schubergphilis.com>
Committed: Tue Nov 18 14:30:55 2014 +0100
----------------------------------------------------------------------
usage/src/com/cloud/usage/UsageServer.java | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/fe0168f6/usage/src/com/cloud/usage/UsageServer.java
----------------------------------------------------------------------
diff --git a/usage/src/com/cloud/usage/UsageServer.java b/usage/src/com/cloud/usage/UsageServer.java
index 37d4b70..d4f19eb 100644
--- a/usage/src/com/cloud/usage/UsageServer.java
+++ b/usage/src/com/cloud/usage/UsageServer.java
@@ -25,7 +25,6 @@ import org.apache.commons.daemon.DaemonInitException;
import org.apache.log4j.Logger;
import org.apache.log4j.PropertyConfigurator;
import org.apache.log4j.xml.DOMConfigurator;
-import org.springframework.context.ApplicationContext;
import org.springframework.context.support.ClassPathXmlApplicationContext;
import org.springframework.util.Log4jConfigurer;
@@ -36,7 +35,8 @@ public class UsageServer implements Daemon {
private static final Logger s_logger = Logger.getLogger(UsageServer.class.getName());
public static final String Name = "usage-server";
- UsageManager mgr;
+ private UsageManager mgr;
+ private ClassPathXmlApplicationContext appContext;
/**
* @param args
@@ -54,7 +54,8 @@ public class UsageServer implements Daemon {
@Override
public void start() {
- ApplicationContext appContext = new ClassPathXmlApplicationContext("usageApplicationContext.xml");
+
+ appContext = new ClassPathXmlApplicationContext("usageApplicationContext.xml");
try {
ComponentContext.initComponentsLifeCycle();
@@ -73,7 +74,7 @@ public class UsageServer implements Daemon {
@Override
public void stop() {
-
+ appContext.close();
}
@Override
[4/4] git commit: updated refs/heads/master to 302d519
Posted by hu...@apache.org.
Merge branch 'bugfix/CID-1254835'
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/302d5195
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/302d5195
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/302d5195
Branch: refs/heads/master
Commit: 302d5195d4a1205d3364cad236039c2dc76027c2
Parents: fe0168f ef30300
Author: Hugo Trippaers <ht...@schubergphilis.com>
Authored: Tue Nov 18 14:31:33 2014 +0100
Committer: Hugo Trippaers <ht...@schubergphilis.com>
Committed: Tue Nov 18 14:31:33 2014 +0100
----------------------------------------------------------------------
.../cloud/alert/ConsoleProxyAlertAdapter.java | 103 +++++++++---------
.../alert/SecondaryStorageVmAlertAdapter.java | 105 ++++++++++---------
2 files changed, 109 insertions(+), 99 deletions(-)
----------------------------------------------------------------------
[2/4] git commit: updated refs/heads/master to 302d519
Posted by hu...@apache.org.
CID-1254834 secStorageVm can only be null in a special case
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/ef303002
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/ef303002
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/ef303002
Branch: refs/heads/master
Commit: ef30300281418e23a5e964a04acd66f7c0994699
Parents: 8560cc3
Author: Hugo Trippaers <ht...@schubergphilis.com>
Authored: Tue Nov 18 09:37:35 2014 +0100
Committer: Hugo Trippaers <ht...@schubergphilis.com>
Committed: Tue Nov 18 09:37:35 2014 +0100
----------------------------------------------------------------------
.../alert/SecondaryStorageVmAlertAdapter.java | 105 ++++++++++---------
1 file changed, 55 insertions(+), 50 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ef303002/server/src/com/cloud/alert/SecondaryStorageVmAlertAdapter.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/alert/SecondaryStorageVmAlertAdapter.java b/server/src/com/cloud/alert/SecondaryStorageVmAlertAdapter.java
index 3bfedce..392015b 100644
--- a/server/src/com/cloud/alert/SecondaryStorageVmAlertAdapter.java
+++ b/server/src/com/cloud/alert/SecondaryStorageVmAlertAdapter.java
@@ -31,6 +31,7 @@ import com.cloud.storage.secondary.SecStorageVmAlertEventArgs;
import com.cloud.storage.secondary.SecondaryStorageVmManager;
import com.cloud.utils.component.AdapterBase;
import com.cloud.utils.events.SubscriptionMgr;
+import com.cloud.utils.exception.CloudRuntimeException;
import com.cloud.vm.SecondaryStorageVmVO;
import com.cloud.vm.dao.SecondaryStorageVmDao;
@@ -56,92 +57,96 @@ public class SecondaryStorageVmAlertAdapter extends AdapterBase implements Alert
if (secStorageVm == null && args.getSecStorageVmId() != 0)
secStorageVm = _ssvmDao.findById(args.getSecStorageVmId());
+ if (secStorageVm == null && args.getType() != SecStorageVmAlertEventArgs.SSVM_CREATE_FAILURE) {
+ throw new CloudRuntimeException("Invalid alert arguments, secStorageVm must be set");
+ }
+
switch (args.getType()) {
- case SecStorageVmAlertEventArgs.SSVM_CREATED:
- if (s_logger.isDebugEnabled())
- s_logger.debug("New secondary storage vm created, zone: " + dc.getName() + ", secStorageVm: " + secStorageVm.getHostName() + ", public IP: " +
+ case SecStorageVmAlertEventArgs.SSVM_CREATED:
+ if (s_logger.isDebugEnabled())
+ s_logger.debug("New secondary storage vm created, zone: " + dc.getName() + ", secStorageVm: " + secStorageVm.getHostName() + ", public IP: " +
secStorageVm.getPublicIpAddress() + ", private IP: " + secStorageVm.getPrivateIpAddress());
- break;
+ break;
- case SecStorageVmAlertEventArgs.SSVM_UP:
- if (s_logger.isDebugEnabled())
- s_logger.debug("Secondary Storage Vm is up, zone: " + dc.getName() + ", secStorageVm: " + secStorageVm.getHostName() + ", public IP: " +
+ case SecStorageVmAlertEventArgs.SSVM_UP:
+ if (s_logger.isDebugEnabled())
+ s_logger.debug("Secondary Storage Vm is up, zone: " + dc.getName() + ", secStorageVm: " + secStorageVm.getHostName() + ", public IP: " +
secStorageVm.getPublicIpAddress() + ", private IP: " + secStorageVm.getPrivateIpAddress());
- _alertMgr.sendAlert(AlertManager.AlertType.ALERT_TYPE_SSVM, args.getZoneId(), secStorageVm.getPodIdToDeployIn(), "Secondary Storage Vm up in zone: " +
+ _alertMgr.sendAlert(AlertManager.AlertType.ALERT_TYPE_SSVM, args.getZoneId(), secStorageVm.getPodIdToDeployIn(), "Secondary Storage Vm up in zone: " +
dc.getName() + ", secStorageVm: " + secStorageVm.getHostName() + ", public IP: " + secStorageVm.getPublicIpAddress() + ", private IP: " +
(secStorageVm.getPrivateIpAddress() == null ? "N/A" : secStorageVm.getPrivateIpAddress()), "Secondary Storage Vm up (zone " + dc.getName() + ")");
- break;
+ break;
- case SecStorageVmAlertEventArgs.SSVM_DOWN:
- if (s_logger.isDebugEnabled())
- s_logger.debug("Secondary Storage Vm is down, zone: " + dc.getName() + ", secStorageVm: " + secStorageVm.getHostName() + ", public IP: " +
+ case SecStorageVmAlertEventArgs.SSVM_DOWN:
+ if (s_logger.isDebugEnabled())
+ s_logger.debug("Secondary Storage Vm is down, zone: " + dc.getName() + ", secStorageVm: " + secStorageVm.getHostName() + ", public IP: " +
secStorageVm.getPublicIpAddress() + ", private IP: " + (secStorageVm.getPrivateIpAddress() == null ? "N/A" : secStorageVm.getPrivateIpAddress()));
- _alertMgr.sendAlert(
+ _alertMgr.sendAlert(
AlertManager.AlertType.ALERT_TYPE_SSVM,
args.getZoneId(),
secStorageVm.getPodIdToDeployIn(),
"Secondary Storage Vm down in zone: " + dc.getName() + ", secStorageVm: " + secStorageVm.getHostName() + ", public IP: " +
- secStorageVm.getPublicIpAddress() + ", private IP: " + (secStorageVm.getPrivateIpAddress() == null ? "N/A" : secStorageVm.getPrivateIpAddress()),
- "Secondary Storage Vm down (zone " + dc.getName() + ")");
- break;
+ secStorageVm.getPublicIpAddress() + ", private IP: " + (secStorageVm.getPrivateIpAddress() == null ? "N/A" : secStorageVm.getPrivateIpAddress()),
+ "Secondary Storage Vm down (zone " + dc.getName() + ")");
+ break;
- case SecStorageVmAlertEventArgs.SSVM_REBOOTED:
- if (s_logger.isDebugEnabled())
- s_logger.debug("Secondary Storage Vm is rebooted, zone: " + dc.getName() + ", secStorageVm: " + secStorageVm.getHostName() + ", public IP: " +
+ case SecStorageVmAlertEventArgs.SSVM_REBOOTED:
+ if (s_logger.isDebugEnabled())
+ s_logger.debug("Secondary Storage Vm is rebooted, zone: " + dc.getName() + ", secStorageVm: " + secStorageVm.getHostName() + ", public IP: " +
secStorageVm.getPublicIpAddress() + ", private IP: " + (secStorageVm.getPrivateIpAddress() == null ? "N/A" : secStorageVm.getPrivateIpAddress()));
- _alertMgr.sendAlert(
+ _alertMgr.sendAlert(
AlertManager.AlertType.ALERT_TYPE_SSVM,
args.getZoneId(),
secStorageVm.getPodIdToDeployIn(),
"Secondary Storage Vm rebooted in zone: " + dc.getName() + ", secStorageVm: " + secStorageVm.getHostName() + ", public IP: " +
- secStorageVm.getPublicIpAddress() + ", private IP: " + (secStorageVm.getPrivateIpAddress() == null ? "N/A" : secStorageVm.getPrivateIpAddress()),
- "Secondary Storage Vm rebooted (zone " + dc.getName() + ")");
- break;
+ secStorageVm.getPublicIpAddress() + ", private IP: " + (secStorageVm.getPrivateIpAddress() == null ? "N/A" : secStorageVm.getPrivateIpAddress()),
+ "Secondary Storage Vm rebooted (zone " + dc.getName() + ")");
+ break;
- case SecStorageVmAlertEventArgs.SSVM_CREATE_FAILURE:
- if (s_logger.isDebugEnabled())
- s_logger.debug("Secondary Storage Vm creation failure, zone: " + dc.getName());
+ case SecStorageVmAlertEventArgs.SSVM_CREATE_FAILURE:
+ if (s_logger.isDebugEnabled())
+ s_logger.debug("Secondary Storage Vm creation failure, zone: " + dc.getName());
- _alertMgr.sendAlert(AlertManager.AlertType.ALERT_TYPE_SSVM, args.getZoneId(), null,
+ _alertMgr.sendAlert(AlertManager.AlertType.ALERT_TYPE_SSVM, args.getZoneId(), null,
"Secondary Storage Vm creation failure. zone: " + dc.getName() + ", error details: " + args.getMessage(),
"Secondary Storage Vm creation failure (zone " + dc.getName() + ")");
- break;
+ break;
- case SecStorageVmAlertEventArgs.SSVM_START_FAILURE:
- if (s_logger.isDebugEnabled())
- s_logger.debug("Secondary Storage Vm startup failure, zone: " + dc.getName() + ", secStorageVm: " + secStorageVm.getHostName() + ", public IP: " +
+ case SecStorageVmAlertEventArgs.SSVM_START_FAILURE:
+ if (s_logger.isDebugEnabled())
+ s_logger.debug("Secondary Storage Vm startup failure, zone: " + dc.getName() + ", secStorageVm: " + secStorageVm.getHostName() + ", public IP: " +
secStorageVm.getPublicIpAddress() + ", private IP: " + (secStorageVm.getPrivateIpAddress() == null ? "N/A" : secStorageVm.getPrivateIpAddress()));
- _alertMgr.sendAlert(AlertManager.AlertType.ALERT_TYPE_SSVM, args.getZoneId(), secStorageVm.getPodIdToDeployIn(),
+ _alertMgr.sendAlert(AlertManager.AlertType.ALERT_TYPE_SSVM, args.getZoneId(), secStorageVm.getPodIdToDeployIn(),
"Secondary Storage Vm startup failure. zone: " +
- dc.getName() + ", secStorageVm: " + secStorageVm.getHostName() + ", public IP: " + secStorageVm.getPublicIpAddress() + ", private IP: " +
- (secStorageVm.getPrivateIpAddress() == null ? "N/A" : secStorageVm.getPrivateIpAddress()) + ", error details: " + args.getMessage(),
- "Secondary Storage Vm startup failure (zone " + dc.getName() + ")");
- break;
-
- case SecStorageVmAlertEventArgs.SSVM_FIREWALL_ALERT:
- if (s_logger.isDebugEnabled())
- s_logger.debug("Secondary Storage Vm firewall alert, zone: " + dc.getName() + ", secStorageVm: " + secStorageVm.getHostName() + ", public IP: " +
+ dc.getName() + ", secStorageVm: " + secStorageVm.getHostName() + ", public IP: " + secStorageVm.getPublicIpAddress() + ", private IP: " +
+ (secStorageVm.getPrivateIpAddress() == null ? "N/A" : secStorageVm.getPrivateIpAddress()) + ", error details: " + args.getMessage(),
+ "Secondary Storage Vm startup failure (zone " + dc.getName() + ")");
+ break;
+
+ case SecStorageVmAlertEventArgs.SSVM_FIREWALL_ALERT:
+ if (s_logger.isDebugEnabled())
+ s_logger.debug("Secondary Storage Vm firewall alert, zone: " + dc.getName() + ", secStorageVm: " + secStorageVm.getHostName() + ", public IP: " +
secStorageVm.getPublicIpAddress() + ", private IP: " + (secStorageVm.getPrivateIpAddress() == null ? "N/A" : secStorageVm.getPrivateIpAddress()));
- _alertMgr.sendAlert(AlertManager.AlertType.ALERT_TYPE_SSVM, args.getZoneId(), secStorageVm.getPodIdToDeployIn(),
+ _alertMgr.sendAlert(AlertManager.AlertType.ALERT_TYPE_SSVM, args.getZoneId(), secStorageVm.getPodIdToDeployIn(),
"Failed to open secondary storage vm firewall port. zone: " + dc.getName() + ", secStorageVm: " + secStorageVm.getHostName() + ", public IP: " +
- secStorageVm.getPublicIpAddress() + ", private IP: " + (secStorageVm.getPrivateIpAddress() == null ? "N/A" : secStorageVm.getPrivateIpAddress()),
- "Secondary Storage Vm alert (zone " + dc.getName() + ")");
- break;
+ secStorageVm.getPublicIpAddress() + ", private IP: " + (secStorageVm.getPrivateIpAddress() == null ? "N/A" : secStorageVm.getPrivateIpAddress()),
+ "Secondary Storage Vm alert (zone " + dc.getName() + ")");
+ break;
- case SecStorageVmAlertEventArgs.SSVM_STORAGE_ALERT:
- if (s_logger.isDebugEnabled())
- s_logger.debug("Secondary Storage Vm storage alert, zone: " + dc.getName() + ", secStorageVm: " + secStorageVm.getHostName() + ", public IP: " +
+ case SecStorageVmAlertEventArgs.SSVM_STORAGE_ALERT:
+ if (s_logger.isDebugEnabled())
+ s_logger.debug("Secondary Storage Vm storage alert, zone: " + dc.getName() + ", secStorageVm: " + secStorageVm.getHostName() + ", public IP: " +
secStorageVm.getPublicIpAddress() + ", private IP: " + secStorageVm.getPrivateIpAddress() + ", message: " + args.getMessage());
- _alertMgr.sendAlert(AlertManager.AlertType.ALERT_TYPE_STORAGE_MISC, args.getZoneId(), secStorageVm.getPodIdToDeployIn(),
+ _alertMgr.sendAlert(AlertManager.AlertType.ALERT_TYPE_STORAGE_MISC, args.getZoneId(), secStorageVm.getPodIdToDeployIn(),
"Secondary Storage Vm storage issue. zone: " + dc.getName() + ", message: " + args.getMessage(), "Secondary Storage Vm alert (zone " + dc.getName() +
- ")");
- break;
+ ")");
+ break;
}
}