From 95478a7bc67501813714dadcd4c7c149b7404877 Mon Sep 17 00:00:00 2001 From: Ding Yuan Date: Mon, 14 Apr 2014 14:39:09 -0400 Subject: [PATCH 2/2] 6242 --- .../src/com/cloud/agent/manager/AgentManagerImpl.java | 1 + .../cloud/agent/manager/ClusteredAgentManagerImpl.java | 10 ++++++++-- .../src/com/cloud/vm/VirtualMachineManagerImpl.java | 2 ++ .../entity/api/db/dao/EngineDataCenterDaoImpl.java | 2 +- engine/schema/src/com/cloud/dc/dao/DataCenterDaoImpl.java | 2 +- engine/schema/src/com/cloud/host/dao/HostDaoImpl.java | 2 +- .../src/com/cloud/storage/dao/StoragePoolHostDaoImpl.java | 2 +- .../src/com/cloud/storage/dao/VMTemplateDaoImpl.java | 2 +- .../schema/src/com/cloud/upgrade/dao/Upgrade2214to30.java | 3 ++- .../schema/src/com/cloud/vm/dao/ConsoleProxyDaoImpl.java | 12 ++++++------ .../src/com/cloud/vm/dao/SecondaryStorageVmDaoImpl.java | 2 +- .../storage/datastore/DataObjectManagerImpl.java | 6 ++++-- .../framework/serializer/OnwireClassRegistry.java | 5 +++++ .../hypervisor/xen/discoverer/XcpServerDiscoverer.java | 2 ++ .../hypervisor/xen/resource/XenServerConnectionPool.java | 9 +++++++-- .../xen/resource/XenServerStorageProcessor.java | 2 +- .../lifecycle/SolidFirePrimaryDataStoreLifeCycle.java | 15 ++++++++++++--- server/src/com/cloud/resource/ResourceManagerImpl.java | 2 ++ server/src/com/cloud/server/ConfigurationServerImpl.java | 7 ++++++- .../cloud/consoleproxy/ConsoleProxyThumbnailHandler.java | 1 + utils/src/com/cloud/utils/net/NetUtils.java | 7 +++++-- 21 files changed, 70 insertions(+), 26 deletions(-) diff --git a/engine/orchestration/src/com/cloud/agent/manager/AgentManagerImpl.java b/engine/orchestration/src/com/cloud/agent/manager/AgentManagerImpl.java index 0d41bc1..3a793a8 100755 --- a/engine/orchestration/src/com/cloud/agent/manager/AgentManagerImpl.java +++ b/engine/orchestration/src/com/cloud/agent/manager/AgentManagerImpl.java @@ -786,6 +786,7 @@ public class AgentManagerImpl extends ManagerBase implements AgentManager, Handl * 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 index 01508a4..5c6319d 100755 --- 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.agentlb.dao.HostTransferMapDao; 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 class ClusteredAgentManagerImpl extends AgentManagerImpl implements Clust 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 class ClusteredAgentManagerImpl extends AgentManagerImpl implements Clust } 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 index 3e088db..ccf21b7 100755 --- a/engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java +++ b/engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java @@ -1917,6 +1917,7 @@ public class VirtualMachineManagerImpl extends ManagerBase implements VirtualMac 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; @@ -3873,6 +3874,7 @@ public class VirtualMachineManagerImpl extends ManagerBase implements VirtualMac 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 index 4b6818e..17833f8 100644 --- 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 class EngineDataCenterDaoImpl extends GenericDaoBase implem 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 index 426c90d..513e4fc 100755 --- a/engine/schema/src/com/cloud/host/dao/HostDaoImpl.java +++ b/engine/schema/src/com/cloud/host/dao/HostDaoImpl.java @@ -870,7 +870,7 @@ public class HostDaoImpl extends GenericDaoBase implements HostDao 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 index e42eaf4..e11c6d5 100644 --- 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 class StoragePoolHostDaoImpl extends GenericDaoBase(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 index 34fdca5..401a4a2 100755 --- 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 class VMTemplateDaoImpl extends GenericDaoBase implem 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 index 58dd916..b2b5e78 100644 --- a/engine/schema/src/com/cloud/upgrade/dao/Upgrade2214to30.java +++ b/engine/schema/src/com/cloud/upgrade/dao/Upgrade2214to30.java @@ -986,8 +986,9 @@ public class Upgrade2214to30 extends Upgrade30xBase implements DbUpgrade { 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 index 5e9c2f0..210300f 100644 --- 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 class ConsoleProxyDaoImpl extends GenericDaoBase im l.add(new Pair(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 class ConsoleProxyDaoImpl extends GenericDaoBase im l.add(new Pair(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 class ConsoleProxyDaoImpl extends GenericDaoBase im return rs.getInt(1); } } catch (SQLException e) { - } catch (Throwable e) { + s_logger.debug("Caught SQLException: ", e); } return 0; } @@ -279,7 +279,7 @@ public class ConsoleProxyDaoImpl extends GenericDaoBase im return rs.getInt(1); } } catch (SQLException e) { - } catch (Throwable e) { + s_logger.debug("Caught SQLException: ", e); } return 0; } @@ -301,7 +301,7 @@ public class ConsoleProxyDaoImpl extends GenericDaoBase im l.add(info); } } catch (SQLException e) { - } catch (Throwable e) { + s_logger.debug("Exception: ", e); } return l; } @@ -323,7 +323,7 @@ public class ConsoleProxyDaoImpl extends GenericDaoBase im 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 index 1f382d6..8cd8a4a 100644 --- 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 class SecondaryStorageVmDaoImpl extends GenericDaoBase packages = new ArrayList(); private final Map> registry = new HashMap>(); @@ -121,6 +124,7 @@ public class OnwireClassRegistry { } } } catch (IOException e) { + s_logger.debug("Encountered IOException", e); } catch (ClassNotFoundException e) { } return classes; @@ -137,6 +141,7 @@ public class OnwireClassRegistry { 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 index 0ad6dc4..c462157 100755 --- a/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/discoverer/XcpServerDiscoverer.java +++ b/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/discoverer/XcpServerDiscoverer.java @@ -231,6 +231,7 @@ public class XcpServerDiscoverer extends DiscovererBase implements Discoverer, L try { Session.logout(conn); } catch (Exception e) { + s_logger.debug("Caught exception during logout", e); } conn.dispose(); conn = null; @@ -407,6 +408,7 @@ public class XcpServerDiscoverer extends DiscovererBase implements Discoverer, L try{ Session.logout(hostConn); } catch (Exception e ) { + s_logger.debug("Caught exception during logout", e); } hostConn.dispose(); hostConn = 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 index b779085..36f0ecf 100644 --- a/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XenServerConnectionPool.java +++ b/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XenServerConnectionPool.java @@ -22,6 +22,8 @@ import java.io.FileNotFoundException; import java.io.IOException; import java.net.SocketException; import java.net.URL; +import java.security.KeyManagementException; +import java.security.NoSuchAlgorithmException; import java.util.HashMap; import java.util.Map; import java.util.Properties; @@ -43,7 +45,6 @@ import com.xensource.xenapi.Session; import com.xensource.xenapi.Types; import com.xensource.xenapi.Types.BadServerResponse; import com.xensource.xenapi.Types.XenAPIException; - import com.cloud.utils.NumbersUtil; import com.cloud.utils.PropertiesUtil; import com.cloud.utils.exception.CloudRuntimeException; @@ -90,7 +91,10 @@ public class XenServerConnectionPool { } }; HttpsURLConnection.setDefaultHostnameVerifier(hv); - } catch (Exception e) { + } catch (NoSuchAlgorithmException e) { + //ignore this + } catch (KeyManagementException e) { + s_logger.debug("Init SSLContext failed ", e); } } @@ -187,6 +191,7 @@ public class XenServerConnectionPool { try { Session.logout(slaveConn); } catch (Exception e) { + s_logger.debug("Caught exception during logout", e); } slaveConn.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 index e512046..8fb9886 100644 --- a/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XenServerStorageProcessor.java +++ b/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XenServerStorageProcessor.java @@ -984,7 +984,7 @@ public class XenServerStorageProcessor implements StorageProcessor { 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 index af6a77a..d30374f 100644 --- 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 class SolidFirePrimaryDataStoreLifeCycle implements PrimaryDataStoreLifeC 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 class SolidFirePrimaryDataStoreLifeCycle implements PrimaryDataStoreLifeC 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 class SolidFirePrimaryDataStoreLifeCycle implements PrimaryDataStoreLifeC 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 index f9a59ba..197780c 100755 --- a/server/src/com/cloud/resource/ResourceManagerImpl.java +++ b/server/src/com/cloud/resource/ResourceManagerImpl.java @@ -1590,6 +1590,7 @@ public class ResourceManagerImpl extends ManagerBase implements ResourceManager, dcId = Long.parseLong(dataCenter); dc = _dcDao.findById(dcId); } catch (final NumberFormatException e) { + s_logger.debug("Cannot parse " + dataCenter + " into Long."); } } if (dc == null) { @@ -1603,6 +1604,7 @@ public class ResourceManagerImpl extends ManagerBase implements ResourceManager, 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 index b8da4c8..a753582 100755 --- a/server/src/com/cloud/server/ConfigurationServerImpl.java +++ b/server/src/com/cloud/server/ConfigurationServerImpl.java @@ -463,6 +463,7 @@ public class ConfigurationServerImpl extends ManagerBase implements Configuratio 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)" @@ -472,6 +473,7 @@ public class ConfigurationServerImpl extends ManagerBase implements Configuratio 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 @@ -488,6 +490,7 @@ public class ConfigurationServerImpl extends ManagerBase implements Configuratio PreparedStatement stmt = txn.prepareAutoCloseStatement(insertSql); stmt.executeUpdate(); } catch (SQLException ex) { + s_logger.debug("Caught SQLException when creating admin account ", ex); } // now insert the user @@ -498,6 +501,7 @@ public class ConfigurationServerImpl extends ManagerBase implements Configuratio PreparedStatement stmt = txn.prepareAutoCloseStatement(insertSql); stmt.executeUpdate(); } catch (SQLException ex) { + s_logger.debug("Caught SQLException when inserting user ", ex); } try { @@ -507,8 +511,9 @@ public class ConfigurationServerImpl extends ManagerBase implements Configuratio 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 index 06f21d3..67d986e 100644 --- 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 class ConsoleProxyThumbnailHandler implements HttpHandler { 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 index 6350986..08976c4 100755 --- a/utils/src/com/cloud/utils/net/NetUtils.java +++ b/utils/src/com/cloud/utils/net/NetUtils.java @@ -20,6 +20,7 @@ package com.cloud.utils.net; import java.io.BufferedReader; +import java.io.IOException; import java.io.InputStreamReader; import java.lang.reflect.Array; import java.math.BigInteger; @@ -172,7 +173,8 @@ public class NetUtils { } line = output.readLine(); } - } catch (Exception e) { + } catch (IOException e) { + s_logger.debug("Caught IOException", e); } return null; } else { @@ -425,7 +427,8 @@ public class NetUtils { try { byte[] mac = nic.getHardwareAddress(); result[1] = byte2Mac(mac); - } catch (Exception e) { + } catch (SocketException e) { + s_logger.debug("Caught exception when trying to get the mac address ", e); } result[2] = prefix2Netmask(addr.getNetworkPrefixLength()); -- 1.8.5.2 (Apple Git-48)