ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From voze...@apache.org
Subject [44/50] ignite git commit: Merge branch master into ignite-2.1.2
Date Tue, 04 Jul 2017 10:02:50 GMT
Merge branch master into ignite-2.1.2


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

Branch: refs/heads/master
Commit: c4ddda3c730ccc3d5de4245049819605769e918c
Parents: e1ce7c9 7db925c
Author: Alexey Goncharuk <alexey.goncharuk@gmail.com>
Authored: Mon Jul 3 15:30:39 2017 +0300
Committer: Alexey Goncharuk <alexey.goncharuk@gmail.com>
Committed: Mon Jul 3 15:30:39 2017 +0300

----------------------------------------------------------------------
 .../apache/ignite/internal/IgniteKernal.java    | 11 ++-
 .../processors/cache/GridCacheAdapter.java      |  4 +
 .../GridCachePartitionExchangeManager.java      |  2 +-
 .../processors/cache/GridCacheProcessor.java    |  9 +-
 .../GridDhtPartitionsExchangeFuture.java        |  2 +-
 .../GridCacheAtomicSequenceImpl.java            | 99 ++++++++++++--------
 .../CacheLateAffinityAssignmentTest.java        | 73 +++++++++++++++
 7 files changed, 154 insertions(+), 46 deletions(-)
----------------------------------------------------------------------


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

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

http://git-wip-us.apache.org/repos/asf/ignite/blob/c4ddda3c/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 0e541c8,cbb07f9..2b5a4ff
--- 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
@@@ -264,12 -261,13 +264,12 @@@ public class GridCachePartitionExchange
                                  exchFut = exchangeFuture(exchId, evt, cache, null, msg);
                              }
                          }
-                         else
 -                        else if (msg.exchangeId().topologyVersion().topologyVersion() >=
cctx.discovery().localJoinEvent().topologyVersion()) {
++                        else if (msg.exchangeId().topologyVersion().topologyVersion() >=
cctx.discovery().localJoinEvent().topologyVersion())
                              exchangeFuture(msg.exchangeId(), null, null, null, null)
                                  .onAffinityChangeMessage(evt.eventNode(), msg);
 -                        }
                      }
 -                    else if (customMsg instanceof StartFullSnapshotAckDiscoveryMessage
 -                        && !((StartFullSnapshotAckDiscoveryMessage)customMsg).hasError())
{
 +                    else if (customMsg instanceof StartSnapshotOperationAckDiscoveryMessage
 +                        && ((StartSnapshotOperationAckDiscoveryMessage)customMsg).needExchange())
{
                          exchId = exchangeId(n.id(), affinityTopologyVersion(evt), evt.type());
  
                          exchFut = exchangeFuture(exchId, evt, null, null, null);

http://git-wip-us.apache.org/repos/asf/ignite/blob/c4ddda3c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
----------------------------------------------------------------------
diff --cc modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
index bb6d068,91325fd..402d874
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
@@@ -1213,10 -1261,10 +1220,10 @@@ public class GridCacheProcessor extend
          if (log.isInfoEnabled()) {
              log.info("Started cache [name=" + cfg.getName() +
                  (cfg.getGroupName() != null ? ", group=" + cfg.getGroupName() : "") +
-                 ", memoryPolicyName=" + cfg.getMemoryPolicyName() +
+                 ", memoryPolicyName=" + memPlcName +
                  ", mode=" + cfg.getCacheMode() +
                  ", atomicity=" + cfg.getAtomicityMode() + ']');
 -}
 +        }
      }
  
      /**

http://git-wip-us.apache.org/repos/asf/ignite/blob/c4ddda3c/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/c4ddda3c/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheAtomicSequenceImpl.java
----------------------------------------------------------------------
diff --cc modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheAtomicSequenceImpl.java
index 29f5880,31ec16f..725e4aa
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheAtomicSequenceImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheAtomicSequenceImpl.java
@@@ -416,9 -438,9 +435,9 @@@ public final class GridCacheAtomicSeque
      }
  
      /** {@inheritDoc} */
-     @Override public void onActivate(GridKernalContext kctx) throws IgniteCheckedException
{
-         this.ctx = kctx.cache().<GridCacheInternalKey, GridCacheAtomicSequenceValue>context().cacheContext(ctx.cacheId());
-         this.seqView = ctx.cache();
+     @Override public void onActivate(GridKernalContext kctx) {
 -        seqView = kctx.cache().atomicsCache();
 -        ctx = seqView.context();
++        ctx = kctx.cache().<GridCacheInternalKey, GridCacheAtomicSequenceValue>context().cacheContext(ctx.cacheId());
++        seqView = ctx.cache();
      }
  
      /** {@inheritDoc} */

http://git-wip-us.apache.org/repos/asf/ignite/blob/c4ddda3c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheLateAffinityAssignmentTest.java
----------------------------------------------------------------------


Mime
View raw message