ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject ignite git commit: Ignite 1924
Date Mon, 16 Nov 2015 14:06:31 GMT
Repository: ignite
Updated Branches:
  refs/heads/ignite-1924 [created] e487cb68a


Ignite 1924


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

Branch: refs/heads/ignite-1924
Commit: e487cb68a41f84ed98eb448626f7efe550a9098a
Parents: 3a8c19e
Author: Anton Vinogradov <av@apache.org>
Authored: Mon Nov 16 17:06:09 2015 +0300
Committer: Anton Vinogradov <av@apache.org>
Committed: Mon Nov 16 17:06:09 2015 +0300

----------------------------------------------------------------------
 .../dht/preloader/GridDhtPartitionDemander.java | 23 ++++++++++++++++++--
 .../dht/preloader/GridDhtPartitionSupplier.java |  2 ++
 .../dht/preloader/GridDhtPreloader.java         |  1 +
 .../IgniteCacheFailoverTestSuite3.java          | 19 +++++++++++++---
 4 files changed, 40 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/e487cb68/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemander.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemander.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemander.java
index 40d3dc1..b4f1c08 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemander.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemander.java
@@ -420,8 +420,8 @@ public class GridDhtPartitionDemander {
                                     rebalanceTopics.get(cnt), initD, cctx.ioPolicy(), initD.timeout());
                         }
 
-                        if (log.isDebugEnabled())
-                            log.debug("Requested rebalancing [from node=" + node.id() + ",
listener index=" +
+                       // if (log.isDebugEnabled())
+                            U.log(log, "Requested rebalancing [from node=" + node.id() +
", listener index=" +
                                 cnt + ", partitions count=" + sParts.get(cnt).size() +
                                 " (" + partitionsList(sParts.get(cnt)) + ")]");
                     }
@@ -952,6 +952,8 @@ public class GridDhtPartitionDemander {
                 if (isDone())
                     return;
 
+                U.log(log, "Loaded partition: [cache=" + cctx.name() + ", part=" + p + ",
fromNode=" + nodeId + "]");
+
                 if (cctx.events().isRecordable(EVT_CACHE_REBALANCE_PART_LOADED))
                     preloadEvent(p, EVT_CACHE_REBALANCE_PART_LOADED,
                         exchFut.discoveryEvent());
@@ -1042,6 +1044,23 @@ public class GridDhtPartitionDemander {
     }
 
     /**
+     * Dumps debug information.
+     */
+    public void dumpDebugInfo() {
+        synchronized (rebalanceFut) {
+            if (!rebalanceFut.remaining.isEmpty()) {
+                U.warn(log, "Rebalancing demander unfinished partitions:");
+
+                for (Map.Entry<UUID, T2<Long, Collection<Integer>>> entry
: rebalanceFut.remaining.entrySet()) {
+                    if (entry.getValue().get2() != null) {
+                        U.warn(log, ">>> [node=" + entry.getKey() + ", parts=" +
entry.getValue().get2().toString());
+                    }
+                }
+            }
+        }
+    }
+
+    /**
      * Supply message wrapper.
      */
     @Deprecated//Backward compatibility. To be removed in future.

http://git-wip-us.apache.org/repos/asf/ignite/blob/e487cb68/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionSupplier.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionSupplier.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionSupplier.java
index 4e33d8e..0a2345b 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionSupplier.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionSupplier.java
@@ -562,6 +562,8 @@ class GridDhtPartitionSupplier {
                     // Mark as last supply message.
                     s.last(part);
 
+                    U.log(log, "Prepared partition [cache=" + cctx.name() + ", part=" + part
+ "]");
+
                     phase = SupplyContextPhase.NEW;
 
                     sctx = null;

http://git-wip-us.apache.org/repos/asf/ignite/blob/e487cb68/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPreloader.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPreloader.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPreloader.java
index 8e56c2d..5840fe1 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPreloader.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPreloader.java
@@ -825,6 +825,7 @@ public class GridDhtPreloader extends GridCachePreloaderAdapter {
         }
 
         supplier.dumpDebugInfo();
+        demander.dumpDebugInfo();
     }
 
     /**

http://git-wip-us.apache.org/repos/asf/ignite/blob/e487cb68/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheFailoverTestSuite3.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheFailoverTestSuite3.java
b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheFailoverTestSuite3.java
index 1f94f9e..99b4fc9 100644
--- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheFailoverTestSuite3.java
+++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheFailoverTestSuite3.java
@@ -35,14 +35,27 @@ public class IgniteCacheFailoverTestSuite3 extends TestSuite {
     public static TestSuite suite() throws Exception {
         TestSuite suite = new TestSuite("Cache Failover Test Suite3");
 
-        suite.addTestSuite(IgniteCachePutRetryAtomicSelfTest.class);
-        suite.addTestSuite(IgniteCachePutRetryAtomicPrimaryWriteOrderSelfTest.class);
-        suite.addTestSuite(IgniteCachePutRetryTransactionalSelfTest.class);
+//        suite.addTestSuite(IgniteCachePutRetryAtomicSelfTest.class);
+//        suite.addTestSuite(IgniteCachePutRetryAtomicPrimaryWriteOrderSelfTest.class);
+//        suite.addTestSuite(IgniteCachePutRetryTransactionalSelfTest.class);
 
         // Disable SSL test with old JDK because of https://bugs.openjdk.java.net/browse/JDK-8013809.
         if (!IgniteUtils.isHotSpot() || IgniteUtils.isJavaVersionAtLeast("1.7.0_65"))
             suite.addTestSuite(IgniteCacheSslStartStopSelfTest.class);
 
+        suite.addTestSuite(IgniteCacheSslStartStopSelfTest.class);
+        suite.addTestSuite(IgniteCacheSslStartStopSelfTest.class);
+        suite.addTestSuite(IgniteCacheSslStartStopSelfTest.class);
+        suite.addTestSuite(IgniteCacheSslStartStopSelfTest.class);
+        suite.addTestSuite(IgniteCacheSslStartStopSelfTest.class);
+        suite.addTestSuite(IgniteCacheSslStartStopSelfTest.class);
+        suite.addTestSuite(IgniteCacheSslStartStopSelfTest.class);
+        suite.addTestSuite(IgniteCacheSslStartStopSelfTest.class);
+        suite.addTestSuite(IgniteCacheSslStartStopSelfTest.class);
+        suite.addTestSuite(IgniteCacheSslStartStopSelfTest.class);
+        suite.addTestSuite(IgniteCacheSslStartStopSelfTest.class);
+        suite.addTestSuite(IgniteCacheSslStartStopSelfTest.class);
+
         return suite;
     }
 }


Mime
View raw message