apache · asfgit · Jul 30, 2015 · Jul 21, 2015 · Jul 29, 2015 · Jul 30, 2015
diff --git a/agent/src/com/cloud/agent/AgentShell.java b/agent/src/com/cloud/agent/AgentShell.java
@@ -464,6 +464,7 @@ public void start() {
                 while (!_exit)
                     Thread.sleep(1000);
             } catch (InterruptedException e) {
+                s_logger.debug("[ignored] AgentShell was interupted.");
             }
 
         } catch (final ConfigurationException e) {

diff --git a/api/test/org/apache/cloudstack/api/command/test/AddVpnUserCmdTest.java b/api/test/org/apache/cloudstack/api/command/test/AddVpnUserCmdTest.java
@@ -70,32 +70,6 @@ public String getPassword() {
         };
     }
 
-    /*
-     * @Test public void testExecuteVpnUserNotFound() {
-     *
-     * EntityManager entityManager = Mockito.mock(EntityManager.class);
-     *
-     * Mockito.when(entityManager.findById(VpnUser.class,
-     * Mockito.anyLong())).thenReturn(null);
-     *
-     * addVpnUserCmd._entityMgr = entityManager; try { addVpnUserCmd.execute();
-     * } catch (Exception e) { }
-     *
-     * }
-     *
-     *
-     * @Test public void testExecuteVpnUserFound() {
-     *
-     * EntityManager entityManager = Mockito.mock(EntityManager.class);
-     * addVpnUserCmd._entityMgr = entityManager;
-     *
-     * VpnUser vpnUser = Mockito.mock(VpnUser.class);
-     * Mockito.when(entityManager.findById(VpnUser.class,
-     * Mockito.anyLong())).thenReturn(vpnUser); addVpnUserCmd.execute();
-     *
-     * }
-     */
-
     @Test
     public void testCreateSuccess() {
 

diff --git a/core/src/com/cloud/storage/template/OVAProcessor.java b/core/src/com/cloud/storage/template/OVAProcessor.java
@@ -91,7 +91,8 @@ public long getVirtualSize(File file) {
             long size = getTemplateVirtualSize(file.getParent(), file.getName());
             return size;
         } catch (Exception e) {
-
+            s_logger.info("[ignored]"
+                    + "failed to get virtual template size for ova: " + e.getLocalizedMessage());
         }
         return file.length();
     }

diff --git a/core/src/com/cloud/storage/template/VmdkProcessor.java b/core/src/com/cloud/storage/template/VmdkProcessor.java
@@ -77,7 +77,8 @@ public long getVirtualSize(File file) {
             long size = getTemplateVirtualSize(file.getParent(), file.getName());
             return size;
         } catch (Exception e) {
-
+            s_logger.info("[ignored]"
+                    + "failed to get template virtual size for vmdk: " + e.getLocalizedMessage());
         }
         return file.length();
     }

diff --git a/engine/orchestration/src/com/cloud/agent/manager/ClusteredAgentManagerImpl.java b/engine/orchestration/src/com/cloud/agent/manager/ClusteredAgentManagerImpl.java
@@ -483,6 +483,8 @@ public SocketChannel connectToPeer(String peerName, SocketChannel prevCh) {
                 try {
                     prevCh.close();
                 } catch (Exception e) {
+                    s_logger.info("[ignored]"
+                            + "failed to get close resource for previous channel Socket: " + e.getLocalizedMessage());
                 }
             }
             if (ch == null || ch == prevCh) {

diff --git a/...tion/src/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/EngineHostDaoImpl.java b/...tion/src/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/EngineHostDaoImpl.java
@@ -611,7 +611,10 @@ public List<RunningHostCountInfo> getRunningHostCounts(Date cutTime) {
                 l.add(info);
             }
         } catch (SQLException e) {
+            s_logger.error("sql exception while getting running hosts: " + e.getLocalizedMessage());
         } catch (Throwable e) {
+            s_logger.info("[ignored]"
+                    + "caught something while getting running hosts: " + e.getLocalizedMessage());
         }
         return l;
     }

