ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [15/16] ignite git commit: Merge remote-tracking branch 'remotes/origin/master' into ignite-1093-2
Date Tue, 22 Sep 2015 11:13:42 GMT
Merge remote-tracking branch 'remotes/origin/master' into ignite-1093-2


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

Branch: refs/heads/ignite-1093-2
Commit: 5998af560af64c15052e33f6f2be71036d5854d5
Parents: 93caa0b 1021d4e
Author: Anton Vinogradov <av@apache.org>
Authored: Mon Sep 21 13:21:24 2015 +0300
Committer: Anton Vinogradov <av@apache.org>
Committed: Mon Sep 21 13:21:24 2015 +0300

----------------------------------------------------------------------
 .../org/apache/ignite/IgniteAtomicLong.java     |  15 +-
 .../apache/ignite/IgniteAtomicReference.java    |   9 +-
 .../org/apache/ignite/IgniteAtomicSequence.java |   9 +-
 .../org/apache/ignite/IgniteAtomicStamped.java  |  13 +-
 .../apache/ignite/internal/IgniteKernal.java    |   7 -
 .../processors/cache/GridCacheContext.java      |   6 +-
 .../cache/GridCacheEvictionManager.java         |   6 +-
 .../cache/GridCacheEvictionResponse.java        |   2 +-
 .../processors/cache/GridCacheIoManager.java    |  47 ++++---
 .../processors/cache/GridCacheMessage.java      |   7 +
 .../processors/cache/GridCacheMvccManager.java  |  34 ++++-
 .../GridCachePartitionExchangeManager.java      |  41 ++++--
 .../processors/cache/GridCacheProcessor.java    |  28 ++--
 .../GridDistributedLockResponse.java            |   6 +-
 .../GridDistributedTxPrepareResponse.java       |   6 +-
 .../distributed/dht/GridDhtTopologyFuture.java  |   6 +-
 .../dht/GridDhtTransactionalCacheAdapter.java   |   2 +-
 .../dht/atomic/GridDhtAtomicUpdateFuture.java   |   2 +-
 .../dht/atomic/GridDhtAtomicUpdateResponse.java |  12 +-
 .../dht/atomic/GridNearAtomicUpdateFuture.java  |  16 ++-
 .../dht/atomic/GridNearAtomicUpdateRequest.java |   2 +
 .../atomic/GridNearAtomicUpdateResponse.java    |  11 +-
 .../colocated/GridDhtColocatedLockFuture.java   |  44 ++++--
 .../dht/preloader/GridDhtForceKeysFuture.java   |   2 +-
 .../dht/preloader/GridDhtForceKeysResponse.java |   6 +-
 .../GridDhtPartitionsExchangeFuture.java        |  19 ++-
 .../distributed/near/GridNearGetResponse.java   |   6 +-
 .../distributed/near/GridNearLockFuture.java    |  26 +++-
 .../near/GridNearOptimisticTxPrepareFuture.java |  20 ++-
 .../near/GridNearTxFinishResponse.java          |   6 +-
 .../cache/query/GridCacheQueryResponse.java     |   6 +-
 .../continuous/CacheContinuousQueryHandler.java |  12 +-
 .../transactions/IgniteTxLocalAdapter.java      |   4 +-
 .../ignite/internal/util/GridSpinBusyLock.java  |  10 ++
 .../IgniteCacheEntryProcessorNodeJoinTest.java  |  24 +++-
 .../loadtests/hashmap/GridCacheTestContext.java |   4 +-
 .../ignite/testframework/GridTestUtils.java     |  14 +-
 .../cache/CacheIndexStreamerTest.java           | 137 +++++++++++++++++++
 .../IgniteCacheQueryNodeRestartSelfTest2.java   |   2 -
 .../ignite/visor/commands/VisorConsole.scala    |   8 +-
 .../config/benchmark-put-indexed-val.properties |   2 +-
 41 files changed, 468 insertions(+), 171 deletions(-)
----------------------------------------------------------------------


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

http://git-wip-us.apache.org/repos/asf/ignite/blob/5998af56/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheIoManager.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ignite/blob/5998af56/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java
----------------------------------------------------------------------
diff --cc modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java
index 91e3ea4,34c571c..e690704
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java
@@@ -435,12 -398,14 +438,18 @@@ public class GridCachePartitionExchange
          }
  
          for (AffinityReadyFuture f : readyFuts.values())
-             f.onDone(err);
+             f.onDone(stopErr);
+ 
+         for (GridDhtPartitionsExchangeFuture f : pendingExchangeFuts)
+             f.onDone(stopErr);
+ 
+         if (locExchFut != null)
+             locExchFut.onDone(stopErr);
  
 +        for (int cnt = 0; cnt < cctx.gridConfig().getRebalanceThreadPoolSize(); cnt++)
{
 +            cctx.io().removeOrderedHandler(rebalanceTopic(cnt));
 +        }
 +
          U.cancel(exchWorker);
  
          if (log.isDebugEnabled())

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


Mime
View raw message