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: # ignite-1056: Fixed
Date Fri, 26 Jun 2015 13:10:38 GMT
Repository: incubator-ignite
Updated Branches:
  refs/heads/ignite-1056 [created] 71df95bfc


# ignite-1056: Fixed


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

Branch: refs/heads/ignite-1056
Commit: 71df95bfc264e26f43e902672837b8149bda98ea
Parents: 01d842a
Author: ashutak <ashutak@gridgain.com>
Authored: Fri Jun 26 16:11:08 2015 +0300
Committer: ashutak <ashutak@gridgain.com>
Committed: Fri Jun 26 16:11:08 2015 +0300

----------------------------------------------------------------------
 .../main/java/org/apache/ignite/internal/IgniteKernal.java   | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/71df95bf/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java b/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
index e19d3d3..e19b6a2 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
@@ -77,7 +77,6 @@ import javax.management.*;
 import java.io.*;
 import java.lang.management.*;
 import java.lang.reflect.*;
-import java.security.*;
 import java.text.*;
 import java.util.*;
 import java.util.concurrent.*;
@@ -112,6 +111,9 @@ public class IgniteKernal implements IgniteEx, IgniteMXBean, Externalizable
{
     /** Periodic version check delay. */
     private static final long PERIODIC_VER_CHECK_CONN_TIMEOUT = 10 * 1000; // 10 seconds.
 
+    /** Additional periodic version check delay. */
+    private static final long ADDITIONAL_PERIODIC_VER_CHECK_CONN_TIMEOUT = 60 * 1000; //
1 min.
+
     /** Periodic starvation check interval. */
     private static final long PERIODIC_STARVATION_CHECK_FREQ = 1000 * 30;
 
@@ -705,6 +707,10 @@ public class IgniteKernal implements IgniteEx, IgniteMXBean, Externalizable
{
                             // Just wait for 10 secs.
                             Thread.sleep(PERIODIC_VER_CHECK_CONN_TIMEOUT);
 
+                            // Wait an additional minut for slow connectiviti.
+                            if (verChecker.latestVersion() == null)
+                                Thread.sleep(ADDITIONAL_PERIODIC_VER_CHECK_CONN_TIMEOUT);
+
                             // Report status if one is available.
                             // No-op if status is NOT available.
                             verChecker.reportStatus(log);


Mime
View raw message