From f3e45bce92a92c66eb51aedf0e172c26dee29f22 Mon Sep 17 00:00:00 2001 From: zhenhaoli Date: Wed, 18 Apr 2018 15:21:45 -0400 Subject: [PATCH 1/3] fix several logs that mismatch method --- .../agent/resource/consoleproxy/ConsoleProxyResource.java | 2 +- .../schema/src/main/java/com/cloud/vm/dao/UserVmDaoImpl.java | 2 +- .../cloudstack/dedicated/DedicatedResourceManagerImpl.java | 2 +- .../java/org/apache/cloudstack/api/DeleteBaremetalRctCmd.java | 2 +- .../com/cloud/hypervisor/kvm/storage/KVMStorageProcessor.java | 4 ++-- .../org/apache/cloudstack/cloudian/client/CloudianClient.java | 2 +- .../network/resource/NetScalerControlCenterResource.java | 2 +- .../java/com/cloud/network/resource/NuageVspResource.java | 2 +- server/src/main/java/com/cloud/network/NetworkModelImpl.java | 2 +- .../main/java/com/cloud/network/as/AutoScaleManagerImpl.java | 2 +- .../cloud/hypervisor/vmware/mo/HostDatastoreBrowserMO.java | 2 +- .../java/com/cloud/hypervisor/vmware/mo/VirtualMachineMO.java | 4 ++-- 12 files changed, 14 insertions(+), 14 deletions(-) diff --git a/agent/src/main/java/com/cloud/agent/resource/consoleproxy/ConsoleProxyResource.java b/agent/src/main/java/com/cloud/agent/resource/consoleproxy/ConsoleProxyResource.java index b3b17e7d970b..fb5e32771a3f 100644 --- a/agent/src/main/java/com/cloud/agent/resource/consoleproxy/ConsoleProxyResource.java +++ b/agent/src/main/java/com/cloud/agent/resource/consoleproxy/ConsoleProxyResource.java @@ -246,7 +246,7 @@ public boolean configure(String name, Map params) throws Configu } String internalDns1 = (String) params.get("internaldns1"); if (internalDns1 == null) { - s_logger.warn("No DNS entry found during configuration of NfsSecondaryStorage"); + s_logger.warn("No DNS entry found during configuration of ConsoleProxy"); } else { addRouteToInternalIpOrCidr(_localgw, _eth1ip, _eth1mask, internalDns1); } diff --git a/engine/schema/src/main/java/com/cloud/vm/dao/UserVmDaoImpl.java b/engine/schema/src/main/java/com/cloud/vm/dao/UserVmDaoImpl.java index d13234d10168..10a133c5a149 100644 --- a/engine/schema/src/main/java/com/cloud/vm/dao/UserVmDaoImpl.java +++ b/engine/schema/src/main/java/com/cloud/vm/dao/UserVmDaoImpl.java @@ -410,7 +410,7 @@ public List listPodIdsHavingVmsforAccount(long zoneId, long accountId) { } catch (Exception e) { - s_logger.error("listVmDetails:Exception:" + e.getMessage()); + s_logger.error("listPodIdsHavingVmsforAccount:Exception:" + e.getMessage()); } } diff --git a/plugins/dedicated-resources/src/main/java/org/apache/cloudstack/dedicated/DedicatedResourceManagerImpl.java b/plugins/dedicated-resources/src/main/java/org/apache/cloudstack/dedicated/DedicatedResourceManagerImpl.java index 7cf193d49beb..87f67c0af5c0 100644 --- a/plugins/dedicated-resources/src/main/java/org/apache/cloudstack/dedicated/DedicatedResourceManagerImpl.java +++ b/plugins/dedicated-resources/src/main/java/org/apache/cloudstack/dedicated/DedicatedResourceManagerImpl.java @@ -497,7 +497,7 @@ public List doInTransaction(TransactionStatus status) { } dedicatedResource = _dedicatedDao.persist(dedicatedResource); } catch (Exception e) { - s_logger.error("Unable to dedicate host due to " + e.getMessage(), e); + s_logger.error("Unable to dedicate cluster due to " + e.getMessage(), e); throw new CloudRuntimeException("Failed to dedicate cluster. Please contact Cloud Support."); } diff --git a/plugins/hypervisors/baremetal/src/main/java/org/apache/cloudstack/api/DeleteBaremetalRctCmd.java b/plugins/hypervisors/baremetal/src/main/java/org/apache/cloudstack/api/DeleteBaremetalRctCmd.java index f1c84231e763..5994516d73f8 100644 --- a/plugins/hypervisors/baremetal/src/main/java/org/apache/cloudstack/api/DeleteBaremetalRctCmd.java +++ b/plugins/hypervisors/baremetal/src/main/java/org/apache/cloudstack/api/DeleteBaremetalRctCmd.java @@ -64,7 +64,7 @@ public void execute() throws ResourceUnavailableException, InsufficientCapacityE SuccessResponse response = new SuccessResponse(getCommandName()); setResponseObject(response); } catch (Exception e) { - s_logger.warn(String.format("unable to add baremetal RCT[%s]", getId()), e); + s_logger.warn(String.format("unable to delete baremetal RCT[%s]", getId()), e); throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, e.getMessage()); } } diff --git a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/storage/KVMStorageProcessor.java b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/storage/KVMStorageProcessor.java index 36be2d39a2e1..73a522ad7ed1 100644 --- a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/storage/KVMStorageProcessor.java +++ b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/storage/KVMStorageProcessor.java @@ -1309,10 +1309,10 @@ public Answer dettachVolume(final DettachCommand cmd) { return new DettachAnswer(disk); } catch (final LibvirtException e) { - s_logger.debug("Failed to attach volume: " + vol.getPath() + ", due to ", e); + s_logger.debug("Failed to dettach volume: " + vol.getPath() + ", due to ", e); return new DettachAnswer(e.toString()); } catch (final InternalErrorException e) { - s_logger.debug("Failed to attach volume: " + vol.getPath() + ", due to ", e); + s_logger.debug("Failed to dettach volume: " + vol.getPath() + ", due to ", e); return new DettachAnswer(e.toString()); } } diff --git a/plugins/integrations/cloudian/src/main/java/org/apache/cloudstack/cloudian/client/CloudianClient.java b/plugins/integrations/cloudian/src/main/java/org/apache/cloudstack/cloudian/client/CloudianClient.java index 11f2055fef8d..45d0964552e7 100644 --- a/plugins/integrations/cloudian/src/main/java/org/apache/cloudstack/cloudian/client/CloudianClient.java +++ b/plugins/integrations/cloudian/src/main/java/org/apache/cloudstack/cloudian/client/CloudianClient.java @@ -324,7 +324,7 @@ public boolean updateGroup(final CloudianGroup group) { final HttpResponse response = post("/group", group); return response.getStatusLine().getStatusCode() == HttpStatus.SC_OK; } catch (final IOException e) { - LOG.error("Failed to remove group due to:", e); + LOG.error("Failed to update group due to:", e); checkResponseTimeOut(e); } return false; diff --git a/plugins/network-elements/netscaler/src/main/java/com/cloud/network/resource/NetScalerControlCenterResource.java b/plugins/network-elements/netscaler/src/main/java/com/cloud/network/resource/NetScalerControlCenterResource.java index 347186c2cac7..d51985725ab0 100644 --- a/plugins/network-elements/netscaler/src/main/java/com/cloud/network/resource/NetScalerControlCenterResource.java +++ b/plugins/network-elements/netscaler/src/main/java/com/cloud/network/resource/NetScalerControlCenterResource.java @@ -785,7 +785,7 @@ public static String getHttpRequest(final String jsonCmd, final URI agentUri, St // use Apache. String logMessage = StringEscapeUtils.unescapeJava(jsonCmd); logMessage = cleanPassword(logMessage); - s_logger.debug("POST request to " + agentUri.toString() + s_logger.debug("GET request to " + agentUri.toString() + " with contents " + logMessage); // Create request diff --git a/plugins/network-elements/nuage-vsp/src/main/java/com/cloud/network/resource/NuageVspResource.java b/plugins/network-elements/nuage-vsp/src/main/java/com/cloud/network/resource/NuageVspResource.java index dae21a93a75b..74b9c1d6f09d 100644 --- a/plugins/network-elements/nuage-vsp/src/main/java/com/cloud/network/resource/NuageVspResource.java +++ b/plugins/network-elements/nuage-vsp/src/main/java/com/cloud/network/resource/NuageVspResource.java @@ -189,7 +189,7 @@ public boolean stop() { try { JmxUtil.unregisterMBean("NuageVspResource", _name); } catch (Exception e) { - s_logger.warn("Unable to initialize inaccurate clock", e); + s_logger.warn("Unable to stop NuageVspResource", e); } return true; diff --git a/server/src/main/java/com/cloud/network/NetworkModelImpl.java b/server/src/main/java/com/cloud/network/NetworkModelImpl.java index a008bdfcd1be..380aabf493a0 100644 --- a/server/src/main/java/com/cloud/network/NetworkModelImpl.java +++ b/server/src/main/java/com/cloud/network/NetworkModelImpl.java @@ -1731,7 +1731,7 @@ public String getDefaultGuestTrafficLabel(long dcId, HypervisorType hypervisorTy } } catch (Exception ex) { if (s_logger.isDebugEnabled()) { - s_logger.debug("Failed to retrive the default label for management traffic:" + "zone: " + dcId + " hypervisor: " + hypervisorType + " due to:" + + s_logger.debug("Failed to retrive the default label for guest traffic:" + "zone: " + dcId + " hypervisor: " + hypervisorType + " due to:" + ex.getMessage()); } } diff --git a/server/src/main/java/com/cloud/network/as/AutoScaleManagerImpl.java b/server/src/main/java/com/cloud/network/as/AutoScaleManagerImpl.java index 0d5da2ff5b49..78d1335bc46b 100644 --- a/server/src/main/java/com/cloud/network/as/AutoScaleManagerImpl.java +++ b/server/src/main/java/com/cloud/network/as/AutoScaleManagerImpl.java @@ -1482,7 +1482,7 @@ public void doScaleUp(long groupId, Integer numVm) { public void doScaleDown(final long groupId) { AutoScaleVmGroupVO asGroup = _autoScaleVmGroupDao.findById(groupId); if (asGroup == null) { - s_logger.error("Can not find the groupid " + groupId + " for scaling up"); + s_logger.error("Can not find the groupid " + groupId + " for scaling down"); return; } if (!checkConditionDown(asGroup)) { diff --git a/vmware-base/src/main/java/com/cloud/hypervisor/vmware/mo/HostDatastoreBrowserMO.java b/vmware-base/src/main/java/com/cloud/hypervisor/vmware/mo/HostDatastoreBrowserMO.java index a0eee2de7b25..4110bfcec3f0 100644 --- a/vmware-base/src/main/java/com/cloud/hypervisor/vmware/mo/HostDatastoreBrowserMO.java +++ b/vmware-base/src/main/java/com/cloud/hypervisor/vmware/mo/HostDatastoreBrowserMO.java @@ -97,7 +97,7 @@ public ArrayList searchDatastoreSubFolders(St } } finally { if (s_logger.isTraceEnabled()) - s_logger.trace("vCenter API trace - searchDatastore() done"); + s_logger.trace("vCenter API trace - searchDatastoreSubFolders() done"); } return null; diff --git a/vmware-base/src/main/java/com/cloud/hypervisor/vmware/mo/VirtualMachineMO.java b/vmware-base/src/main/java/com/cloud/hypervisor/vmware/mo/VirtualMachineMO.java index 0078793df8d0..2fb772e0daf4 100644 --- a/vmware-base/src/main/java/com/cloud/hypervisor/vmware/mo/VirtualMachineMO.java +++ b/vmware-base/src/main/java/com/cloud/hypervisor/vmware/mo/VirtualMachineMO.java @@ -1492,14 +1492,14 @@ public void attachIso(String isoDatastorePath, ManagedObjectReference morDs, if (!result) { if (s_logger.isTraceEnabled()) - s_logger.trace("vCenter API trace - detachIso() done(failed)"); + s_logger.trace("vCenter API trace - attachIso() done(failed)"); throw new Exception("Failed to attach ISO due to " + TaskMO.getTaskFailureInfo(_context, morTask)); } _context.waitForTaskProgressDone(morTask); if (s_logger.isTraceEnabled()) - s_logger.trace("vCenter API trace - detachIso() done(successfully)"); + s_logger.trace("vCenter API trace - attachIso() done(successfully)"); } public int detachIso(String isoDatastorePath) throws Exception { From 78ceaecc06c5937539b5e2b41ca189e3e15ea12d Mon Sep 17 00:00:00 2001 From: zhenhaoli Date: Wed, 18 Apr 2018 15:59:19 -0400 Subject: [PATCH 2/3] add stacktraces for throw new statements --- .../cloudstack/dedicated/DedicatedResourceManagerImpl.java | 4 ++-- .../java/org/apache/cloudstack/api/DeleteBaremetalRctCmd.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/plugins/dedicated-resources/src/main/java/org/apache/cloudstack/dedicated/DedicatedResourceManagerImpl.java b/plugins/dedicated-resources/src/main/java/org/apache/cloudstack/dedicated/DedicatedResourceManagerImpl.java index 87f67c0af5c0..cd6d8cf590d4 100644 --- a/plugins/dedicated-resources/src/main/java/org/apache/cloudstack/dedicated/DedicatedResourceManagerImpl.java +++ b/plugins/dedicated-resources/src/main/java/org/apache/cloudstack/dedicated/DedicatedResourceManagerImpl.java @@ -498,7 +498,7 @@ public List doInTransaction(TransactionStatus status) { dedicatedResource = _dedicatedDao.persist(dedicatedResource); } catch (Exception e) { s_logger.error("Unable to dedicate cluster due to " + e.getMessage(), e); - throw new CloudRuntimeException("Failed to dedicate cluster. Please contact Cloud Support."); + throw new CloudRuntimeException("Failed to dedicate cluster. Please contact Cloud Support.", e); } List result = new ArrayList(); @@ -595,7 +595,7 @@ public List doInTransaction(TransactionStatus status) { dedicatedResource = _dedicatedDao.persist(dedicatedResource); } catch (Exception e) { s_logger.error("Unable to dedicate host due to " + e.getMessage(), e); - throw new CloudRuntimeException("Failed to dedicate host. Please contact Cloud Support."); + throw new CloudRuntimeException("Failed to dedicate host. Please contact Cloud Support.", e); } List result = new ArrayList(); diff --git a/plugins/hypervisors/baremetal/src/main/java/org/apache/cloudstack/api/DeleteBaremetalRctCmd.java b/plugins/hypervisors/baremetal/src/main/java/org/apache/cloudstack/api/DeleteBaremetalRctCmd.java index 5994516d73f8..8157c751e0f1 100644 --- a/plugins/hypervisors/baremetal/src/main/java/org/apache/cloudstack/api/DeleteBaremetalRctCmd.java +++ b/plugins/hypervisors/baremetal/src/main/java/org/apache/cloudstack/api/DeleteBaremetalRctCmd.java @@ -65,7 +65,7 @@ public void execute() throws ResourceUnavailableException, InsufficientCapacityE setResponseObject(response); } catch (Exception e) { s_logger.warn(String.format("unable to delete baremetal RCT[%s]", getId()), e); - throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, e.getMessage()); + throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, e.getMessage(), e); } } From 562f92a194e9c4e532a3b6318471d6d4c271c027 Mon Sep 17 00:00:00 2001 From: Rohit Yadav Date: Fri, 20 Apr 2018 00:32:32 +0530 Subject: [PATCH 3/3] Fix name typo --- .../com/cloud/hypervisor/kvm/storage/KVMStorageProcessor.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/storage/KVMStorageProcessor.java b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/storage/KVMStorageProcessor.java index 73a522ad7ed1..e7e0ea26b605 100644 --- a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/storage/KVMStorageProcessor.java +++ b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/storage/KVMStorageProcessor.java @@ -1309,10 +1309,10 @@ public Answer dettachVolume(final DettachCommand cmd) { return new DettachAnswer(disk); } catch (final LibvirtException e) { - s_logger.debug("Failed to dettach volume: " + vol.getPath() + ", due to ", e); + s_logger.debug("Failed to detach volume: " + vol.getPath() + ", due to ", e); return new DettachAnswer(e.toString()); } catch (final InternalErrorException e) { - s_logger.debug("Failed to dettach volume: " + vol.getPath() + ", due to ", e); + s_logger.debug("Failed to detach volume: " + vol.getPath() + ", due to ", e); return new DettachAnswer(e.toString()); } }