CLOUDSTACK-6242: exception handling improvements

Ding Yuan · DaanHoogland · commit c031eb7d3820 · 2014-04-15T08:07:15.000+02:00
Signed-off-by: Daan Hoogland &lt;daan@onecht.net&gt;
diff --git a/engine/orchestration/src/com/cloud/agent/manager/AgentManagerImpl.java b/engine/orchestration/src/com/cloud/agent/manager/AgentManagerImpl.java
@@ -802,6 +802,7 @@ protected boolean handleDisconnectWithInvestigation(AgentAttache attache, Status
                  * Why this can happen? Ask God not me. I hate there was no piece of comment for code handling race condition.
                  * God knew what race condition the code dealt with!
                  */
+                s_logger.debug("Caught exception while getting agent's next status", ne);
             }
 
             if (nextStatus == Status.Alert) {
diff --git a/engine/orchestration/src/com/cloud/agent/manager/ClusteredAgentManagerImpl.java b/engine/orchestration/src/com/cloud/agent/manager/ClusteredAgentManagerImpl.java
@@ -79,6 +79,7 @@
 import com.cloud.cluster.dao.ManagementServerHostDao;
 import com.cloud.exception.AgentUnavailableException;
 import com.cloud.exception.OperationTimedoutException;
+import com.cloud.exception.UnsupportedVersionException;
 import com.cloud.host.Host;
 import com.cloud.host.HostVO;
 import com.cloud.host.Status;
@@ -412,7 +413,9 @@ public boolean routeToPeer(String peer, byte[] bytes) {
             if (ch == null) {
                 try {
                     logD(bytes, "Unable to route to peer: " + Request.parse(bytes).toString());
-                } catch (Exception e) {
+                } catch (ClassNotFoundException | UnsupportedVersionException e) {
+                    // Request.parse thrown exception when we try to log it, log as much as we can
+                    logD(bytes, "Unable to route to peer, and Request.parse further caught exception" + e.getMessage());
                 }
                 return false;
             }
@@ -430,7 +433,10 @@ public boolean routeToPeer(String peer, byte[] bytes) {
             } catch (IOException e) {
                 try {
                     logI(bytes, "Unable to route to peer: " + Request.parse(bytes).toString() + " due to " + e.getMessage());
-                } catch (Exception ex) {
+                } catch (ClassNotFoundException | UnsupportedVersionException ex) {
+                    // Request.parse thrown exception when we try to log it, log as much as we can
+                    logI(bytes, "Unable to route to peer due to" + e.getMessage()
+                          + ". Also caught exception when parsing request: " + ex.getMessage());
                 }
             }
         }
diff --git a/engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java b/engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java
@@ -1930,6 +1930,7 @@ protected void migrate(VMInstanceVO vm, long srcHostId, DeployDestination dest)
                     throw new CloudRuntimeException("Unable to complete migration for " + vm);
                 }
             } catch (OperationTimedoutException e) {
+                s_logger.debug("Error while checking the vm " + vm + " on host " + dstHostId, e);
             }
 
             migrated = true;
@@ -3898,6 +3899,7 @@ private void orchestrateMigrateForScale(String vmUuid, long srcHostId, DeployDes
                     throw new CloudRuntimeException("Unable to complete migration for " + vm);
                 }
             } catch (OperationTimedoutException e) {
+                s_logger.debug("Error while checking the vm " + vm + " on host " + dstHostId, e);
             }
 
             migrated = true;
diff --git a/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/EngineDataCenterDaoImpl.java b/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/EngineDataCenterDaoImpl.java
@@ -270,7 +270,7 @@ public EngineDataCenterVO findByTokenOrIdOrName(String tokenOrIdOrName) {
                     Long dcId = Long.parseLong(tokenOrIdOrName);
                     return findById(dcId);
                 } catch (NumberFormatException nfe) {
-
+                    s_logger.debug("Cannot parse " + tokenOrIdOrName + " into long. " + nfe);
                 }
             }
         }
