From e2b62374644fccc0e9a586f61e57970b00c2b23a Mon Sep 17 00:00:00 2001 From: Daan Hoogland Date: Thu, 30 Jul 2015 16:03:10 +0200 Subject: [PATCH] CLOUDSTACK-8656: debug messages on interupted exceptions --- agent/src/com/cloud/agent/AgentShell.java | 1 + .../network/security/dao/VmRulesetLogDaoImpl.java | 2 +- .../cache/manager/StorageCacheManagerImpl.java | 4 +++- .../cluster/ClusterServiceServletContainer.java | 1 + .../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 + .../sampleserver/SampleManagementServer.java | 4 ++++ .../cloudstack/messagebus/TestMessageBus.java | 13 ++++++++----- .../framework/jobs/AsyncJobManagerTest.java | 2 ++ .../framework/jobs/AsyncJobTestDispatcher.java | 1 + .../src/com/cloud/utils/db/StaticStrategy.java | 4 ++++ .../networkservice/BareMetalResourceBase.java | 1 + .../resource/HypervDirectConnectResource.java | 2 ++ .../cloud/hypervisor/kvm/resource/KVMHAMonitor.java | 4 ++-- .../kvm/storage/KVMStoragePoolManager.java | 1 + .../vmware/manager/VmwareManagerImpl.java | 1 + .../hypervisor/vmware/resource/VmwareResource.java | 3 +++ .../cloud/network/resource/NetscalerResource.java | 1 + .../cloud/storage/snapshot/SnapshotManagerImpl.java | 1 + server/src/com/cloud/vm/SystemVmLoadScanner.java | 1 + .../cloud/consoleproxy/ConsoleProxyClientBase.java | 2 ++ .../cloud/consoleproxy/ConsoleProxyGCThread.java | 1 + test/src/com/cloud/test/regression/ApiCommand.java | 1 + .../cloud/test/stress/StressTestDirectAttach.java | 1 + .../com/cloud/test/stress/TestClientWithAPI.java | 1 + test/src/com/cloud/test/utils/ConsoleProxy.java | 2 +- .../hypervisor/vmware/mo/HypervisorHostHelper.java | 1 + .../hypervisor/vmware/mo/VirtualMachineMO.java | 7 +++++++ .../cloud/hypervisor/vmware/util/VmwareContext.java | 1 + 31 files changed, 58 insertions(+), 10 deletions(-) diff --git a/agent/src/com/cloud/agent/AgentShell.java b/agent/src/com/cloud/agent/AgentShell.java index 7f834769883..961c1060176 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) { 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 90f8349349d..8fe9375c051 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 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"); 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 eca841eb0d0..278c80d3247 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(); diff --git a/framework/cluster/src/com/cloud/cluster/ClusterServiceServletContainer.java b/framework/cluster/src/com/cloud/cluster/ClusterServiceServletContainer.java index 9615f01a2dc..f5d67224d2b 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."); } } } diff --git a/framework/db/src/com/cloud/utils/db/Merovingian2.java b/framework/db/src/com/cloud/utils/db/Merovingian2.java index fe0b24d4dd9..d2537e369bd 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"; diff --git a/framework/db/test/com/cloud/utils/db/GlobalLockTest.java b/framework/db/test/com/cloud/utils/db/GlobalLockTest.java index 58c496f330b..79f96707bf0 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(); 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 e3eeb7bc6c3..3579690aa95 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; 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 1dcd6bd2682..774b99969aa 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."); } } } 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 4de8952da74..af5862c48e6 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] ."); } } } diff --git a/framework/ipc/test/org/apache/cloudstack/messagebus/TestMessageBus.java b/framework/ipc/test/org/apache/cloudstack/messagebus/TestMessageBus.java index 64e4f8863cb..3ee48803e29 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] ."); } } } 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 62a8d81ced2..a49f28ef55d 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] ."); } } 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 34351a6c934..eb30a804978 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); 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 c8d21dd1a8f..6b0cb24878a 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 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 7075c6b4881..5ef861d8139 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) { 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 66aa425b7cf..0e57df4ca65 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."); } } 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 5407d764474..49aa99cea68 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."); } } } 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 40ba11fcdce..28e5f03d512 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++; } 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 5b85c29d331..eb0ec55505c 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(); 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 491323c861a..c649748e4d0 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."); } } 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 eb119e72323..137aa613f9c 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()); diff --git a/server/src/com/cloud/storage/snapshot/SnapshotManagerImpl.java b/server/src/com/cloud/storage/snapshot/SnapshotManagerImpl.java index baa048821c8..bc661305d2a 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..."); diff --git a/server/src/com/cloud/vm/SystemVmLoadScanner.java b/server/src/com/cloud/vm/SystemVmLoadScanner.java index 97f9dcdaab4..c1a875871f0 100644 --- a/server/src/com/cloud/vm/SystemVmLoadScanner.java +++ b/server/src/com/cloud/vm/SystemVmLoadScanner.java @@ -61,6 +61,7 @@ public class SystemVmLoadScanner { try { _capacityScanScheduler.awaitTermination(1000, TimeUnit.MILLISECONDS); } catch (InterruptedException e) { + s_logger.debug("[ignored] interupted while stopping systemvm load scanner."); } _capacityScanLock.releaseRef(); 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 e3f2ea0f031..100e00c5284 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."); } } } 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 b50fb94645d..2e987d707e5 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."); } } } diff --git a/test/src/com/cloud/test/regression/ApiCommand.java b/test/src/com/cloud/test/regression/ApiCommand.java index 7b685f9f46a..b9229963f68 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; diff --git a/test/src/com/cloud/test/stress/StressTestDirectAttach.java b/test/src/com/cloud/test/stress/StressTestDirectAttach.java index 463023c3457..15a0ba29b27 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; diff --git a/test/src/com/cloud/test/stress/TestClientWithAPI.java b/test/src/com/cloud/test/stress/TestClientWithAPI.java index 548747245e0..c41fae8b817 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; diff --git a/test/src/com/cloud/test/utils/ConsoleProxy.java b/test/src/com/cloud/test/utils/ConsoleProxy.java index bc77bc918c7..35de0773593 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."); } } 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 0099ae1772c..44c6a853f00 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."); } } } 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 b509ba2e1e7..dd7421ef253 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."); } } 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 3e9c890559c..d4766dca5ac 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."); } } }