ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [17/18] ignite git commit: Merge remote-tracking branch 'remotes/origin/master' into ignite-1093-3
Date Thu, 05 Nov 2015 07:58:37 GMT
Merge remote-tracking branch 'remotes/origin/master' into ignite-1093-3

Conflicts:
	modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePreloader.java
	modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePreloaderAdapter.java
	modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPreloader.java


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

Branch: refs/heads/ignite-1093-3
Commit: 5f81df87e69332cef04ed2058fb24d6e375dc584
Parents: bee5e9c 7573003
Author: Anton Vinogradov <av@apache.org>
Authored: Thu Nov 5 10:57:29 2015 +0300
Committer: Anton Vinogradov <av@apache.org>
Committed: Thu Nov 5 10:57:29 2015 +0300

----------------------------------------------------------------------
 .../java8/messaging/MessagingExample.java       |   7 +-
 .../src/main/java/org/apache/ignite/Ignite.java |  12 +-
 .../apache/ignite/internal/IgniteKernal.java    |  33 ++-
 .../affinity/GridAffinityAssignmentCache.java   |  13 +
 .../cache/GridCacheAffinityManager.java         |  10 +
 .../GridCachePartitionExchangeManager.java      |  24 ++
 .../cache/GridCachePreloaderAdapter.java        |  12 +-
 .../processors/cache/GridCacheProcessor.java    |  19 ++
 .../dht/preloader/GridDhtForceKeysFuture.java   |  14 ++
 .../GridDhtPartitionsExchangeFuture.java        |   6 +
 .../dht/preloader/GridDhtPreloader.java         |  24 +-
 .../processors/job/GridJobProcessor.java        |  96 ++++---
 .../ignite/spi/discovery/tcp/ServerImpl.java    |  21 +-
 .../TcpDiscoveryClientReconnectMessage.java     |   1 +
 .../messages/TcpDiscoveryDiscardMessage.java    |   1 +
 .../GridTaskFailoverAffinityRunTest.java        |   3 +
 .../processors/cache/CacheNamesSelfTest.java    |  69 +++++
 ...niteCacheClientNodeChangingTopologyTest.java |   4 +-
 .../near/GridCacheNearTxExceptionSelfTest.java  |  11 +
 ...gniteClientReconnectMassiveShutdownTest.java |  84 ++++---
 .../tcp/TcpDiscoveryMultiThreadedTest.java      |   5 +-
 .../ignite/testframework/junits/IgniteMock.java |   5 +
 .../junits/multijvm/IgniteProcessProxy.java     |   7 +-
 .../ignite/testsuites/IgniteCacheTestSuite.java |   2 +
 modules/rest-http/pom.xml                       |   6 +
 .../http/jetty/GridJettyRestProtocol.java       |   4 +-
 .../scala/org/apache/ignite/spark/Entity.scala  |   2 +-
 .../org/apache/ignite/spark/IgniteRDDSpec.scala | 249 +++++++++++++++++++
 .../org/apache/ignite/spark/IgniteRddSpec.scala | 249 -------------------
 .../org/apache/ignite/IgniteSpringBean.java     |  10 +-
 modules/ssh/pom.xml                             |   2 +-
 31 files changed, 628 insertions(+), 377 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/5f81df87/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ignite/blob/5f81df87/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ignite/blob/5f81df87/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePreloaderAdapter.java
----------------------------------------------------------------------
diff --cc modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePreloaderAdapter.java
index 9c0e9f7,4ec6749..917f895
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePreloaderAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePreloaderAdapter.java
@@@ -170,17 -148,7 +170,7 @@@ public class GridCachePreloaderAdapter 
      }
  
      /** {@inheritDoc} */
 -    @Override public void dumpDebugInfo() {
 +    @Override public void evictPartitionAsync(GridDhtLocalPartition part) {
          // No-op.
      }
- 
-     /** {@inheritDoc} */
-     @Override public void onTopologyChanged(AffinityTopologyVersion topVer) {
-         // No-op.
-     }
- 
-     /** {@inheritDoc} */
-     @Override public void dumpDebugInfo() {
-         // No-op.
-     }
- }
+ }

http://git-wip-us.apache.org/repos/asf/ignite/blob/5f81df87/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ignite/blob/5f81df87/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ignite/blob/5f81df87/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPreloader.java
----------------------------------------------------------------------
diff --cc modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPreloader.java
index 8f2b19d,998c720..c634ff5
--- 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
@@@ -742,21 -585,9 +742,16 @@@ public class GridDhtPreloader extends G
  
      /** {@inheritDoc} */
      @Override public void unwindUndeploys() {
 -        demandPool.unwindUndeploys();
 +        demandLock.writeLock().lock();
 +
 +        try {
 +            cctx.deploy().unwind(cctx);
 +        }
 +        finally {
 +            demandLock.writeLock().unlock();
 +        }
      }
  
-     /** {@inheritDoc} */
-     @Override public void dumpDebugInfo() {
-         supplier.dumpDebugInfo();
-     }
- 
      /**
       * Adds future to future map.
       *
@@@ -776,43 -607,22 +771,62 @@@
      }
  
      /** {@inheritDoc} */
 +    @Override public void evictPartitionAsync(GridDhtLocalPartition part) {
 +        partsToEvict.add(part);
 +
 +        if (partsEvictOwning.get() == 0 && partsEvictOwning.compareAndSet(0, 1))
{
 +            cctx.closures().callLocalSafe(new GPC<Boolean>() {
 +                @Override public Boolean call() {
 +                    boolean locked = true;
 +
 +                    while (locked || !partsToEvict.isEmptyx()) {
 +                        if (!locked && !partsEvictOwning.compareAndSet(0, 1))
 +                            return false;
 +
 +                        try {
 +                            GridDhtLocalPartition part = partsToEvict.poll();
 +
 +                            if (part != null)
 +                                part.tryEvict();
 +                        }
 +                        finally {
 +                            if (!partsToEvict.isEmptyx())
 +                                locked = true;
 +                            else {
 +                                boolean res = partsEvictOwning.compareAndSet(1, 0);
 +
 +                                assert res;
 +
 +                                locked = false;
 +                            }
 +                        }
 +                    }
 +
 +                    return true;
 +                }
 +            }, /*system pool*/ true);
 +        }
 +    }
 +
++    /** {@inheritDoc} */
+     @Override public void dumpDebugInfo() {
+         if (!forceKeyFuts.isEmpty()) {
+             U.warn(log, "Pending force key futures [cache=" + cctx.name() +"]:");
+ 
+             for (GridDhtForceKeysFuture fut : forceKeyFuts.values())
+                 U.warn(log, ">>> " + fut);
+         }
+ 
+         if (!pendingAssignmentFetchFuts.isEmpty()) {
+             U.warn(log, "Pending assignment fetch futures [cache=" + cctx.name() +"]:");
+ 
+             for (GridDhtAssignmentFetchFuture fut : pendingAssignmentFetchFuts.values())
+                 U.warn(log, ">>> " + fut);
+         }
++
++        supplier.dumpDebugInfo();
+     }
+ 
      /**
       *
       */


Mime
View raw message