This is an automated email from the ASF dual-hosted git repository. DaanHoogland pushed a commit to branch ghi7297-messages in repository https://gitbox.apache.org/repos/asf/cloudstack.git
commit 3bfa0449efe42aa437e0de5621f4f0d46970ee07 Author: Daan Hoogland <[email protected]> AuthorDate: Mon Aug 3 11:05:38 2026 +0200 adjust calls to format alert strings --- .../engine/orchestration/NetworkOrchestrator.java | 4 ++- .../vmsnapshot/ScaleIOVMSnapshotStrategy.java | 2 +- .../datastore/provider/DateraHostListener.java | 3 ++- .../storage/listener/OntapHostListener.java | 6 ++--- .../driver/ScaleIOPrimaryDataStoreDriver.java | 4 +-- .../datastore/provider/ScaleIOHostListener.java | 14 +++++----- .../java/com/cloud/alert/AlertManagerImpl.java | 2 +- .../configuration/ConfigurationManagerImpl.java | 10 +++---- server/src/main/java/com/cloud/ha/KVMFencer.java | 4 +-- .../resourcelimit/ResourceLimitManagerImpl.java | 4 +-- .../storage/snapshot/SnapshotManagerImpl.java | 2 +- .../main/java/com/cloud/vm/UserVmManagerImpl.java | 31 ++++++++++++++-------- .../org/apache/cloudstack/ca/CAManagerImpl.java | 2 +- .../OutOfBandManagementServiceImpl.java | 2 +- 14 files changed, 51 insertions(+), 39 deletions(-) diff --git a/engine/orchestration/src/main/java/org/apache/cloudstack/engine/orchestration/NetworkOrchestrator.java b/engine/orchestration/src/main/java/org/apache/cloudstack/engine/orchestration/NetworkOrchestrator.java index 84a397349ce..dc7d90edecb 100644 --- a/engine/orchestration/src/main/java/org/apache/cloudstack/engine/orchestration/NetworkOrchestrator.java +++ b/engine/orchestration/src/main/java/org/apache/cloudstack/engine/orchestration/NetworkOrchestrator.java @@ -82,6 +82,7 @@ import com.cloud.agent.api.StartupRoutingCommand; import com.cloud.agent.api.routing.NetworkElementCommand; import com.cloud.agent.api.to.NicTO; import com.cloud.agent.api.to.deployasis.OVFNetworkTO; +import com.cloud.alert.AlertFormatUtils; import com.cloud.alert.AlertManager; import com.cloud.api.query.dao.DomainRouterJoinDao; import com.cloud.api.query.vo.DomainRouterJoinVO; @@ -4497,7 +4498,8 @@ public class NetworkOrchestrator extends ManagerBase implements NetworkOrchestra if (!answer.getResult()) { logger.warn("Unable to setup agent {} due to {}", host, answer.getDetails()); - final String msg = "Incorrect Network setup on agent, Reinitialize agent after network names are setup, details : " + answer.getDetails(); + final String msg = "Incorrect Network setup on agent " + AlertFormatUtils.describeHostLocation(host, dc, null) + + ", Reinitialize agent after network names are setup, details : " + answer.getDetails(); _alertMgr.sendAlert(AlertManager.AlertType.ALERT_TYPE_HOST, dcId, host.getPodId(), msg, msg); throw new ConnectionException(true, msg); } else { diff --git a/engine/storage/snapshot/src/main/java/org/apache/cloudstack/storage/vmsnapshot/ScaleIOVMSnapshotStrategy.java b/engine/storage/snapshot/src/main/java/org/apache/cloudstack/storage/vmsnapshot/ScaleIOVMSnapshotStrategy.java index aced750bd32..98cb5fc616c 100644 --- a/engine/storage/snapshot/src/main/java/org/apache/cloudstack/storage/vmsnapshot/ScaleIOVMSnapshotStrategy.java +++ b/engine/storage/snapshot/src/main/java/org/apache/cloudstack/storage/vmsnapshot/ScaleIOVMSnapshotStrategy.java @@ -257,7 +257,7 @@ public class ScaleIOVMSnapshotStrategy extends ManagerBase implements VMSnapshot vmSnapshotHelper.vmSnapshotStateTransitTo(vmSnapshot, VMSnapshot.Event.OperationFailed); String subject = "Take snapshot failed for Instance: " + userVm.getDisplayName(); - String message = "Snapshot operation failed for Instance: " + userVm.getDisplayName() + ", Please check and delete if any stale volumes created with Instance Snapshot id: " + vmSnapshot.getVmId(); + String message = "Snapshot operation failed for Instance: " + userVm.getDisplayName() + ", Please check and delete if any stale volumes created with " + vmSnapshot; alertManager.sendAlert(AlertManager.AlertType.ALERT_TYPE_VM_SNAPSHOT, userVm.getDataCenterId(), userVm.getPodIdToDeployIn(), subject, message); } catch (NoTransitionException e1) { logger.error("Cannot set Instance Snapshot state due to: " + e1.getMessage()); diff --git a/plugins/storage/volume/datera/src/main/java/org/apache/cloudstack/storage/datastore/provider/DateraHostListener.java b/plugins/storage/volume/datera/src/main/java/org/apache/cloudstack/storage/datastore/provider/DateraHostListener.java index 08bc89737f2..5d8b4308918 100644 --- a/plugins/storage/volume/datera/src/main/java/org/apache/cloudstack/storage/datastore/provider/DateraHostListener.java +++ b/plugins/storage/volume/datera/src/main/java/org/apache/cloudstack/storage/datastore/provider/DateraHostListener.java @@ -297,7 +297,8 @@ public class DateraHostListener implements HypervisorHostListener { } if (!answer.getResult()) { - String msg = String.format("Unable to attach storage pool %s to host %d", storagePool, hostId); + HostVO host = _hostDao.findById(hostId); + String msg = String.format("Unable to attach storage pool %s to host %s", storagePool, host); _alertMgr.sendAlert(AlertManager.AlertType.ALERT_TYPE_HOST, storagePool.getDataCenterId(), storagePool.getPodId(), msg, msg); diff --git a/plugins/storage/volume/ontap/src/main/java/org/apache/cloudstack/storage/listener/OntapHostListener.java b/plugins/storage/volume/ontap/src/main/java/org/apache/cloudstack/storage/listener/OntapHostListener.java index ecdd3efd2c5..35d90a58f8b 100644 --- a/plugins/storage/volume/ontap/src/main/java/org/apache/cloudstack/storage/listener/OntapHostListener.java +++ b/plugins/storage/volume/ontap/src/main/java/org/apache/cloudstack/storage/listener/OntapHostListener.java @@ -95,7 +95,7 @@ public class OntapHostListener implements HypervisorHostListener { } if (!answer.getResult()) { - String msg = String.format("Unable to attach storage pool %s to host %d", pool, hostId); + String msg = String.format("Unable to attach storage pool %s to host %s", pool, host); _alertMgr.sendAlert(AlertManager.AlertType.ALERT_TYPE_HOST, pool.getDataCenterId(), pool.getPodId(), msg, msg); @@ -107,8 +107,8 @@ public class OntapHostListener implements HypervisorHostListener { if (!(answer instanceof ModifyStoragePoolAnswer)) { throw new CloudRuntimeException(String.format( - "Unexpected answer type %s returned for modify storage pool command for pool %s on host %d", - answer.getClass().getName(), pool, hostId)); + "Unexpected answer type %s returned for modify storage pool command for pool %s on host %s", + answer.getClass().getName(), pool, host)); } ModifyStoragePoolAnswer mspAnswer = (ModifyStoragePoolAnswer) answer; diff --git a/plugins/storage/volume/scaleio/src/main/java/org/apache/cloudstack/storage/datastore/driver/ScaleIOPrimaryDataStoreDriver.java b/plugins/storage/volume/scaleio/src/main/java/org/apache/cloudstack/storage/datastore/driver/ScaleIOPrimaryDataStoreDriver.java index 14cb82a4c2b..e419d0ddd7e 100644 --- a/plugins/storage/volume/scaleio/src/main/java/org/apache/cloudstack/storage/datastore/driver/ScaleIOPrimaryDataStoreDriver.java +++ b/plugins/storage/volume/scaleio/src/main/java/org/apache/cloudstack/storage/datastore/driver/ScaleIOPrimaryDataStoreDriver.java @@ -1552,7 +1552,7 @@ public class ScaleIOPrimaryDataStoreDriver implements PrimaryDataStoreDriver { final ScaleIOGatewayClient client = getScaleIOClient(pool); return client.listVolumesMappedToSdc(sdcId).isEmpty(); } catch (Exception e) { - logger.warn("Unable to check whether the host: " + host.getId() + " can be disconnected from storage pool: " + pool.getId() + ", due to " + e.getMessage(), e); + logger.warn("Unable to check whether the host: " + host + " can be disconnected from storage pool: " + pool + ", due to " + e.getMessage(), e); return false; } } @@ -1564,7 +1564,7 @@ public class ScaleIOPrimaryDataStoreDriver implements PrimaryDataStoreDriver { logger.warn("SDC not connected on the host: {}", host); String msg = String.format("SDC not connected on the host: %s, reconnect the SDC to MDM", host); - alertMgr.sendAlert(AlertManager.AlertType.ALERT_TYPE_HOST, host.getDataCenterId(), host.getPodId(), "SDC disconnected on host: " + host.getUuid(), msg); + alertMgr.sendAlert(AlertManager.AlertType.ALERT_TYPE_HOST, host.getDataCenterId(), host.getPodId(), "SDC disconnected on host: " + host, msg); } @Override diff --git a/plugins/storage/volume/scaleio/src/main/java/org/apache/cloudstack/storage/datastore/provider/ScaleIOHostListener.java b/plugins/storage/volume/scaleio/src/main/java/org/apache/cloudstack/storage/datastore/provider/ScaleIOHostListener.java index f169b581b2c..379b8c22f24 100644 --- a/plugins/storage/volume/scaleio/src/main/java/org/apache/cloudstack/storage/datastore/provider/ScaleIOHostListener.java +++ b/plugins/storage/volume/scaleio/src/main/java/org/apache/cloudstack/storage/datastore/provider/ScaleIOHostListener.java @@ -123,7 +123,7 @@ public class ScaleIOHostListener implements HypervisorHostListener { if (MapUtils.isEmpty(poolDetails)) { String msg = String.format("PowerFlex storage SDC details not found on the host: %s, (re)install SDC and restart agent", host); logger.warn(msg); - _alertMgr.sendAlert(AlertManager.AlertType.ALERT_TYPE_HOST, host.getDataCenterId(), host.getPodId(), "SDC details not found on host: " + host.getUuid(), msg); + _alertMgr.sendAlert(AlertManager.AlertType.ALERT_TYPE_HOST, host.getDataCenterId(), host.getPodId(), "SDC details not found on host: " + host, msg); return null; } @@ -138,16 +138,16 @@ public class ScaleIOHostListener implements HypervisorHostListener { if (StringUtils.isBlank(sdcId)) { String msg = String.format("Couldn't retrieve PowerFlex storage SDC details from the host: %s, add MDMs if On-demand connect disabled or try (re)install SDC & restart agent", host); logger.warn(msg); - _alertMgr.sendAlert(AlertManager.AlertType.ALERT_TYPE_HOST, host.getDataCenterId(), host.getPodId(), "SDC details not found on host: " + host.getUuid(), msg); + _alertMgr.sendAlert(AlertManager.AlertType.ALERT_TYPE_HOST, host.getDataCenterId(), host.getPodId(), "SDC details not found on host: " + host, msg); return null; } if (details.containsKey(ScaleIOSDCManager.ConnectOnDemand.key())) { String connectOnDemand = details.get(ScaleIOSDCManager.ConnectOnDemand.key()); if (connectOnDemand != null && !Boolean.parseBoolean(connectOnDemand) && !_sdcManager.isHostSdcConnected(sdcId, dataStore, 15)) { - logger.warn("SDC not connected on the host: " + hostId); - String msg = "SDC not connected on the host: " + hostId + ", reconnect the SDC to MDM and restart agent"; - _alertMgr.sendAlert(AlertManager.AlertType.ALERT_TYPE_HOST, host.getDataCenterId(), host.getPodId(), "SDC not connected on host: " + host.getUuid(), msg); + logger.warn("SDC not connected on the host: " + host); + String msg = "SDC not connected on host: " + host + ", reconnect the SDC to MDM and restart agent"; + _alertMgr.sendAlert(AlertManager.AlertType.ALERT_TYPE_HOST, host.getDataCenterId(), host.getPodId(), "SDC not connected on host: " + host, msg); return null; } } @@ -213,7 +213,7 @@ public class ScaleIOHostListener implements HypervisorHostListener { ModifyStoragePoolCommand cmd = new ModifyStoragePoolCommand(false, storagePool, storagePool.getPath(), details); ModifyStoragePoolAnswer answer = sendModifyStoragePoolCommand(cmd, storagePool, host); if (!answer.getResult()) { - logger.error("Failed to disconnect storage pool: " + storagePool + " and host: " + hostId); + logger.error("Failed to disconnect storage pool: " + storagePool + " and host: " + host); return false; } @@ -221,7 +221,7 @@ public class ScaleIOHostListener implements HypervisorHostListener { if (storagePoolHost != null) { _storagePoolHostDao.deleteStoragePoolHostDetails(hostId, poolId); } - logger.info("Connection removed between storage pool: " + storagePool + " and host: " + hostId); + logger.info("Connection removed between storage pool: " + storagePool + " and host: " + host); return true; } diff --git a/server/src/main/java/com/cloud/alert/AlertManagerImpl.java b/server/src/main/java/com/cloud/alert/AlertManagerImpl.java index 27b445ba376..6b67dbbddde 100644 --- a/server/src/main/java/com/cloud/alert/AlertManagerImpl.java +++ b/server/src/main/java/com/cloud/alert/AlertManagerImpl.java @@ -815,7 +815,7 @@ public class AlertManagerImpl extends ManagerBase implements AlertManager, Confi Long clusterId = cluster == null ? null : cluster.getId(); Long podId = pod == null ? null : pod.getId(); long dcId = dataCenter == null ? 0L : dataCenter.getId(); - logger.warn(String.format("alertType=[%s] dataCenterId=[%s] podId=[%s] clusterId=[%s] message=[%s].", alertType, dcId, podId, clusterId, subject)); + logger.warn("alertType=[{}] dataCenter=[{}] pod=[{}] cluster=[{}] message=[{}].", alertType, dataCenter, pod, cluster, subject); AlertVO alert = getAlertForTrivialAlertType(alertType, dcId, podId, clusterId); if (alert == null) { diff --git a/server/src/main/java/com/cloud/configuration/ConfigurationManagerImpl.java b/server/src/main/java/com/cloud/configuration/ConfigurationManagerImpl.java index 837254ed8b3..1644e1a0cbd 100644 --- a/server/src/main/java/com/cloud/configuration/ConfigurationManagerImpl.java +++ b/server/src/main/java/com/cloud/configuration/ConfigurationManagerImpl.java @@ -3594,7 +3594,7 @@ public class ConfigurationManagerImpl extends ManagerBase implements Configurati } for (Long domainId : filteredDomainIds) { if (!_domainDao.isChildDomain(account.getDomainId(), domainId)) { - throw new InvalidParameterValueException(String.format("Unable to create service offering by another domain-admin: %s for domain: %s", user, _entityMgr.findById(Domain.class, domainId).getUuid())); + throw new InvalidParameterValueException(String.format("Unable to create service offering by another domain-admin: %s for domain: %s", user, _entityMgr.findById(Domain.class, domainId))); } } } else if (account.getType() != Account.Type.ADMIN) { @@ -4646,7 +4646,7 @@ public class ConfigurationManagerImpl extends ManagerBase implements Configurati } for (Long domainId : filteredDomainIds) { if (domainId == null || !_domainDao.isChildDomain(account.getDomainId(), domainId)) { - throw new InvalidParameterValueException(String.format("Unable to create disk offering by another domain-admin: %s for domain: %s", user, _entityMgr.findById(Domain.class, domainId).getUuid())); + throw new InvalidParameterValueException(String.format("Unable to create disk offering by another domain-admin: %s for domain: %s", user, _entityMgr.findById(Domain.class, domainId))); } } } else if (account.getType() != Account.Type.ADMIN) { @@ -7740,7 +7740,7 @@ public class ConfigurationManagerImpl extends ManagerBase implements Configurati // only one network offering in the system can be Required final List<NetworkOfferingVO> offerings = _networkOfferingDao.listByAvailability(Availability.Required, false); if (!offerings.isEmpty()) { - throw new InvalidParameterValueException("System already has network offering id=" + offerings.get(0).getId() + " with availability " + Availability.Required); + throw new InvalidParameterValueException("System already has network offering " + offerings.get(0) + " with availability " + Availability.Required); } } @@ -8056,7 +8056,7 @@ public class ConfigurationManagerImpl extends ManagerBase implements Configurati throw new InvalidParameterValueException("Unable to find the domain by id=" + domainId); } if (!_domainDao.isChildDomain(caller.getDomainId(), domainId)) { - throw new InvalidParameterValueException(String.format("Unable to list network offerings for domain: %s as caller does not have access for it", domain.getUuid())); + throw new InvalidParameterValueException(String.format("Unable to list network offerings for domain: %s as caller does not have access for it", domain)); } } @@ -8920,7 +8920,7 @@ public class ConfigurationManagerImpl extends ManagerBase implements Configurati // only one network offering in the system can be Required final List<NetworkOfferingVO> offerings = _networkOfferingDao.listByAvailability(Availability.Required, false); if (!offerings.isEmpty() && offerings.get(0).getId() != offeringToUpdate.getId()) { - throw new InvalidParameterValueException("System already has network offering id=" + offerings.get(0).getId() + " with availability " + throw new InvalidParameterValueException("System already has network offering " + offerings.get(0) + " with availability " + Availability.Required); } } diff --git a/server/src/main/java/com/cloud/ha/KVMFencer.java b/server/src/main/java/com/cloud/ha/KVMFencer.java index 4a6606b09cc..11d39bccedf 100644 --- a/server/src/main/java/com/cloud/ha/KVMFencer.java +++ b/server/src/main/java/com/cloud/ha/KVMFencer.java @@ -108,8 +108,8 @@ public class KVMFencer extends AdapterBase implements FenceBuilder { } _alertMgr.sendAlert(AlertManager.AlertType.ALERT_TYPE_HOST, host.getDataCenterId(), host.getPodId(), - "Unable to fence off host: " + host.getId(), - "Fencing off host " + host.getId() + " did not succeed after asking " + i + " hosts. " + + "Unable to fence off host: " + host, + "Fencing off host " + host + " did not succeed after asking " + i + " hosts. " + "Check Agent logs for more information."); logger.error("Unable to fence off {} on {}", vm.toString(), host.toString()); diff --git a/server/src/main/java/com/cloud/resourcelimit/ResourceLimitManagerImpl.java b/server/src/main/java/com/cloud/resourcelimit/ResourceLimitManagerImpl.java index bc3abd30d88..23dbe2717ce 100644 --- a/server/src/main/java/com/cloud/resourcelimit/ResourceLimitManagerImpl.java +++ b/server/src/main/java/com/cloud/resourcelimit/ResourceLimitManagerImpl.java @@ -1008,12 +1008,12 @@ public class ResourceLimitManagerImpl extends ManagerBase implements ResourceLim if (Domain.ROOT_DOMAIN == domainId) { // no one can add limits on ROOT domain, disallow... - throw new PermissionDeniedException("Cannot update resource limit for ROOT domain " + domainId + ", permission denied"); + throw new PermissionDeniedException("Cannot update resource limit for ROOT domain " + domain + ", permission denied"); } if ((caller.getDomainId() == domainId) && caller.getType() == Account.Type.DOMAIN_ADMIN || caller.getType() == Account.Type.RESOURCE_DOMAIN_ADMIN) { // if the admin is trying to update their own domain, disallow... - throw new PermissionDeniedException("Unable to update resource limit for domain " + domainId + ", permission denied"); + throw new PermissionDeniedException("Unable to update resource limit for domain " + domain + ", permission denied"); } if (StringUtils.isNotEmpty(tag)) { long untaggedLimit = findCorrectResourceLimitForDomain(domain, resourceType, null); diff --git a/server/src/main/java/com/cloud/storage/snapshot/SnapshotManagerImpl.java b/server/src/main/java/com/cloud/storage/snapshot/SnapshotManagerImpl.java index dc33a4442a3..96d6b4173fa 100755 --- a/server/src/main/java/com/cloud/storage/snapshot/SnapshotManagerImpl.java +++ b/server/src/main/java/com/cloud/storage/snapshot/SnapshotManagerImpl.java @@ -2082,7 +2082,7 @@ public class SnapshotManagerImpl extends MutualExclusiveIdsManagerBase implement return snapshot; } catch (ResourceAllocationException e) { if (snapshotType != Type.MANUAL) { - String msg = String.format("Snapshot resource limit exceeded for account id : %s. Failed to create recurring snapshots", owner.getId()); + String msg = String.format("Snapshot resource limit exceeded for account: %s. Failed to create recurring snapshots", owner); logger.warn(msg); _alertMgr.sendAlert(AlertManager.AlertType.ALERT_TYPE_UPDATE_RESOURCE_COUNT, 0L, 0L, msg, msg + ". Please, use updateResourceLimit to increase the limit"); } diff --git a/server/src/main/java/com/cloud/vm/UserVmManagerImpl.java b/server/src/main/java/com/cloud/vm/UserVmManagerImpl.java index b3bc69835ff..12e8a9faf75 100644 --- a/server/src/main/java/com/cloud/vm/UserVmManagerImpl.java +++ b/server/src/main/java/com/cloud/vm/UserVmManagerImpl.java @@ -2862,10 +2862,10 @@ public class UserVmManagerImpl extends ManagerBase implements UserVmManager, Vir volumeMgr.destroyVolume(volume); } } - String subject = String.format("Failed to deploy Instance [ID: %s]", vm.getUuid()); + String subject = String.format("Failed to deploy Instance [%s]", vm); String body = String.format("Failed to deploy [%s]%s. To troubleshoot, please check the logs with [logid:%s].", vm, - hostId != null ? String.format(" on host [%s]", hostId) : "", + hostId != null ? String.format(" on host [%s]", host) : "", ThreadContext.get("logcontextid")); _alertMgr.sendAlert(AlertManager.AlertType.ALERT_TYPE_USERVM, vm.getDataCenterId(), vm.getPodIdToDeployIn(), subject, body); @@ -7760,15 +7760,23 @@ public class UserVmManagerImpl extends ManagerBase implements UserVmManager, Vir //if hosts are dedicated to different account/domains, raise an alert if (srcExplDedicated && destExplDedicated) { - if (!((accountOfDedicatedHost(srcHost) == null) || (accountOfDedicatedHost(srcHost).equals(accountOfDedicatedHost(destHost))))) { - String msg = String.format("VM is being migrated from host %s explicitly dedicated to account %d to host %s explicitly dedicated to account %d", - srcHost, accountOfDedicatedHost(srcHost), destHost, accountOfDedicatedHost(destHost)); + Long srcAccountId = accountOfDedicatedHost(srcHost); + Long destAccountId = accountOfDedicatedHost(destHost); + if (!((srcAccountId == null) || (srcAccountId.equals(destAccountId)))) { + Account srcAccount = _accountDao.findById(srcAccountId); + Account destAccount = _accountDao.findById(destAccountId); + String msg = String.format("VM is being migrated from host %s explicitly dedicated to account %s to host %s explicitly dedicated to account %s", + srcHost, srcAccount, destHost, destAccount); _alertMgr.sendAlert(AlertManager.AlertType.ALERT_TYPE_USERVM, vm.getDataCenterId(), vm.getPodIdToDeployIn(), msg, msg); logger.warn(msg); } - if (!((domainOfDedicatedHost(srcHost) == null) || (domainOfDedicatedHost(srcHost).equals(domainOfDedicatedHost(destHost))))) { - String msg = String.format("VM is being migrated from host %s explicitly dedicated to domain %d to host %s explicitly dedicated to domain %d", - srcHost, domainOfDedicatedHost(srcHost), destHost, domainOfDedicatedHost(destHost)); + Long srcDomainId = domainOfDedicatedHost(srcHost); + Long destDomainId = domainOfDedicatedHost(destHost); + if (!((srcDomainId == null) || (srcDomainId.equals(destDomainId)))) { + Domain srcDomain = _domainDao.findById(srcDomainId); + Domain destDomain = _domainDao.findById(destDomainId); + String msg = String.format("VM is being migrated from host %s explicitly dedicated to domain %s to host %s explicitly dedicated to domain %s", + srcHost, srcDomain, destHost, destDomain); _alertMgr.sendAlert(AlertManager.AlertType.ALERT_TYPE_USERVM, vm.getDataCenterId(), vm.getPodIdToDeployIn(), msg, msg); logger.warn(msg); } @@ -7779,7 +7787,8 @@ public class UserVmManagerImpl extends ManagerBase implements UserVmManager, Vir if (deployPlanner.getDeploymentPlanner() != null && deployPlanner.getDeploymentPlanner().equals("ImplicitDedicationPlanner")) { //VM is deployed using implicit planner long accountOfVm = vm.getAccountId(); - String msg = String.format("VM of account %d with implicit deployment planner being migrated to host %s", accountOfVm, destHost); + Account accountOfVmObj = _accountDao.findById(accountOfVm); + String msg = String.format("VM of account %s with implicit deployment planner being migrated to host %s", accountOfVmObj, destHost); //Get all vms on destination host boolean emptyDestination = false; List<VMInstanceVO> vmsOnDest = getVmsOnHost(destHostId); @@ -7792,7 +7801,7 @@ public class UserVmManagerImpl extends ManagerBase implements UserVmManager, Vir if (!isServiceOfferingUsingPlannerInPreferredMode(vm.getServiceOfferingId())) { //Check if all vms on destination host are created using strict implicit mode if (!checkIfAllVmsCreatedInStrictMode(accountOfVm, vmsOnDest)) { - msg = String.format("Instance of Account %d with strict implicit deployment planner being migrated to host %s not having all Instances strict implicitly dedicated to Account %d", accountOfVm, destHost, accountOfVm); + msg = String.format("Instance of Account %s with strict implicit deployment planner being migrated to host %s not having all Instances strict implicitly dedicated to Account %s", accountOfVmObj, destHost, accountOfVmObj); } } else { //If vm is deployed using preferred implicit planner, check if all vms on destination host must be @@ -7800,7 +7809,7 @@ public class UserVmManagerImpl extends ManagerBase implements UserVmManager, Vir for (VMInstanceVO vmsDest : vmsOnDest) { ServiceOfferingVO destPlanner = serviceOfferingDao.findById(vm.getId(), vmsDest.getServiceOfferingId()); if (!((destPlanner.getDeploymentPlanner() != null && destPlanner.getDeploymentPlanner().equals("ImplicitDedicationPlanner")) && vmsDest.getAccountId() == accountOfVm)) { - msg = String.format("Instance of Account %d with preferred implicit deployment planner being migrated to host %s not having all Instances implicitly dedicated to Account %d", accountOfVm, destHost, accountOfVm); + msg = String.format("Instance of Account %s with preferred implicit deployment planner being migrated to host %s not having all Instances implicitly dedicated to Account %s", accountOfVmObj, destHost, accountOfVmObj); } } } diff --git a/server/src/main/java/org/apache/cloudstack/ca/CAManagerImpl.java b/server/src/main/java/org/apache/cloudstack/ca/CAManagerImpl.java index 73ff79301fb..a1e3a3cf6ca 100644 --- a/server/src/main/java/org/apache/cloudstack/ca/CAManagerImpl.java +++ b/server/src/main/java/org/apache/cloudstack/ca/CAManagerImpl.java @@ -330,7 +330,7 @@ public class CAManagerImpl extends ManagerBase implements CAManager { return true; } catch (Exception e) { - logger.error("Error during forced SSH provisioning for KVM host " + host.getUuid(), e); + logger.error("Error during forced SSH provisioning for KVM host " + host, e); return false; } finally { if (sshConnection != null) { diff --git a/server/src/main/java/org/apache/cloudstack/outofbandmanagement/OutOfBandManagementServiceImpl.java b/server/src/main/java/org/apache/cloudstack/outofbandmanagement/OutOfBandManagementServiceImpl.java index d5013f71cb5..c015229ad1c 100644 --- a/server/src/main/java/org/apache/cloudstack/outofbandmanagement/OutOfBandManagementServiceImpl.java +++ b/server/src/main/java/org/apache/cloudstack/outofbandmanagement/OutOfBandManagementServiceImpl.java @@ -260,7 +260,7 @@ public class OutOfBandManagementServiceImpl extends ManagerBase implements OutOf Host host = hostDao.findById(hostId); if (host == null || host.getResourceState() == ResourceState.Degraded) { String state = host != null ? String.valueOf(host.getResourceState()) : null; - logger.debug("Host [id={}, uuid={}, state={}] was removed or placed in Degraded state by the Admin.", hostId, host != null ? host.getUuid() : "", state); + logger.debug("Host [{}] was removed or placed in Degraded state (state={}) by the Admin.", host != null ? host : "id=" + hostId, state); return false; }