diff --git 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 @@ private int executeWithRetryOnDeadlock(TransactionLegacy txn, String pstmt, List
                     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/schema/src/com/cloud/storage/dao/SnapshotDaoImpl.java b/engine/schema/src/com/cloud/storage/dao/SnapshotDaoImpl.java
@@ -41,12 +41,12 @@
 import com.cloud.utils.db.Filter;
 import com.cloud.utils.db.GenericDaoBase;
 import com.cloud.utils.db.GenericSearchBuilder;
-import com.cloud.utils.db.UpdateBuilder;
 import com.cloud.utils.db.JoinBuilder.JoinType;
 import com.cloud.utils.db.SearchBuilder;
 import com.cloud.utils.db.SearchCriteria;
 import com.cloud.utils.db.SearchCriteria.Func;
 import com.cloud.utils.db.TransactionLegacy;
+import com.cloud.utils.db.UpdateBuilder;
 import com.cloud.vm.VMInstanceVO;
 import com.cloud.vm.dao.VMInstanceDao;
 
@@ -208,6 +208,8 @@ public Long getSecHostId(long volumeId) {
                 return rs.getLong(1);
             }
         } catch (Exception ex) {
+            s_logger.info("[ignored]"
+                    + "caught something while getting sec. host id: " + ex.getLocalizedMessage());
         }
         return null;
     }