diff --git a/engine/schema/src/com/cloud/dc/dao/DataCenterDaoImpl.java b/engine/schema/src/com/cloud/dc/dao/DataCenterDaoImpl.java
@@ -411,7 +411,7 @@ public DataCenterVO findByTokenOrIdOrName(String tokenOrIdOrName) {
                     Long dcId = Long.parseLong(tokenOrIdOrName);
                     return findById(dcId);
                 } catch (NumberFormatException nfe) {
-
+                    s_logger.debug("Cannot parse " + tokenOrIdOrName + " into long. " + nfe);
                 }
             }
         }
diff --git a/engine/schema/src/com/cloud/host/dao/HostDaoImpl.java b/engine/schema/src/com/cloud/host/dao/HostDaoImpl.java
@@ -871,7 +871,7 @@ public List<RunningHostCountInfo> getRunningHostCounts(Date cutTime) {
                 l.add(info);
             }
         } catch (SQLException e) {
-        } catch (Throwable e) {
+            s_logger.debug("SQLException caught", e);
         }
         return l;
     }
diff --git a/engine/schema/src/com/cloud/storage/dao/StoragePoolHostDaoImpl.java b/engine/schema/src/com/cloud/storage/dao/StoragePoolHostDaoImpl.java
@@ -151,7 +151,7 @@ public List<Pair<Long, Integer>> getDatacenterStoragePoolHostInfo(long dcId, boo
                 l.add(new Pair<Long, Integer>(rs.getLong(1), rs.getInt(2)));
             }
         } catch (SQLException e) {
-        } catch (Throwable e) {
+            s_logger.debug("SQLException: ", e);
         }
         return l;
     }
diff --git a/engine/schema/src/com/cloud/storage/dao/VMTemplateDaoImpl.java b/engine/schema/src/com/cloud/storage/dao/VMTemplateDaoImpl.java
@@ -232,7 +232,7 @@ public List<Long> listPrivateTemplatesByHost(Long hostId) {
                 l.add(rs.getLong(1));
             }
         } catch (SQLException e) {
-        } catch (Throwable e) {
+            s_logger.debug("Exception: ", e);
         }
         return l;
     }
diff --git a/engine/schema/src/com/cloud/upgrade/dao/Upgrade2214to30.java b/engine/schema/src/com/cloud/upgrade/dao/Upgrade2214to30.java
@@ -986,8 +986,9 @@ protected void switchAccountSpecificNetworksToIsolated(Connection conn) {
                 pstmt = conn.prepareStatement("ALTER TABLE `cloud`.`networks` DROP COLUMN `switch_to_isolated`");
                 pstmt2Close.add(pstmt);
                 pstmt.executeUpdate();
-            } catch (Exception ex) {
+            } catch (SQLException ex) {
                 // do nothing here
+                s_logger.debug("Caught SQLException when trying to drop switch_to_isolated column ", ex);
             }
 
         } catch (SQLException e) {
diff --git a/engine/schema/src/com/cloud/vm/dao/ConsoleProxyDaoImpl.java b/engine/schema/src/com/cloud/vm/dao/ConsoleProxyDaoImpl.java
@@ -217,7 +217,7 @@ public List<Pair<Long, Integer>> getProxyLoadMatrix() {
                 l.add(new Pair<Long, Integer>(rs.getLong(1), rs.getInt(2)));
             }
         } catch (SQLException e) {
-        } catch (Throwable e) {
+            s_logger.debug("Caught SQLException: ", e);
         }
         return l;
     }
@@ -242,7 +242,7 @@ public List<Pair<Long, Integer>> getDatacenterStoragePoolHostInfo(long dcId, boo
                 l.add(new Pair<Long, Integer>(rs.getLong(1), rs.getInt(2)));
             }
         } catch (SQLException e) {
-        } catch (Throwable e) {
+            s_logger.debug("Caught SQLException: ", e);
         }
         return l;
     }
