You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by GitBox <gi...@apache.org> on 2018/04/19 19:03:29 UTC
[GitHub] rhtyd closed pull request #2580: CLOUDSTACK-10357 Improve log
messages that do not match with their method function
rhtyd closed pull request #2580: CLOUDSTACK-10357 Improve log messages that do not match with their method function
URL: https://github.com/apache/cloudstack/pull/2580
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
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 b3b17e7d970..fb5e32771a3 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<String, Object> 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 d13234d1016..10a133c5a14 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 void saveDetails(UserVmVO vm) {
}
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 7cf193d49be..cd6d8cf590d 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,8 +497,8 @@ public boolean configure(final String name, final Map<String, Object> params) th
}
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 cluster. Please contact Cloud Support.");
+ s_logger.error("Unable to dedicate cluster due to " + e.getMessage(), e);
+ throw new CloudRuntimeException("Failed to dedicate cluster. Please contact Cloud Support.", e);
}
List<DedicatedResourceVO> result = new ArrayList<DedicatedResourceVO>();
@@ -595,7 +595,7 @@ public boolean configure(final String name, final Map<String, Object> params) th
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<DedicatedResourceVO> result = new ArrayList<DedicatedResourceVO>();
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 f1c84231e76..8157c751e0f 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,8 +64,8 @@ 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);
- throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, e.getMessage());
+ s_logger.warn(String.format("unable to delete baremetal RCT[%s]", getId()), e);
+ throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, e.getMessage(), e);
}
}
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 36be2d39a2e..e7e0ea26b60 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 detach 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 detach 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 11f2055fef8..45d0964552e 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 347186c2cac..d51985725ab 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 dae21a93a75..74b9c1d6f09 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 a008bdfcd1b..380aabf493a 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 0d5da2ff5b4..78d1335bc46 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 a0eee2de7b2..4110bfcec3f 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 HostDatastoreBrowserSearchResults searchDatastore(String datastorePath, S
}
} 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 0078793df8d..2fb772e0daf 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 {
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services