cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From anthon...@apache.org
Subject git commit: updated refs/heads/master to 726dd16
Date Mon, 24 Mar 2014 23:32:47 GMT
Repository: cloudstack
Updated Branches:
  refs/heads/master bf48309e1 -> 726dd16da


use vm instance name in log


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/726dd16d
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/726dd16d
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/726dd16d

Branch: refs/heads/master
Commit: 726dd16daa654476e22460e459364f51b06ca48d
Parents: bf48309
Author: Anthony Xu <anthony.xu@citrix.com>
Authored: Mon Mar 24 16:23:56 2014 -0700
Committer: Anthony Xu <anthony.xu@citrix.com>
Committed: Mon Mar 24 16:24:55 2014 -0700

----------------------------------------------------------------------
 server/src/com/cloud/ha/HighAvailabilityManagerImpl.java | 6 +++---
 server/src/com/cloud/vm/UserVmManagerImpl.java           | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/726dd16d/server/src/com/cloud/ha/HighAvailabilityManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/ha/HighAvailabilityManagerImpl.java b/server/src/com/cloud/ha/HighAvailabilityManagerImpl.java
index f7ab552..406b9b2 100755
--- a/server/src/com/cloud/ha/HighAvailabilityManagerImpl.java
+++ b/server/src/com/cloud/ha/HighAvailabilityManagerImpl.java
@@ -267,12 +267,12 @@ public class HighAvailabilityManagerImpl extends ManagerBase implements
HighAvai
 
         for (VMInstanceVO vm : vms) {
             if (s_logger.isDebugEnabled()) {
-                s_logger.debug("Notifying HA Mgr of to restart vm " + vm.getId() + "-" +
vm.getHostName());
+                s_logger.debug("Notifying HA Mgr of to restart vm " + vm.getId() + "-" +
vm.getInstanceName());
             }
             vm = _instanceDao.findByUuid(vm.getUuid());
             Long hostId = vm.getHostId();
             if ( hostId != null && !hostId.equals(host.getId()) ) {
-                s_logger.debug("VM " + vm.getHostName() + " is not on down host " + host.getId()
+ " it is on other host "
+                s_logger.debug("VM " + vm.getInstanceName() + " is not on down host " + host.getId()
+ " it is on other host "
                         + hostId + " VM HA is done");
                 continue;
             }
@@ -501,7 +501,7 @@ public class HighAvailabilityManagerImpl extends ManagerBase implements
HighAvai
                 } else if (!alive) {
                     fenced = true;
                 } else {
-                    s_logger.debug("VM " + vm.getHostName() + " is found to be alive by "
+ investigator.getName());
+                    s_logger.debug("VM " + vm.getInstanceName() + " is found to be alive
by " + investigator.getName());
                     if (host.getStatus() == Status.Up) {
                         s_logger.info(vm + " is alive and host is up. No need to restart
it.");
                         return null;

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/726dd16d/server/src/com/cloud/vm/UserVmManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/vm/UserVmManagerImpl.java b/server/src/com/cloud/vm/UserVmManagerImpl.java
index f92eaca..a1dd6c9 100755
--- a/server/src/com/cloud/vm/UserVmManagerImpl.java
+++ b/server/src/com/cloud/vm/UserVmManagerImpl.java
@@ -3533,12 +3533,12 @@ public class UserVmManagerImpl extends ManagerBase implements UserVmManager,
Vir
         try {
             diskStatsAnswer = (GetVmDiskStatsAnswer)_agentMgr.easySend(hostId, new GetVmDiskStatsCommand(vmNames,
host.getGuid(), host.getName()));
         } catch (Exception e) {
-            s_logger.warn("Error while collecting disk stats for vm: " + userVm.getHostName()
+ " from host: " + host.getName(), e);
+            s_logger.warn("Error while collecting disk stats for vm: " + userVm.getInstanceName()
+ " from host: " + host.getName(), e);
             return;
         }
         if (diskStatsAnswer != null) {
             if (!diskStatsAnswer.getResult()) {
-                s_logger.warn("Error while collecting disk stats vm: " + userVm.getHostName()
+ " from host: " + host.getName() + "; details: " + diskStatsAnswer.getDetails());
+                s_logger.warn("Error while collecting disk stats vm: " + userVm.getInstanceName()
+ " from host: " + host.getName() + "; details: " + diskStatsAnswer.getDetails());
                 return;
             }
             try {


Mime
View raw message