You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by da...@apache.org on 2015/07/30 19:14:12 UTC
[3/4] git commit: updated refs/heads/master to c9857ca
CLOUDSTACK-8656: debug messages on interupted exceptions
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/e2b62374
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/e2b62374
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/e2b62374
Branch: refs/heads/master
Commit: e2b62374644fccc0e9a586f61e57970b00c2b23a
Parents: 520e0c8
Author: Daan Hoogland <da...@gmail.com>
Authored: Thu Jul 30 16:03:10 2015 +0200
Committer: Daan Hoogland <da...@gmail.com>
Committed: Thu Jul 30 16:03:10 2015 +0200
----------------------------------------------------------------------
agent/src/com/cloud/agent/AgentShell.java | 1 +
.../network/security/dao/VmRulesetLogDaoImpl.java | 2 +-
.../storage/cache/manager/StorageCacheManagerImpl.java | 4 +++-
.../cloud/cluster/ClusterServiceServletContainer.java | 1 +
framework/db/src/com/cloud/utils/db/Merovingian2.java | 1 +
.../db/test/com/cloud/utils/db/GlobalLockTest.java | 1 +
.../framework/messagebus/MessageBusBase.java | 1 +
.../framework/messagebus/MessageDetector.java | 1 +
.../framework/sampleserver/SampleManagementServer.java | 4 ++++
.../apache/cloudstack/messagebus/TestMessageBus.java | 13 ++++++++-----
.../cloudstack/framework/jobs/AsyncJobManagerTest.java | 2 ++
.../framework/jobs/AsyncJobTestDispatcher.java | 1 +
.../src/com/cloud/utils/db/StaticStrategy.java | 4 ++++
.../networkservice/BareMetalResourceBase.java | 1 +
.../hyperv/resource/HypervDirectConnectResource.java | 2 ++
.../cloud/hypervisor/kvm/resource/KVMHAMonitor.java | 4 ++--
.../hypervisor/kvm/storage/KVMStoragePoolManager.java | 1 +
.../hypervisor/vmware/manager/VmwareManagerImpl.java | 1 +
.../hypervisor/vmware/resource/VmwareResource.java | 3 +++
.../com/cloud/network/resource/NetscalerResource.java | 1 +
.../cloud/storage/snapshot/SnapshotManagerImpl.java | 1 +
server/src/com/cloud/vm/SystemVmLoadScanner.java | 1 +
.../com/cloud/consoleproxy/ConsoleProxyClientBase.java | 2 ++
.../com/cloud/consoleproxy/ConsoleProxyGCThread.java | 1 +
test/src/com/cloud/test/regression/ApiCommand.java | 1 +
.../com/cloud/test/stress/StressTestDirectAttach.java | 1 +
test/src/com/cloud/test/stress/TestClientWithAPI.java | 1 +
test/src/com/cloud/test/utils/ConsoleProxy.java | 2 +-
.../hypervisor/vmware/mo/HypervisorHostHelper.java | 1 +
.../cloud/hypervisor/vmware/mo/VirtualMachineMO.java | 7 +++++++
.../cloud/hypervisor/vmware/util/VmwareContext.java | 1 +
31 files changed, 58 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e2b62374/agent/src/com/cloud/agent/AgentShell.java
----------------------------------------------------------------------
diff --git a/agent/src/com/cloud/agent/AgentShell.java b/agent/src/com/cloud/agent/AgentShell.java
index 7f83476..961c106 100644
--- a/agent/src/com/cloud/agent/AgentShell.java
+++ b/agent/src/com/cloud/agent/AgentShell.java
@@ -464,6 +464,7 @@ public class AgentShell implements IAgentShell, Daemon {
while (!_exit)
Thread.sleep(1000);
} catch (InterruptedException e) {
+ s_logger.debug("[ignored] AgentShell was interupted.");
}
} catch (final ConfigurationException e) {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e2b62374/engine/schema/src/com/cloud/network/security/dao/VmRulesetLogDaoImpl.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/network/security/dao/VmRulesetLogDaoImpl.java b/engine/schema/src/com/cloud/network/security/dao/VmRulesetLogDaoImpl.java
index 90f8349..8fe9375 100644
--- a/engine/schema/src/com/cloud/network/security/dao/VmRulesetLogDaoImpl.java
+++ b/engine/schema/src/com/cloud/network/security/dao/VmRulesetLogDaoImpl.java
@@ -104,7 +104,7 @@ public class VmRulesetLogDaoImpl extends GenericDaoBase<VmRulesetLogVO, Long> im
try {
Thread.sleep(delayMs);
} catch (InterruptedException ie) {
-
+ s_logger.debug("[ignored] interupted while inserting security group rule log.");
}
} else
s_logger.warn("Caught another deadlock exception while retrying inserting security group rule log, giving up");
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e2b62374/engine/storage/cache/src/org/apache/cloudstack/storage/cache/manager/StorageCacheManagerImpl.java
----------------------------------------------------------------------
diff --git a/engine/storage/cache/src/org/apache/cloudstack/storage/cache/manager/StorageCacheManagerImpl.java b/engine/storage/cache/src/org/apache/cloudstack/storage/cache/manager/StorageCacheManagerImpl.java
index eca841e..278c80d 100644
--- a/engine/storage/cache/src/org/apache/cloudstack/storage/cache/manager/StorageCacheManagerImpl.java
+++ b/engine/storage/cache/src/org/apache/cloudstack/storage/cache/manager/StorageCacheManagerImpl.java
@@ -274,7 +274,9 @@ public class StorageCacheManagerImpl implements StorageCacheManager, Manager {
s_logger.debug("waiting cache copy completion type: " + typeName + ", id: " + obj.getObjectId() + ", lock: " + lock.hashCode());
try {
lock.wait(miliSeconds);
- } catch (InterruptedException e) {}
+ } catch (InterruptedException e) {
+ s_logger.debug("[ignored] interupted while waiting for cache copy completion.");
+ }
s_logger.debug("waken up");
now = new Date();
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e2b62374/framework/cluster/src/com/cloud/cluster/ClusterServiceServletContainer.java
----------------------------------------------------------------------
diff --git a/framework/cluster/src/com/cloud/cluster/ClusterServiceServletContainer.java b/framework/cluster/src/com/cloud/cluster/ClusterServiceServletContainer.java
index 9615f01..f5d6722 100644
--- a/framework/cluster/src/com/cloud/cluster/ClusterServiceServletContainer.java
+++ b/framework/cluster/src/com/cloud/cluster/ClusterServiceServletContainer.java
@@ -170,6 +170,7 @@ public class ClusterServiceServletContainer {
try {
Thread.sleep(1000);
} catch (InterruptedException e1) {
+ s_logger.debug("[ignored] interupted while waiting to retry running the servlet container.");
}
}
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e2b62374/framework/db/src/com/cloud/utils/db/Merovingian2.java
----------------------------------------------------------------------
diff --git a/framework/db/src/com/cloud/utils/db/Merovingian2.java b/framework/db/src/com/cloud/utils/db/Merovingian2.java
index fe0b24d..d2537e3 100644
--- a/framework/db/src/com/cloud/utils/db/Merovingian2.java
+++ b/framework/db/src/com/cloud/utils/db/Merovingian2.java
@@ -144,6 +144,7 @@ public class Merovingian2 extends StandardMBean implements MerovingianMBean {
}
Thread.sleep(5000);
} catch (InterruptedException e) {
+ s_logger.debug("[ignored] interupted while aquiring " + key);
}
}
String msg = "Timed out on acquiring lock " + key + " . Waited for " + ((InaccurateClock.getTime() - startTime)/1000) + "seconds";
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e2b62374/framework/db/test/com/cloud/utils/db/GlobalLockTest.java
----------------------------------------------------------------------
diff --git a/framework/db/test/com/cloud/utils/db/GlobalLockTest.java b/framework/db/test/com/cloud/utils/db/GlobalLockTest.java
index 58c496f..79f9670 100644
--- a/framework/db/test/com/cloud/utils/db/GlobalLockTest.java
+++ b/framework/db/test/com/cloud/utils/db/GlobalLockTest.java
@@ -54,6 +54,7 @@ public class GlobalLockTest {
Thread.sleep(jobDuration * 1000);
}
} catch (InterruptedException e) {
+ s_logger.debug("[ignored] interupted while testing global lock.");
} finally {
if (locked) {
boolean unlocked = WorkLock.unlock();
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e2b62374/framework/ipc/src/org/apache/cloudstack/framework/messagebus/MessageBusBase.java
----------------------------------------------------------------------
diff --git a/framework/ipc/src/org/apache/cloudstack/framework/messagebus/MessageBusBase.java b/framework/ipc/src/org/apache/cloudstack/framework/messagebus/MessageBusBase.java
index e3eeb7b..3579690 100644
--- a/framework/ipc/src/org/apache/cloudstack/framework/messagebus/MessageBusBase.java
+++ b/framework/ipc/src/org/apache/cloudstack/framework/messagebus/MessageBusBase.java
@@ -326,6 +326,7 @@ public class MessageBusBase implements MessageBus {
try {
wait();
} catch (InterruptedException e) {
+ s_logger.debug("[ignored] interupted while guarding re-entrance on message bus.");
}
} else {
break;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e2b62374/framework/ipc/src/org/apache/cloudstack/framework/messagebus/MessageDetector.java
----------------------------------------------------------------------
diff --git a/framework/ipc/src/org/apache/cloudstack/framework/messagebus/MessageDetector.java b/framework/ipc/src/org/apache/cloudstack/framework/messagebus/MessageDetector.java
index 1dcd6bd..774b999 100644
--- a/framework/ipc/src/org/apache/cloudstack/framework/messagebus/MessageDetector.java
+++ b/framework/ipc/src/org/apache/cloudstack/framework/messagebus/MessageDetector.java
@@ -41,6 +41,7 @@ public class MessageDetector implements MessageSubscriber {
try {
wait(timeoutInMiliseconds);
} catch (InterruptedException e) {
+ s_logger.debug("[ignored] interupted while waiting on any message.");
}
}
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e2b62374/framework/ipc/test/org/apache/cloudstack/framework/sampleserver/SampleManagementServer.java
----------------------------------------------------------------------
diff --git a/framework/ipc/test/org/apache/cloudstack/framework/sampleserver/SampleManagementServer.java b/framework/ipc/test/org/apache/cloudstack/framework/sampleserver/SampleManagementServer.java
index 4de8952..af5862c 100644
--- a/framework/ipc/test/org/apache/cloudstack/framework/sampleserver/SampleManagementServer.java
+++ b/framework/ipc/test/org/apache/cloudstack/framework/sampleserver/SampleManagementServer.java
@@ -18,13 +18,17 @@
*/
package org.apache.cloudstack.framework.sampleserver;
+import org.apache.log4j.Logger;
+
public class SampleManagementServer {
+ private static final Logger s_logger = Logger.getLogger(SampleManagementServer.class);
public void mainLoop() {
while (true) {
try {
Thread.sleep(1000);
} catch (InterruptedException e) {
+ s_logger.debug("[ignored] .");
}
}
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e2b62374/framework/ipc/test/org/apache/cloudstack/messagebus/TestMessageBus.java
----------------------------------------------------------------------
diff --git a/framework/ipc/test/org/apache/cloudstack/messagebus/TestMessageBus.java b/framework/ipc/test/org/apache/cloudstack/messagebus/TestMessageBus.java
index 64e4f88..3ee4880 100644
--- a/framework/ipc/test/org/apache/cloudstack/messagebus/TestMessageBus.java
+++ b/framework/ipc/test/org/apache/cloudstack/messagebus/TestMessageBus.java
@@ -22,6 +22,11 @@ import javax.inject.Inject;
import junit.framework.TestCase;
+import org.apache.cloudstack.framework.messagebus.MessageBus;
+import org.apache.cloudstack.framework.messagebus.MessageDetector;
+import org.apache.cloudstack.framework.messagebus.MessageSubscriber;
+import org.apache.cloudstack.framework.messagebus.PublishScope;
+import org.apache.log4j.Logger;
import org.junit.Assert;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -29,14 +34,10 @@ import org.mockito.Mockito;
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-import org.apache.cloudstack.framework.messagebus.MessageBus;
-import org.apache.cloudstack.framework.messagebus.MessageDetector;
-import org.apache.cloudstack.framework.messagebus.MessageSubscriber;
-import org.apache.cloudstack.framework.messagebus.PublishScope;
-
@RunWith(SpringJUnit4ClassRunner.class)
@ContextConfiguration(locations = "classpath:/MessageBusTestContext.xml")
public class TestMessageBus extends TestCase {
+ private static final Logger s_logger = Logger.getLogger(TestMessageBus.class);
@Inject
MessageBus _messageBus;
@@ -128,6 +129,7 @@ public class TestMessageBus extends TestCase {
try {
Thread.sleep(3000);
} catch (InterruptedException e) {
+ s_logger.debug("[ignored] .");
}
_messageBus.publish(null, "Host", PublishScope.GLOBAL, null);
}
@@ -148,6 +150,7 @@ public class TestMessageBus extends TestCase {
try {
thread.join();
} catch (InterruptedException e) {
+ s_logger.debug("[ignored] .");
}
}
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e2b62374/framework/jobs/test/org/apache/cloudstack/framework/jobs/AsyncJobManagerTest.java
----------------------------------------------------------------------
diff --git a/framework/jobs/test/org/apache/cloudstack/framework/jobs/AsyncJobManagerTest.java b/framework/jobs/test/org/apache/cloudstack/framework/jobs/AsyncJobManagerTest.java
index 62a8d81..a49f28e 100644
--- a/framework/jobs/test/org/apache/cloudstack/framework/jobs/AsyncJobManagerTest.java
+++ b/framework/jobs/test/org/apache/cloudstack/framework/jobs/AsyncJobManagerTest.java
@@ -61,6 +61,7 @@ public class AsyncJobManagerTest extends TestCase {
try {
Thread.sleep(3000);
} catch (InterruptedException e) {
+ s_logger.debug("[ignored] .");
}
s_logger.info("wakeup");
@@ -119,6 +120,7 @@ public class AsyncJobManagerTest extends TestCase {
try {
Thread.sleep(1000);
} catch (InterruptedException e) {
+ s_logger.debug("[ignored] .");
}
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e2b62374/framework/jobs/test/org/apache/cloudstack/framework/jobs/AsyncJobTestDispatcher.java
----------------------------------------------------------------------
diff --git a/framework/jobs/test/org/apache/cloudstack/framework/jobs/AsyncJobTestDispatcher.java b/framework/jobs/test/org/apache/cloudstack/framework/jobs/AsyncJobTestDispatcher.java
index 34351a6..eb30a80 100644
--- a/framework/jobs/test/org/apache/cloudstack/framework/jobs/AsyncJobTestDispatcher.java
+++ b/framework/jobs/test/org/apache/cloudstack/framework/jobs/AsyncJobTestDispatcher.java
@@ -52,6 +52,7 @@ public class AsyncJobTestDispatcher extends AdapterBase implements AsyncJobDispa
try {
Thread.sleep(interval);
} catch (InterruptedException e) {
+ s_logger.debug("[ignored] .");
}
_asyncJobMgr.completeAsyncJob(job.getId(), Status.SUCCEEDED, 0, null);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e2b62374/plugins/database/mysql-ha/src/com/cloud/utils/db/StaticStrategy.java
----------------------------------------------------------------------
diff --git a/plugins/database/mysql-ha/src/com/cloud/utils/db/StaticStrategy.java b/plugins/database/mysql-ha/src/com/cloud/utils/db/StaticStrategy.java
index c8d21dd..6b0cb24 100644
--- a/plugins/database/mysql-ha/src/com/cloud/utils/db/StaticStrategy.java
+++ b/plugins/database/mysql-ha/src/com/cloud/utils/db/StaticStrategy.java
@@ -23,6 +23,8 @@ import java.util.List;
import java.util.Map;
import java.util.Properties;
+import org.apache.log4j.Logger;
+
import com.mysql.jdbc.BalanceStrategy;
import com.mysql.jdbc.Connection;
import com.mysql.jdbc.ConnectionImpl;
@@ -30,6 +32,7 @@ import com.mysql.jdbc.LoadBalancingConnectionProxy;
import com.mysql.jdbc.SQLError;
public class StaticStrategy implements BalanceStrategy {
+ private static final Logger s_logger = Logger.getLogger(StaticStrategy.class);
public StaticStrategy() {
}
@@ -91,6 +94,7 @@ public class StaticStrategy implements BalanceStrategy {
try {
Thread.sleep(250);
} catch (InterruptedException e) {
+ s_logger.debug("[ignored] interupted while fail over in progres.");
}
// start fresh
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e2b62374/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BareMetalResourceBase.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BareMetalResourceBase.java b/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BareMetalResourceBase.java
index 7075c6b..5ef861d 100644
--- a/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BareMetalResourceBase.java
+++ b/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BareMetalResourceBase.java
@@ -303,6 +303,7 @@ public class BareMetalResourceBase extends ManagerBase implements ServerResource
try {
TimeUnit.SECONDS.sleep(1);
} catch (InterruptedException e) {
+ s_logger.debug("[ignored] interupted while waiting to retry running script.");
}
continue;
} else if (res == null) {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e2b62374/plugins/hypervisors/hyperv/src/com/cloud/hypervisor/hyperv/resource/HypervDirectConnectResource.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/hyperv/src/com/cloud/hypervisor/hyperv/resource/HypervDirectConnectResource.java b/plugins/hypervisors/hyperv/src/com/cloud/hypervisor/hyperv/resource/HypervDirectConnectResource.java
index 66aa425..0e57df4 100644
--- a/plugins/hypervisors/hyperv/src/com/cloud/hypervisor/hyperv/resource/HypervDirectConnectResource.java
+++ b/plugins/hypervisors/hyperv/src/com/cloud/hypervisor/hyperv/resource/HypervDirectConnectResource.java
@@ -2382,6 +2382,7 @@ public class HypervDirectConnectResource extends ServerResourceBase implements S
try {
Thread.sleep(5000);
} catch (InterruptedException ex) {
+ s_logger.debug("[ignored] interupted while waiting to retry connecting to vm after exception: "+e.getLocalizedMessage());
}
}
} finally {
@@ -2396,6 +2397,7 @@ public class HypervDirectConnectResource extends ServerResourceBase implements S
try {
Thread.sleep(1000);
} catch (InterruptedException ex) {
+ s_logger.debug("[ignored] interupted while connecting to vm.");
}
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e2b62374/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/KVMHAMonitor.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/KVMHAMonitor.java b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/KVMHAMonitor.java
index 5407d76..49aa99c 100644
--- a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/KVMHAMonitor.java
+++ b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/KVMHAMonitor.java
@@ -160,13 +160,13 @@ public class KVMHAMonitor extends KVMHABase implements Runnable {
try {
monitorThread.join();
} catch (InterruptedException e) {
-
+ s_logger.debug("[ignored] interupted joining monitor.");
}
try {
Thread.sleep(_heartBeatUpdateFreq);
} catch (InterruptedException e) {
-
+ s_logger.debug("[ignored] interupted between heartbeats.");
}
}
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e2b62374/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/storage/KVMStoragePoolManager.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/storage/KVMStoragePoolManager.java b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/storage/KVMStoragePoolManager.java
index 40ba11f..28e5f03 100644
--- a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/storage/KVMStoragePoolManager.java
+++ b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/storage/KVMStoragePoolManager.java
@@ -286,6 +286,7 @@ public class KVMStoragePoolManager {
try {
Thread.sleep(30000);
} catch (InterruptedException e) {
+ s_logger.debug("[ignored] interupted while trying to get storage pool.");
}
cnt++;
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e2b62374/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/manager/VmwareManagerImpl.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/manager/VmwareManagerImpl.java b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/manager/VmwareManagerImpl.java
index 5b85c29..eb0ec55 100644
--- a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/manager/VmwareManagerImpl.java
+++ b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/manager/VmwareManagerImpl.java
@@ -321,6 +321,7 @@ public class VmwareManagerImpl extends ManagerBase implements VmwareManager, Vmw
try {
_hostScanScheduler.awaitTermination(3000, TimeUnit.MILLISECONDS);
} catch (InterruptedException e) {
+ s_logger.debug("[ignored] interupted while stopping<:/.");
}
shutdownCleanup();
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e2b62374/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java
index 491323c..c649748 100644
--- a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java
+++ b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java
@@ -784,6 +784,7 @@ public class VmwareResource implements StoragePoolResource, ServerResource, Vmwa
Thread.currentThread();
Thread.sleep(1000);
} catch (InterruptedException e) {
+ s_logger.debug("[ignored] interupted while trying to get mac.");
}
}
@@ -4818,6 +4819,7 @@ public class VmwareResource implements StoragePoolResource, ServerResource, Vmwa
try {
Thread.sleep(5000);
} catch (InterruptedException ex) {
+ s_logger.debug("[ignored] interupted while waiting to retry connect after failure.", e);
}
}
} finally {
@@ -4832,6 +4834,7 @@ public class VmwareResource implements StoragePoolResource, ServerResource, Vmwa
try {
Thread.sleep(1000);
} catch (InterruptedException ex) {
+ s_logger.debug("[ignored] interupted while waiting to retry connect.");
}
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e2b62374/plugins/network-elements/netscaler/src/com/cloud/network/resource/NetscalerResource.java
----------------------------------------------------------------------
diff --git a/plugins/network-elements/netscaler/src/com/cloud/network/resource/NetscalerResource.java b/plugins/network-elements/netscaler/src/com/cloud/network/resource/NetscalerResource.java
index eb119e7..137aa61 100644
--- a/plugins/network-elements/netscaler/src/com/cloud/network/resource/NetscalerResource.java
+++ b/plugins/network-elements/netscaler/src/com/cloud/network/resource/NetscalerResource.java
@@ -954,6 +954,7 @@ public class NetscalerResource implements ServerResource {
try {
Thread.sleep(10000);
} catch (InterruptedException e) {
+ s_logger.debug("[ignored] interupted while waiting for netscaler to be 'up'.");
}
ns refreshNsObj = new ns();
refreshNsObj.set_id(newVpx.get_id());
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e2b62374/server/src/com/cloud/storage/snapshot/SnapshotManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/storage/snapshot/SnapshotManagerImpl.java b/server/src/com/cloud/storage/snapshot/SnapshotManagerImpl.java
index baa0488..bc66130 100644
--- a/server/src/com/cloud/storage/snapshot/SnapshotManagerImpl.java
+++ b/server/src/com/cloud/storage/snapshot/SnapshotManagerImpl.java
@@ -221,6 +221,7 @@ public class SnapshotManagerImpl extends ManagerBase implements SnapshotManager,
try {
Thread.sleep(_pauseInterval * 1000);
} catch (InterruptedException e) {
+ s_logger.debug("[ignored] interupted while retry cmd.");
}
s_logger.debug("Retrying...");
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e2b62374/server/src/com/cloud/vm/SystemVmLoadScanner.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/vm/SystemVmLoadScanner.java b/server/src/com/cloud/vm/SystemVmLoadScanner.java
index 97f9dcd..c1a8758 100644
--- a/server/src/com/cloud/vm/SystemVmLoadScanner.java
+++ b/server/src/com/cloud/vm/SystemVmLoadScanner.java
@@ -61,6 +61,7 @@ public class SystemVmLoadScanner<T> {
try {
_capacityScanScheduler.awaitTermination(1000, TimeUnit.MILLISECONDS);
} catch (InterruptedException e) {
+ s_logger.debug("[ignored] interupted while stopping systemvm load scanner.");
}
_capacityScanLock.releaseRef();
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e2b62374/services/console-proxy/server/src/com/cloud/consoleproxy/ConsoleProxyClientBase.java
----------------------------------------------------------------------
diff --git a/services/console-proxy/server/src/com/cloud/consoleproxy/ConsoleProxyClientBase.java b/services/console-proxy/server/src/com/cloud/consoleproxy/ConsoleProxyClientBase.java
index e3f2ea0..100e00c 100644
--- a/services/console-proxy/server/src/com/cloud/consoleproxy/ConsoleProxyClientBase.java
+++ b/services/console-proxy/server/src/com/cloud/consoleproxy/ConsoleProxyClientBase.java
@@ -230,6 +230,7 @@ public abstract class ConsoleProxyClientBase implements ConsoleProxyClient, Cons
try {
Thread.sleep(100);
} catch (InterruptedException e) {
+ s_logger.debug("[ignored] Console proxy was interupted while waiting for viewer to become ready.");
}
}
return false;
@@ -341,6 +342,7 @@ public abstract class ConsoleProxyClientBase implements ConsoleProxyClient, Cons
try {
tileDirtyEvent.wait(3000);
} catch (InterruptedException e) {
+ s_logger.debug("[ignored] Console proxy ajax update was interupted while waiting for viewer to become ready.");
}
}
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e2b62374/services/console-proxy/server/src/com/cloud/consoleproxy/ConsoleProxyGCThread.java
----------------------------------------------------------------------
diff --git a/services/console-proxy/server/src/com/cloud/consoleproxy/ConsoleProxyGCThread.java b/services/console-proxy/server/src/com/cloud/consoleproxy/ConsoleProxyGCThread.java
index b50fb94..2e987d7 100644
--- a/services/console-proxy/server/src/com/cloud/consoleproxy/ConsoleProxyGCThread.java
+++ b/services/console-proxy/server/src/com/cloud/consoleproxy/ConsoleProxyGCThread.java
@@ -111,6 +111,7 @@ public class ConsoleProxyGCThread extends Thread {
try {
Thread.sleep(5000);
} catch (InterruptedException ex) {
+ s_logger.debug("[ignored] Console proxy was interupted during GC.");
}
}
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e2b62374/test/src/com/cloud/test/regression/ApiCommand.java
----------------------------------------------------------------------
diff --git a/test/src/com/cloud/test/regression/ApiCommand.java b/test/src/com/cloud/test/regression/ApiCommand.java
index 7b685f9..b922996 100644
--- a/test/src/com/cloud/test/regression/ApiCommand.java
+++ b/test/src/com/cloud/test/regression/ApiCommand.java
@@ -802,6 +802,7 @@ public class ApiCommand {
try {
Thread.sleep(1000);
} catch (InterruptedException e) {
+ s_logger.debug("[ignored] interupted while during async job result query.");
}
} else {
break;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e2b62374/test/src/com/cloud/test/stress/StressTestDirectAttach.java
----------------------------------------------------------------------
diff --git a/test/src/com/cloud/test/stress/StressTestDirectAttach.java b/test/src/com/cloud/test/stress/StressTestDirectAttach.java
index 463023c..15a0ba2 100644
--- a/test/src/com/cloud/test/stress/StressTestDirectAttach.java
+++ b/test/src/com/cloud/test/stress/StressTestDirectAttach.java
@@ -1337,6 +1337,7 @@ public class StressTestDirectAttach {
try {
Thread.sleep(1000);
} catch (InterruptedException e) {
+ s_logger.debug("[ignored] interupted while during async job result query.");
}
} else {
break;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e2b62374/test/src/com/cloud/test/stress/TestClientWithAPI.java
----------------------------------------------------------------------
diff --git a/test/src/com/cloud/test/stress/TestClientWithAPI.java b/test/src/com/cloud/test/stress/TestClientWithAPI.java
index 5487472..c41fae8 100644
--- a/test/src/com/cloud/test/stress/TestClientWithAPI.java
+++ b/test/src/com/cloud/test/stress/TestClientWithAPI.java
@@ -2273,6 +2273,7 @@ public class TestClientWithAPI {
try {
Thread.sleep(1000);
} catch (InterruptedException e) {
+ s_logger.debug("[ignored] interupted while during async job result query.");
}
} else {
break;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e2b62374/test/src/com/cloud/test/utils/ConsoleProxy.java
----------------------------------------------------------------------
diff --git a/test/src/com/cloud/test/utils/ConsoleProxy.java b/test/src/com/cloud/test/utils/ConsoleProxy.java
index bc77bc9..35de077 100644
--- a/test/src/com/cloud/test/utils/ConsoleProxy.java
+++ b/test/src/com/cloud/test/utils/ConsoleProxy.java
@@ -67,7 +67,7 @@ public class ConsoleProxy implements Runnable {
try {
Thread.sleep(1000);
} catch (InterruptedException e) {
-
+ s_logger.debug("[ignored] interupted.");
}
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e2b62374/vmware-base/src/com/cloud/hypervisor/vmware/mo/HypervisorHostHelper.java
----------------------------------------------------------------------
diff --git a/vmware-base/src/com/cloud/hypervisor/vmware/mo/HypervisorHostHelper.java b/vmware-base/src/com/cloud/hypervisor/vmware/mo/HypervisorHostHelper.java
index 0099ae1..44c6a85 100644
--- a/vmware-base/src/com/cloud/hypervisor/vmware/mo/HypervisorHostHelper.java
+++ b/vmware-base/src/com/cloud/hypervisor/vmware/mo/HypervisorHostHelper.java
@@ -1333,6 +1333,7 @@ public class HypervisorHostHelper {
try {
Thread.sleep(1000);
} catch (InterruptedException e) {
+ s_logger.debug("[ignored] interupted while waiting to config vm.");
}
}
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e2b62374/vmware-base/src/com/cloud/hypervisor/vmware/mo/VirtualMachineMO.java
----------------------------------------------------------------------
diff --git a/vmware-base/src/com/cloud/hypervisor/vmware/mo/VirtualMachineMO.java b/vmware-base/src/com/cloud/hypervisor/vmware/mo/VirtualMachineMO.java
index b509ba2..dd7421e 100644
--- a/vmware-base/src/com/cloud/hypervisor/vmware/mo/VirtualMachineMO.java
+++ b/vmware-base/src/com/cloud/hypervisor/vmware/mo/VirtualMachineMO.java
@@ -243,6 +243,7 @@ public class VirtualMachineMO extends BaseMO {
try {
Thread.sleep(1000);
} catch (InterruptedException e) {
+ s_logger.debug("[ignored] interupted while dealing with vm questions.");
}
}
s_logger.info("VM Question monitor stopped");
@@ -289,6 +290,7 @@ public class VirtualMachineMO extends BaseMO {
try {
Thread.sleep(1000);
} catch (InterruptedException e) {
+ s_logger.debug("[ignored] interupted while powering of vm.");
}
}
@@ -321,6 +323,7 @@ public class VirtualMachineMO extends BaseMO {
try {
Thread.sleep(1000);
} catch (InterruptedException e) {
+ s_logger.debug("[ignored] interupted while powering of vm unconditionaly.");
}
}
return true;
@@ -354,6 +357,7 @@ public class VirtualMachineMO extends BaseMO {
try {
Thread.sleep(1000);
} catch (InterruptedException e) {
+ s_logger.debug("[ignored] interupted while pausing after power off.");
}
} else {
break;
@@ -477,6 +481,7 @@ public class VirtualMachineMO extends BaseMO {
try {
Thread.sleep(1000);
} catch (InterruptedException e) {
+ s_logger.debug("[ignored] interupted while waiting for snapshot to be done.");
}
}
@@ -1405,6 +1410,7 @@ public class VirtualMachineMO extends BaseMO {
try {
Thread.sleep(1000);
} catch (InterruptedException e) {
+ s_logger.debug("[ignored] interupted while handling vm question about iso detach.");
}
}
s_logger.info("VM Question monitor stopped");
@@ -2572,6 +2578,7 @@ public class VirtualMachineMO extends BaseMO {
try {
Thread.sleep(1000);
} catch (InterruptedException e) {
+ s_logger.debug("[ignored] interupted while handling vm question about umount tools install.");
}
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e2b62374/vmware-base/src/com/cloud/hypervisor/vmware/util/VmwareContext.java
----------------------------------------------------------------------
diff --git a/vmware-base/src/com/cloud/hypervisor/vmware/util/VmwareContext.java b/vmware-base/src/com/cloud/hypervisor/vmware/util/VmwareContext.java
index 3e9c890..d4766dc 100644
--- a/vmware-base/src/com/cloud/hypervisor/vmware/util/VmwareContext.java
+++ b/vmware-base/src/com/cloud/hypervisor/vmware/util/VmwareContext.java
@@ -632,6 +632,7 @@ public class VmwareContext {
try {
Thread.sleep(CONNECT_RETRY_INTERVAL);
} catch (InterruptedException ex) {
+ s_logger.debug("[ignored] interupted while connecting.");
}
}
}