----------------------------------------------------------- This is an automatically generated e-mail. To reply, visit: https://reviews.apache.org/r/19917/ -----------------------------------------------------------
(Updated April 3, 2014, 3:22 p.m.) Review request for cloudstack. Changes ------- Updated according to our email discussions. Changed the verbosity to debug, and addressed Daan’s comment on providing more distinctive text messages. Sorry that I haven’t split them into smaller patches. Note in a few cases the original code was like: try { pstmt = txn.prepareAutoCloseStatement(sql); String gmtCutTime = DateUtil.getDateDisplayString(TimeZone.getTimeZone("GMT"), cutTime); pstmt.setString(1, gmtCutTime); pstmt.setString(2, gmtCutTime); ResultSet rs = pstmt.executeQuery(); while (rs.next()) { RunningHostCountInfo info = new RunningHostCountInfo(); info.setDcId(rs.getLong(1)); info.setHostType(rs.getString(2)); info.setCount(rs.getInt(3)); l.add(info); } } catch (SQLException e) { } catch (Throwable e) { } The try block only throws SQLException as checked exception, and this code would also swallow any unchecked exceptions. I removed the catch (Throwable) in these cases to avoid potentially swallowing any unexpected runtime exceptions. Please let me know if this is not desirable so I can further update. Thanks, Repository: cloudstack-git Description ------- This is the patch for JIRA-6242. See https://issues.apache.org/jira/browse/CLOUDSTACK-6242 for more details. Thanks! Diffs ----- engine/orchestration/src/com/cloud/agent/manager/AgentManagerImpl.java 0d41bc1 engine/orchestration/src/com/cloud/agent/manager/ClusteredAgentManagerImpl.java 01508a4 engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java 3e088db engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/EngineDataCenterDaoImpl.java 4b6818e engine/schema/src/com/cloud/dc/dao/DataCenterDaoImpl.java ea5039f engine/schema/src/com/cloud/host/dao/HostDaoImpl.java 426c90d engine/schema/src/com/cloud/storage/dao/StoragePoolHostDaoImpl.java e42eaf4 engine/schema/src/com/cloud/storage/dao/VMTemplateDaoImpl.java 34fdca5 engine/schema/src/com/cloud/upgrade/dao/Upgrade2214to30.java 58dd916 engine/schema/src/com/cloud/vm/dao/ConsoleProxyDaoImpl.java 5e9c2f0 engine/schema/src/com/cloud/vm/dao/SecondaryStorageVmDaoImpl.java 1f382d6 engine/storage/src/org/apache/cloudstack/storage/datastore/DataObjectManagerImpl.java 6ed1274 framework/ipc/src/org/apache/cloudstack/framework/serializer/OnwireClassRegistry.java 83c8a42 plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/discoverer/XcpServerDiscoverer.java 0ad6dc4 plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XenServerConnectionPool.java b779085 plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XenServerStorageProcessor.java e512046 plugins/storage/volume/solidfire/src/org/apache/cloudstack/storage/datastore/lifecycle/SolidFirePrimaryDataStoreLifeCycle.java af6a77a server/src/com/cloud/resource/ResourceManagerImpl.java f9a59ba server/src/com/cloud/server/ConfigurationServerImpl.java b8da4c8 services/console-proxy/server/src/com/cloud/consoleproxy/ConsoleProxyThumbnailHandler.java 06f21d3 utils/src/com/cloud/utils/net/NetUtils.java 6350986 Diff: https://reviews.apache.org/r/19917/diff/ Testing ------- Thanks, Ding Yuan