You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by ag...@apache.org on 2017/05/29 07:46:11 UTC
[01/11] ignite git commit: Corrected default checkpoint pool size
Repository: ignite
Updated Branches:
refs/heads/ignite-5267 c68b61d3c -> c6313b7ec
Corrected default checkpoint pool size
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/a245d620
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/a245d620
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/a245d620
Branch: refs/heads/ignite-5267
Commit: a245d620a6c4ca5c560171dcb6f69fa879a17481
Parents: b84df56
Author: Dmitriy Govorukhin <dm...@gmail.com>
Authored: Thu May 25 10:43:19 2017 +0300
Committer: Alexey Goncharuk <al...@gmail.com>
Committed: Thu May 25 10:43:19 2017 +0300
----------------------------------------------------------------------
.../apache/ignite/IgniteSystemProperties.java | 3 +
.../configuration/MemoryConfiguration.java | 12 ++-
.../pagemem/impl/PageMemoryNoStoreImpl.java | 14 +++-
.../IgniteCacheDatabaseSharedManager.java | 86 ++++++++++++--------
.../database/MetadataStorageSelfTest.java | 13 ++-
.../GridCacheDatabaseSharedManager.java | 38 +++++++--
...istentStoreCacheRebalancingAbstractTest.java | 2 +
.../db/file/PageStoreEvictionSelfTest.java | 20 +++--
8 files changed, 126 insertions(+), 62 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/a245d620/modules/core/src/main/java/org/apache/ignite/IgniteSystemProperties.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/IgniteSystemProperties.java b/modules/core/src/main/java/org/apache/ignite/IgniteSystemProperties.java
index 2832fbd..d6015d7 100644
--- a/modules/core/src/main/java/org/apache/ignite/IgniteSystemProperties.java
+++ b/modules/core/src/main/java/org/apache/ignite/IgniteSystemProperties.java
@@ -615,6 +615,9 @@ public final class IgniteSystemProperties {
*/
public static final String IGNITE_PDS_WAL_REBALANCE_THRESHOLD = "IGNITE_PDS_WAL_REBALANCE_THRESHOLD";
+ /** Ignite page memory concurrency level. */
+ public static final String IGNITE_OFFHEAP_LOCK_CONCURRENCY_LEVEL = "IGNITE_OFFHEAP_LOCK_CONCURRENCY_LEVEL";
+
/** Returns true for system properties only avoiding sending sensitive information. */
private static final IgnitePredicate<Map.Entry<String, String>> PROPS_FILTER = new IgnitePredicate<Map.Entry<String, String>>() {
@Override public boolean apply(final Map.Entry<String, String> entry) {
http://git-wip-us.apache.org/repos/asf/ignite/blob/a245d620/modules/core/src/main/java/org/apache/ignite/configuration/MemoryConfiguration.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/configuration/MemoryConfiguration.java b/modules/core/src/main/java/org/apache/ignite/configuration/MemoryConfiguration.java
index e6324dc..2d71e99 100644
--- a/modules/core/src/main/java/org/apache/ignite/configuration/MemoryConfiguration.java
+++ b/modules/core/src/main/java/org/apache/ignite/configuration/MemoryConfiguration.java
@@ -102,7 +102,7 @@ public class MemoryConfiguration implements Serializable {
private String dfltMemPlcName = DFLT_MEM_PLC_DEFAULT_NAME;
/** Size of memory (in bytes) to use for default MemoryPolicy. */
- private Long dfltMemPlcSize;
+ private long dfltMemPlcSize = DFLT_MEMORY_POLICY_MAX_SIZE;
/** Memory policies. */
private MemoryPolicyConfiguration[] memPlcs;
@@ -126,6 +126,8 @@ public class MemoryConfiguration implements Serializable {
* @return {@code this} for chaining.
*/
public MemoryConfiguration setSystemCacheInitialSize(long sysCacheInitSize) {
+ A.ensure(sysCacheMaxSize > 0, "System cache initial size can not be less zero.");
+
this.sysCacheInitSize = sysCacheInitSize;
return this;
@@ -149,6 +151,8 @@ public class MemoryConfiguration implements Serializable {
* @return {@code this} for chaining.
*/
public MemoryConfiguration setSystemCacheMaxSize(long sysCacheMaxSize) {
+ A.ensure(sysCacheMaxSize > 0, "System cache max size can not be less zero.");
+
this.sysCacheMaxSize = sysCacheMaxSize;
return this;
@@ -214,7 +218,7 @@ public class MemoryConfiguration implements Serializable {
public MemoryPolicyConfiguration createDefaultPolicyConfig() {
MemoryPolicyConfiguration memPlc = new MemoryPolicyConfiguration();
- long maxSize = (dfltMemPlcSize != null) ? dfltMemPlcSize : DFLT_MEMORY_POLICY_MAX_SIZE;
+ long maxSize = dfltMemPlcSize;
if (maxSize < DFLT_MEMORY_POLICY_INITIAL_SIZE)
memPlc.setInitialSize(maxSize);
@@ -248,10 +252,10 @@ public class MemoryConfiguration implements Serializable {
/**
* Gets a size for default memory policy overridden by user.
*
- * @return default memory policy size overridden by user or -1 if nothing was specified.
+ * @return default memory policy size overridden by user or {@link #DFLT_MEMORY_POLICY_MAX_SIZE} if nothing was specified.
*/
public long getDefaultMemoryPolicySize() {
- return (dfltMemPlcSize != null) ? dfltMemPlcSize : -1;
+ return dfltMemPlcSize;
}
/**
http://git-wip-us.apache.org/repos/asf/ignite/blob/a245d620/modules/core/src/main/java/org/apache/ignite/internal/pagemem/impl/PageMemoryNoStoreImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/pagemem/impl/PageMemoryNoStoreImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/pagemem/impl/PageMemoryNoStoreImpl.java
index 7bc92d6..b205991 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/pagemem/impl/PageMemoryNoStoreImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/pagemem/impl/PageMemoryNoStoreImpl.java
@@ -26,6 +26,7 @@ import java.util.concurrent.atomic.AtomicLong;
import java.util.concurrent.locks.ReentrantReadWriteLock;
import org.apache.ignite.IgniteException;
import org.apache.ignite.IgniteLogger;
+import org.apache.ignite.IgniteSystemProperties;
import org.apache.ignite.configuration.MemoryPolicyConfiguration;
import org.apache.ignite.internal.mem.DirectMemoryProvider;
import org.apache.ignite.internal.mem.DirectMemoryRegion;
@@ -40,6 +41,7 @@ import org.apache.ignite.internal.util.OffheapReadWriteLock;
import org.apache.ignite.internal.util.offheap.GridOffHeapOutOfMemoryException;
import org.apache.ignite.internal.util.typedef.internal.U;
+import static org.apache.ignite.IgniteSystemProperties.IGNITE_OFFHEAP_LOCK_CONCURRENCY_LEVEL;
import static org.apache.ignite.internal.util.GridUnsafe.wrapPointer;
/**
@@ -143,6 +145,12 @@ public class PageMemoryNoStoreImpl implements PageMemory {
/** */
private OffheapReadWriteLock rwLock;
+ /** Concurrency lvl. */
+ private final int lockConcLvl = IgniteSystemProperties.getInteger(
+ IGNITE_OFFHEAP_LOCK_CONCURRENCY_LEVEL,
+ Runtime.getRuntime().availableProcessors() * 4
+ );
+
/** */
private final int totalPages;
@@ -182,8 +190,7 @@ public class PageMemoryNoStoreImpl implements PageMemory {
totalPages = (int)(memPlcCfg.getMaxSize() / sysPageSize);
- // TODO configure concurrency level.
- rwLock = new OffheapReadWriteLock(128);
+ rwLock = new OffheapReadWriteLock(lockConcLvl);
}
/** {@inheritDoc} */
@@ -516,9 +523,8 @@ public class PageMemoryNoStoreImpl implements PageMemory {
if (cmp < 0)
high = mid - 1;
- else if (cmp > 0) {
+ else if (cmp > 0)
low = mid + 1;
- }
else
return seg.pageIndex(seqNo);
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/a245d620/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/database/IgniteCacheDatabaseSharedManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/database/IgniteCacheDatabaseSharedManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/database/IgniteCacheDatabaseSharedManager.java
index 0a906b2..098fa1e 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/database/IgniteCacheDatabaseSharedManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/database/IgniteCacheDatabaseSharedManager.java
@@ -106,24 +106,21 @@ public class IgniteCacheDatabaseSharedManager extends GridCacheSharedManagerAdap
* @throws IgniteCheckedException If failed.
*/
public void init() throws IgniteCheckedException {
- if (memPlcMap == null) {
- MemoryConfiguration memCfg = cctx.kernalContext().config().getMemoryConfiguration();
+ MemoryConfiguration memCfg = cctx.kernalContext().config().getMemoryConfiguration();
- if (memCfg == null)
- memCfg = new MemoryConfiguration();
+ assert memCfg != null;
- validateConfiguration(memCfg);
+ validateConfiguration(memCfg);
- pageSize = memCfg.getPageSize();
+ pageSize = memCfg.getPageSize();
- initPageMemoryPolicies(memCfg);
+ initPageMemoryPolicies(memCfg);
- registerMetricsMBeans();
+ registerMetricsMBeans();
- startMemoryPolicies();
+ startMemoryPolicies();
- initPageMemoryDataStructures(memCfg);
- }
+ initPageMemoryDataStructures(memCfg);
}
/**
@@ -220,9 +217,11 @@ public class IgniteCacheDatabaseSharedManager extends GridCacheSharedManagerAdap
memPlcMap = U.newHashMap(2);
memMetricsMap = U.newHashMap(2);
- addMemoryPolicy(memCfg,
+ addMemoryPolicy(
+ memCfg,
memCfg.createDefaultPolicyConfig(),
- DFLT_MEM_PLC_DEFAULT_NAME);
+ DFLT_MEM_PLC_DEFAULT_NAME
+ );
U.warn(log, "No user-defined default MemoryPolicy found; system default of 1GB size will be used.");
}
@@ -234,9 +233,11 @@ public class IgniteCacheDatabaseSharedManager extends GridCacheSharedManagerAdap
memPlcMap = U.newHashMap(memPlcsCfgs.length + 2);
memMetricsMap = U.newHashMap(memPlcsCfgs.length + 2);
- addMemoryPolicy(memCfg,
+ addMemoryPolicy(
+ memCfg,
memCfg.createDefaultPolicyConfig(),
- DFLT_MEM_PLC_DEFAULT_NAME);
+ DFLT_MEM_PLC_DEFAULT_NAME
+ );
U.warn(log, "No user-defined default MemoryPolicy found; system default of 1GB size will be used.");
}
@@ -250,27 +251,34 @@ public class IgniteCacheDatabaseSharedManager extends GridCacheSharedManagerAdap
addMemoryPolicy(memCfg, memPlcCfg, memPlcCfg.getName());
}
- addMemoryPolicy(memCfg,
- createSystemMemoryPolicy(memCfg.getSystemCacheInitialSize(), memCfg.getSystemCacheMaxSize()),
- SYSTEM_MEMORY_POLICY_NAME);
+ addMemoryPolicy(
+ memCfg,
+ createSystemMemoryPolicy(
+ memCfg.getSystemCacheInitialSize(),
+ memCfg.getSystemCacheMaxSize()
+ ),
+ SYSTEM_MEMORY_POLICY_NAME
+ );
}
/**
- * @param dbCfg Database config.
+ * @param memCfg Database config.
* @param memPlcCfg Memory policy config.
* @param memPlcName Memory policy name.
*/
- private void addMemoryPolicy(MemoryConfiguration dbCfg,
- MemoryPolicyConfiguration memPlcCfg,
- String memPlcName) {
- String dfltMemPlcName = dbCfg.getDefaultMemoryPolicyName();
+ private void addMemoryPolicy(
+ MemoryConfiguration memCfg,
+ MemoryPolicyConfiguration memPlcCfg,
+ String memPlcName
+ ) {
+ String dfltMemPlcName = memCfg.getDefaultMemoryPolicyName();
if (dfltMemPlcName == null)
dfltMemPlcName = DFLT_MEM_PLC_DEFAULT_NAME;
MemoryMetricsImpl memMetrics = new MemoryMetricsImpl(memPlcCfg);
- MemoryPolicy memPlc = initMemory(dbCfg, memPlcCfg, memMetrics);
+ MemoryPolicy memPlc = initMemory(memCfg, memPlcCfg, memMetrics);
memPlcMap.put(memPlcName, memPlc);
@@ -328,8 +336,10 @@ public class IgniteCacheDatabaseSharedManager extends GridCacheSharedManagerAdap
Set<String> plcNames = (plcCfgs != null) ? U.<String>newHashSet(plcCfgs.length) : new HashSet<String>(0);
- checkSystemMemoryPolicySizeConfiguration(memCfg.getSystemCacheInitialSize(),
- memCfg.getSystemCacheMaxSize());
+ checkSystemMemoryPolicySizeConfiguration(
+ memCfg.getSystemCacheInitialSize(),
+ memCfg.getSystemCacheMaxSize()
+ );
if (plcCfgs != null) {
for (MemoryPolicyConfiguration plcCfg : plcCfgs) {
@@ -344,9 +354,10 @@ public class IgniteCacheDatabaseSharedManager extends GridCacheSharedManagerAdap
}
checkDefaultPolicyConfiguration(
- memCfg.getDefaultMemoryPolicyName(),
- memCfg.getDefaultMemoryPolicySize(),
- plcNames);
+ memCfg.getDefaultMemoryPolicyName(),
+ memCfg.getDefaultMemoryPolicySize(),
+ plcNames
+ );
}
/**
@@ -355,7 +366,10 @@ public class IgniteCacheDatabaseSharedManager extends GridCacheSharedManagerAdap
*
* @throws IgniteCheckedException In case of validation violation.
*/
- private void checkSystemMemoryPolicySizeConfiguration(long sysCacheInitSize, long sysCacheMaxSize) throws IgniteCheckedException {
+ private static void checkSystemMemoryPolicySizeConfiguration(
+ long sysCacheInitSize,
+ long sysCacheMaxSize
+ ) throws IgniteCheckedException {
if (sysCacheInitSize < MIN_PAGE_MEMORY_SIZE)
throw new IgniteCheckedException("Initial size for system cache must have size more than 10MB (use " +
"MemoryConfiguration.systemCacheInitialSize property to set correct size in bytes) " +
@@ -388,7 +402,7 @@ public class IgniteCacheDatabaseSharedManager extends GridCacheSharedManagerAdap
long dfltPlcSize,
Collection<String> plcNames
) throws IgniteCheckedException {
- if (dfltPlcSize != -1) {
+ if (dfltPlcSize != MemoryConfiguration.DFLT_MEMORY_POLICY_MAX_SIZE) {
if (!F.eq(dfltPlcName, MemoryConfiguration.DFLT_MEM_PLC_DEFAULT_NAME))
throw new IgniteCheckedException("User-defined MemoryPolicy configuration " +
"and defaultMemoryPolicySize properties are set at the same time. " +
@@ -843,7 +857,15 @@ public class IgniteCacheDatabaseSharedManager extends GridCacheSharedManagerAdap
MemoryPolicyConfiguration memPlcCfg,
MemoryMetricsImpl memMetrics
) {
- return new PageMemoryNoStoreImpl(log, memProvider, cctx, memCfg.getPageSize(), memPlcCfg, memMetrics, false);
+ return new PageMemoryNoStoreImpl(
+ log,
+ memProvider,
+ cctx,
+ memCfg.getPageSize(),
+ memPlcCfg,
+ memMetrics,
+ false
+ );
}
/**
http://git-wip-us.apache.org/repos/asf/ignite/blob/a245d620/modules/core/src/test/java/org/apache/ignite/internal/processors/database/MetadataStorageSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/database/MetadataStorageSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/database/MetadataStorageSelfTest.java
index b98f429..5206472 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/database/MetadataStorageSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/database/MetadataStorageSelfTest.java
@@ -17,6 +17,12 @@
package org.apache.ignite.internal.processors.database;
+import java.io.File;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Random;
+import java.util.concurrent.ThreadLocalRandom;
+import java.util.concurrent.atomic.AtomicLong;
import org.apache.ignite.configuration.MemoryPolicyConfiguration;
import org.apache.ignite.internal.mem.DirectMemoryProvider;
import org.apache.ignite.internal.pagemem.FullPageId;
@@ -30,13 +36,6 @@ import org.apache.ignite.internal.processors.cache.database.RootPage;
import org.apache.ignite.internal.util.typedef.internal.U;
import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
-import java.io.File;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Random;
-import java.util.concurrent.ThreadLocalRandom;
-import java.util.concurrent.atomic.AtomicLong;
-
/**
*
*/
http://git-wip-us.apache.org/repos/asf/ignite/blob/a245d620/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 c1fed9f..589ae13 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
@@ -150,7 +150,7 @@ public class GridCacheDatabaseSharedManager extends IgniteCacheDatabaseSharedMan
IgniteSystemProperties.getLong(IGNITE_PDS_PARTITION_DESTROY_CHECKPOINT_DELAY, 30_000);
/** */
- private final int ggWalRebalanceThreshold = IgniteSystemProperties.getInteger(
+ private final int walRebalanceThreshold = IgniteSystemProperties.getInteger(
IGNITE_PDS_WAL_REBALANCE_THRESHOLD, 500_000);
/** Checkpoint lock hold count. */
@@ -355,15 +355,36 @@ public class GridCacheDatabaseSharedManager extends IgniteCacheDatabaseSharedMan
);
// Intentionally use identity comparison to check if configuration default has changed.
- //noinspection NumberEquality
+ // Noinspection NumberEquality.
if (cpBufSize == PersistenceConfiguration.DFLT_CHECKPOINT_PAGE_BUFFER_SIZE) {
MemoryConfiguration memCfg = cctx.kernalContext().config().getMemoryConfiguration();
+ assert memCfg != null;
+
+ long totalSize = memCfg.getSystemCacheMaxSize();
+
+ if (memCfg.getMemoryPolicies() == null)
+ totalSize += MemoryConfiguration.DFLT_MEMORY_POLICY_MAX_SIZE;
+ else {
+ for (MemoryPolicyConfiguration memPlc : memCfg.getMemoryPolicies()) {
+ if (Long.MAX_VALUE - memPlc.getMaxSize() > totalSize)
+ totalSize += memPlc.getMaxSize();
+ else {
+ totalSize = Long.MAX_VALUE;
+
+ break;
+ }
+ }
+
+ assert totalSize > 0;
+ }
+
// Limit the checkpoint page buffer size by 2GB.
- //TODO find max page cache and use it instead of memCfg.getPageCacheSize() (replaced with Long.MAX_VALUE now)
- long adjusted = Math.min(Long.MAX_VALUE / 4, 2 * 1024L * 1024L * 1024L);
+ long dfltSize = 2 * 1024L * 1024L * 1024L;
+
+ long adjusted = Math.min(totalSize / 4, dfltSize);
- if (memCfg != null && cpBufSize < adjusted) {
+ if (cpBufSize < adjusted) {
U.quietAndInfo(log,
"Default checkpoint page buffer size is too small, setting to an adjusted value: "
+ U.readableSize(adjusted, false)
@@ -555,7 +576,10 @@ public class GridCacheDatabaseSharedManager extends IgniteCacheDatabaseSharedMan
) {
return new PageMemoryImpl(
memProvider,
- calculateFragmentSizes(memCfg.getConcurrencyLevel(), plcCfg.getMaxSize()),
+ calculateFragmentSizes(
+ memCfg.getConcurrencyLevel(),
+ plcCfg.getMaxSize()
+ ),
cctx,
memCfg.getPageSize(),
new GridInClosure3X<FullPageId, ByteBuffer, Integer>() {
@@ -880,7 +904,7 @@ public class GridCacheDatabaseSharedManager extends IgniteCacheDatabaseSharedMan
continue;
for (GridDhtLocalPartition part : cacheCtx.topology().currentLocalPartitions()) {
- if (part.state() != GridDhtPartitionState.OWNING || part.dataStore().size() <= ggWalRebalanceThreshold)
+ if (part.state() != GridDhtPartitionState.OWNING || part.dataStore().size() <= walRebalanceThreshold)
continue;
CheckpointEntry cpEntry = searchCheckpointEntry(cacheCtx, part.id(), null);
http://git-wip-us.apache.org/repos/asf/ignite/blob/a245d620/modules/pds/src/test/java/org/apache/ignite/cache/database/IgnitePersistentStoreCacheRebalancingAbstractTest.java
----------------------------------------------------------------------
diff --git a/modules/pds/src/test/java/org/apache/ignite/cache/database/IgnitePersistentStoreCacheRebalancingAbstractTest.java b/modules/pds/src/test/java/org/apache/ignite/cache/database/IgnitePersistentStoreCacheRebalancingAbstractTest.java
index ecb12f5..6aa98af 100644
--- a/modules/pds/src/test/java/org/apache/ignite/cache/database/IgnitePersistentStoreCacheRebalancingAbstractTest.java
+++ b/modules/pds/src/test/java/org/apache/ignite/cache/database/IgnitePersistentStoreCacheRebalancingAbstractTest.java
@@ -362,6 +362,8 @@ public abstract class IgnitePersistentStoreCacheRebalancingAbstractTest extends
* @throws Exception If failed.
*/
public void testTopologyChangesWithConstantLoad() throws Exception {
+ fail("only for one run, must be removed soon");
+
final int entriesCnt = 10_000;
int maxNodesCount = 4;
int topChanges = 20;
http://git-wip-us.apache.org/repos/asf/ignite/blob/a245d620/modules/pds/src/test/java/org/apache/ignite/cache/database/db/file/PageStoreEvictionSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/pds/src/test/java/org/apache/ignite/cache/database/db/file/PageStoreEvictionSelfTest.java b/modules/pds/src/test/java/org/apache/ignite/cache/database/db/file/PageStoreEvictionSelfTest.java
index cc43613..0d9f598 100644
--- a/modules/pds/src/test/java/org/apache/ignite/cache/database/db/file/PageStoreEvictionSelfTest.java
+++ b/modules/pds/src/test/java/org/apache/ignite/cache/database/db/file/PageStoreEvictionSelfTest.java
@@ -59,6 +59,9 @@ public class PageStoreEvictionSelfTest extends GridCommonAbstractTest {
/** */
private static final int PAGES_NUM = 128_000;
+ /** Cache name. */
+ private final String cacheName = "cache";
+
/** {@inheritDoc} */
@Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception {
final IgniteConfiguration cfg = super.getConfiguration(gridName);
@@ -67,6 +70,8 @@ public class PageStoreEvictionSelfTest extends GridCommonAbstractTest {
cfg.setMemoryConfiguration(createDbConfig());
+ cfg.setCacheConfiguration(new CacheConfiguration<>(cacheName));
+
return cfg;
}
@@ -74,19 +79,19 @@ public class PageStoreEvictionSelfTest extends GridCommonAbstractTest {
* @return DB config.
*/
private MemoryConfiguration createDbConfig() {
- final MemoryConfiguration dbCfg = new MemoryConfiguration();
+ final MemoryConfiguration memCfg = new MemoryConfiguration();
MemoryPolicyConfiguration memPlcCfg = new MemoryPolicyConfiguration();
memPlcCfg.setInitialSize(MEMORY_LIMIT);
memPlcCfg.setMaxSize(MEMORY_LIMIT);
memPlcCfg.setName("dfltMemPlc");
- dbCfg.setPageSize(PAGE_SIZE);
- dbCfg.setConcurrencyLevel(NUMBER_OF_SEGMENTS);
- dbCfg.setMemoryPolicies(memPlcCfg);
- dbCfg.setDefaultMemoryPolicyName("dfltMemPlc");
+ memCfg.setPageSize(PAGE_SIZE);
+ memCfg.setConcurrencyLevel(NUMBER_OF_SEGMENTS);
+ memCfg.setMemoryPolicies(memPlcCfg);
+ memCfg.setDefaultMemoryPolicyName("dfltMemPlc");
- return dbCfg;
+ return memCfg;
}
@@ -111,11 +116,10 @@ public class PageStoreEvictionSelfTest extends GridCommonAbstractTest {
*/
public void testPageEviction() throws Exception {
final IgniteEx ig = startGrid(0);
- ig.getOrCreateCache(new CacheConfiguration<>("partitioned"));
final PageMemory memory = getMemory(ig);
- writeData(ig, memory, CU.cacheId("partitioned"));
+ writeData(ig, memory, CU.cacheId(cacheName));
}
/**
[04/11] ignite git commit: ignite-gg-12163 fix testExchangeMessages
after merge
Posted by ag...@apache.org.
ignite-gg-12163 fix testExchangeMessages after merge
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/59b88f5f
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/59b88f5f
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/59b88f5f
Branch: refs/heads/ignite-5267
Commit: 59b88f5fef05e36cc50962d156e78b539f136e13
Parents: 059008e
Author: Dmitriy Govorukhin <dm...@gmail.com>
Authored: Thu May 25 20:25:48 2017 +0300
Committer: Dmitriy Govorukhin <dm...@gmail.com>
Committed: Thu May 25 20:25:48 2017 +0300
----------------------------------------------------------------------
.../cache/CacheExchangeMessageDuplicatedStateTest.java | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/59b88f5f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheExchangeMessageDuplicatedStateTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheExchangeMessageDuplicatedStateTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheExchangeMessageDuplicatedStateTest.java
index d8a2065..99e6afb 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheExchangeMessageDuplicatedStateTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheExchangeMessageDuplicatedStateTest.java
@@ -40,9 +40,10 @@ import org.apache.ignite.plugin.extensions.communication.Message;
import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi;
import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder;
import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder;
-import org.apache.ignite.testframework.GridTestUtils;
import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
+import static org.apache.ignite.testframework.GridTestUtils.getFieldValue;
+
/**
*
*/
@@ -234,7 +235,7 @@ public class CacheExchangeMessageDuplicatedStateTest extends GridCommonAbstractT
* @param msg Message.
*/
private void checkFullMessage(GridDhtPartitionsFullMessage msg) {
- Map<Integer, Integer> dupPartsData = GridTestUtils.getFieldValue(msg, "dupPartsData");
+ Map<Integer, Integer> dupPartsData = getFieldValue(msg, "dupPartsData");
assertNotNull(dupPartsData);
@@ -243,7 +244,8 @@ public class CacheExchangeMessageDuplicatedStateTest extends GridCommonAbstractT
assertFalse(dupPartsData.containsKey(CU.cacheId(AFF3_CACHE1)));
- Map<Integer, Map<Integer, Long>> partCntrs = GridTestUtils.getFieldValue(msg, "partCntrs");
+ Map<Integer, Map<Integer, Long>> partCntrs =
+ getFieldValue(getFieldValue(msg, "partCntrs"), "map");
if (partCntrs != null) {
for (Map<Integer, Long> cntrs : partCntrs.values())
@@ -255,7 +257,7 @@ public class CacheExchangeMessageDuplicatedStateTest extends GridCommonAbstractT
* @param msg Message.
*/
private void checkSingleMessage(GridDhtPartitionsSingleMessage msg) {
- Map<Integer, Integer> dupPartsData = GridTestUtils.getFieldValue(msg, "dupPartsData");
+ Map<Integer, Integer> dupPartsData = getFieldValue(msg, "dupPartsData");
assertNotNull(dupPartsData);
@@ -264,7 +266,7 @@ public class CacheExchangeMessageDuplicatedStateTest extends GridCommonAbstractT
assertFalse(dupPartsData.containsKey(CU.cacheId(AFF3_CACHE1)));
- Map<Integer, Map<Integer, Long>> partCntrs = GridTestUtils.getFieldValue(msg, "partCntrs");
+ Map<Integer, Map<Integer, Long>> partCntrs = getFieldValue(msg, "partCntrs");
if (partCntrs != null) {
for (Map<Integer, Long> cntrs : partCntrs.values())
[05/11] ignite git commit: ignite-gg-12163 fix concurrency lvl for rw
lock by default
Posted by ag...@apache.org.
ignite-gg-12163 fix concurrency lvl for rw lock by default
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/68ee0630
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/68ee0630
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/68ee0630
Branch: refs/heads/ignite-5267
Commit: 68ee06304209541a8a1fafaab8a149002d70022d
Parents: 59b88f5
Author: Dmitriy Govorukhin <dm...@gmail.com>
Authored: Fri May 26 11:35:31 2017 +0300
Committer: Dmitriy Govorukhin <dm...@gmail.com>
Committed: Fri May 26 11:35:31 2017 +0300
----------------------------------------------------------------------
.../pagemem/impl/PageMemoryNoStoreImpl.java | 3 ++-
.../ignite/internal/util/IgniteUtils.java | 23 ++++++++++++++++++++
2 files changed, 25 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/68ee0630/modules/core/src/main/java/org/apache/ignite/internal/pagemem/impl/PageMemoryNoStoreImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/pagemem/impl/PageMemoryNoStoreImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/pagemem/impl/PageMemoryNoStoreImpl.java
index b205991..dc72482 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/pagemem/impl/PageMemoryNoStoreImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/pagemem/impl/PageMemoryNoStoreImpl.java
@@ -37,6 +37,7 @@ import org.apache.ignite.internal.processors.cache.GridCacheSharedContext;
import org.apache.ignite.internal.processors.cache.database.MemoryMetricsImpl;
import org.apache.ignite.internal.processors.cache.database.tree.io.PageIO;
import org.apache.ignite.internal.util.GridUnsafe;
+import org.apache.ignite.internal.util.IgniteUtils;
import org.apache.ignite.internal.util.OffheapReadWriteLock;
import org.apache.ignite.internal.util.offheap.GridOffHeapOutOfMemoryException;
import org.apache.ignite.internal.util.typedef.internal.U;
@@ -148,7 +149,7 @@ public class PageMemoryNoStoreImpl implements PageMemory {
/** Concurrency lvl. */
private final int lockConcLvl = IgniteSystemProperties.getInteger(
IGNITE_OFFHEAP_LOCK_CONCURRENCY_LEVEL,
- Runtime.getRuntime().availableProcessors() * 4
+ IgniteUtils.nearestPow2(Runtime.getRuntime().availableProcessors() * 4)
);
/** */
http://git-wip-us.apache.org/repos/asf/ignite/blob/68ee0630/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java b/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
index d57c0f1..555238f 100755
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
@@ -10186,6 +10186,29 @@ public abstract class IgniteUtils {
}
/**
+ * @param x X.
+ */
+ public static int nearestPow2(int x) {
+ return nearestPow2(x, true);
+ }
+
+ /**
+ * @param x X.
+ * @param less Less.
+ */
+ public static int nearestPow2(int x, boolean less) {
+ int y = 1;
+
+ while (y < x)
+ y *= 2;
+
+ if (less)
+ y /= 2;
+
+ return y;
+ }
+
+ /**
* @param lock Lock.
*/
public static ReentrantReadWriteLockTracer lockTracer(ReadWriteLock lock) {
[09/11] ignite git commit: Fixed unhandled
GridDhtInvalidPartitionException.
Posted by ag...@apache.org.
Fixed unhandled GridDhtInvalidPartitionException.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/164e3188
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/164e3188
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/164e3188
Branch: refs/heads/ignite-5267
Commit: 164e3188f303b3565a53634be713917b0f6e2e85
Parents: 9c3028a
Author: Ilya Lantukh <il...@gridgain.com>
Authored: Fri May 26 16:08:57 2017 +0300
Committer: Ilya Lantukh <il...@gridgain.com>
Committed: Fri May 26 16:08:57 2017 +0300
----------------------------------------------------------------------
.../distributed/dht/GridDhtGetSingleFuture.java | 27 ++++++++++++--------
1 file changed, 16 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/164e3188/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtGetSingleFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtGetSingleFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtGetSingleFuture.java
index d93831d..9a7cfdc 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtGetSingleFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtGetSingleFuture.java
@@ -265,23 +265,28 @@ public final class GridDhtGetSingleFuture<K, V> extends GridFutureAdapter<GridCa
* @return {@code True} if mapped.
*/
private boolean map(KeyCacheObject key) {
- GridDhtLocalPartition part = topVer.topologyVersion() > 0 ?
- cache().topology().localPartition(cctx.affinity().partition(key), topVer, true) :
- cache().topology().localPartition(key, false);
+ try {
+ GridDhtLocalPartition part = topVer.topologyVersion() > 0 ?
+ cache().topology().localPartition(cctx.affinity().partition(key), topVer, true) :
+ cache().topology().localPartition(key, false);
- if (part == null)
- return false;
+ if (part == null)
+ return false;
- assert this.part == -1;
+ assert this.part == -1;
- // By reserving, we make sure that partition won't be unloaded while processed.
- if (part.reserve()) {
- this.part = part.id();
+ // By reserving, we make sure that partition won't be unloaded while processed.
+ if (part.reserve()) {
+ this.part = part.id();
- return true;
+ return true;
+ }
+ else
+ return false;
}
- else
+ catch (GridDhtInvalidPartitionException ex) {
return false;
+ }
}
/**
[08/11] ignite git commit: Merge remote-tracking branch
'origin/ignite-5267' into ignite-gg-12163
Posted by ag...@apache.org.
Merge remote-tracking branch 'origin/ignite-5267' into ignite-gg-12163
# Conflicts:
# modules/pds/src/main/java/org/apache/ignite/internal/processors/cache/database/GridCacheDatabaseSharedManager.java
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/9c3028a6
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/9c3028a6
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/9c3028a6
Branch: refs/heads/ignite-5267
Commit: 9c3028a6414bf7c94a9550b40cc40a7da72d34e0
Parents: 13c5a5f a0fc2b0
Author: Dmitriy Govorukhin <dm...@gmail.com>
Authored: Fri May 26 12:37:32 2017 +0300
Committer: Dmitriy Govorukhin <dm...@gmail.com>
Committed: Fri May 26 12:37:32 2017 +0300
----------------------------------------------------------------------
.../example-persistent-store.xml | 71 +++++
examples/pom.xml | 7 +
.../ignite/examples/model/Organization.java | 9 +
.../persistentstore/PersistentStoreExample.java | 88 ++++++
.../PersistentStoreExampleNodeStartup.java | 29 ++
.../configuration/IgniteConfiguration.java | 14 +-
.../configuration/PersistenceConfiguration.java | 289 ------------------
.../PersistentStoreConfiguration.java | 292 +++++++++++++++++++
.../processors/cache/GridCacheProcessor.java | 4 +-
.../GridCacheDatabaseSharedManager.java | 8 +-
.../database/file/FilePageStoreManager.java | 12 +-
.../database/wal/FileWriteAheadLogManager.java | 12 +-
...istentStoreCacheRebalancingAbstractTest.java | 4 +-
...tNearCachePutGetWithPersistenceSelfTest.java | 4 +-
...ersistentStoreContinuousRestartSelfTest.java | 4 +-
.../IgnitePersistentStoreDynamicCacheTest.java | 4 +-
...tentStoreMultiNodePutGetRestartSelfTest.java | 4 +-
.../IgnitePersistentStorePageSizesTest.java | 4 +-
...entStoreRecoveryAfterFileCorruptionTest.java | 6 +-
...entStoreRemoveDuringRebalancingSelfTest.java | 4 +-
...toreSingleNodePutGetPersistenceSelfTest.java | 4 +-
...deWithIndexingPutGetPersistenceSelfTest.java | 4 +-
.../IgnitePersistentStoreWalTlbSelfTest.java | 8 +-
...ageEvictionDuringPartitionClearSelfTest.java | 4 +-
.../IgniteDbMultiNodePutGetRestartSelfTest.java | 4 +-
.../db/IgniteDbPageEvictionSelfTest.java | 4 +-
.../db/IgniteDbWholeClusterRestartSelfTest.java | 4 +-
.../db/RebalancingOnNotStableTopologyTest.java | 6 +-
.../cache/database/db/TransactionsHangTest.java | 6 +-
...IgniteCachePageStoreIntegrationSelfTest.java | 4 +-
.../file/IgniteNoActualWalHistorySelfTest.java | 6 +-
.../IgniteWalDirectoriesConfigurationTest.java | 6 +-
.../IgniteWalHistoryReservationsSelfTest.java | 4 +-
.../db/file/IgniteWalRecoverySelfTest.java | 7 +-
.../IgniteWalRecoverySeveralRestartsTest.java | 6 +-
.../PageStoreCheckpointSimulationSelfTest.java | 6 +-
.../db/file/PageStoreEvictionSelfTest.java | 4 +-
.../file/WalRecoveryTxLogicalRecordsTest.java | 6 +-
.../GridChangeGlobalStateAbstractTest.java | 8 +-
.../extended/GridActivateExtensionTest.java | 8 +-
40 files changed, 592 insertions(+), 386 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/9c3028a6/modules/pds/src/main/java/org/apache/ignite/internal/processors/cache/database/GridCacheDatabaseSharedManager.java
----------------------------------------------------------------------
diff --cc modules/pds/src/main/java/org/apache/ignite/internal/processors/cache/database/GridCacheDatabaseSharedManager.java
index 589ae13,45b5abf..a78ba27
--- 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
@@@ -355,36 -355,15 +355,36 @@@ public class GridCacheDatabaseSharedMan
);
// Intentionally use identity comparison to check if configuration default has changed.
- //noinspection NumberEquality
+ // Noinspection NumberEquality.
- if (cpBufSize == PersistenceConfiguration.DFLT_CHECKPOINT_PAGE_BUFFER_SIZE) {
+ if (cpBufSize == PersistentStoreConfiguration.DFLT_CHECKPOINT_PAGE_BUFFER_SIZE) {
MemoryConfiguration memCfg = cctx.kernalContext().config().getMemoryConfiguration();
+ assert memCfg != null;
+
+ long totalSize = memCfg.getSystemCacheMaxSize();
+
+ if (memCfg.getMemoryPolicies() == null)
+ totalSize += MemoryConfiguration.DFLT_MEMORY_POLICY_MAX_SIZE;
+ else {
+ for (MemoryPolicyConfiguration memPlc : memCfg.getMemoryPolicies()) {
+ if (Long.MAX_VALUE - memPlc.getMaxSize() > totalSize)
+ totalSize += memPlc.getMaxSize();
+ else {
+ totalSize = Long.MAX_VALUE;
+
+ break;
+ }
+ }
+
+ assert totalSize > 0;
+ }
+
// Limit the checkpoint page buffer size by 2GB.
- //TODO find max page cache and use it instead of memCfg.getPageCacheSize() (replaced with Long.MAX_VALUE now)
- long adjusted = Math.min(Long.MAX_VALUE / 4, 2 * 1024L * 1024L * 1024L);
+ long dfltSize = 2 * 1024L * 1024L * 1024L;
+
+ long adjusted = Math.min(totalSize / 4, dfltSize);
- if (memCfg != null && cpBufSize < adjusted) {
+ if (cpBufSize < adjusted) {
U.quietAndInfo(log,
"Default checkpoint page buffer size is too small, setting to an adjusted value: "
+ U.readableSize(adjusted, false)
http://git-wip-us.apache.org/repos/asf/ignite/blob/9c3028a6/modules/pds/src/test/java/org/apache/ignite/cache/database/IgnitePersistentStoreCacheRebalancingAbstractTest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/9c3028a6/modules/pds/src/test/java/org/apache/ignite/cache/database/db/file/PageStoreEvictionSelfTest.java
----------------------------------------------------------------------
[07/11] ignite git commit: ignite-gg-12163 utils update
Posted by ag...@apache.org.
ignite-gg-12163 utils update
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/13c5a5f3
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/13c5a5f3
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/13c5a5f3
Branch: refs/heads/ignite-5267
Commit: 13c5a5f37a448c5fde66538ff522ff2582db6146
Parents: 874096f
Author: Dmitriy Govorukhin <dm...@gmail.com>
Authored: Fri May 26 12:02:37 2017 +0300
Committer: Dmitriy Govorukhin <dm...@gmail.com>
Committed: Fri May 26 12:02:37 2017 +0300
----------------------------------------------------------------------
.../java/org/apache/ignite/internal/util/IgniteUtils.java | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/13c5a5f3/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java b/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
index 90de683..ba4717a 100755
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
@@ -10199,11 +10199,11 @@ public abstract class IgniteUtils {
public static int nearestPow2(int x, boolean less) {
assert x > 0 : "can not calculate for less zero";
- int y = 1;
+ long y = 1;
while (y < x){
- if ((long)y * 2 > Integer.MAX_VALUE)
- return y;
+ if (y * 2 > Integer.MAX_VALUE)
+ return (int)y;
y *= 2;
}
@@ -10211,7 +10211,7 @@ public abstract class IgniteUtils {
if (less)
y /= 2;
- return y;
+ return (int)y;
}
/**
[06/11] ignite git commit: ignite-gg-12163 utils update nearestPow2
Posted by ag...@apache.org.
ignite-gg-12163 utils update nearestPow2
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/874096f3
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/874096f3
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/874096f3
Branch: refs/heads/ignite-5267
Commit: 874096f33a68e61d96dfce2ef3af0f354b4ce102
Parents: 68ee063
Author: Dmitriy Govorukhin <dm...@gmail.com>
Authored: Fri May 26 11:54:59 2017 +0300
Committer: Dmitriy Govorukhin <dm...@gmail.com>
Committed: Fri May 26 11:54:59 2017 +0300
----------------------------------------------------------------------
.../java/org/apache/ignite/internal/util/IgniteUtils.java | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/874096f3/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java b/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
index 555238f..90de683 100755
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
@@ -10197,10 +10197,16 @@ public abstract class IgniteUtils {
* @param less Less.
*/
public static int nearestPow2(int x, boolean less) {
+ assert x > 0 : "can not calculate for less zero";
+
int y = 1;
- while (y < x)
+ while (y < x){
+ if ((long)y * 2 > Integer.MAX_VALUE)
+ return y;
+
y *= 2;
+ }
if (less)
y /= 2;
[11/11] ignite git commit: Merge branch 'ignite-5267' of
https://git-wip-us.apache.org/repos/asf/ignite into ignite-gg-12163
Posted by ag...@apache.org.
Merge branch 'ignite-5267' of https://git-wip-us.apache.org/repos/asf/ignite 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/c6313b7e
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/c6313b7e
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/c6313b7e
Branch: refs/heads/ignite-5267
Commit: c6313b7ec24c860f803d191e776ee7ace11cec82
Parents: a988b8d c68b61d
Author: Alexey Goncharuk <al...@gmail.com>
Authored: Mon May 29 10:45:42 2017 +0300
Committer: Alexey Goncharuk <al...@gmail.com>
Committed: Mon May 29 10:45:42 2017 +0300
----------------------------------------------------------------------
.../PersistentStoreConfiguration.java | 39 ++++++++++----------
.../processors/cache/GridCacheProcessor.java | 16 ++++++--
2 files changed, 32 insertions(+), 23 deletions(-)
----------------------------------------------------------------------
[10/11] ignite git commit: IGNITE-GG-12163 JIRA for failing test with
detailed description was created
Posted by ag...@apache.org.
IGNITE-GG-12163 JIRA for failing test with detailed description was created
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/a988b8dd
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/a988b8dd
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/a988b8dd
Branch: refs/heads/ignite-5267
Commit: a988b8ddee36209bae7a9fd7b3d6d39428bd4180
Parents: 164e318
Author: Sergey Chugunov <se...@gmail.com>
Authored: Fri May 26 17:08:55 2017 +0300
Committer: Sergey Chugunov <se...@gmail.com>
Committed: Fri May 26 17:08:55 2017 +0300
----------------------------------------------------------------------
.../IgnitePersistentStoreCacheRebalancingAbstractTest.java | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/a988b8dd/modules/pds/src/test/java/org/apache/ignite/cache/database/IgnitePersistentStoreCacheRebalancingAbstractTest.java
----------------------------------------------------------------------
diff --git a/modules/pds/src/test/java/org/apache/ignite/cache/database/IgnitePersistentStoreCacheRebalancingAbstractTest.java b/modules/pds/src/test/java/org/apache/ignite/cache/database/IgnitePersistentStoreCacheRebalancingAbstractTest.java
index 75d655f..9f64f1b 100644
--- a/modules/pds/src/test/java/org/apache/ignite/cache/database/IgnitePersistentStoreCacheRebalancingAbstractTest.java
+++ b/modules/pds/src/test/java/org/apache/ignite/cache/database/IgnitePersistentStoreCacheRebalancingAbstractTest.java
@@ -315,6 +315,8 @@ public abstract class IgnitePersistentStoreCacheRebalancingAbstractTest extends
* @throws Exception If fails.
*/
public void testPartitionLossAndRecover() throws Exception {
+ fail("IGNITE-5302");
+
Ignite ignite1 = startGrid(0);
Ignite ignite2 = startGrid(1);
Ignite ignite3 = startGrid(2);
[03/11] ignite git commit: Merge remote-tracking branch
'professional/ignite-gg-12163' into ignite-gg-12163
Posted by ag...@apache.org.
Merge remote-tracking branch 'professional/ignite-gg-12163' 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/059008ed
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/059008ed
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/059008ed
Branch: refs/heads/ignite-5267
Commit: 059008ed0d4b279f5461b67d2e478d804701269f
Parents: 54beab9 a245d62
Author: Dmitriy Govorukhin <dm...@gmail.com>
Authored: Thu May 25 20:19:43 2017 +0300
Committer: Dmitriy Govorukhin <dm...@gmail.com>
Committed: Thu May 25 20:19:43 2017 +0300
----------------------------------------------------------------------
examples/config/filesystem/example-igfs.xml | 4 +
.../examples/datagrid/CacheQueryExample.java | 2 +-
.../store/cassandra/CassandraCacheStore.java | 15 +-
.../ignite/tests/IgnitePersistentStoreTest.java | 62 +-
.../persistence/loadall_blob/ignite-config.xml | 90 +
.../loadall_blob/persistence-settings.xml | 29 +
modules/clients/src/test/config/jdbc-config.xml | 6 -
.../internal/jdbc2/JdbcMetadataSelfTest.java | 5 +-
.../internal/jdbc2/JdbcResultSetSelfTest.java | 24 +-
.../ignite/jdbc/JdbcMetadataSelfTest.java | 4 +-
.../ignite/jdbc/JdbcResultSetSelfTest.java | 121 +-
.../jdbc/suite/IgniteJdbcDriverTestSuite.java | 3 +
.../jdbc/thin/JdbcConnectionSelfTest.java | 195 ++
.../java/org/apache/ignite/IgniteCache.java | 13 +
.../org/apache/ignite/IgniteJdbcThinDriver.java | 312 +++
.../apache/ignite/IgniteSystemProperties.java | 5 +-
.../ignite/binary/BinaryBasicNameMapper.java | 2 +-
.../ignite/cache/query/FieldsQueryCursor.java | 39 +
.../store/jdbc/CacheAbstractJdbcStore.java | 6 +-
.../configuration/AtomicConfiguration.java | 25 +
.../configuration/MemoryConfiguration.java | 15 +-
.../MemoryPolicyConfiguration.java | 4 +-
.../ignite/internal/GridKernalContext.java | 8 +-
.../ignite/internal/GridKernalContextImpl.java | 12 +-
.../apache/ignite/internal/IgniteKernal.java | 6 +-
.../org/apache/ignite/internal/IgnitionEx.java | 1 +
.../internal/binary/BinaryClassDescriptor.java | 1 +
.../ignite/internal/binary/BinaryContext.java | 58 +-
.../internal/binary/BinaryWriterExImpl.java | 16 +-
.../GridClientOptimizedMarshaller.java | 2 +-
.../GridClientZipOptimizedMarshaller.java | 2 +-
.../internal/jdbc/thin/JdbcConnection.java | 529 +++++
.../ignite/internal/jdbc/thin/JdbcTcpIo.java | 207 ++
.../ignite/internal/jdbc2/JdbcConnection.java | 3 +-
.../managers/communication/GridIoManager.java | 366 ++-
.../communication/GridIoMessageFactory.java | 2 +
.../communication/IgniteIoTestMessage.java | 362 ++-
.../managers/indexing/GridIndexingManager.java | 19 +-
.../optimized/OptimizedClassDescriptor.java | 2 +-
.../optimized/OptimizedMarshaller.java | 2 +-
.../marshaller/optimized/package-info.java | 22 +
.../mem/unsafe/UnsafeMemoryProvider.java | 18 +-
.../pagemem/impl/PageMemoryNoStoreImpl.java | 36 +-
.../processors/cache/GridCacheMapEntry.java | 4 +-
.../processors/cache/IgniteCacheProxy.java | 22 +-
.../processors/cache/QueryCursorImpl.java | 19 +-
.../IgniteCacheDatabaseSharedManager.java | 115 +-
.../cache/database/tree/BPlusTree.java | 64 +-
.../cache/query/GridCacheQueryManager.java | 32 +-
.../processors/odbc/OdbcNioListener.java | 242 --
.../internal/processors/odbc/OdbcProcessor.java | 199 --
.../odbc/SqlListenerAbstractMessageParser.java | 265 +++
.../odbc/SqlListenerAbstractObjectReader.java | 137 ++
.../odbc/SqlListenerAbstractObjectWriter.java | 111 +
.../processors/odbc/SqlListenerNioListener.java | 263 +++
.../processors/odbc/SqlListenerProcessor.java | 191 ++
.../odbc/SqlListenerRequestHandlerImpl.java | 494 ++++
.../processors/odbc/jdbc/JdbcMessageParser.java | 50 +
.../processors/odbc/jdbc/JdbcObjectReader.java | 33 +
.../processors/odbc/jdbc/JdbcObjectWriter.java | 33 +
.../processors/odbc/odbc/OdbcMessageParser.java | 249 +-
.../processors/odbc/odbc/OdbcObjectReader.java | 33 +
.../processors/odbc/odbc/OdbcObjectWriter.java | 32 +
.../odbc/odbc/OdbcRequestHandler.java | 513 ----
.../platform/cache/PlatformCache.java | 28 +-
.../processors/query/GridQueryIndexing.java | 100 +-
.../processors/query/GridQueryProcessor.java | 317 +--
.../processors/query/QueryIndexKey.java | 20 +-
.../query/QueryTypeDescriptorImpl.java | 16 +-
.../processors/query/QueryTypeIdKey.java | 26 +-
.../processors/query/QueryTypeNameKey.java | 12 +-
.../internal/processors/query/QueryUtils.java | 14 +-
.../schema/SchemaIndexCacheVisitorImpl.java | 12 +-
.../processors/query/schema/SchemaKey.java | 59 -
.../message/SchemaProposeDiscoveryMessage.java | 7 +-
.../operation/SchemaAbstractOperation.java | 27 +-
.../operation/SchemaIndexAbstractOperation.java | 7 +-
.../operation/SchemaIndexCreateOperation.java | 8 +-
.../operation/SchemaIndexDropOperation.java | 7 +-
.../handlers/GridRestCommandHandlerAdapter.java | 3 +
.../handlers/cache/GridCacheCommandHandler.java | 2 +-
.../handlers/query/QueryCommandHandler.java | 13 +-
.../ignite/internal/util/IgniteUtils.java | 17 +
.../apache/ignite/marshaller/Marshaller.java | 3 -
.../ignite/marshaller/jdk/JdkMarshaller.java | 5 +-
.../spi/indexing/IndexingQueryFilter.java | 8 +-
.../apache/ignite/spi/indexing/IndexingSpi.java | 17 +-
.../spi/indexing/noop/NoopIndexingSpi.java | 6 +-
modules/core/src/test/config/example-cache.xml | 5 +-
.../src/test/config/spring-start-nodes-attr.xml | 4 +-
.../core/src/test/config/spring-start-nodes.xml | 4 +-
.../config/websession/example-cache-base.xml | 5 +-
.../IgniteExternalizableAbstractTest.java | 15 +-
...dbcPojoStoreOptimizedMarshallerSelfTest.java | 31 -
...ptimizedMarshallerWithSqlEscapeSelfTest.java | 28 -
.../apache/ignite/igfs/IgfsPathSelfTest.java | 7 +-
.../internal/GridLifecycleAwareSelfTest.java | 3 +-
.../BinarySimpleNameTestPropertySelfTest.java | 17 +
.../managers/GridManagerStopSelfTest.java | 3 +-
.../GridDiscoveryManagerAttributesSelfTest.java | 2 +-
.../optimized/OptimizedMarshallerTest.java | 8 +
.../marshaller/optimized/package-info.java | 22 +
.../pagemem/impl/PageMemoryNoLoadSelfTest.java | 31 +-
.../AtomicCacheAffinityConfigurationTest.java | 175 ++
.../CacheStartupInDeploymentModesTest.java | 37 -
.../cache/GridCacheEntryMemorySizeSelfTest.java | 2 +-
...ridCacheStoreManagerDeserializationTest.java | 4 +-
.../cache/GridCacheVersionSelfTest.java | 7 +-
.../IgniteTxExceptionAbstractSelfTest.java | 6 +-
.../distributed/CacheAffinityEarlyTest.java | 7 +-
.../CacheGetFutureHangsSelfTest.java | 6 +-
.../IgniteCacheCreatePutMultiNodeSelfTest.java | 7 +-
.../distributed/IgniteCacheCreatePutTest.java | 7 +-
.../IgniteCachePartitionLossPolicySelfTest.java | 1 +
.../cache/query/IndexingSpiQuerySelfTest.java | 14 +-
.../cache/query/IndexingSpiQueryTxSelfTest.java | 6 +-
.../CacheEntryProcessorNonSerializableTest.java | 5 +-
.../database/MetadataStorageSelfTest.java | 13 +-
.../igfs/IgfsAbstractBaseSelfTest.java | 10 -
.../processors/igfs/IgfsFileInfoSelfTest.java | 16 +-
.../IgfsPrimaryOptimziedMarshallerSelfTest.java | 28 -
.../odbc/OdbcProcessorValidationSelfTest.java | 182 --
.../SqlListenerProcessorValidationSelfTest.java | 184 ++
.../service/ClosureServiceClientsNodesTest.java | 4 +-
...namicProxySerializationMultiJvmSelfTest.java | 13 -
.../GridMarshallerPerformanceTest.java | 8 +-
.../IgniteMessagingWithClientTest.java | 4 +-
...pClientDiscoveryMarshallerCheckSelfTest.java | 4 +-
.../TcpDiscoveryMarshallerCheckSelfTest.java | 4 +-
.../ignite/testframework/GridTestUtils.java | 2 +-
.../config/GridTestProperties.java | 3 +-
.../configvariations/ConfigVariations.java | 14 +-
.../testframework/junits/GridAbstractTest.java | 33 +
.../junits/IgniteTestResources.java | 8 +-
.../multijvm/IgniteCacheProcessProxy.java | 8 +
...naryObjectsTxDeadlockDetectionTestSuite.java | 37 -
.../ignite/testsuites/IgniteBasicTestSuite.java | 4 +-
.../testsuites/IgniteBinaryBasicTestSuite.java | 14 +-
.../IgniteBinaryCacheFullApiTestSuite.java | 37 -
.../testsuites/IgniteBinaryCacheTestSuite.java | 4 -
...ObjectsCacheDataStructuresSelfTestSuite.java | 42 -
...BinaryObjectsCacheExpiryPolicyTestSuite.java | 38 -
...gniteBinaryObjectsCacheRestartTestSuite.java | 37 -
.../IgniteBinaryObjectsCacheTestSuite2.java | 37 -
.../IgniteBinaryObjectsCacheTestSuite3.java | 2 -
.../IgniteBinaryObjectsCacheTestSuite4.java | 37 -
...IgniteBinaryObjectsComputeGridTestSuite.java | 4 -
.../IgniteCacheDataStructuresSelfTestSuite.java | 3 +
.../ignite/testsuites/IgniteCacheTestSuite.java | 4 -
...teBasicConfigVariationsFullApiTestSuite.java | 2 +-
.../ignite/testsuites/IgniteIgfsTestSuite.java | 3 -
.../testsuites/IgniteKernalSelfTestSuite.java | 4 -
.../IgniteMarshallerSelfTestSuite.java | 8 +-
...essagingConfigVariationFullApiTestSuite.java | 2 +-
...ServiceConfigVariationsFullApiTestSuite.java | 2 +-
.../webapp/META-INF/ignite-webapp-config.xml | 15 +-
.../test/config/hadoop-fs-open-test/grid-0.xml | 3 +-
.../test/config/hadoop-fs-open-test/grid-1.xml | 3 +-
.../test/config/hadoop-fs-open-test/grid-2.xml | 3 +-
.../test/config/igfs-cli-config-dual-async.xml | 3 +-
.../test/config/igfs-cli-config-dual-sync.xml | 3 +-
.../src/test/config/igfs-cli-config-primary.xml | 3 +-
.../src/test/config/igfs-cli-config-proxy.xml | 3 +-
.../IgniteHadoopFileSystemAbstractSelfTest.java | 4 +-
.../cache/query/GridCacheTwoStepQuery.java | 84 +-
.../processors/cache/query/QueryTable.java | 164 ++
.../query/h2/DmlStatementsProcessor.java | 71 +-
.../query/h2/GridH2ResultSetIterator.java | 191 --
.../query/h2/H2ConnectionWrapper.java | 67 +
.../processors/query/h2/H2DatabaseType.java | 161 ++
.../processors/query/h2/H2FieldsIterator.java | 50 +
.../processors/query/h2/H2KeyValueIterator.java | 48 +
.../query/h2/H2ResultSetIterator.java | 191 ++
.../processors/query/h2/H2RowDescriptor.java | 479 ++++
.../internal/processors/query/h2/H2Schema.java | 135 ++
.../processors/query/h2/H2SqlFieldMetadata.java | 111 +
.../processors/query/h2/H2StatementCache.java | 73 +
.../processors/query/h2/H2TableDescriptor.java | 345 +++
.../processors/query/h2/H2TableEngine.java | 89 +
.../query/h2/H2TwoStepCachedQuery.java | 49 +
.../query/h2/H2TwoStepCachedQueryKey.java | 107 +
.../internal/processors/query/h2/H2Utils.java | 299 +++
.../processors/query/h2/IgniteH2Indexing.java | 2212 +++---------------
.../query/h2/database/H2PkHashIndex.java | 4 +-
.../query/h2/database/H2TreeIndex.java | 4 +-
.../query/h2/ddl/DdlStatementsProcessor.java | 25 +-
.../query/h2/opt/GridH2CollocationModel.java | 6 +-
.../query/h2/opt/GridH2IndexBase.java | 14 +-
.../processors/query/h2/opt/GridH2Table.java | 177 +-
.../query/h2/opt/GridH2TreeIndex.java | 2 +-
.../query/h2/opt/GridLuceneIndex.java | 15 +-
.../query/h2/sql/GridSqlDropIndex.java | 14 +-
.../query/h2/sql/GridSqlQueryParser.java | 2 +-
.../query/h2/sql/GridSqlQuerySplitter.java | 25 +-
.../query/h2/twostep/GridMapQueryExecutor.java | 23 +-
.../h2/twostep/GridReduceQueryExecutor.java | 272 +--
.../h2/twostep/msg/GridH2QueryRequest.java | 13 +-
.../twostep/msg/GridH2ValueMessageFactory.java | 4 +
.../cache/GridCacheCrossCacheQuerySelfTest.java | 12 +-
.../cache/IgniteCacheNoClassQuerySelfTest.java | 4 +-
.../cache/SqlFieldsQuerySelfTest.java | 12 +-
.../DynamicIndexAbstractBasicSelfTest.java | 26 +-
.../DynamicIndexAbstractConcurrentSelfTest.java | 74 +-
.../cache/index/SchemaExchangeSelfTest.java | 2 +-
.../query/IgniteQueryDedicatedPoolTest.java | 6 +-
.../query/IgniteSqlSegmentedIndexSelfTest.java | 25 +
.../h2/GridIndexingSpiAbstractSelfTest.java | 140 +-
.../h2/sql/AbstractH2CompareQueryTest.java | 4 +-
.../query/h2/sql/GridQueryParsingTest.java | 6 +-
.../FetchingQueryCursorStressTest.java | 4 +-
.../IgniteBinaryCacheQueryTestSuite.java | 4 -
.../IgniteBinaryCacheQueryTestSuite2.java | 4 -
.../IgniteBinaryCacheQueryTestSuite3.java | 39 -
.../IgniteBinaryCacheQueryTestSuite4.java | 39 -
.../GridCacheDatabaseSharedManager.java | 38 +-
...istentStoreCacheRebalancingAbstractTest.java | 2 +
.../db/file/PageStoreEvictionSelfTest.java | 20 +-
.../core/include/ignite/cache/query/query_sql.h | 2 +
.../ignite/cache/query/query_sql_fields.h | 3 +
.../cpp/odbc/include/ignite/odbc/message.h | 10 +
.../Cache/Query/CacheLinqTest.cs | 36 +-
.../Cache/Query/CacheQueriesTest.cs | 60 +-
.../Apache.Ignite.Core.Tests/MarshallerTest.cs | 2 +-
.../Cache/Query/SqlFieldsQuery.cs | 29 +-
.../Apache.Ignite.Core/Cache/Query/SqlQuery.cs | 31 +
.../Apache.Ignite.Core/Impl/Cache/CacheImpl.cs | 3 +
.../Apache.Ignite.Linq/CacheExtensions.cs | 10 +
.../Impl/CacheFieldsQueryExecutor.cs | 42 +-
.../Apache.Ignite.Linq/Impl/CacheQueryable.cs | 3 +-
.../dotnet/Apache.Ignite.Linq/QueryOptions.cs | 23 +
modules/spark/pom.xml | 6 -
.../spring/SpringTransactionManager.java | 13 +
.../GridSpringBeanSerializationSelfTest.java | 15 +-
.../GridSpringTransactionManagerSelfTest.java | 45 +
.../webapp2/META-INF/ignite-webapp-config.xml | 15 +-
.../ignite-int-max-values-onheap-config.xml | 4 +-
modules/yardstick/config/ignite-jdbc-config.xml | 4 +-
parent/pom.xml | 2 +-
238 files changed, 8836 insertions(+), 5367 deletions(-)
----------------------------------------------------------------------
[02/11] ignite git commit: ignite-gg-12138 stop nodes after test +
small test refactoring
Posted by ag...@apache.org.
ignite-gg-12138 stop nodes after test + small test refactoring
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/54beab99
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/54beab99
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/54beab99
Branch: refs/heads/ignite-5267
Commit: 54beab99c12762a53f539f68bf1003ebf9ea3e85
Parents: dc3450e
Author: Dmitriy Govorukhin <dm...@gmail.com>
Authored: Thu May 25 20:19:22 2017 +0300
Committer: Dmitriy Govorukhin <dm...@gmail.com>
Committed: Thu May 25 20:19:22 2017 +0300
----------------------------------------------------------------------
.../internal/binary/BinaryObjectExceptionSelfTest.java | 10 ++++++++--
.../ipfinder/TcpDiscoveryIpFinderAbstractSelfTest.java | 7 +++++++
.../tcp/ipfinder/vm/TcpDiscoveryVmIpFinderSelfTest.java | 7 +++++--
3 files changed, 20 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/54beab99/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryObjectExceptionSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryObjectExceptionSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryObjectExceptionSelfTest.java
index e4be824..35756a4 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryObjectExceptionSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryObjectExceptionSelfTest.java
@@ -45,6 +45,9 @@ public class BinaryObjectExceptionSelfTest extends GridCommonAbstractTest {
/** */
private static final TcpDiscoveryIpFinder IP_FINDER = new TcpDiscoveryVmIpFinder(true);
+ /** Cache name. */
+ private final String cacheName = "cache";
+
/** {@inheritDoc} */
@Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception {
IgniteConfiguration cfg = super.getConfiguration(gridName);
@@ -52,7 +55,10 @@ public class BinaryObjectExceptionSelfTest extends GridCommonAbstractTest {
cfg.setMarshaller(new BinaryMarshaller());
cfg.setDiscoverySpi(new TcpDiscoverySpi().setIpFinder(IP_FINDER));
- cfg.setCacheConfiguration(new CacheConfiguration().setCopyOnRead(true));
+ cfg.setCacheConfiguration(
+ new CacheConfiguration(cacheName)
+ .setCopyOnRead(true)
+ );
BinaryConfiguration bcfg = new BinaryConfiguration();
@@ -84,7 +90,7 @@ public class BinaryObjectExceptionSelfTest extends GridCommonAbstractTest {
public void testUnexpectedFieldType() throws Exception {
IgniteEx grid = grid(0);
- IgniteCache<String, Value> cache = grid.cache(null);
+ IgniteCache<String, Value> cache = grid.cache(cacheName);
cache.put(TEST_KEY, new Value());
http://git-wip-us.apache.org/repos/asf/ignite/blob/54beab99/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/ipfinder/TcpDiscoveryIpFinderAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/ipfinder/TcpDiscoveryIpFinderAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/ipfinder/TcpDiscoveryIpFinderAbstractSelfTest.java
index 6f2201f..465b38d 100644
--- a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/ipfinder/TcpDiscoveryIpFinderAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/ipfinder/TcpDiscoveryIpFinderAbstractSelfTest.java
@@ -54,6 +54,13 @@ public abstract class TcpDiscoveryIpFinderAbstractSelfTest<T extends TcpDiscover
injectLogger(finder);
}
+ /** {@inheritDoc} */
+ @Override protected void afterTest() throws Exception {
+ super.afterTest();
+
+ stopAllGrids();
+ }
+
/**
* @throws Exception If any error occurs.
*/
http://git-wip-us.apache.org/repos/asf/ignite/blob/54beab99/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/ipfinder/vm/TcpDiscoveryVmIpFinderSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/ipfinder/vm/TcpDiscoveryVmIpFinderSelfTest.java b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/ipfinder/vm/TcpDiscoveryVmIpFinderSelfTest.java
index 25cb083..acc12c2 100644
--- a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/ipfinder/vm/TcpDiscoveryVmIpFinderSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/ipfinder/vm/TcpDiscoveryVmIpFinderSelfTest.java
@@ -223,6 +223,7 @@ public class TcpDiscoveryVmIpFinderSelfTest
Ignition.stop("client1", true);
Ignition.stop("client2", true);
+ Ignition.stop("client3", true);
assertEquals(3 * srvSize, IP_FINDER.getRegisteredAddresses().size());
@@ -237,12 +238,14 @@ public class TcpDiscoveryVmIpFinderSelfTest
Ignition.stop("server1", true);
Ignition.stop("server2", true);
- GridTestUtils.waitForCondition(new GridAbsPredicate() {
+ boolean res = GridTestUtils.waitForCondition(new GridAbsPredicate() {
@Override public boolean apply() {
- return 0 == G.allGrids().size();
+ return G.allGrids().isEmpty();
}
}, 10000);
+ assertTrue(res);
+
assertTrue(3 * srvSize >= IP_FINDER.getRegisteredAddresses().size());
}