@@ -276,7 +278,7 @@ public Long countSnapshotsForAccount(long accountId) {
 
     @Override
     public List<SnapshotVO> listByInstanceId(long instanceId, Snapshot.State... status) {
-        SearchCriteria<SnapshotVO> sc = this.InstanceIdSearch.create();
+        SearchCriteria<SnapshotVO> sc = InstanceIdSearch.create();
 
         if (status != null && status.length != 0) {
             sc.setParameters("status", (Object[])status);
@@ -289,7 +291,7 @@ public List<SnapshotVO> listByInstanceId(long instanceId, Snapshot.State... stat
 
     @Override
     public List<SnapshotVO> listByStatus(long volumeId, Snapshot.State... status) {
-        SearchCriteria<SnapshotVO> sc = this.StatusSearch.create();
+        SearchCriteria<SnapshotVO> sc = StatusSearch.create();
         sc.setParameters("volumeId", volumeId);
         sc.setParameters("status", (Object[])status);
         return listBy(sc, null);
@@ -311,7 +313,7 @@ public boolean remove(Long id) {
 
     @Override
     public List<SnapshotVO> listAllByStatus(Snapshot.State... status) {
-        SearchCriteria<SnapshotVO> sc = this.StatusSearch.create();
+        SearchCriteria<SnapshotVO> sc = StatusSearch.create();
         sc.setParameters("status", (Object[])status);
         return listBy(sc, null);
     }

diff --git a/...torage/cache/src/org/apache/cloudstack/storage/cache/manager/StorageCacheManagerImpl.java b/...torage/cache/src/org/apache/cloudstack/storage/cache/manager/StorageCacheManagerImpl.java
@@ -274,7 +274,9 @@ public DataObject createCacheObject(DataObject data, DataStore store) {
                     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
@@ -170,6 +170,7 @@ protected void runInContext() {
                     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
@@ -144,6 +144,7 @@ public boolean acquire(String key, int timeInSeconds) {
                 }
                 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
@@ -54,6 +54,7 @@ public void run() {
                     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/client/ClientTransportProvider.java b/framework/ipc/src/org/apache/cloudstack/framework/client/ClientTransportProvider.java
@@ -23,6 +23,8 @@
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 
+import org.apache.log4j.Logger;
+
 import org.apache.cloudstack.framework.serializer.MessageSerializer;
 import org.apache.cloudstack.framework.transport.TransportEndpoint;
 import org.apache.cloudstack.framework.transport.TransportEndpointSite;
@@ -32,10 +34,11 @@
 import com.cloud.utils.concurrency.NamedThreadFactory;
 
 public class ClientTransportProvider implements TransportProvider {
+    final static Logger s_logger = Logger.getLogger(ClientTransportProvider.class);
     public static final int DEFAULT_WORKER_POOL_SIZE = 5;
 
-    private Map<Integer, ClientTransportEndpointSite> _endpointSites = new HashMap<Integer, ClientTransportEndpointSite>();
-    private Map<String, ClientTransportEndpointSite> _attachedMap = new HashMap<String, ClientTransportEndpointSite>();
+    private final Map<Integer, ClientTransportEndpointSite> _endpointSites = new HashMap<Integer, ClientTransportEndpointSite>();
+    private final Map<String, ClientTransportEndpointSite> _attachedMap = new HashMap<String, ClientTransportEndpointSite>();
 
     private MessageSerializer _messageSerializer;
 
@@ -69,6 +72,8 @@ protected void runInContext() {
                 try {
                     _connection.connect(_serverAddress, _serverPort);
                 } catch (Throwable e) {
+                    s_logger.info("[ignored]"
+                            + "error during ipc client initialization: " + e.getLocalizedMessage());
                 }
             }
         });

diff --git 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 boolean enter(boolean wait) {
                             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
@@ -41,6 +41,7 @@ public void waitAny(long timeoutInMiliseconds) {
             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
@@ -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
@@ -22,21 +22,22 @@
 
 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;
 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 void run() {
                     try {
                         Thread.sleep(3000);
                     } catch (InterruptedException e) {
+                        s_logger.debug("[ignored] .");
                     }
                     _messageBus.publish(null, "Host", PublishScope.GLOBAL, null);
                 }
@@ -148,6 +150,7 @@ public void run() {
         try {
             thread.join();
         } catch (InterruptedException e) {
+            s_logger.debug("[ignored] .");
         }
     }
 }
diff --git a/framework/jobs/src/org/apache/cloudstack/framework/jobs/dao/VmWorkJobDaoImpl.java b/framework/jobs/src/org/apache/cloudstack/framework/jobs/dao/VmWorkJobDaoImpl.java
@@ -20,6 +20,7 @@
 import java.sql.SQLException;
 import java.util.Date;
 import java.util.List;
+
 import javax.annotation.PostConstruct;
 import javax.inject.Inject;
 
@@ -166,25 +167,35 @@ public void expungeLeftoverWorkJobs(final long msid) {
             public void doInTransactionWithoutResult(TransactionStatus status) {
                 TransactionLegacy txn = TransactionLegacy.currentTxn();
 
-                PreparedStatement pstmt = null;
-                try {
-                    pstmt = txn.prepareAutoCloseStatement(
+                try (
+                        PreparedStatement pstmt = txn
+                                .prepareAutoCloseStatement(
                             "DELETE FROM vm_work_job WHERE id IN (SELECT id FROM async_job WHERE (job_dispatcher='VmWorkJobPlaceHolder' OR job_dispatcher='VmWorkJobDispatcher') AND job_init_msid=?)");
+                ) {
                     pstmt.setLong(1, msid);
 
                     pstmt.execute();
                 } catch (SQLException e) {
+                    s_logger.info("[ignored]"
+                            + "SQL failed to delete vm work job: " + e.getLocalizedMessage());
                 } catch (Throwable e) {
+                    s_logger.info("[ignored]"
+                            + "caught an error during delete vm work job: " + e.getLocalizedMessage());
                 }
 
-                try {
-                    pstmt = txn.prepareAutoCloseStatement(
+                try (
+                        PreparedStatement pstmt = txn.prepareAutoCloseStatement(
                             "DELETE FROM async_job WHERE (job_dispatcher='VmWorkJobPlaceHolder' OR job_dispatcher='VmWorkJobDispatcher') AND job_init_msid=?");
+                ) {
                     pstmt.setLong(1, msid);
 
                     pstmt.execute();
                 } catch (SQLException e) {
+                    s_logger.info("[ignored]"
+                            + "SQL failed to delete async job: " + e.getLocalizedMessage());
                 } catch (Throwable e) {
+                    s_logger.info("[ignored]"
+                            + "caught an error during delete async job: " + e.getLocalizedMessage());
                 }
             }
         });

diff --git 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 void run() {
                 try {
                     Thread.sleep(3000);
                 } catch (InterruptedException e) {
+                    s_logger.debug("[ignored] .");
                 }
 
                 s_logger.info("wakeup");
@@ -119,6 +120,7 @@ public void test() {
             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
@@ -52,6 +52,7 @@ public void runJob(final AsyncJob job) {
         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
@@ -23,13 +23,16 @@
 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;
 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 ConnectionImpl pickConnection(LoadBalancingConnectionProxy proxy, List<St
                             try {
                                 Thread.sleep(250);
                             } catch (InterruptedException e) {
+                                s_logger.debug("[ignored] interupted while fail over in progres.");
                             }
 
                             // start fresh

diff --git a/...s/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BareMetalResourceBase.java b/...s/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BareMetalResourceBase.java
@@ -303,6 +303,7 @@ protected boolean doScript(Script cmd, OutputInterpreter interpreter, int retry)
                 try {
                     TimeUnit.SECONDS.sleep(1);
                 } catch (InterruptedException e) {
+                    s_logger.debug("[ignored] interupted while waiting to retry running script.");
                 }
                 continue;
             } else if (res == null) {
-Original file line number
+Diff line change
@@ Expand Up / @@ -170,6 +170,7 @@ protected void runInContext() { @@
                         try {
                             Thread.sleep(1000);
                         } catch (InterruptedException e1) {
+                            s_logger.debug("[ignored] interupted while waiting to retry running the servlet container.");
                         }
                     }
                 }
@@ Expand Down @@