ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject incubator-ignite git commit: #Added logging.
Date Fri, 19 Jun 2015 14:22:48 GMT
Repository: incubator-ignite
Updated Branches:
  refs/heads/ignite-yardstick-client 300e43c05 -> edc669fe9


#Added logging.


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

Branch: refs/heads/ignite-yardstick-client
Commit: edc669fe9a30570b7ed8c0a3eaae5b306b79cefa
Parents: 300e43c
Author: nikolay_tikhonov <ntikhonov@gridgain.com>
Authored: Fri Jun 19 17:22:45 2015 +0300
Committer: nikolay_tikhonov <ntikhonov@gridgain.com>
Committed: Fri Jun 19 17:22:45 2015 +0300

----------------------------------------------------------------------
 .../internal/managers/discovery/GridDiscoveryManager.java   | 9 +++++++++
 .../main/java/org/apache/ignite/yardstick/IgniteNode.java   | 2 ++
 2 files changed, 11 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/edc669fe/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 464110c..3974b92 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
@@ -359,6 +359,15 @@ public class GridDiscoveryManager extends GridManagerAdapter<DiscoverySpi>
{
                 Map<Long, Collection<ClusterNode>> snapshots,
                 @Nullable DiscoverySpiCustomMessage spiCustomMsg
             ) {
+                if (snapshots == null || topSnapshot.isEmpty()) {
+                    U.dumpStack();
+
+                    log.error("Topology snapshot is EMPTY. [tolopogy snaphot="+ topSnapshot
+", topology version="+
+                        topVer + ", type=" + type + "]");
+
+                    return;
+                }
+
                 DiscoveryCustomMessage customMsg = spiCustomMsg == null ? null
                     : ((CustomMessageWrapper)spiCustomMsg).delegate();
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/edc669fe/modules/yardstick/src/main/java/org/apache/ignite/yardstick/IgniteNode.java
----------------------------------------------------------------------
diff --git a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/IgniteNode.java b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/IgniteNode.java
index f6aaefb..80d9181 100644
--- a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/IgniteNode.java
+++ b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/IgniteNode.java
@@ -140,6 +140,8 @@ public class IgniteNode implements BenchmarkServer {
         if (spi == null)
             spi = new TcpDiscoverySpi();
 
+        spi.setMaxAckTimeout(100_000);
+        spi.setAckTimeout(30_000);
         spi.setNetworkTimeout(30_000);
         spi.setSocketTimeout(30_000);
         spi.setJoinTimeout(0);


Mime
View raw message