You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by sb...@apache.org on 2017/05/22 15:13:11 UTC
[43/50] [abbrv] ignite git commit: Merge branch master into
ignite-gg-12163
Merge branch master into ignite-gg-12163
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/39b440fc
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/39b440fc
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/39b440fc
Branch: refs/heads/ignite-5075-pds
Commit: 39b440fccf5aee8d37aaa742b84e7f286b259c2e
Parents: 1924873
Author: Alexey Goncharuk <al...@gmail.com>
Authored: Fri May 19 20:37:50 2017 +0300
Committer: Alexey Goncharuk <al...@gmail.com>
Committed: Fri May 19 20:37:50 2017 +0300
----------------------------------------------------------------------
.../database/GridCacheDatabaseSharedManager.java | 4 ++--
.../cache/database/pagemem/PageMemoryImpl.java | 15 ---------------
2 files changed, 2 insertions(+), 17 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/39b440fc/modules/pds/src/main/java/org/apache/ignite/internal/processors/cache/database/GridCacheDatabaseSharedManager.java
----------------------------------------------------------------------
diff --git a/modules/pds/src/main/java/org/apache/ignite/internal/processors/cache/database/GridCacheDatabaseSharedManager.java b/modules/pds/src/main/java/org/apache/ignite/internal/processors/cache/database/GridCacheDatabaseSharedManager.java
index 0b20195..08857ee 100755
--- a/modules/pds/src/main/java/org/apache/ignite/internal/processors/cache/database/GridCacheDatabaseSharedManager.java
+++ b/modules/pds/src/main/java/org/apache/ignite/internal/processors/cache/database/GridCacheDatabaseSharedManager.java
@@ -663,7 +663,7 @@ public class GridCacheDatabaseSharedManager extends IgniteCacheDatabaseSharedMan
if (cctx.kernalContext().query().moduleEnabled()) {
for (GridCacheContext cacheCtx : (Collection<GridCacheContext>)cctx.cacheContexts()) {
- if (fut.cacheAddedOnExchange(cacheCtx.cacheId(), cacheCtx.receivedFrom()) &&
+ if (cacheCtx.startTopologyVersion().equals(fut.topologyVersion()) &&
!cctx.pageStore().hasIndexStore(cacheCtx.cacheId()) && cacheCtx.affinityNode()) {
final int cacheId = cacheCtx.cacheId();
@@ -880,7 +880,7 @@ public class GridCacheDatabaseSharedManager extends IgniteCacheDatabaseSharedMan
continue;
for (GridDhtLocalPartition part : cacheCtx.topology().currentLocalPartitions()) {
- if (part.state() != GridDhtPartitionState.OWNING || part.publicSize() <= ggWalRebalanceThreshold)
+ if (part.state() != GridDhtPartitionState.OWNING || part.dataStore().size() <= ggWalRebalanceThreshold)
continue;
for (Long cpTs : checkpointHist.checkpoints()) {
http://git-wip-us.apache.org/repos/asf/ignite/blob/39b440fc/modules/pds/src/main/java/org/apache/ignite/internal/processors/cache/database/pagemem/PageMemoryImpl.java
----------------------------------------------------------------------
diff --git a/modules/pds/src/main/java/org/apache/ignite/internal/processors/cache/database/pagemem/PageMemoryImpl.java b/modules/pds/src/main/java/org/apache/ignite/internal/processors/cache/database/pagemem/PageMemoryImpl.java
index 4a7f1c5..21ebcbf 100755
--- a/modules/pds/src/main/java/org/apache/ignite/internal/processors/cache/database/pagemem/PageMemoryImpl.java
+++ b/modules/pds/src/main/java/org/apache/ignite/internal/processors/cache/database/pagemem/PageMemoryImpl.java
@@ -17,8 +17,6 @@
package org.apache.ignite.internal.processors.cache.database.pagemem;
-import java.io.Closeable;
-import java.io.IOException;
import java.nio.ByteBuffer;
import java.nio.ByteOrder;
import java.util.ArrayList;
@@ -72,7 +70,6 @@ import org.apache.ignite.internal.util.offheap.GridOffHeapOutOfMemoryException;
import org.apache.ignite.internal.util.typedef.T2;
import org.apache.ignite.internal.util.typedef.internal.U;
import org.apache.ignite.lang.IgniteBiTuple;
-import org.apache.ignite.lifecycle.LifecycleAware;
import sun.misc.JavaNioAccess;
import sun.misc.SharedSecrets;
import sun.nio.ch.DirectBuffer;
@@ -321,18 +318,6 @@ public class PageMemoryImpl implements PageMemoryEx {
log.debug("Stopping page memory.");
directMemoryProvider.shutdown();
-
- if (directMemoryProvider instanceof LifecycleAware)
- ((LifecycleAware)directMemoryProvider).stop();
-
- if (directMemoryProvider instanceof Closeable) {
- try {
- ((Closeable)directMemoryProvider).close();
- }
- catch (IOException e) {
- throw new IgniteException(e);
- }
- }
}
/** {@inheritDoc} */