optimisation on OOBM and NPE guards

Author: Daan Hoogland

engine/orchestration/src/main/java/com/cloud/agent/manager/AgentManagerImpl.java

@@ -2006,7 +2006,7 @@ protected void runInContext() {
                     if (_resourceMgr.checkAndMaintain(host.getId())) {
                         final DataCenterVO dcVO = _dcDao.findById(host.getDataCenterId());
                         final HostPodVO podVO = _podDao.findById(host.getPodId());
-                        final String hostDesc = "name: " + host.getName() + " (id:" + host.getId() + "), availability zone: " + dcVO.getName() + ", pod: " + podVO.getName();
+                        final String hostDesc = AlertFormatUtils.describeHostLocation(host, dcVO, podVO);
                         _alertMgr.sendAlert(AlertService.AlertType.ALERT_TYPE_HOST, host.getDataCenterId(), host.getPodId(), "Migration Complete for host " + hostDesc,
                                 "Host [" + hostDesc + "] is ready for maintenance");
                     }

engine/storage/volume/src/main/java/org/apache/cloudstack/storage/datastore/provider/DefaultHostListener.java

@@ -163,7 +163,7 @@ public boolean hostConnect(long hostId, long poolId) throws StorageConflictExcep
         }
 
         if (!answer.getResult()) {
-            String msg = String.format("Unable to attach storage pool %s to the host %s", pool, host);
+            String msg = String.format("Unable to attach storage pool %s to the host %s", pool, host != null ? host : "id " + hostId);
             alertMgr.sendAlert(AlertManager.AlertType.ALERT_TYPE_HOST, pool.getDataCenterId(), pool.getPodId(), msg, msg);
             throw new CloudRuntimeException(String.format("Unable to establish connection from storage head to storage pool %s due to %s %s",
                     pool, answer.getDetails(), pool.getUuid()));

plugins/storage/volume/datera/src/main/java/org/apache/cloudstack/storage/datastore/provider/DateraHostListener.java

@@ -281,9 +281,9 @@ private void sendModifyTargetsCommand(ModifyTargetsCommand cmd, long hostId) {
 
         if (!answer.getResult()) {
             HostVO host = _hostDao.findById(hostId);
-            String msg = String.format("Unable to modify targets on the following host: %s", host);
+            String msg = String.format("Unable to modify targets on the following host: %s", host != null ? host : "id " + hostId);
 
-            _alertMgr.sendAlert(AlertManager.AlertType.ALERT_TYPE_HOST, host.getDataCenterId(), host.getPodId(), msg, msg);
+            _alertMgr.sendAlert(AlertManager.AlertType.ALERT_TYPE_HOST, host != null ? host.getDataCenterId() : -1L, host != null ? host.getPodId() : null, msg, msg);
 
             throw new CloudRuntimeException(msg);
         }
@@ -298,7 +298,7 @@ private void sendModifyStoragePoolCommand(ModifyStoragePoolCommand cmd, StorageP
 
         if (!answer.getResult()) {
             HostVO host = _hostDao.findById(hostId);
-            String msg = String.format("Unable to attach storage pool %s to host %s", storagePool, host);
+            String msg = String.format("Unable to attach storage pool %s to host %s", storagePool, host != null ? host : "id " + hostId);
 
             _alertMgr.sendAlert(AlertManager.AlertType.ALERT_TYPE_HOST, storagePool.getDataCenterId(), storagePool.getPodId(), msg, msg);
 

server/src/main/java/com/cloud/vm/UserVmManagerImpl.java

@@ -2853,7 +2853,7 @@ private void updateVmStateForFailedVmCreation(Long vmId, Long hostId) {
 
         if (vm != null) {
             if (vm.getState().equals(State.Stopped)) {
-                HostVO host = _hostDao.findById(hostId);
+                HostVO host = hostId != null ? _hostDao.findById(hostId) : null;
                 logger.debug("Destroying VM [{}] as it was unable to be deployed on Host: {}.", vm, host);
                 try {
                     _itMgr.stateTransitTo(vm, VirtualMachine.Event.OperationFailedToError, null);

server/src/test/java/org/apache/cloudstack/outofbandmanagement/OutOfBandManagementServiceImplTest.java

@@ -97,24 +97,32 @@ public class OutOfBandManagementServiceImplTest {
 
     private OutOfBandManagementServiceImpl service;
 
+    private static Field cacheField;
+    private static Field executorField;
+    private static Object originalCache;
+    private static Object originalExecutor;
+
     @BeforeClass
     public static void setUpStaticFields() throws Exception {
-        Field cacheField = OutOfBandManagementServiceImpl.class.getDeclaredField("hostAlertCache");
+        cacheField = OutOfBandManagementServiceImpl.class.getDeclaredField("hostAlertCache");
         cacheField.setAccessible(true);
+        originalCache = cacheField.get(null);
         cacheField.set(null, CacheBuilder.newBuilder().build());
 
-        Field executorField = OutOfBandManagementServiceImpl.class.getDeclaredField("backgroundSyncBlockingExecutor");
+        executorField = OutOfBandManagementServiceImpl.class.getDeclaredField("backgroundSyncBlockingExecutor");
         executorField.setAccessible(true);
+        originalExecutor = executorField.get(null);
         executorField.set(null, Executors.newSingleThreadExecutor());
     }
 
     @AfterClass
     public static void tearDownStaticFields() throws Exception {
-        Field executorField = OutOfBandManagementServiceImpl.class.getDeclaredField("backgroundSyncBlockingExecutor");
-        executorField.setAccessible(true);
         ExecutorService executor = (ExecutorService) executorField.get(null);
         executor.shutdownNow();
         executor.awaitTermination(5, TimeUnit.SECONDS);
+
+        cacheField.set(null, originalCache);
+        executorField.set(null, originalExecutor);
     }
 
     @Before