You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by bh...@apache.org on 2016/11/03 11:18:44 UTC
[1/2] git commit: updated refs/heads/master to b59db0d
Repository: cloudstack
Updated Branches:
refs/heads/master 96213f909 -> b59db0dc0
Made the changes to improve logging.
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/cd9c7737
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/cd9c7737
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/cd9c7737
Branch: refs/heads/master
Commit: cd9c7737d19c97c95fd536e1ecb4641d4e8651fc
Parents: 227ff38
Author: Nemo <ch...@gmail.com>
Authored: Tue Oct 11 12:58:02 2016 -0400
Committer: Nemo <ch...@gmail.com>
Committed: Tue Oct 11 12:58:02 2016 -0400
----------------------------------------------------------------------
.../src/com/cloud/agent/manager/AgentManagerImpl.java | 4 ++--
.../src/com/cloud/vm/VirtualMachineManagerImpl.java | 2 +-
.../kvm/src/com/cloud/hypervisor/kvm/resource/KVMHAChecker.java | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/cd9c7737/engine/orchestration/src/com/cloud/agent/manager/AgentManagerImpl.java
----------------------------------------------------------------------
diff --git a/engine/orchestration/src/com/cloud/agent/manager/AgentManagerImpl.java b/engine/orchestration/src/com/cloud/agent/manager/AgentManagerImpl.java
index aa7068a..aaa3ba5 100644
--- a/engine/orchestration/src/com/cloud/agent/manager/AgentManagerImpl.java
+++ b/engine/orchestration/src/com/cloud/agent/manager/AgentManagerImpl.java
@@ -1231,9 +1231,9 @@ public class AgentManagerImpl extends ManagerBase implements AgentManager, Handl
} else if (cmd instanceof PingCommand) {
logD = false;
s_logger.debug("Ping from " + hostId + "(" + hostName + ")");
- s_logger.trace("SeqA " + attache.getId() + "-" + request.getSequence() + ": Processing " + request);
+ s_logger.trace("SeqA " + hostId + "-" + request.getSequence() + ": Processing " + request);
} else {
- s_logger.debug("SeqA " + attache.getId() + "-" + request.getSequence() + ": Processing " + request);
+ s_logger.debug("SeqA " + hostId + "-" + request.getSequence() + ": Processing " + request);
}
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/cd9c7737/engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java
----------------------------------------------------------------------
diff --git a/engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java b/engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java
index 9523b92..ad8e928 100644
--- a/engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java
+++ b/engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java
@@ -3355,7 +3355,7 @@ public class VirtualMachineManagerImpl extends ManagerBase implements VirtualMac
}
if (fromHost.getClusterId().longValue() != dest.getCluster().getId()) {
- s_logger.info("Source and destination host are not in same cluster, unable to migrate to host: " + dest.getHost().getId());
+ s_logger.info("Source and destination host are not in same cluster, unable to migrate to host: " + dstHostId);
throw new CloudRuntimeException("Source and destination host are not in same cluster, unable to migrate to host: " + dest.getHost().getId());
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/cd9c7737/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/KVMHAChecker.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/KVMHAChecker.java b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/KVMHAChecker.java
index c2af191..565673e 100644
--- a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/KVMHAChecker.java
+++ b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/KVMHAChecker.java
@@ -57,7 +57,7 @@ public class KVMHAChecker extends KVMHABase implements Callable<Boolean> {
s_logger.debug("reture: " + result);
s_logger.debug("parser: " + parser.getLine());
if (result == null && parser.getLine().contains("> DEAD <")) {
- s_logger.debug("read heartbeat failed: " + result);
+ s_logger.debug("read heartbeat failed: ");
results.add(false);
} else {
results.add(true);
[2/2] git commit: updated refs/heads/master to b59db0d
Posted by bh...@apache.org.
Merge pull request #1705 from nemo9cby/CLOUDSTACK-9465
Made the changes to improve logging.CLOUSTACK-9465 Several log refactoring/improvement suggestions.
There are two scenarios of logging which needs refactoring/improvement:
Method invocation replaced by variable
This means that in the logging code, the method invocation is pre-defined as a variable. for simplicity, the method invocation should be replaced by the variable.
Delete variable which must be null
The variable in the logging code is null, there is no need to put the variable there.
* pr/1705:
Made the changes to improve logging.
Signed-off-by: Rohit Yadav <ro...@shapeblue.com>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/b59db0dc
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/b59db0dc
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/b59db0dc
Branch: refs/heads/master
Commit: b59db0dc06e0ef14f6c1a54ffcdc5578ed203007
Parents: 96213f9 cd9c773
Author: Rohit Yadav <ro...@shapeblue.com>
Authored: Thu Nov 3 16:48:21 2016 +0530
Committer: Rohit Yadav <ro...@shapeblue.com>
Committed: Thu Nov 3 16:48:21 2016 +0530
----------------------------------------------------------------------
.../src/com/cloud/agent/manager/AgentManagerImpl.java | 4 ++--
.../src/com/cloud/vm/VirtualMachineManagerImpl.java | 2 +-
.../kvm/src/com/cloud/hypervisor/kvm/resource/KVMHAChecker.java | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b59db0dc/engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java
----------------------------------------------------------------------