This is an automated email from the ASF dual-hosted git repository.
rohit pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
The following commit(s) were added to refs/heads/master by this push:
new fed3492 CLOUDSTACK-10357: Improve log messages in methods (#2580)
fed3492 is described below
commit fed3492b57625f415df556b5e2e44efee2257f50
Author: lzh3636 <[email protected]>
AuthorDate: Thu Apr 19 15:03:27 2018 -0400
CLOUDSTACK-10357: Improve log messages in methods (#2580)
Fix several logs that mismatch method.
Add stacktraces for throw new statements.
---
.../com/cloud/agent/resource/consoleproxy/ConsoleProxyResource.java | 2 +-
engine/schema/src/main/java/com/cloud/vm/dao/UserVmDaoImpl.java | 2 +-
.../apache/cloudstack/dedicated/DedicatedResourceManagerImpl.java | 6 +++---
.../main/java/org/apache/cloudstack/api/DeleteBaremetalRctCmd.java | 4 ++--
.../java/com/cloud/hypervisor/kvm/storage/KVMStorageProcessor.java | 4 ++--
.../java/org/apache/cloudstack/cloudian/client/CloudianClient.java | 2 +-
.../com/cloud/network/resource/NetScalerControlCenterResource.java | 2 +-
.../src/main/java/com/cloud/network/resource/NuageVspResource.java | 2 +-
server/src/main/java/com/cloud/network/NetworkModelImpl.java | 2 +-
server/src/main/java/com/cloud/network/as/AutoScaleManagerImpl.java | 2 +-
.../java/com/cloud/hypervisor/vmware/mo/HostDatastoreBrowserMO.java | 2 +-
.../main/java/com/cloud/hypervisor/vmware/mo/VirtualMachineMO.java | 4 ++--
12 files changed, 17 insertions(+), 17 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 b3b17e7..fb5e327 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 class ConsoleProxyResource extends
ServerResourceBase implements ServerRe
}
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 d13234d..10a133c 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 class UserVmDaoImpl extends GenericDaoBase<UserVmVO,
Long> implements Use
}
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 7cf193d..cd6d8cf 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 class DedicatedResourceManagerImpl implements
DedicatedService {
}
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 class DedicatedResourceManagerImpl implements
DedicatedService {
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 f1c8423..8157c75 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 class DeleteBaremetalRctCmd extends BaseAsyncCmd {
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 36be2d3..e7e0ea2 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 class KVMStorageProcessor implements
StorageProcessor {
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 11f2055..45d0964 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 class CloudianClient {
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 347186c..d519857 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 class NetScalerControlCenterResource implements
ServerResource {
// 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 dae21a9..74b9c1d 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 class NuageVspResource extends ManagerBase
implements ServerResource, Vsp
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 a008bdf..380aabf 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 class NetworkModelImpl extends ManagerBase
implements NetworkModel, Confi
}
} 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 0d5da2f..78d1335 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 class AutoScaleManagerImpl<Type> extends
ManagerBase implements AutoScale
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 a0eee2d..4110bfc 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 class HostDatastoreBrowserMO extends BaseMO {
}
} 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 0078793..2fb772e 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 class VirtualMachineMO extends BaseMO {
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 {
--
To stop receiving notification emails like this one, please contact
[email protected].
