ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sevdoki...@apache.org
Subject incubator-ignite git commit: # IGNITE-709 Bug fix: update GridDiscoveryManager.topSnap correctly.
Date Tue, 21 Apr 2015 20:41:56 GMT
Repository: incubator-ignite
Updated Branches:
  refs/heads/ignite-709 df24fbdf0 -> 4e57b644e


# IGNITE-709 Bug fix: update GridDiscoveryManager.topSnap correctly.


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

Branch: refs/heads/ignite-709
Commit: 4e57b644e494e0a338503aee608482b9e3bb1de9
Parents: df24fbd
Author: sevdokimov <sergey.evdokimov@jetbrains.com>
Authored: Tue Apr 21 23:41:45 2015 +0300
Committer: sevdokimov <sergey.evdokimov@jetbrains.com>
Committed: Tue Apr 21 23:41:45 2015 +0300

----------------------------------------------------------------------
 .../managers/discovery/GridDiscoveryManager.java      | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4e57b644/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 11fa261..ec4d54f 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
@@ -390,11 +390,15 @@ public class GridDiscoveryManager extends GridManagerAdapter<DiscoverySpi>
{
 
                     discoCacheHist.put(nextTopVer, cache);
 
-                    boolean set = updateTopologyVersionIfGreater(nextTopVer, cache);
-
-                    assert set || topVer == 0 : "Topology version has not been updated [this.topVer="
+
-                        topSnap + ", topVer=" + topVer + ", node=" + node +
-                        ", evt=" + U.gridEventName(type) + ']';
+                    if (type == EVT_NODE_JOINED && locNode.equals(node))
+                        topSnap.set(new Snapshot(nextTopVer, cache));
+                    else {
+                        boolean set = updateTopologyVersionIfGreater(nextTopVer, cache);
+
+                        assert set || topVer == 0 : "Topology version has not been updated
[this.topVer=" +
+                            topSnap + ", topVer=" + topVer + ", node=" + node +
+                            ", evt=" + U.gridEventName(type) + ']';
+                    }
                 }
 
                 // If this is a local join event, just save it and do not notify listeners.


Mime
View raw message