cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From weiz...@apache.org
Subject [1/2] git commit: updated refs/heads/master to 858b6c0
Date Wed, 26 Aug 2015 06:35:05 GMT
Repository: cloudstack
Updated Branches:
  refs/heads/master 44ba14d17 -> 858b6c025


Replace some profiler.getDuration with profiler.getDurationInMillis after commit 5557ad55


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/662b478d
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/662b478d
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/662b478d

Branch: refs/heads/master
Commit: 662b478d454a9c60fcd7c0e7fc952fd6c98bf20f
Parents: 614ee49
Author: Wei Zhou <w.zhou@tech.leaseweb.com>
Authored: Fri Aug 21 13:36:27 2015 +0200
Committer: Wei Zhou <w.zhou@tech.leaseweb.com>
Committed: Fri Aug 21 13:36:27 2015 +0200

----------------------------------------------------------------------
 .../src/com/cloud/cluster/ClusterManagerImpl.java   | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/662b478d/framework/cluster/src/com/cloud/cluster/ClusterManagerImpl.java
----------------------------------------------------------------------
diff --git a/framework/cluster/src/com/cloud/cluster/ClusterManagerImpl.java b/framework/cluster/src/com/cloud/cluster/ClusterManagerImpl.java
index a9b01d4..ecf3aac 100644
--- a/framework/cluster/src/com/cloud/cluster/ClusterManagerImpl.java
+++ b/framework/cluster/src/com/cloud/cluster/ClusterManagerImpl.java
@@ -572,7 +572,7 @@ public class ClusterManagerImpl extends ManagerBase implements ClusterManager,
C
                     } finally {
                         profiler.stop();
 
-                        if (profiler.getDuration() >= HeartbeatInterval.value()) {
+                        if (profiler.getDurationInMillis() >= HeartbeatInterval.value())
{
                             if (s_logger.isDebugEnabled()) {
                                 s_logger.debug("Management server heartbeat takes too long
to finish. profiler: " + profiler.toString() + ", profilerHeartbeatUpdate: " +
                                         profilerHeartbeatUpdate.toString() + ", profilerPeerScan:
" + profilerPeerScan.toString());
@@ -665,12 +665,12 @@ public class ClusterManagerImpl extends ManagerBase implements ClusterManager,
C
                                     notifyNodeJoined(msg.getNodes());
 
                                     profiler.stop();
-                                    if (profiler.getDuration() > 1000) {
+                                    if (profiler.getDurationInMillis() > 1000) {
                                         if (s_logger.isDebugEnabled()) {
-                                            s_logger.debug("Notifying management server join
event took " + profiler.getDuration() + " ms");
+                                            s_logger.debug("Notifying management server join
event took " + profiler.getDurationInMillis() + " ms");
                                         }
                                     } else {
-                                        s_logger.warn("Notifying management server join event
took " + profiler.getDuration() + " ms");
+                                        s_logger.warn("Notifying management server join event
took " + profiler.getDurationInMillis() + " ms");
                                     }
                                 }
                                 break;
@@ -683,12 +683,12 @@ public class ClusterManagerImpl extends ManagerBase implements ClusterManager,
C
                                     notifyNodeLeft(msg.getNodes());
 
                                     profiler.stop();
-                                    if (profiler.getDuration() > 1000) {
+                                    if (profiler.getDurationInMillis() > 1000) {
                                         if (s_logger.isDebugEnabled()) {
-                                            s_logger.debug("Notifying management server leave
event took " + profiler.getDuration() + " ms");
+                                            s_logger.debug("Notifying management server leave
event took " + profiler.getDurationInMillis() + " ms");
                                         }
                                     } else {
-                                        s_logger.warn("Notifying management server leave
event took " + profiler.getDuration() + " ms");
+                                        s_logger.warn("Notifying management server leave
event took " + profiler.getDurationInMillis() + " ms");
                                     }
                                 }
                                 break;
@@ -927,7 +927,7 @@ public class ClusterManagerImpl extends ManagerBase implements ClusterManager,
C
 
         profiler.stop();
 
-        if (profiler.getDuration() >= HeartbeatInterval.value()) {
+        if (profiler.getDurationInMillis() >= HeartbeatInterval.value()) {
             if (s_logger.isDebugEnabled()) {
                 s_logger.debug("Peer scan takes too long to finish. profiler: " + profiler.toString()
+ ", profilerQueryActiveList: " +
                         profilerQueryActiveList.toString() + ", profilerSyncClusterInfo:
" + profilerSyncClusterInfo.toString() + ", profilerInvalidatedNodeList: " +


Mime
View raw message