@@ -261,7 +261,7 @@ public int getProxyStaticLoad(long proxyVmId) {
                 return rs.getInt(1);
             }
         } catch (SQLException e) {
-        } catch (Throwable e) {
+            s_logger.debug("Caught SQLException: ", e);
         }
         return 0;
     }
@@ -279,7 +279,7 @@ public int getProxyActiveLoad(long proxyVmId) {
                 return rs.getInt(1);
             }
         } catch (SQLException e) {
-        } catch (Throwable e) {
+            s_logger.debug("Caught SQLException: ", e);
         }
         return 0;
     }
@@ -301,7 +301,7 @@ private List<ConsoleProxyLoadInfo> getDatacenterLoadMatrix(String sql) {
                 l.add(info);
             }
         } catch (SQLException e) {
-        } catch (Throwable e) {
+            s_logger.debug("Exception: ", e);
         }
         return l;
     }
@@ -323,7 +323,7 @@ public List<Long> getRunningProxyListByMsid(long msid) {
                 l.add(rs.getLong(1));
             }
         } catch (SQLException e) {
-        } catch (Throwable e) {
+            s_logger.debug("Caught SQLException: ", e);
         }
         return l;
     }
diff --git a/engine/schema/src/com/cloud/vm/dao/SecondaryStorageVmDaoImpl.java b/engine/schema/src/com/cloud/vm/dao/SecondaryStorageVmDaoImpl.java
@@ -195,7 +195,7 @@ public List<Long> getRunningSecStorageVmListByMsid(SecondaryStorageVm.Role role,
                 l.add(rs.getLong(1));
             }
         } catch (SQLException e) {
-        } catch (Throwable e) {
+            s_logger.debug("Caught SQLException: ", e);
         }
         return l;
     }
