ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sevdoki...@apache.org
Subject [1/2] incubator-ignite git commit: # IGNITE-312 Optimization of closing discovery SPI.
Date Fri, 20 Feb 2015 15:51:21 GMT
Repository: incubator-ignite
Updated Branches:
  refs/heads/ignite-312 [created] 700067689


# IGNITE-312 Optimization of closing discovery SPI.


Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/5c91ce1a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/5c91ce1a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/5c91ce1a

Branch: refs/heads/ignite-312
Commit: 5c91ce1a0e2c2d3468c7126615c285c444e7815e
Parents: 36e9236
Author: sevdokimov <sevdokimov@gridgain.com>
Authored: Fri Feb 20 15:21:36 2015 +0300
Committer: sevdokimov <sevdokimov@gridgain.com>
Committed: Fri Feb 20 15:21:36 2015 +0300

----------------------------------------------------------------------
 .../internal/managers/discovery/GridDiscoveryManager.java     | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5c91ce1a/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java
b/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java
index ab3ea07..6a14d60 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java
@@ -776,12 +776,11 @@ public class GridDiscoveryManager extends GridManagerAdapter<DiscoverySpi>
{
         // Stop receiving notifications.
         getSpi().setListener(null);
 
-        // Stop discovery worker.
+        // Stop discovery worker and metrics updater.
         U.cancel(discoWrk);
-        U.join(discoWrk, log);
-
-        // Stop metrics updater.
         U.cancel(metricsUpdater);
+
+        U.join(discoWrk, log);
         U.join(metricsUpdater, log);
 
         // Stop SPI itself.


Mime
View raw message