diff --git a/engine/storage/src/org/apache/cloudstack/storage/datastore/DataObjectManagerImpl.java b/engine/storage/src/org/apache/cloudstack/storage/datastore/DataObjectManagerImpl.java
@@ -224,7 +224,7 @@ public void copyAsync(DataObject srcData, DataObject destData, AsyncCompletionCa
             try {
                 objectInDataStoreMgr.update(destData, ObjectInDataStoreStateMachine.Event.OperationFailed);
             } catch (Exception e1) {
-
+                s_logger.debug("failed to further change state to OperationFailed", e1);
             }
             CreateCmdResult res = new CreateCmdResult(null, null);
             res.setResult("Failed to change state: " + e.toString());
@@ -234,7 +234,7 @@ public void copyAsync(DataObject srcData, DataObject destData, AsyncCompletionCa
             try {
                 objectInDataStoreMgr.update(destData, ObjectInDataStoreStateMachine.Event.OperationFailed);
             } catch (Exception e1) {
-
+                s_logger.debug("failed to further change state to OperationFailed", e1);
             }
             CreateCmdResult res = new CreateCmdResult(null, null);
             res.setResult("Failed to change state: " + e.toString());
@@ -272,6 +272,7 @@ protected Void copyCallback(AsyncCallbackDispatcher<DataObjectManagerImpl, CopyC
             try {
                 objectInDataStoreMgr.update(destObj, ObjectInDataStoreStateMachine.Event.OperationFailed);
             } catch (Exception e1) {
+                s_logger.debug("failed to further change state to OperationFailed", e1);
             }
             CreateCmdResult res = new CreateCmdResult(null, null);
             res.setResult("Failed to update copying state: " + e.toString());
@@ -281,6 +282,7 @@ protected Void copyCallback(AsyncCallbackDispatcher<DataObjectManagerImpl, CopyC
             try {
                 objectInDataStoreMgr.update(destObj, ObjectInDataStoreStateMachine.Event.OperationFailed);
             } catch (Exception e1) {
+                s_logger.debug("failed to further change state to OperationFailed", e1);
             }
             CreateCmdResult res = new CreateCmdResult(null, null);
             res.setResult("Failed to update copying state: " + e.toString());
diff --git a/framework/ipc/src/org/apache/cloudstack/framework/serializer/OnwireClassRegistry.java b/framework/ipc/src/org/apache/cloudstack/framework/serializer/OnwireClassRegistry.java
@@ -33,12 +33,15 @@
 import java.util.jar.JarInputStream;
 
 import org.apache.commons.io.IOUtils;
+import org.apache.log4j.Logger;
+
 
 //
 // Finding classes in a given package code is taken and modified from
 // Credit: http://internna.blogspot.com/2007/11/java-5-retrieving-all-classes-from.html
 //
 public class OnwireClassRegistry {
+    private static final Logger s_logger = Logger.getLogger(OnwireClassRegistry.class);
 
     private List<String> packages = new ArrayList<String>();
     private final Map<String, Class<?>> registry = new HashMap<String, Class<?>>();
@@ -121,6 +124,7 @@ static Set<Class<?>> getClasses(ClassLoader loader, String packageName) {
                 }
             }
         } catch (IOException e) {
+            s_logger.debug("Encountered IOException", e);
         } catch (ClassNotFoundException e) {
         }
         return classes;
@@ -137,6 +141,7 @@ static Set<Class<?>> getFromDirectory(File directory, String packageName) throws
                         classes.add(clazz);
                     } catch (ClassNotFoundException e) {
                     } catch (Exception e) {
+                        s_logger.debug("Encountered unexpect exception! ", e);
                     }
                 } else {
                     File f = new File(directory.getPath() + "/" + file);
diff --git a/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/discoverer/XcpServerDiscoverer.java b/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/discoverer/XcpServerDiscoverer.java
@@ -255,6 +255,7 @@ protected boolean poolHasHotFix(Connection conn, String hostIp, String hotFixUui
                 try {
                     Session.logout(conn);
                 } catch (Exception e) {
+                    s_logger.debug("Caught exception during logout", e);
                 }
                 conn.dispose();
                 conn = null;
diff --git a/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XenServerConnectionPool.java b/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XenServerConnectionPool.java
@@ -21,6 +21,8 @@
 import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.net.URL;
+import java.security.KeyManagementException;
+import java.security.NoSuchAlgorithmException;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Properties;
@@ -90,7 +92,10 @@ public boolean verify(String hostName, SSLSession session) {
                 }
             };
             HttpsURLConnection.setDefaultHostnameVerifier(hv);
-        } catch (Exception e) {
+        } catch (NoSuchAlgorithmException e) {
+            //ignore this
+        } catch (KeyManagementException e) {
+            s_logger.debug("Init SSLContext failed ", e);
         }
     }
 
@@ -228,6 +233,7 @@ public Connection connect(String hostUuid, String poolUuid, String ipAddress,
                         try{
                             Session.logout(conn);
                         } catch (Exception e) {
+                            s_logger.debug("Caught exception during logout", e);
                         }
                         conn.dispose();
                     }
diff --git a/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XenServerStorageProcessor.java b/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XenServerStorageProcessor.java
@@ -982,7 +982,7 @@ public Answer copyTemplateToPrimaryStorage(CopyCommand cmd) {
 
                 try {
                     Thread.sleep(5000);
-                } catch (Exception e) {
+                } catch (InterruptedException e) {
                 }
 
                 TemplateObjectTO newVol = new TemplateObjectTO();
diff --git a/plugins/storage/volume/solidfire/src/org/apache/cloudstack/storage/datastore/lifecycle/SolidFirePrimaryDataStoreLifeCycle.java b/plugins/storage/volume/solidfire/src/org/apache/cloudstack/storage/datastore/lifecycle/SolidFirePrimaryDataStoreLifeCycle.java
@@ -137,7 +137,10 @@ public DataStore initialize(Map<String, Object> dsInfos) {
             if (clusterDefaultMinIops != null && clusterDefaultMinIops.trim().length() > 0) {
                 lClusterDefaultMinIops = Long.parseLong(clusterDefaultMinIops);
             }
-        } catch (Exception ex) {
+        } catch (NumberFormatException ex) {
+            s_logger.warn("Cannot parse the setting of " + SolidFireUtil.CLUSTER_DEFAULT_MIN_IOPS +
+                          ", using default value: " + lClusterDefaultMinIops +
+                          ". Exception: " + ex);
         }
 
         try {
@@ -146,7 +149,10 @@ public DataStore initialize(Map<String, Object> dsInfos) {
             if (clusterDefaultMaxIops != null && clusterDefaultMaxIops.trim().length() > 0) {
                 lClusterDefaultMaxIops = Long.parseLong(clusterDefaultMaxIops);
             }
-        } catch (Exception ex) {
+        } catch (NumberFormatException ex) {
+            s_logger.warn("Cannot parse the setting of " + SolidFireUtil.CLUSTER_DEFAULT_MAX_IOPS +
+                          ", using default value: " + lClusterDefaultMaxIops +
+                          ". Exception: " + ex);
         }
 
         try {
@@ -155,7 +161,10 @@ public DataStore initialize(Map<String, Object> dsInfos) {
             if (clusterDefaultBurstIopsPercentOfMaxIops != null && clusterDefaultBurstIopsPercentOfMaxIops.trim().length() > 0) {
                 fClusterDefaultBurstIopsPercentOfMaxIops = Float.parseFloat(clusterDefaultBurstIopsPercentOfMaxIops);
             }
-        } catch (Exception ex) {
+        } catch (NumberFormatException ex) {
+            s_logger.warn("Cannot parse the setting of " + SolidFireUtil.CLUSTER_DEFAULT_BURST_IOPS_PERCENT_OF_MAX_IOPS +
+                          ", using default value: " + fClusterDefaultBurstIopsPercentOfMaxIops +
+                          ". Exception: " + ex);
         }
 
         if (lClusterDefaultMinIops > lClusterDefaultMaxIops) {
diff --git a/server/src/com/cloud/resource/ResourceManagerImpl.java b/server/src/com/cloud/resource/ResourceManagerImpl.java
@@ -1591,6 +1591,7 @@ protected HostVO createHostVO(StartupCommand[] cmds, ServerResource resource, Ma
                 dcId = Long.parseLong(dataCenter);
                 dc = _dcDao.findById(dcId);
             } catch (final NumberFormatException e) {
+                s_logger.debug("Cannot parse " + dataCenter + " into Long.");
             }
         }
         if (dc == null) {
@@ -1604,6 +1605,7 @@ protected HostVO createHostVO(StartupCommand[] cmds, ServerResource resource, Ma
                 final long podId = Long.parseLong(pod);
                 p = _podDao.findById(podId);
             } catch (final NumberFormatException e) {
+                s_logger.debug("Cannot parse " + pod + " into Long.");
             }
         }
         /*
diff --git a/server/src/com/cloud/server/ConfigurationServerImpl.java b/server/src/com/cloud/server/ConfigurationServerImpl.java
@@ -464,6 +464,7 @@ public void doInTransactionWithoutResult(TransactionStatus status) {
                     PreparedStatement stmt = txn.prepareAutoCloseStatement(insertSql);
                     stmt.executeUpdate();
                 } catch (SQLException ex) {
+                    s_logger.debug("Caught SQLException when inserting system account ", ex);
                 }
                 // insert system user
                 insertSql = "INSERT INTO `cloud`.`user` (id, uuid, username, password, account_id, firstname, lastname, created, user.default)"
@@ -473,6 +474,7 @@ public void doInTransactionWithoutResult(TransactionStatus status) {
                     PreparedStatement stmt = txn.prepareAutoCloseStatement(insertSql);
                     stmt.executeUpdate();
                 } catch (SQLException ex) {
+                    s_logger.debug("Caught SQLException when inserting system user ", ex);
                 }
 
                 // insert admin user, but leave the account disabled until we set a
@@ -489,6 +491,7 @@ public void doInTransactionWithoutResult(TransactionStatus status) {
                     PreparedStatement stmt = txn.prepareAutoCloseStatement(insertSql);
                     stmt.executeUpdate();
                 } catch (SQLException ex) {
+                    s_logger.debug("Caught SQLException when creating admin account ", ex);
                 }
 
                 // now insert the user
@@ -499,6 +502,7 @@ public void doInTransactionWithoutResult(TransactionStatus status) {
                     PreparedStatement stmt = txn.prepareAutoCloseStatement(insertSql);
                     stmt.executeUpdate();
                 } catch (SQLException ex) {
+                    s_logger.debug("Caught SQLException when inserting user ", ex);
                 }
 
                 try {
@@ -508,8 +512,9 @@ public void doInTransactionWithoutResult(TransactionStatus status) {
                         PreparedStatement stmt = txn.prepareAutoCloseStatement(checkSql);
                         stmt.executeQuery();
                         tableName = "network_group";
-                    } catch (Exception ex) {
+                    } catch (SQLException ex) {
                         // if network_groups table exists, create the default security group there
+                        s_logger.debug("Caught SQLException: no network_group  ", ex);
                     }
 
                     insertSql = "SELECT * FROM " + tableName + " where account_id=2 and name='default'";
diff --git a/services/console-proxy/server/src/com/cloud/consoleproxy/ConsoleProxyThumbnailHandler.java b/services/console-proxy/server/src/com/cloud/consoleproxy/ConsoleProxyThumbnailHandler.java
@@ -77,6 +77,7 @@ public void handle(HttpExchange t) throws IOException {
                 width = Integer.parseInt(ws);
                 height = Integer.parseInt(hs);
             } catch (NumberFormatException ex) {
+                s_logger.debug("Cannot parse width: " + ws + " or height: " + hs, ex);
             }
             width = Math.min(width, 800);
             height = Math.min(height, 600);
diff --git a/utils/src/com/cloud/utils/net/NetUtils.java b/utils/src/com/cloud/utils/net/NetUtils.java

Original file line number	Diff line number	Diff line change
`@@ -802,6 +802,7 @@ protected boolean handleDisconnectWithInvestigation(AgentAttache attache, Status`
`802`	`802`	`* Why this can happen? Ask God not me. I hate there was no piece of comment for code handling race condition.`
`803`	`803`	`* God knew what race condition the code dealt with!`
`804`	`804`	`*/`
	`805`	`+ s_logger.debug("Caught exception while getting agent's next status", ne);`
`805`	`806`	`}`
`806`	`807`
`807`	`808`	`if (nextStatus == Status.Alert) {`
Original file line number	Diff line number	Diff line change
`@@ -79,6 +79,7 @@`
`79`	`79`	`import com.cloud.cluster.dao.ManagementServerHostDao;`
`80`	`80`	`import com.cloud.exception.AgentUnavailableException;`
`81`	`81`	`import com.cloud.exception.OperationTimedoutException;`
	`82`	`+import com.cloud.exception.UnsupportedVersionException;`
`82`	`83`	`import com.cloud.host.Host;`
`83`	`84`	`import com.cloud.host.HostVO;`
`84`	`85`	`import com.cloud.host.Status;`
`@@ -412,7 +413,9 @@ public boolean routeToPeer(String peer, byte[] bytes) {`
`412`	`413`	`if (ch == null) {`
`413`	`414`	`try {`
`414`	`415`	`logD(bytes, "Unable to route to peer: " + Request.parse(bytes).toString());`
`415`		`- } catch (Exception e) {`
	`416`	`+ } catch (ClassNotFoundException \| UnsupportedVersionException e) {`
	`417`	`+ // Request.parse thrown exception when we try to log it, log as much as we can`
	`418`	`+ logD(bytes, "Unable to route to peer, and Request.parse further caught exception" + e.getMessage());`
`416`	`419`	`}`
`417`	`420`	`return false;`
`418`	`421`	`}`
`@@ -430,7 +433,10 @@ public boolean routeToPeer(String peer, byte[] bytes) {`
`430`	`433`	`} catch (IOException e) {`
`431`	`434`	`try {`
`432`	`435`	`logI(bytes, "Unable to route to peer: " + Request.parse(bytes).toString() + " due to " + e.getMessage());`
`433`		`- } catch (Exception ex) {`
	`436`	`+ } catch (ClassNotFoundException \| UnsupportedVersionException ex) {`
	`437`	`+ // Request.parse thrown exception when we try to log it, log as much as we can`
	`438`	`+ logI(bytes, "Unable to route to peer due to" + e.getMessage()`
	`439`	`+ + ". Also caught exception when parsing request: " + ex.getMessage());`
`434`	`440`	`}`
`435`	`441`	`}`
`436`	`442`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1930,6 +1930,7 @@ protected void migrate(VMInstanceVO vm, long srcHostId, DeployDestination dest)`
`1930`	`1930`	`throw new CloudRuntimeException("Unable to complete migration for " + vm);`
`1931`	`1931`	`}`
`1932`	`1932`	`} catch (OperationTimedoutException e) {`
	`1933`	`+ s_logger.debug("Error while checking the vm " + vm + " on host " + dstHostId, e);`
`1933`	`1934`	`}`
`1934`	`1935`
`1935`	`1936`	`migrated = true;`
`@@ -3898,6 +3899,7 @@ private void orchestrateMigrateForScale(String vmUuid, long srcHostId, DeployDes`
`3898`	`3899`	`throw new CloudRuntimeException("Unable to complete migration for " + vm);`
`3899`	`3900`	`}`
`3900`	`3901`	`} catch (OperationTimedoutException e) {`
	`3902`	`+ s_logger.debug("Error while checking the vm " + vm + " on host " + dstHostId, e);`
`3901`	`3903`	`}`
`3902`	`3904`
`3903`	`3905`	`migrated = true;`
Original file line number	Diff line number	Diff line change
`@@ -270,7 +270,7 @@ public EngineDataCenterVO findByTokenOrIdOrName(String tokenOrIdOrName) {`
`270`	`270`	`Long dcId = Long.parseLong(tokenOrIdOrName);`
`271`	`271`	`return findById(dcId);`
`272`	`272`	`} catch (NumberFormatException nfe) {`
`273`		`-`
	`273`	`+ s_logger.debug("Cannot parse " + tokenOrIdOrName + " into long. " + nfe);`
`274`	`274`	`}`
`275`	`275`	`}`
`276`	`276`	`}`
Original file line number	Diff line number	Diff line change
`@@ -411,7 +411,7 @@ public DataCenterVO findByTokenOrIdOrName(String tokenOrIdOrName) {`
`411`	`411`	`Long dcId = Long.parseLong(tokenOrIdOrName);`
`412`	`412`	`return findById(dcId);`
`413`	`413`	`} catch (NumberFormatException nfe) {`
`414`		`-`
	`414`	`+ s_logger.debug("Cannot parse " + tokenOrIdOrName + " into long. " + nfe);`
`415`	`415`	`}`
`416`	`416`	`}`
`417`	`417`	`}`
Original file line number	Diff line number	Diff line change
`@@ -871,7 +871,7 @@ public List<RunningHostCountInfo> getRunningHostCounts(Date cutTime) {`
`871`	`871`	`l.add(info);`
`872`	`872`	`}`
`873`	`873`	`} catch (SQLException e) {`
`874`		`- } catch (Throwable e) {`
	`874`	`+ s_logger.debug("SQLException caught", e);`
`875`	`875`	`}`
`876`	`876`	`return l;`
`877`	`877`	`}`
Original file line number	Diff line number	Diff line change
`@@ -151,7 +151,7 @@ public List<Pair<Long, Integer>> getDatacenterStoragePoolHostInfo(long dcId, boo`
`151`	`151`	`l.add(new Pair<Long, Integer>(rs.getLong(1), rs.getInt(2)));`
`152`	`152`	`}`
`153`	`153`	`} catch (SQLException e) {`
`154`		`- } catch (Throwable e) {`
	`154`	`+ s_logger.debug("SQLException: ", e);`
`155`	`155`	`}`
`156`	`156`	`return l;`
`157`	`157`	`}`
Original file line number	Diff line number	Diff line change
`@@ -232,7 +232,7 @@ public List<Long> listPrivateTemplatesByHost(Long hostId) {`
`232`	`232`	`l.add(rs.getLong(1));`
`233`	`233`	`}`
`234`	`234`	`} catch (SQLException e) {`
`235`		`- } catch (Throwable e) {`
	`235`	`+ s_logger.debug("Exception: ", e);`
`236`	`236`	`}`
`237`	`237`	`return l;`
`238`	`238`	`}`
Original file line number	Diff line number	Diff line change
`@@ -217,7 +217,7 @@ public List<Pair<Long, Integer>> getProxyLoadMatrix() {`
`217`	`217`	`l.add(new Pair<Long, Integer>(rs.getLong(1), rs.getInt(2)));`
`218`	`218`	`}`
`219`	`219`	`} catch (SQLException e) {`
`220`		`- } catch (Throwable e) {`
	`220`	`+ s_logger.debug("Caught SQLException: ", e);`
`221`	`221`	`}`
`222`	`222`	`return l;`
`223`	`223`	`}`
`@@ -242,7 +242,7 @@ public List<Pair<Long, Integer>> getDatacenterStoragePoolHostInfo(long dcId, boo`
`242`	`242`	`l.add(new Pair<Long, Integer>(rs.getLong(1), rs.getInt(2)));`
`243`	`243`	`}`
`244`	`244`	`} catch (SQLException e) {`
`245`		`- } catch (Throwable e) {`
	`245`	`+ s_logger.debug("Caught SQLException: ", e);`
`246`	`246`	`}`
`247`	`247`	`return l;`
`248`	`248`	`}`
`@@ -261,7 +261,7 @@ public int getProxyStaticLoad(long proxyVmId) {`
`261`	`261`	`return rs.getInt(1);`
`262`	`262`	`}`
`263`	`263`	`} catch (SQLException e) {`
`264`		`- } catch (Throwable e) {`
	`264`	`+ s_logger.debug("Caught SQLException: ", e);`
`265`	`265`	`}`
`266`	`266`	`return 0;`
`267`	`267`	`}`
`@@ -279,7 +279,7 @@ public int getProxyActiveLoad(long proxyVmId) {`
`279`	`279`	`return rs.getInt(1);`
`280`	`280`	`}`
`281`	`281`	`} catch (SQLException e) {`
`282`		`- } catch (Throwable e) {`
	`282`	`+ s_logger.debug("Caught SQLException: ", e);`
`283`	`283`	`}`
`284`	`284`	`return 0;`
`285`	`285`	`}`
`@@ -301,7 +301,7 @@ private List<ConsoleProxyLoadInfo> getDatacenterLoadMatrix(String sql) {`
`301`	`301`	`l.add(info);`
`302`	`302`	`}`
`303`	`303`	`} catch (SQLException e) {`
`304`		`- } catch (Throwable e) {`
	`304`	`+ s_logger.debug("Exception: ", e);`
`305`	`305`	`}`
`306`	`306`	`return l;`
`307`	`307`	`}`
`@@ -323,7 +323,7 @@ public List<Long> getRunningProxyListByMsid(long msid) {`
`323`	`323`	`l.add(rs.getLong(1));`
`324`	`324`	`}`
`325`	`325`	`} catch (SQLException e) {`
`326`		`- } catch (Throwable e) {`
	`326`	`+ s_logger.debug("Caught SQLException: ", e);`
`327`	`327`	`}`
`328`	`328`	`return l;`
`329`	`329`	`}`