You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by dp...@apache.org on 2018/05/24 12:51:24 UTC
[01/50] [abbrv] ignite git commit: IGNITE-8381 Fix for flaky failures
of testNodeSingletonDeploy in Basic 2 - Fixes #3996.
Repository: ignite
Updated Branches:
refs/heads/ignite-5789-1 3daf81286 -> fbf252ba7
IGNITE-8381 Fix for flaky failures of testNodeSingletonDeploy in Basic 2 - Fixes #3996.
Signed-off-by: dpavlov <dp...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/8f2eeee5
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/8f2eeee5
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/8f2eeee5
Branch: refs/heads/ignite-5789-1
Commit: 8f2eeee57b13a4e5b2dcc7d1b407f66a97d71169
Parents: fdad641
Author: Vyacheslav Daradur <da...@gmail.com>
Authored: Fri May 18 16:20:51 2018 +0300
Committer: dpavlov <dp...@apache.org>
Committed: Fri May 18 16:20:51 2018 +0300
----------------------------------------------------------------------
...gniteServiceConfigVariationsFullApiTest.java | 22 ++++++++++++++++----
1 file changed, 18 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/8f2eeee5/modules/core/src/test/java/org/apache/ignite/internal/processors/service/IgniteServiceConfigVariationsFullApiTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/service/IgniteServiceConfigVariationsFullApiTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/service/IgniteServiceConfigVariationsFullApiTest.java
index 453ddc0..825e561 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/service/IgniteServiceConfigVariationsFullApiTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/service/IgniteServiceConfigVariationsFullApiTest.java
@@ -36,6 +36,7 @@ import org.apache.ignite.internal.IgniteEx;
import org.apache.ignite.services.Service;
import org.apache.ignite.services.ServiceConfiguration;
import org.apache.ignite.services.ServiceContext;
+import org.apache.ignite.testframework.GridTestUtils;
import org.apache.ignite.testframework.configvariations.Parameters;
import org.apache.ignite.testframework.junits.IgniteConfigVariationsAbstractTest;
@@ -46,6 +47,9 @@ public class IgniteServiceConfigVariationsFullApiTest extends IgniteConfigVariat
/** Test service name. */
private static final String SERVICE_NAME = "testService";
+ /** Timeout to wait finish of a service's deployment. */
+ private static final long DEPLOYMENT_WAIT_TIMEOUT = 10_000L;
+
/** Test service name. */
private static final String CACHE_NAME = "testCache";
@@ -82,8 +86,11 @@ public class IgniteServiceConfigVariationsFullApiTest extends IgniteConfigVariat
*/
public void testNodeSingletonDeploy() throws Exception {
runInAllDataModes(new ServiceTestRunnable(true, new DeployClosure() {
- @Override public void run(IgniteServices services, String svcName, TestService svc) {
+ @Override public void run(IgniteServices services, String svcName, TestService svc) throws Exception {
services.deployNodeSingleton(svcName, (Service)svc);
+
+ // TODO: Waiting for deployment should be removed after IEP-17 completion
+ GridTestUtils.waitForCondition(() -> services.service(svcName) != null, DEPLOYMENT_WAIT_TIMEOUT);
}
}));
}
@@ -95,8 +102,11 @@ public class IgniteServiceConfigVariationsFullApiTest extends IgniteConfigVariat
*/
public void testClusterSingletonDeploy() throws Exception {
runInAllDataModes(new ServiceTestRunnable(false, new DeployClosure() {
- @Override public void run(IgniteServices services, String svcName, TestService svc) {
+ @Override public void run(IgniteServices services, String svcName, TestService svc) throws Exception {
services.deployClusterSingleton(svcName, (Service)svc);
+
+ // TODO: Waiting for deployment should be removed after IEP-17 completion
+ GridTestUtils.waitForCondition(() -> services.service(svcName) != null, DEPLOYMENT_WAIT_TIMEOUT);
}
}));
}
@@ -141,7 +151,7 @@ public class IgniteServiceConfigVariationsFullApiTest extends IgniteConfigVariat
*/
public void testDeploy() throws Exception {
runInAllDataModes(new ServiceTestRunnable(false, new DeployClosure() {
- @Override public void run(IgniteServices services, String svcName, TestService svc) {
+ @Override public void run(IgniteServices services, String svcName, TestService svc) throws Exception {
services.deployClusterSingleton(svcName, (Service)svc);
ServiceConfiguration cfg = new ServiceConfiguration();
@@ -157,6 +167,9 @@ public class IgniteServiceConfigVariationsFullApiTest extends IgniteConfigVariat
cfg.setNodeFilter(services.clusterGroup().predicate());
services.deploy(cfg);
+
+ // TODO: Waiting for deployment should be removed after IEP-17 completion
+ GridTestUtils.waitForCondition(() -> services.service(svcName) != null, DEPLOYMENT_WAIT_TIMEOUT);
}
}));
}
@@ -198,8 +211,9 @@ public class IgniteServiceConfigVariationsFullApiTest extends IgniteConfigVariat
* @param services Services.
* @param svcName Service name.
* @param svc Service.
+ * @throws Exception In case of an error.
*/
- void run(IgniteServices services, String svcName, TestService svc);
+ void run(IgniteServices services, String svcName, TestService svc) throws Exception;
}
/**
[31/50] [abbrv] ignite git commit: IGNITE-8556 Web Console: Relaxed
DEV mode for Webpack.
Posted by dp...@apache.org.
IGNITE-8556 Web Console: Relaxed DEV mode for Webpack.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/2be52953
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/2be52953
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/2be52953
Branch: refs/heads/ignite-5789-1
Commit: 2be529534e6cdbfe428ebe7f2c6952a4bd9c8066
Parents: e227f22
Author: Alexey Kuznetsov <ak...@apache.org>
Authored: Tue May 22 17:29:27 2018 +0700
Committer: Alexey Kuznetsov <ak...@apache.org>
Committed: Tue May 22 17:29:27 2018 +0700
----------------------------------------------------------------------
modules/web-console/frontend/webpack/webpack.dev.babel.js | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/2be52953/modules/web-console/frontend/webpack/webpack.dev.babel.js
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/webpack/webpack.dev.babel.js b/modules/web-console/frontend/webpack/webpack.dev.babel.js
index d17fbc7..f70d3a0 100644
--- a/modules/web-console/frontend/webpack/webpack.dev.babel.js
+++ b/modules/web-console/frontend/webpack/webpack.dev.babel.js
@@ -63,6 +63,9 @@ export default merge(commonCfg, {
]
},
devServer: {
+ headers: {
+ 'Content-Security-Policy': `script-src 'self' 'unsafe-inline' 'unsafe-eval' data: http: https:;`
+ },
compress: true,
historyApiFallback: true,
disableHostCheck: true,
@@ -78,7 +81,7 @@ export default merge(commonCfg, {
target: `http://localhost:${backendPort}`,
ws: true
},
- '/api/v1/*': {
+ '/api/*': {
target: `http://localhost:${backendPort}`
}
},
[23/50] [abbrv] ignite git commit: IGNITE-8544 Use exchange result
topology version for local wal state management. - Fixes #4039.
Posted by dp...@apache.org.
IGNITE-8544 Use exchange result topology version for local wal state management. - Fixes #4039.
Signed-off-by: Alexey Goncharuk <al...@gmail.com>
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/fe38f3e3
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/fe38f3e3
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/fe38f3e3
Branch: refs/heads/ignite-5789-1
Commit: fe38f3e389ed2cf9ccdf4146a7960a3375ee4d72
Parents: 028df98
Author: Pavel Kovalenko <jo...@gmail.com>
Authored: Mon May 21 22:33:50 2018 +0300
Committer: Alexey Goncharuk <al...@gmail.com>
Committed: Mon May 21 22:33:50 2018 +0300
----------------------------------------------------------------------
.../GridDhtPartitionsExchangeFuture.java | 2 +-
...lWalModeChangeDuringRebalancingSelfTest.java | 66 ++++++++++++++++++++
2 files changed, 67 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/fe38f3e3/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java
index 1b79b76..c62b067 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java
@@ -1723,7 +1723,7 @@ public class GridDhtPartitionsExchangeFuture extends GridDhtTopologyFutureAdapte
grp.topology().onExchangeDone(this, grp.affinity().readyAffinity(res), false);
}
- cctx.walState().changeLocalStatesOnExchangeDone(exchId.topologyVersion());
+ cctx.walState().changeLocalStatesOnExchangeDone(res);
}
if (super.onDone(res, err)) {
http://git-wip-us.apache.org/repos/asf/ignite/blob/fe38f3e3/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/LocalWalModeChangeDuringRebalancingSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/LocalWalModeChangeDuringRebalancingSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/LocalWalModeChangeDuringRebalancingSelfTest.java
index 07653f2..ca46a75 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/LocalWalModeChangeDuringRebalancingSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/LocalWalModeChangeDuringRebalancingSelfTest.java
@@ -24,10 +24,12 @@ import java.nio.MappedByteBuffer;
import java.nio.file.OpenOption;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.atomic.AtomicReference;
+import com.sun.org.apache.regexp.internal.RE;
import org.apache.ignite.Ignite;
import org.apache.ignite.IgniteCache;
import org.apache.ignite.IgniteException;
import org.apache.ignite.IgniteSystemProperties;
+import org.apache.ignite.cache.CacheMode;
import org.apache.ignite.cluster.ClusterNode;
import org.apache.ignite.configuration.CacheConfiguration;
import org.apache.ignite.configuration.DataRegionConfiguration;
@@ -49,6 +51,7 @@ import org.apache.ignite.spi.IgniteSpiException;
import org.apache.ignite.spi.communication.tcp.TcpCommunicationSpi;
import org.apache.ignite.testframework.GridTestUtils;
import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
+import org.junit.Assert;
/**
*
@@ -63,6 +66,9 @@ public class LocalWalModeChangeDuringRebalancingSelfTest extends GridCommonAbstr
/** */
private static final AtomicReference<CountDownLatch> fileIOLatch = new AtomicReference<>();
+ /** Replicated cache name. */
+ private static final String REPL_CACHE = "cache";
+
/** {@inheritDoc} */
@Override protected IgniteConfiguration getConfiguration(String igniteInstanceName) throws Exception {
IgniteConfiguration cfg = super.getConfiguration(igniteInstanceName);
@@ -83,7 +89,11 @@ public class LocalWalModeChangeDuringRebalancingSelfTest extends GridCommonAbstr
cfg.setCacheConfiguration(
new CacheConfiguration(DEFAULT_CACHE_NAME)
// Test checks internal state before and after rebalance, so it is configured to be triggered manually
+ .setRebalanceDelay(-1),
+
+ new CacheConfiguration(REPL_CACHE)
.setRebalanceDelay(-1)
+ .setCacheMode(CacheMode.REPLICATED)
);
cfg.setCommunicationSpi(new TcpCommunicationSpi() {
@@ -295,6 +305,62 @@ public class LocalWalModeChangeDuringRebalancingSelfTest extends GridCommonAbstr
}
/**
+ * Test that local WAL mode changing works well with exchanges merge.
+ *
+ * @throws Exception If failed.
+ */
+ public void testWithExchangesMerge() throws Exception {
+ final int nodeCnt = 5;
+ final int keyCnt = 10_000;
+
+ Ignite ignite = startGrids(nodeCnt);
+
+ ignite.cluster().active(true);
+
+ IgniteCache<Integer, Integer> cache = ignite.cache(REPL_CACHE);
+
+ for (int k = 0; k < keyCnt; k++)
+ cache.put(k, k);
+
+ stopGrid(2);
+ stopGrid(3);
+ stopGrid(4);
+
+ // Rewrite data to trigger further rebalance.
+ for (int k = 0; k < keyCnt; k++)
+ cache.put(k, k * 2);
+
+ // Start several grids in parallel to trigger exchanges merge.
+ startGridsMultiThreaded(2, 3);
+
+ for (int nodeIdx = 2; nodeIdx < nodeCnt; nodeIdx++) {
+ CacheGroupContext grpCtx = grid(nodeIdx).cachex(REPL_CACHE).context().group();
+
+ assertFalse(grpCtx.walEnabled());
+ }
+
+ // Invoke rebalance manually.
+ for (Ignite g : G.allGrids())
+ g.cache(REPL_CACHE).rebalance();
+
+ awaitPartitionMapExchange();
+
+ for (int nodeIdx = 2; nodeIdx < nodeCnt; nodeIdx++) {
+ CacheGroupContext grpCtx = grid(nodeIdx).cachex(REPL_CACHE).context().group();
+
+ assertTrue(grpCtx.walEnabled());
+ }
+
+ // Check no data loss.
+ for (int nodeIdx = 2; nodeIdx < nodeCnt; nodeIdx++) {
+ IgniteCache<Integer, Integer> cache0 = grid(nodeIdx).cache(REPL_CACHE);
+
+ for (int k = 0; k < keyCnt; k++)
+ Assert.assertEquals("nodeIdx=" + nodeIdx + ", key=" + k, (Integer) (2 * k), cache0.get(k));
+ }
+ }
+
+ /**
* @throws Exception If failed.
*/
public void testParallelExchangeDuringRebalance() throws Exception {
[48/50] [abbrv] ignite git commit: IGNITE-4958 Make data pages
recyclable into index/meta/etc pages and vice versa - Fixes #3780.
Posted by dp...@apache.org.
IGNITE-4958 Make data pages recyclable into index/meta/etc pages and vice versa - Fixes #3780.
Signed-off-by: Ivan Rakov <ir...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/0bdfa20c
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/0bdfa20c
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/0bdfa20c
Branch: refs/heads/ignite-5789-1
Commit: 0bdfa20cd393ea896a59f0fbd9270f8b8128dae6
Parents: 24cee46
Author: Dmitriy Sorokin <d....@gmail.com>
Authored: Thu May 24 01:56:01 2018 +0300
Committer: Ivan Rakov <ir...@apache.org>
Committed: Thu May 24 01:56:01 2018 +0300
----------------------------------------------------------------------
.../ignite/internal/pagemem/PageIdUtils.java | 5 +-
.../internal/pagemem/wal/record/WALRecord.java | 5 +-
.../wal/record/delta/RotatedIdPartRecord.java | 66 ++++++++
.../cache/persistence/DataStructure.java | 34 ++++-
.../persistence/freelist/AbstractFreeList.java | 104 ++++++++-----
.../cache/persistence/freelist/PagesList.java | 60 ++++++--
.../cache/persistence/tree/BPlusTree.java | 29 +---
.../cache/persistence/tree/io/PageIO.java | 35 ++++-
.../tree/reuse/LongListReuseBag.java | 46 ++++++
.../persistence/wal/record/RecordTypes.java | 1 +
.../wal/serializer/RecordDataV1Serializer.java | 24 +++
.../pagemem/impl/PageIdUtilsSelfTest.java | 3 +-
...ageEvictionPagesRecyclingAndReusingTest.java | 153 +++++++++++++++++++
.../pagemem/FillFactorMetricTest.java | 5 +-
.../IgniteCacheEvictionSelfTestSuite.java | 3 +
15 files changed, 479 insertions(+), 94 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/0bdfa20c/modules/core/src/main/java/org/apache/ignite/internal/pagemem/PageIdUtils.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/pagemem/PageIdUtils.java b/modules/core/src/main/java/org/apache/ignite/internal/pagemem/PageIdUtils.java
index 2754d79..1335269 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/pagemem/PageIdUtils.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/pagemem/PageIdUtils.java
@@ -184,7 +184,10 @@ public final class PageIdUtils {
* @return New page ID.
*/
public static long rotatePageId(long pageId) {
- long updatedRotationId = (pageId >> PAGE_IDX_SIZE + PART_ID_SIZE + FLAG_SIZE) + 1;
+ long updatedRotationId = (pageId >>> PAGE_IDX_SIZE + PART_ID_SIZE + FLAG_SIZE) + 1;
+
+ if (updatedRotationId > MAX_ITEMID_NUM)
+ updatedRotationId = 1; // We always want non-zero updatedRotationId
return (pageId & PAGE_ID_MASK) |
(updatedRotationId << (PAGE_IDX_SIZE + PART_ID_SIZE + FLAG_SIZE));
http://git-wip-us.apache.org/repos/asf/ignite/blob/0bdfa20c/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/WALRecord.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/WALRecord.java b/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/WALRecord.java
index 4fae179..52bd034 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/WALRecord.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/WALRecord.java
@@ -175,7 +175,10 @@ public abstract class WALRecord {
EXCHANGE,
/** Baseline topology record. */
- BASELINE_TOP_RECORD;
+ BASELINE_TOP_RECORD,
+
+ /** Rotated id part record. */
+ ROTATED_ID_PART_RECORD;
/** */
private static final RecordType[] VALS = RecordType.values();
http://git-wip-us.apache.org/repos/asf/ignite/blob/0bdfa20c/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/RotatedIdPartRecord.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/RotatedIdPartRecord.java b/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/RotatedIdPartRecord.java
new file mode 100644
index 0000000..24a45c6
--- /dev/null
+++ b/modules/core/src/main/java/org/apache/ignite/internal/pagemem/wal/record/delta/RotatedIdPartRecord.java
@@ -0,0 +1,66 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.internal.pagemem.wal.record.delta;
+
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.internal.pagemem.PageMemory;
+import org.apache.ignite.internal.processors.cache.persistence.tree.io.PageIO;
+import org.apache.ignite.internal.util.typedef.internal.S;
+
+/**
+ * Rotated (when page has been recycled) id part delta record.
+ */
+public class RotatedIdPartRecord extends PageDeltaRecord {
+ /** Rotated id part. */
+ private byte rotatedIdPart;
+
+ /**
+ * @param grpId Group id.
+ * @param pageId Page id.
+ * @param rotatedIdPart Rotated id part.
+ */
+ public RotatedIdPartRecord(int grpId, long pageId, int rotatedIdPart) {
+ super(grpId, pageId);
+
+ assert rotatedIdPart >= 0 && rotatedIdPart <= 0xFF;
+
+ this.rotatedIdPart = (byte) rotatedIdPart;
+ }
+
+ /** {@inheritDoc} */
+ @Override public void applyDelta(PageMemory pageMem, long pageAddr) throws IgniteCheckedException {
+ PageIO.setRotatedIdPart(pageAddr, rotatedIdPart);
+ }
+
+ /** {@inheritDoc} */
+ @Override public RecordType type() {
+ return RecordType.ROTATED_ID_PART_RECORD;
+ }
+
+ /**
+ * @return Rotated id part.
+ */
+ public byte rotatedIdPart() {
+ return rotatedIdPart;
+ }
+
+ /** {@inheritDoc} */
+ @Override public String toString() {
+ return S.toString(RotatedIdPartRecord.class, this, "super", super.toString());
+ }
+}
http://git-wip-us.apache.org/repos/asf/ignite/blob/0bdfa20c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/DataStructure.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/DataStructure.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/DataStructure.java
index 663a139..0177407 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/DataStructure.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/DataStructure.java
@@ -25,6 +25,7 @@ import org.apache.ignite.internal.pagemem.PageIdUtils;
import org.apache.ignite.internal.pagemem.PageMemory;
import org.apache.ignite.internal.pagemem.wal.IgniteWriteAheadLogManager;
import org.apache.ignite.internal.pagemem.wal.record.delta.RecycleRecord;
+import org.apache.ignite.internal.pagemem.wal.record.delta.RotatedIdPartRecord;
import org.apache.ignite.internal.processors.cache.persistence.tree.io.PageIO;
import org.apache.ignite.internal.processors.cache.persistence.tree.reuse.ReuseBag;
import org.apache.ignite.internal.processors.cache.persistence.tree.reuse.ReuseList;
@@ -36,6 +37,7 @@ import static org.apache.ignite.internal.pagemem.PageIdAllocator.FLAG_DATA;
import static org.apache.ignite.internal.pagemem.PageIdAllocator.FLAG_IDX;
import static org.apache.ignite.internal.pagemem.PageIdAllocator.INDEX_PARTITION;
import static org.apache.ignite.internal.pagemem.PageIdAllocator.MAX_PARTITION_ID;
+import static org.apache.ignite.internal.pagemem.PageIdUtils.MAX_ITEMID_NUM;
/**
* Base class for all the data structures based on {@link PageMemory}.
@@ -346,7 +348,7 @@ public abstract class DataStructure implements PageLockListener {
* @param page Page pointer.
* @param pageAddr Page address.
* @param walPlc Full page WAL record policy.
- * @return Rotated page ID.
+ * @return Recycled page ID.
* @throws IgniteCheckedException If failed.
*/
protected final long recyclePage(
@@ -354,14 +356,34 @@ public abstract class DataStructure implements PageLockListener {
long page,
long pageAddr,
Boolean walPlc) throws IgniteCheckedException {
- long rotated = PageIdUtils.rotatePageId(pageId);
+ long recycled = 0;
- PageIO.setPageId(pageAddr, rotated);
+ boolean needWalDeltaRecord = needWalDeltaRecord(pageId, page, walPlc);
- if (needWalDeltaRecord(pageId, page, walPlc))
- wal.log(new RecycleRecord(grpId, pageId, rotated));
+ if (PageIdUtils.tag(pageId) == FLAG_DATA) {
+ int rotatedIdPart = PageIO.getRotatedIdPart(pageAddr);
- return rotated;
+ if (rotatedIdPart != 0) {
+ recycled = PageIdUtils.link(pageId, rotatedIdPart > MAX_ITEMID_NUM ? 1 : rotatedIdPart);
+
+ PageIO.setRotatedIdPart(pageAddr, 0);
+
+ if (needWalDeltaRecord)
+ wal.log(new RotatedIdPartRecord(grpId, pageId, 0));
+ }
+ }
+
+ if (recycled == 0)
+ recycled = PageIdUtils.rotatePageId(pageId);
+
+ assert PageIdUtils.itemId(recycled) > 0 && PageIdUtils.itemId(recycled) <= MAX_ITEMID_NUM : U.hexLong(recycled);
+
+ PageIO.setPageId(pageAddr, recycled);
+
+ if (needWalDeltaRecord)
+ wal.log(new RecycleRecord(grpId, pageId, recycled));
+
+ return recycled;
}
/**
http://git-wip-us.apache.org/repos/asf/ignite/blob/0bdfa20c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/freelist/AbstractFreeList.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/freelist/AbstractFreeList.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/freelist/AbstractFreeList.java
index 5f5948d..c1a48bb 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/freelist/AbstractFreeList.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/freelist/AbstractFreeList.java
@@ -28,18 +28,18 @@ import org.apache.ignite.internal.pagemem.wal.record.delta.DataPageInsertFragmen
import org.apache.ignite.internal.pagemem.wal.record.delta.DataPageInsertRecord;
import org.apache.ignite.internal.pagemem.wal.record.delta.DataPageRemoveRecord;
import org.apache.ignite.internal.pagemem.wal.record.delta.DataPageUpdateRecord;
-import org.apache.ignite.internal.processors.cache.persistence.DataRegionMetricsImpl;
import org.apache.ignite.internal.processors.cache.persistence.DataRegion;
+import org.apache.ignite.internal.processors.cache.persistence.DataRegionMetricsImpl;
import org.apache.ignite.internal.processors.cache.persistence.Storable;
import org.apache.ignite.internal.processors.cache.persistence.evict.PageEvictionTracker;
import org.apache.ignite.internal.processors.cache.persistence.tree.io.AbstractDataPageIO;
import org.apache.ignite.internal.processors.cache.persistence.tree.io.DataPagePayload;
import org.apache.ignite.internal.processors.cache.persistence.tree.io.IOVersions;
import org.apache.ignite.internal.processors.cache.persistence.tree.io.PageIO;
+import org.apache.ignite.internal.processors.cache.persistence.tree.reuse.LongListReuseBag;
import org.apache.ignite.internal.processors.cache.persistence.tree.reuse.ReuseBag;
import org.apache.ignite.internal.processors.cache.persistence.tree.reuse.ReuseList;
import org.apache.ignite.internal.processors.cache.persistence.tree.util.PageHandler;
-import org.apache.ignite.internal.util.typedef.T2;
import org.apache.ignite.internal.util.typedef.internal.U;
/**
@@ -76,9 +76,6 @@ public abstract class AbstractFreeList<T extends Storable> extends PagesList imp
private final int MIN_SIZE_FOR_DATA_PAGE;
/** */
- private final int emptyDataPagesBucket;
-
- /** */
private final PageHandler<T, Boolean> updateRow = new UpdateRowHandler();
/** */
@@ -256,12 +253,12 @@ public abstract class AbstractFreeList<T extends Storable> extends PagesList imp
}
/** */
- private final PageHandler<Void, Long> rmvRow;
+ private final PageHandler<ReuseBag, Long> rmvRow;
/**
*
*/
- private final class RemoveRowHandler extends PageHandler<Void, Long> {
+ private final class RemoveRowHandler extends PageHandler<ReuseBag, Long> {
/** Indicates whether partition ID should be masked from page ID. */
private final boolean maskPartId;
@@ -277,7 +274,7 @@ public abstract class AbstractFreeList<T extends Storable> extends PagesList imp
long pageAddr,
PageIO iox,
Boolean walPlc,
- Void ignored,
+ ReuseBag reuseBag,
int itemId)
throws IgniteCheckedException {
AbstractDataPageIO<T> io = (AbstractDataPageIO<T>)iox;
@@ -296,21 +293,27 @@ public abstract class AbstractFreeList<T extends Storable> extends PagesList imp
if (newFreeSpace > MIN_PAGE_FREE_SPACE) {
int newBucket = bucket(newFreeSpace, false);
- if (oldFreeSpace > MIN_PAGE_FREE_SPACE) {
+ boolean putIsNeeded = oldFreeSpace <= MIN_PAGE_FREE_SPACE;
+
+ if (!putIsNeeded) {
int oldBucket = bucket(oldFreeSpace, false);
if (oldBucket != newBucket) {
// It is possible that page was concurrently taken for put, in this case put will handle bucket change.
pageId = maskPartId ? PageIdUtils.maskPartitionId(pageId) : pageId;
- if (removeDataPage(pageId, page, pageAddr, io, oldBucket))
- put(null, pageId, page, pageAddr, newBucket);
+
+ putIsNeeded = removeDataPage(pageId, page, pageAddr, io, oldBucket);
}
}
- else
- put(null, pageId, page, pageAddr, newBucket);
- if (io.isEmpty(pageAddr))
+ if (io.isEmpty(pageAddr)) {
evictionTracker.forgetPage(pageId);
+
+ if (putIsNeeded)
+ reuseBag.addFreePage(recyclePage(pageId, page, pageAddr, null));
+ }
+ else if (putIsNeeded)
+ put(null, pageId, page, pageAddr, newBucket);
}
// For common case boxed 0L will be cached inside of Long, so no garbage will be produced.
@@ -365,8 +368,6 @@ public abstract class AbstractFreeList<T extends Storable> extends PagesList imp
this.memMetrics = memMetrics;
- emptyDataPagesBucket = bucket(MIN_SIZE_FOR_DATA_PAGE, false);
-
init(metaPageId, initNew);
}
@@ -473,44 +474,63 @@ public abstract class AbstractFreeList<T extends Storable> extends PagesList imp
if (written != 0)
memMetrics.incrementLargeEntriesPages();
- int freeSpace = Math.min(MIN_SIZE_FOR_DATA_PAGE, rowSize - written);
+ int remaining = rowSize - written;
long pageId = 0L;
- if (freeSpace == MIN_SIZE_FOR_DATA_PAGE)
- pageId = takeEmptyPage(emptyDataPagesBucket, ioVersions());
-
- boolean reuseBucket = false;
-
- // TODO: properly handle reuse bucket.
- if (pageId == 0L) {
- for (int b = bucket(freeSpace, false) + 1; b < BUCKETS - 1; b++) {
- pageId = takeEmptyPage(b, ioVersions());
-
- if (pageId != 0L) {
- reuseBucket = isReuseBucket(b);
+ for (int b = remaining < MIN_SIZE_FOR_DATA_PAGE ? bucket(remaining, false) + 1 : REUSE_BUCKET; b < BUCKETS; b++) {
+ pageId = takeEmptyPage(b, ioVersions());
- break;
- }
- }
+ if (pageId != 0L)
+ break;
}
- boolean allocated = pageId == 0L;
+ AbstractDataPageIO<T> initIo = null;
- if (allocated)
+ if (pageId == 0L) {
pageId = allocateDataPage(row.partition());
+
+ initIo = ioVersions().latest();
+ }
+ else if (PageIdUtils.tag(pageId) != PageIdAllocator.FLAG_DATA)
+ pageId = initReusedPage(pageId, row.partition());
else
pageId = PageIdUtils.changePartitionId(pageId, (row.partition()));
- AbstractDataPageIO<T> init = reuseBucket || allocated ? ioVersions().latest() : null;
-
- written = write(pageId, writeRow, init, row, written, FAIL_I);
+ written = write(pageId, writeRow, initIo, row, written, FAIL_I);
assert written != FAIL_I; // We can't fail here.
}
while (written != COMPLETE);
}
+ /**
+ * @param reusedPageId Reused page id.
+ * @param partId Partition id.
+ * @return Prepared page id.
+ *
+ * @see PagesList#initReusedPage(long, long, long, int, byte, PageIO)
+ */
+ private long initReusedPage(long reusedPageId, int partId) throws IgniteCheckedException {
+ long reusedPage = acquirePage(reusedPageId);
+ try {
+ long reusedPageAddr = writeLock(reusedPageId, reusedPage);
+
+ assert reusedPageAddr != 0;
+
+ try {
+ return initReusedPage(reusedPageId, reusedPage, reusedPageAddr,
+ partId, PageIdAllocator.FLAG_DATA, ioVersions().latest());
+ }
+ finally {
+ writeUnlock(reusedPageId, reusedPage, reusedPageAddr, true);
+ }
+ }
+ finally {
+ releasePage(reusedPageId, reusedPage);
+ }
+ }
+
/** {@inheritDoc} */
@Override public boolean updateDataRow(long link, T row) throws IgniteCheckedException {
assert link != 0;
@@ -532,7 +552,9 @@ public abstract class AbstractFreeList<T extends Storable> extends PagesList imp
long pageId = PageIdUtils.pageId(link);
int itemId = PageIdUtils.itemId(link);
- long nextLink = write(pageId, rmvRow, itemId, FAIL_L);
+ ReuseBag bag = new LongListReuseBag();
+
+ long nextLink = write(pageId, rmvRow, bag, itemId, FAIL_L);
assert nextLink != FAIL_L; // Can't fail here.
@@ -542,10 +564,12 @@ public abstract class AbstractFreeList<T extends Storable> extends PagesList imp
itemId = PageIdUtils.itemId(nextLink);
pageId = PageIdUtils.pageId(nextLink);
- nextLink = write(pageId, rmvRow, itemId, FAIL_L);
+ nextLink = write(pageId, rmvRow, bag, itemId, FAIL_L);
assert nextLink != FAIL_L; // Can't fail here.
}
+
+ reuseList.addForRecycle(bag);
}
/** {@inheritDoc} */
@@ -567,7 +591,7 @@ public abstract class AbstractFreeList<T extends Storable> extends PagesList imp
* @return Number of empty data pages in free list.
*/
public int emptyDataPages() {
- return bucketsSize[emptyDataPagesBucket].intValue();
+ return bucketsSize[REUSE_BUCKET].intValue();
}
/** {@inheritDoc} */
http://git-wip-us.apache.org/repos/asf/ignite/blob/0bdfa20c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/freelist/PagesList.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/freelist/PagesList.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/freelist/PagesList.java
index ed77674..905507e 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/freelist/PagesList.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/freelist/PagesList.java
@@ -35,6 +35,7 @@ import org.apache.ignite.internal.pagemem.wal.record.delta.PagesListInitNewPageR
import org.apache.ignite.internal.pagemem.wal.record.delta.PagesListRemovePageRecord;
import org.apache.ignite.internal.pagemem.wal.record.delta.PagesListSetNextRecord;
import org.apache.ignite.internal.pagemem.wal.record.delta.PagesListSetPreviousRecord;
+import org.apache.ignite.internal.pagemem.wal.record.delta.RotatedIdPartRecord;
import org.apache.ignite.internal.processors.cache.persistence.DataStructure;
import org.apache.ignite.internal.processors.cache.persistence.freelist.io.PagesListMetaIO;
import org.apache.ignite.internal.processors.cache.persistence.freelist.io.PagesListNodeIO;
@@ -55,6 +56,7 @@ import static java.lang.Boolean.FALSE;
import static java.lang.Boolean.TRUE;
import static org.apache.ignite.internal.pagemem.PageIdAllocator.FLAG_DATA;
import static org.apache.ignite.internal.pagemem.PageIdAllocator.FLAG_IDX;
+import static org.apache.ignite.internal.pagemem.PageIdUtils.MAX_ITEMID_NUM;
import static org.apache.ignite.internal.processors.cache.persistence.tree.io.PageIO.getPageId;
/**
@@ -855,6 +857,8 @@ public abstract class PagesList extends DataStructure {
try {
while ((nextId = bag.pollFreePage()) != 0L) {
+ assert PageIdUtils.itemId(nextId) > 0 && PageIdUtils.itemId(nextId) <= MAX_ITEMID_NUM : U.hexLong(nextId);
+
int idx = io.addPage(prevAddr, nextId, pageSize());
if (idx == -1) { // Attempt to add page failed: the node page is full.
@@ -1070,6 +1074,10 @@ public abstract class PagesList extends DataStructure {
dirty = true;
+ assert !isReuseBucket(bucket) ||
+ PageIdUtils.itemId(pageId) > 0 && PageIdUtils.itemId(pageId) <= MAX_ITEMID_NUM
+ : "Incorrectly recycled pageId in reuse bucket: " + U.hexLong(pageId);
+
dataPageId = pageId;
if (io.isEmpty(tailAddr)) {
@@ -1108,18 +1116,8 @@ public abstract class PagesList extends DataStructure {
decrementBucketSize(bucket);
- if (initIoVers != null) {
- dataPageId = PageIdUtils.changeType(tailId, FLAG_DATA);
-
- PageIO initIo = initIoVers.latest();
-
- initIo.initNewPage(tailAddr, dataPageId, pageSize());
-
- if (needWalDeltaRecord(tailId, tailPage, null)) {
- wal.log(new InitNewPageRecord(grpId, tailId, initIo.getType(),
- initIo.getVersion(), dataPageId));
- }
- }
+ if (initIoVers != null)
+ dataPageId = initReusedPage(tailId, tailPage, tailAddr, 0, FLAG_DATA, initIoVers.latest());
else
dataPageId = recyclePage(tailId, tailPage, tailAddr, null);
@@ -1151,6 +1149,44 @@ public abstract class PagesList extends DataStructure {
}
/**
+ * Reused page must obtain correctly assembled page id, then initialized by proper {@link PageIO} instance
+ * and non-zero {@code itemId} of reused page id must be saved into special place.
+ *
+ * @param reusedPageId Reused page id.
+ * @param reusedPage Reused page.
+ * @param reusedPageAddr Reused page address.
+ * @param partId Partition id.
+ * @param flag Flag.
+ * @param initIo Initial io.
+ * @return Prepared page id.
+ */
+ protected final long initReusedPage(long reusedPageId, long reusedPage, long reusedPageAddr,
+ int partId, byte flag, PageIO initIo) throws IgniteCheckedException {
+
+ long newPageId = PageIdUtils.pageId(partId, flag, PageIdUtils.pageIndex(reusedPageId));
+
+ initIo.initNewPage(reusedPageAddr, newPageId, pageSize());
+
+ boolean needWalDeltaRecord = needWalDeltaRecord(reusedPageId, reusedPage, null);
+
+ if (needWalDeltaRecord) {
+ wal.log(new InitNewPageRecord(grpId, reusedPageId, initIo.getType(),
+ initIo.getVersion(), newPageId));
+ }
+
+ int itemId = PageIdUtils.itemId(reusedPageId);
+
+ if (itemId != 0) {
+ PageIO.setRotatedIdPart(reusedPageAddr, itemId);
+
+ if (needWalDeltaRecord)
+ wal.log(new RotatedIdPartRecord(grpId, newPageId, itemId));
+ }
+
+ return newPageId;
+ }
+
+ /**
* @param dataId Data page ID.
* @param dataPage Data page pointer.
* @param dataAddr Data page address.
http://git-wip-us.apache.org/repos/asf/ignite/blob/0bdfa20c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/tree/BPlusTree.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/tree/BPlusTree.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/tree/BPlusTree.java
index 4d05095..e30de5a 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/tree/BPlusTree.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/tree/BPlusTree.java
@@ -17,7 +17,6 @@
package org.apache.ignite.internal.processors.cache.persistence.tree;
-import java.io.Externalizable;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
@@ -50,6 +49,7 @@ import org.apache.ignite.internal.processors.cache.persistence.tree.io.BPlusLeaf
import org.apache.ignite.internal.processors.cache.persistence.tree.io.BPlusMetaIO;
import org.apache.ignite.internal.processors.cache.persistence.tree.io.IOVersions;
import org.apache.ignite.internal.processors.cache.persistence.tree.io.PageIO;
+import org.apache.ignite.internal.processors.cache.persistence.tree.reuse.LongListReuseBag;
import org.apache.ignite.internal.processors.cache.persistence.tree.reuse.ReuseBag;
import org.apache.ignite.internal.processors.cache.persistence.tree.reuse.ReuseList;
import org.apache.ignite.internal.processors.cache.persistence.tree.util.PageHandler;
@@ -2156,7 +2156,7 @@ public abstract class BPlusTree<L, T extends L> extends DataStructure implements
if (reuseList == null)
return -1;
- DestroyBag bag = new DestroyBag();
+ LongListReuseBag bag = new LongListReuseBag();
long pagesCnt = 0;
@@ -4836,31 +4836,6 @@ public abstract class BPlusTree<L, T extends L> extends DataStructure implements
}
/**
- * Reuse bag for destroy.
- */
- protected static final class DestroyBag extends GridLongList implements ReuseBag {
- /** */
- private static final long serialVersionUID = 0L;
-
- /**
- * Default constructor for {@link Externalizable}.
- */
- public DestroyBag() {
- // No-op.
- }
-
- /** {@inheritDoc} */
- @Override public void addFreePage(long pageId) {
- add(pageId);
- }
-
- /** {@inheritDoc} */
- @Override public long pollFreePage() {
- return isEmpty() ? 0 : remove();
- }
- }
-
- /**
*
*/
private static class TreeMetaData {
http://git-wip-us.apache.org/repos/asf/ignite/blob/0bdfa20c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/tree/io/PageIO.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/tree/io/PageIO.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/tree/io/PageIO.java
index c940c39..4534bb5 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/tree/io/PageIO.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/tree/io/PageIO.java
@@ -109,16 +109,25 @@ public abstract class PageIO {
public static final int PAGE_ID_OFF = CRC_OFF + 4;
/** */
- private static final int RESERVED_1_OFF = PAGE_ID_OFF + 8;
+ public static final int ROTATED_ID_PART_OFF = PAGE_ID_OFF + 8;
/** */
- private static final int RESERVED_2_OFF = RESERVED_1_OFF + 8;
+ private static final int RESERVED_BYTE_OFF = ROTATED_ID_PART_OFF + 1;
+
+ /** */
+ private static final int RESERVED_SHORT_OFF = RESERVED_BYTE_OFF + 1;
+
+ /** */
+ private static final int RESERVED_INT_OFF = RESERVED_SHORT_OFF + 2;
+
+ /** */
+ private static final int RESERVED_2_OFF = RESERVED_INT_OFF + 4;
/** */
private static final int RESERVED_3_OFF = RESERVED_2_OFF + 8;
/** */
- public static final int COMMON_HEADER_END = RESERVED_3_OFF + 8; // 40=type(2)+ver(2)+crc(4)+pageId(8)+reserved(3*8)
+ public static final int COMMON_HEADER_END = RESERVED_3_OFF + 8; // 40=type(2)+ver(2)+crc(4)+pageId(8)+rotatedIdPart(1)+reserved(1+2+4+2*8)
/* All the page types. */
@@ -301,6 +310,24 @@ public abstract class PageIO {
/**
* @param pageAddr Page address.
+ * @return Rotated page ID part.
+ */
+ public static int getRotatedIdPart(long pageAddr) {
+ return PageUtils.getUnsignedByte(pageAddr, ROTATED_ID_PART_OFF);
+ }
+
+ /**
+ * @param pageAddr Page address.
+ * @param rotatedIdPart Rotated page ID part.
+ */
+ public static void setRotatedIdPart(long pageAddr, int rotatedIdPart) {
+ PageUtils.putUnsignedByte(pageAddr, ROTATED_ID_PART_OFF, rotatedIdPart);
+
+ assert getRotatedIdPart(pageAddr) == rotatedIdPart;
+ }
+
+ /**
+ * @param pageAddr Page address.
* @return Checksum.
*/
public static int getCrc(long pageAddr) {
@@ -415,7 +442,7 @@ public abstract class PageIO {
setPageId(pageAddr, pageId);
setCrc(pageAddr, 0);
- PageUtils.putLong(pageAddr, RESERVED_1_OFF, 0L);
+ PageUtils.putLong(pageAddr, ROTATED_ID_PART_OFF, 0L); // 1 + reserved(1+2+4)
PageUtils.putLong(pageAddr, RESERVED_2_OFF, 0L);
PageUtils.putLong(pageAddr, RESERVED_3_OFF, 0L);
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/0bdfa20c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/tree/reuse/LongListReuseBag.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/tree/reuse/LongListReuseBag.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/tree/reuse/LongListReuseBag.java
new file mode 100644
index 0000000..415c603
--- /dev/null
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/tree/reuse/LongListReuseBag.java
@@ -0,0 +1,46 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.internal.processors.cache.persistence.tree.reuse;
+
+import java.io.Externalizable;
+import org.apache.ignite.internal.util.GridLongList;
+
+/**
+ * {@link GridLongList}-based reuse bag.
+ */
+public final class LongListReuseBag extends GridLongList implements ReuseBag {
+ /** */
+ private static final long serialVersionUID = 0L;
+
+ /**
+ * Default constructor for {@link Externalizable}.
+ */
+ public LongListReuseBag() {
+ // No-op.
+ }
+
+ /** {@inheritDoc} */
+ @Override public void addFreePage(long pageId) {
+ add(pageId);
+ }
+
+ /** {@inheritDoc} */
+ @Override public long pollFreePage() {
+ return isEmpty() ? 0 : remove();
+ }
+}
http://git-wip-us.apache.org/repos/asf/ignite/blob/0bdfa20c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/wal/record/RecordTypes.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/wal/record/RecordTypes.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/wal/record/RecordTypes.java
index 9654748..1807d1d 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/wal/record/RecordTypes.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/wal/record/RecordTypes.java
@@ -65,5 +65,6 @@ public final class RecordTypes {
DELTA_TYPE_SET.add(WALRecord.RecordType.PAGE_LIST_META_RESET_COUNT_RECORD);
DELTA_TYPE_SET.add(WALRecord.RecordType.DATA_PAGE_UPDATE_RECORD);
DELTA_TYPE_SET.add(WALRecord.RecordType.BTREE_META_PAGE_INIT_ROOT2);
+ DELTA_TYPE_SET.add(WALRecord.RecordType.ROTATED_ID_PART_RECORD);
}
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/0bdfa20c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/wal/serializer/RecordDataV1Serializer.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/wal/serializer/RecordDataV1Serializer.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/wal/serializer/RecordDataV1Serializer.java
index e8d116b..f433d26 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/wal/serializer/RecordDataV1Serializer.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/wal/serializer/RecordDataV1Serializer.java
@@ -73,6 +73,7 @@ import org.apache.ignite.internal.pagemem.wal.record.delta.PartitionMetaStateRec
import org.apache.ignite.internal.pagemem.wal.record.delta.RecycleRecord;
import org.apache.ignite.internal.pagemem.wal.record.delta.RemoveRecord;
import org.apache.ignite.internal.pagemem.wal.record.delta.ReplaceRecord;
+import org.apache.ignite.internal.pagemem.wal.record.delta.RotatedIdPartRecord;
import org.apache.ignite.internal.pagemem.wal.record.delta.SplitExistingPageRecord;
import org.apache.ignite.internal.pagemem.wal.record.delta.SplitForwardPageRecord;
import org.apache.ignite.internal.pagemem.wal.record.delta.TrackingPageDeltaRecord;
@@ -286,6 +287,9 @@ public class RecordDataV1Serializer implements RecordDataSerializer {
case PAGE_LIST_META_RESET_COUNT_RECORD:
return /*cacheId*/ 4 + /*pageId*/ 8;
+ case ROTATED_ID_PART_RECORD:
+ return 4 + 8 + 1;
+
case SWITCH_SEGMENT_RECORD:
return 0;
@@ -835,6 +839,16 @@ public class RecordDataV1Serializer implements RecordDataSerializer {
res = new PageListMetaResetCountRecord(cacheId, pageId);
break;
+ case ROTATED_ID_PART_RECORD:
+ cacheId = in.readInt();
+ pageId = in.readLong();
+
+ byte rotatedIdPart = in.readByte();
+
+ res = new RotatedIdPartRecord(cacheId, pageId, rotatedIdPart);
+
+ break;
+
case SWITCH_SEGMENT_RECORD:
throw new EOFException("END OF SEGMENT");
@@ -1351,6 +1365,16 @@ public class RecordDataV1Serializer implements RecordDataSerializer {
break;
+ case ROTATED_ID_PART_RECORD:
+ RotatedIdPartRecord rotatedIdPartRecord = (RotatedIdPartRecord) rec;
+
+ buf.putInt(rotatedIdPartRecord.groupId());
+ buf.putLong(rotatedIdPartRecord.pageId());
+
+ buf.put(rotatedIdPartRecord.rotatedIdPart());
+
+ break;
+
case TX_RECORD:
txRecordSerializer.write((TxRecord)rec, buf);
http://git-wip-us.apache.org/repos/asf/ignite/blob/0bdfa20c/modules/core/src/test/java/org/apache/ignite/internal/pagemem/impl/PageIdUtilsSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/pagemem/impl/PageIdUtilsSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/pagemem/impl/PageIdUtilsSelfTest.java
index 2984067..8b41944 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/pagemem/impl/PageIdUtilsSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/pagemem/impl/PageIdUtilsSelfTest.java
@@ -34,7 +34,8 @@ public class PageIdUtilsSelfTest extends GridCommonAbstractTest {
assertEquals(0x0102FFFFFFFFFFFFL, PageIdUtils.rotatePageId(0x0002FFFFFFFFFFFFL));
assertEquals(0x0B02FFFFFFFFFFFFL, PageIdUtils.rotatePageId(0x0A02FFFFFFFFFFFFL));
assertEquals(0x1002FFFFFFFFFFFFL, PageIdUtils.rotatePageId(0x0F02FFFFFFFFFFFFL));
- assertEquals(0x0002FFFFFFFFFFFFL, PageIdUtils.rotatePageId(0xFF02FFFFFFFFFFFFL));
+ assertEquals(0x0102FFFFFFFFFFFFL, PageIdUtils.rotatePageId(0xFE02FFFFFFFFFFFFL));
+ assertEquals(0x0102FFFFFFFFFFFFL, PageIdUtils.rotatePageId(0xFF02FFFFFFFFFFFFL));
}
/**
http://git-wip-us.apache.org/repos/asf/ignite/blob/0bdfa20c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/paged/PageEvictionPagesRecyclingAndReusingTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/paged/PageEvictionPagesRecyclingAndReusingTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/paged/PageEvictionPagesRecyclingAndReusingTest.java
new file mode 100644
index 0000000..9c777fb
--- /dev/null
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/paged/PageEvictionPagesRecyclingAndReusingTest.java
@@ -0,0 +1,153 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.internal.processors.cache.eviction.paged;
+
+import java.util.Random;
+import org.apache.ignite.IgniteCache;
+import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.cache.CacheAtomicityMode;
+import org.apache.ignite.cache.CacheMode;
+import org.apache.ignite.cache.CacheWriteSynchronizationMode;
+import org.apache.ignite.configuration.CacheConfiguration;
+import org.apache.ignite.configuration.DataPageEvictionMode;
+import org.apache.ignite.configuration.IgniteConfiguration;
+import org.apache.ignite.internal.IgniteEx;
+import org.apache.ignite.internal.processors.cache.persistence.tree.reuse.ReuseList;
+
+/**
+ *
+ */
+public class PageEvictionPagesRecyclingAndReusingTest extends PageEvictionAbstractTest {
+ /** Test timeout. */
+ private static final long TEST_TIMEOUT = 10 * 60 * 1000;
+
+ /** Number of small entries. */
+ private static final int SMALL_ENTRIES = ENTRIES * 10;
+
+ /** {@inheritDoc} */
+ @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception {
+ return setEvictionMode(DataPageEvictionMode.RANDOM_LRU, super.getConfiguration(gridName));
+ }
+
+ /** {@inheritDoc} */
+ @Override protected void afterTest() throws Exception {
+ stopAllGrids();
+ }
+
+ /** {@inheritDoc} */
+ @Override protected long getTestTimeout() {
+ return TEST_TIMEOUT;
+ }
+
+ /**
+ * @throws Exception If failed.
+ */
+ public void testPagesRecyclingAndReusingAtomicReplicated() throws Exception {
+ testPagesRecyclingAndReusing(CacheAtomicityMode.ATOMIC, CacheMode.REPLICATED);
+ }
+
+ /**
+ * @throws Exception If failed.
+ */
+ public void testPagesRecyclingAndReusingAtomicLocal() throws Exception {
+ testPagesRecyclingAndReusing(CacheAtomicityMode.ATOMIC, CacheMode.LOCAL);
+ }
+
+ /**
+ * @throws Exception If failed.
+ */
+ public void testPagesRecyclingAndReusingTxReplicated() throws Exception {
+ testPagesRecyclingAndReusing(CacheAtomicityMode.TRANSACTIONAL, CacheMode.REPLICATED);
+ }
+
+ /**
+ * @throws Exception If failed.
+ */
+ public void testPagesRecyclingAndReusingTxLocal() throws Exception {
+ testPagesRecyclingAndReusing(CacheAtomicityMode.TRANSACTIONAL, CacheMode.LOCAL);
+ }
+
+ /**
+ * @param atomicityMode Atomicity mode.
+ * @param cacheMode Cache mode.
+ */
+ private void testPagesRecyclingAndReusing(CacheAtomicityMode atomicityMode, CacheMode cacheMode) throws Exception {
+ IgniteEx ignite = startGrid(0);
+
+ CacheConfiguration<Object, Object> cfg = cacheConfig("evict-fair", null, cacheMode, atomicityMode,
+ CacheWriteSynchronizationMode.PRIMARY_SYNC);
+
+ IgniteCache<Object, Object> cache = ignite(0).getOrCreateCache(cfg);
+
+ ReuseList reuseList = ignite.context().cache().context().database().reuseList(null);
+
+ putRemoveCycles(cache, reuseList);
+
+ long recycledPagesCnt1 = reuseList.recycledPagesCount();
+
+ putRemoveCycles(cache, reuseList);
+
+ long recycledPagesCnt2 = reuseList.recycledPagesCount();
+
+ assert recycledPagesCnt1 == recycledPagesCnt2 : "Possible recycled pages leak!";
+ }
+
+ /**
+ * @param cache Cache.
+ * @param reuseList Reuse list.
+ */
+ private void putRemoveCycles(IgniteCache<Object, Object> cache, ReuseList reuseList) throws IgniteCheckedException {
+ for (int i = 1; i <= ENTRIES; i++) {
+ cache.put(i, new TestObject(PAGE_SIZE / 4 - 50));
+
+ if (i % (ENTRIES / 10) == 0)
+ System.out.println(">>> Entries put: " + i);
+ }
+
+ System.out.println("### Recycled pages count: " + reuseList.recycledPagesCount());
+
+ for (int i = 1; i <= ENTRIES; i++) {
+ cache.remove(i);
+
+ if (i % (ENTRIES / 10) == 0)
+ System.out.println(">>> Entries removed: " + i);
+ }
+
+ System.out.println("### Recycled pages count: " + reuseList.recycledPagesCount());
+
+ Random rnd = new Random();
+
+ for (int i = 1; i <= SMALL_ENTRIES; i++) {
+ cache.put(i, rnd.nextInt());
+
+ if (i % (SMALL_ENTRIES / 10) == 0)
+ System.out.println(">>> Small entries put: " + i);
+ }
+
+ System.out.println("### Recycled pages count: " + reuseList.recycledPagesCount());
+
+ for (int i = 1; i <= SMALL_ENTRIES; i++) {
+ cache.remove(i);
+
+ if (i % (SMALL_ENTRIES / 10) == 0)
+ System.out.println(">>> Small entries removed: " + i);
+ }
+
+ System.out.println("### Recycled pages count: " + reuseList.recycledPagesCount());
+ }
+}
http://git-wip-us.apache.org/repos/asf/ignite/blob/0bdfa20c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/pagemem/FillFactorMetricTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/pagemem/FillFactorMetricTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/pagemem/FillFactorMetricTest.java
index cdea7bc..42eaf36 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/pagemem/FillFactorMetricTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/pagemem/FillFactorMetricTest.java
@@ -202,9 +202,10 @@ public class FillFactorMetricTest extends GridCommonAbstractTest {
// Wait for cache to be cleared
clearFut.get();
- // Fill factor will typically be 0.8, occupied pages mostly partition metadata
+ // Since refactoring of AbstractFreeList with recycling empty data pages,
+ // fill factor after cache cleaning will about 0.99, no more obsolete typically value 0.8
for (float fillFactor : curFillFactor)
- assertTrue("FillFactor too high: " + fillFactor, fillFactor < 0.85);
+ assertTrue("FillFactor too low: " + fillFactor, fillFactor > 0.9);
}
doneFlag.set(true);
http://git-wip-us.apache.org/repos/asf/ignite/blob/0bdfa20c/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheEvictionSelfTestSuite.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheEvictionSelfTestSuite.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheEvictionSelfTestSuite.java
index 1d4fdf7..f2ac1c0 100644
--- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheEvictionSelfTestSuite.java
+++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheEvictionSelfTestSuite.java
@@ -38,6 +38,7 @@ import org.apache.ignite.internal.processors.cache.eviction.lru.LruNearOnlyNearE
import org.apache.ignite.internal.processors.cache.eviction.paged.PageEvictionDataStreamerTest;
import org.apache.ignite.internal.processors.cache.eviction.paged.PageEvictionMetricTest;
import org.apache.ignite.internal.processors.cache.eviction.paged.PageEvictionMultinodeMixedRegionsTest;
+import org.apache.ignite.internal.processors.cache.eviction.paged.PageEvictionPagesRecyclingAndReusingTest;
import org.apache.ignite.internal.processors.cache.eviction.paged.PageEvictionReadThroughTest;
import org.apache.ignite.internal.processors.cache.eviction.paged.PageEvictionTouchOrderTest;
import org.apache.ignite.internal.processors.cache.eviction.paged.Random2LruNearEnabledPageEvictionMultinodeTest;
@@ -94,6 +95,8 @@ public class IgniteCacheEvictionSelfTestSuite extends TestSuite {
suite.addTest(new TestSuite(PageEvictionMetricTest.class));
+ suite.addTest(new TestSuite(PageEvictionPagesRecyclingAndReusingTest.class));
+
return suite;
}
}
[11/50] [abbrv] ignite git commit: IGNITE-8054 serialize only
valuable part of GridLongList - Fixes #3748.
Posted by dp...@apache.org.
IGNITE-8054 serialize only valuable part of GridLongList - Fixes #3748.
Signed-off-by: dpavlov <dp...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/d0e26beb
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/d0e26beb
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/d0e26beb
Branch: refs/heads/ignite-5789-1
Commit: d0e26bebb42efb8bb49ef7c802fe086b06473c48
Parents: 381448e
Author: Alexander Menshikov <sh...@gmail.com>
Authored: Mon May 21 13:01:47 2018 +0300
Committer: dpavlov <dp...@apache.org>
Committed: Mon May 21 13:01:47 2018 +0300
----------------------------------------------------------------------
.../main/java/org/apache/ignite/internal/util/GridLongList.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/d0e26beb/modules/core/src/main/java/org/apache/ignite/internal/util/GridLongList.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/GridLongList.java b/modules/core/src/main/java/org/apache/ignite/internal/util/GridLongList.java
index 09fb098..d1f20e6 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/GridLongList.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/GridLongList.java
@@ -530,7 +530,7 @@ public class GridLongList implements Message, Externalizable {
switch (writer.state()) {
case 0:
- if (!writer.writeLongArray("arr", arr))
+ if (!writer.writeLongArray("arr", arr, idx))
return false;
writer.incrementState();
[27/50] [abbrv] ignite git commit: IGNITE-8537 Web Console:
Proof-reading texts.
Posted by dp...@apache.org.
IGNITE-8537 Web Console: Proof-reading texts.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/a44c54ca
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/a44c54ca
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/a44c54ca
Branch: refs/heads/ignite-5789-1
Commit: a44c54caa2941661e4e42051b3b1a64345a23338
Parents: 00a330a
Author: Alexey Kuznetsov <ak...@apache.org>
Authored: Tue May 22 15:47:57 2018 +0700
Committer: Alexey Kuznetsov <ak...@apache.org>
Committed: Tue May 22 15:47:57 2018 +0700
----------------------------------------------------------------------
.../page-forgot-password/template.pug | 2 +-
.../app/components/page-landing/template.pug | 20 ++++++++++----------
.../helpers/jade/form/form-field-feedback.pug | 2 +-
.../helpers/jade/form/form-field-password.pug | 2 +-
.../app/helpers/jade/form/form-field-text.pug | 2 +-
5 files changed, 14 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/a44c54ca/modules/web-console/frontend/app/components/page-forgot-password/template.pug
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/app/components/page-forgot-password/template.pug b/modules/web-console/frontend/app/components/page-forgot-password/template.pug
index 2532959..58a8f7e 100644
--- a/modules/web-console/frontend/app/components/page-forgot-password/template.pug
+++ b/modules/web-console/frontend/app/components/page-forgot-password/template.pug
@@ -24,7 +24,7 @@ web-console-header
section
- const form = '$ctrl.form'
h3 Forgot password?
- p That's ok! Simply enter your email below and a reset password link will be sent to you via email. You can then follow that link and select a new password.
+ p Enter the email address for your account & we'll email you a link to reset your password.
form(name=form novalidate ng-submit='$ctrl.remindPassword()')
+form-field__email({
label: 'Email:',
http://git-wip-us.apache.org/repos/asf/ignite/blob/a44c54ca/modules/web-console/frontend/app/components/page-landing/template.pug
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/app/components/page-landing/template.pug b/modules/web-console/frontend/app/components/page-landing/template.pug
index 7b5b1cc..0fc1f9c 100644
--- a/modules/web-console/frontend/app/components/page-landing/template.pug
+++ b/modules/web-console/frontend/app/components/page-landing/template.pug
@@ -25,7 +25,7 @@ section.intro-container-wrapper
.col-lg-6.col-md-6.col-sm-6.col-xs-12.intro-content
h1 Web Console
h2 An Interactive Configuration Wizard and Management Tool for Apache™ Ignite®
- p It provides an interactive configuration wizard which helps you create and download configuration files and code snippets for your Apache Ignite projects. Additionally, the tool allows you to automatically load SQL metadata from any RDBMS, run SQL queries on your in-memory cache as well as view execution plans, in-memory schema, and streaming charts.
+ p It provides an interactive configuration wizard which helps you create and download configuration files and code snippets for your Apache Ignite projects. Additionally, the tool allows you to automatically load SQL metadata from any RDBMS, run SQL queries on your in-memory cache, and view execution plans, in-memory schema, and streaming charts.
a#signup_show.btn.btn-lg.btn-primary.btn-custom(ui-sref='signup') Sign Up
.col-lg-6.col-md-6.col-sm-6.col-xs-12
ui-carousel(slides='$ctrl.images' autoplay='true' slides-to-show='1' arrows='false')
@@ -33,33 +33,33 @@ section.intro-container-wrapper
img(ng-src='{{item}}')
section.features-container-wrapper
.container.features-container
- .section-title Web Console allows you to:
+ .section-title The Web Console allows you to:
.row
.col-lg-6.col-md-6.col-sm-6.col-xs-12.feature
.col-lg-2.col-md-2.col-sm-2.col-xs-2
i.fa.fa-sitemap
.col-lg-9.col-md-9.col-sm-9.col-xs-9
- h3 Configure Apache Ignite Clusters and Caches
- p The Web Console configuration wizard takes you through a step-by-step process to define all of your required configuration parameters. The system then generates a ready-to-use project with all of the required config files for you.
+ h3 Configure Apache Ignite clusters and caches
+ p The Web Console configuration wizard takes you through a step-by-step process that helps you define all the required configuration parameters. The system then generates a ready-to-use project with all the required config files.
.col-lg-6.col-md-6.col-sm-6.col-xs-12.feature
.col-lg-2.col-md-2.col-sm-2.col-xs-2
i.fa.fa-search
.col-lg-9.col-md-9.col-sm-9.col-xs-9
- h3 Run Free Form SQL Queries on #[br] Apache Ignite Caches
- p By connecting The Web Console to your Apache Ignite cluster, you can execute SQL queries on your in-memory cache. You can also view the execution plan, in-memory schema, and streaming charts for your cluster.
+ h3 Run free-form SQL queries on #[br] Apache Ignite caches
+ p By connecting the Web Console to your Apache Ignite cluster, you can execute SQL queries on your in-memory cache. You can also view the execution plan, in-memory schema, and streaming charts for your cluster.
.row
.col-lg-6.col-md-6.col-sm-6.col-xs-12.feature
.col-lg-2.col-md-2.col-sm-2.col-xs-2
i.fa.fa-database
.col-lg-9.col-md-9.col-sm-9.col-xs-9
- h3 Import Database Schemas from #[br] Virtually Any RDBMS
- p To speed the creation of your configuration files, The Web Console allows you to automatically import the database schema from any current RDBMS. and Apache Ignite support virtually any RDBMS including Oracle, SAP, MySQL, PostgreSQL and many more.
+ h3 Import database schemas from #[br] virtually any RDBMS
+ p To speed the creation of your configuration files, the Web Console allows you to automatically import the database schema from virtually any RDBMS including Oracle, SAP, MySQL, PostgreSQL, and many more.
.col-lg-6.col-md-6.col-sm-6.col-xs-12.feature
.col-lg-2.col-md-2.col-sm-2.col-xs-2
i.fa.fa-gears
.col-lg-9.col-md-9.col-sm-9.col-xs-9
- h3 Manage The Web Console users
- p With The Web Console you can have accounts with different roles.
+ h3 Manage the Web Console users
+ p The Web Console allows you to have accounts with different roles.
.align-center.text-center
a.btn.btn-lg.btn-primary.btn-custom(ui-sref='signup') Get Started
http://git-wip-us.apache.org/repos/asf/ignite/blob/a44c54ca/modules/web-console/frontend/app/helpers/jade/form/form-field-feedback.pug
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/app/helpers/jade/form/form-field-feedback.pug b/modules/web-console/frontend/app/helpers/jade/form/form-field-feedback.pug
index 2fa0a3c..dcdcf0e 100644
--- a/modules/web-console/frontend/app/helpers/jade/form/form-field-feedback.pug
+++ b/modules/web-console/frontend/app/helpers/jade/form/form-field-feedback.pug
@@ -15,4 +15,4 @@
limitations under the License.
mixin form-field-feedback(name, error, message)
- div(ng-message=error) #{message}
\ No newline at end of file
+ div(ng-message=error) #{message}
http://git-wip-us.apache.org/repos/asf/ignite/blob/a44c54ca/modules/web-console/frontend/app/helpers/jade/form/form-field-password.pug
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/app/helpers/jade/form/form-field-password.pug b/modules/web-console/frontend/app/helpers/jade/form/form-field-password.pug
index 6de29c8..3e35974 100644
--- a/modules/web-console/frontend/app/helpers/jade/form/form-field-password.pug
+++ b/modules/web-console/frontend/app/helpers/jade/form/form-field-password.pug
@@ -44,4 +44,4 @@ mixin ignite-form-field-password(label, model, name, disabled, required, placeho
if block
block
- +form-field-feedback(name, 'required', `${errLbl} could not be empty!`)
\ No newline at end of file
+ +form-field-feedback(name, 'required', `${errLbl} could not be empty!`)
http://git-wip-us.apache.org/repos/asf/ignite/blob/a44c54ca/modules/web-console/frontend/app/helpers/jade/form/form-field-text.pug
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/app/helpers/jade/form/form-field-text.pug b/modules/web-console/frontend/app/helpers/jade/form/form-field-text.pug
index d1c6491..3d28e17 100644
--- a/modules/web-console/frontend/app/helpers/jade/form/form-field-text.pug
+++ b/modules/web-console/frontend/app/helpers/jade/form/form-field-text.pug
@@ -50,4 +50,4 @@ mixin ignite-form-field-text(lbl, model, name, disabled, required, placeholder,
mixin sane-ignite-form-field-text({label, model, name, disabled, required, placeholder, tip})
+ignite-form-field-text(label, model, name, disabled, required, placeholder, tip)&attributes(attributes)
if block
- block
\ No newline at end of file
+ block
[36/50] [abbrv] ignite git commit: IGNITE-8501 Retry on
GridServiceNotFoundException in GridServiceProxy needs to be fixed - Fixes
#4004.
Posted by dp...@apache.org.
IGNITE-8501 Retry on GridServiceNotFoundException in GridServiceProxy needs to be fixed - Fixes #4004.
Signed-off-by: Ivan Rakov <ir...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/7c2fe647
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/7c2fe647
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/7c2fe647
Branch: refs/heads/ignite-5789-1
Commit: 7c2fe6472ecaa940ded38649d0a40abea99f383f
Parents: ce8e31e
Author: Stanislav Lukyanov <st...@gmail.com>
Authored: Tue May 22 16:43:45 2018 +0300
Committer: Ivan Rakov <ir...@apache.org>
Committed: Tue May 22 16:43:45 2018 +0300
----------------------------------------------------------------------
.../processors/service/GridServiceProxy.java | 22 +++++--
...GridServiceProxyClientReconnectSelfTest.java | 62 +++++++++++++++++++-
2 files changed, 78 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/7c2fe647/modules/core/src/main/java/org/apache/ignite/internal/processors/service/GridServiceProxy.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/service/GridServiceProxy.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/service/GridServiceProxy.java
index c5a2cee..eb75a5b 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/service/GridServiceProxy.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/service/GridServiceProxy.java
@@ -206,13 +206,25 @@ public class GridServiceProxy<T> implements Serializable {
throw e;
}
catch (IgniteCheckedException e) {
- // Rethrow original service method exception so that calling user code can handle it correctly.
- ServiceProxyException svcProxyE = X.cause(e, ServiceProxyException.class);
+ // Check if ignorable exceptions are in the cause chain.
+ Throwable ignorableCause = X.cause(e, GridServiceNotFoundException.class);
- if (svcProxyE != null)
- throw svcProxyE.getCause();
+ if (ignorableCause == null)
+ ignorableCause = X.cause(e, ClusterTopologyCheckedException.class);
- throw U.convertException(e);
+ if (ignorableCause != null) {
+ if (log.isDebugEnabled())
+ log.debug("Service was not found or topology changed (will retry): " + ignorableCause.getMessage());
+ }
+ else {
+ // Rethrow original service method exception so that calling user code can handle it correctly.
+ ServiceProxyException svcProxyE = X.cause(e, ServiceProxyException.class);
+
+ if (svcProxyE != null)
+ throw svcProxyE.getCause();
+
+ throw U.convertException(e);
+ }
}
catch (Exception e) {
throw new IgniteException(e);
http://git-wip-us.apache.org/repos/asf/ignite/blob/7c2fe647/modules/core/src/test/java/org/apache/ignite/internal/processors/service/GridServiceProxyClientReconnectSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/service/GridServiceProxyClientReconnectSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/service/GridServiceProxyClientReconnectSelfTest.java
index d2fda2f..5fdcdc4 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/service/GridServiceProxyClientReconnectSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/service/GridServiceProxyClientReconnectSelfTest.java
@@ -82,13 +82,49 @@ public class GridServiceProxyClientReconnectSelfTest extends GridCommonAbstractT
startGrid("server");
- assert latch.await(10, TimeUnit.SECONDS);
+ assertTrue(latch.await(10, TimeUnit.SECONDS));
client.services().deployClusterSingleton("my-service", new MyServiceImpl());
assertEquals(42, proxy.hello());
}
+
+ /**
+ * @throws Exception If failed.
+ */
+ public void testClientReconnectLongServiceInit() throws Exception {
+ startGrid("server");
+
+ Ignite client = startGrid("client");
+
+ client.services().deployClusterSingleton("my-service", new MyLongInitServiceImpl());
+
+ MyService proxy = client.services().serviceProxy("my-service", MyService.class, false);
+
+ assertEquals(9001, proxy.hello());
+
+ final CountDownLatch latch = new CountDownLatch(1);
+
+ client.events().localListen(new IgnitePredicate<Event>() {
+ @Override public boolean apply(Event event) {
+ latch.countDown();
+
+ return true;
+ }
+ }, EventType.EVT_CLIENT_NODE_RECONNECTED);
+
+ stopGrid("server");
+
+ startGrid("server");
+
+ assertTrue(latch.await(10, TimeUnit.SECONDS));
+
+ client.services().deployClusterSingleton("my-service", new MyLongInitServiceImpl());
+
+ assertEquals(9001, proxy.hello());
+ }
+
/**
*/
private interface MyService extends Service {
@@ -121,4 +157,28 @@ public class GridServiceProxyClientReconnectSelfTest extends GridCommonAbstractT
// No-op.
}
}
+
+ /**
+ */
+ private static class MyLongInitServiceImpl implements MyService {
+ /** {@inheritDoc} */
+ @Override public int hello() {
+ return 9001;
+ }
+
+ /** {@inheritDoc} */
+ @Override public void cancel(ServiceContext ctx) {
+ // No-op.
+ }
+
+ /** {@inheritDoc} */
+ @Override public void init(ServiceContext ctx) throws Exception {
+ Thread.sleep(5_000);
+ }
+
+ /** {@inheritDoc} */
+ @Override public void execute(ServiceContext ctx) throws Exception {
+ // No-op.
+ }
+ }
}
[32/50] [abbrv] ignite git commit: IGNITE-8557 Web Console: Added
support for SVG images.
Posted by dp...@apache.org.
IGNITE-8557 Web Console: Added support for SVG images.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/306f7786
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/306f7786
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/306f7786
Branch: refs/heads/ignite-5789-1
Commit: 306f778689e8a05a1487724a50d8ae61b8e4f5c4
Parents: 2be5295
Author: Dmitriy Shabalin <dm...@gmail.com>
Authored: Tue May 22 18:00:20 2018 +0700
Committer: Alexey Kuznetsov <ak...@apache.org>
Committed: Tue May 22 18:00:20 2018 +0700
----------------------------------------------------------------------
modules/web-console/frontend/webpack/webpack.common.js | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/306f7786/modules/web-console/frontend/webpack/webpack.common.js
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/webpack/webpack.common.js b/modules/web-console/frontend/webpack/webpack.common.js
index 3b9aef0..452206a 100644
--- a/modules/web-console/frontend/webpack/webpack.common.js
+++ b/modules/web-console/frontend/webpack/webpack.common.js
@@ -128,11 +128,16 @@ export default {
loader: 'file?name=assets/fonts/[name].[ext]'
},
{
- test: /.*\.svg$/,
+ test: /^(?:(?!url\.svg$).)*\.svg$/,
include: [contentBase, IgniteModules],
use: ['svg-sprite-loader']
},
{
+ test: /.*\.url\.svg$/,
+ include: [contentBase, IgniteModules],
+ loader: 'file?name=assets/fonts/[name].[ext]'
+ },
+ {
test: /\.(jpe?g|png|gif)$/i,
loader: 'file?name=assets/images/[name].[hash].[ext]'
},
[09/50] [abbrv] ignite git commit: IGNITE-8488 Web Console: Fixed
scrolling issues in bs-select-menu.
Posted by dp...@apache.org.
http://git-wip-us.apache.org/repos/asf/ignite/blob/381448ea/modules/web-console/frontend/package-lock.json
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/package-lock.json b/modules/web-console/frontend/package-lock.json
index c966cb7..31347f9 100644
--- a/modules/web-console/frontend/package-lock.json
+++ b/modules/web-console/frontend/package-lock.json
@@ -8,12 +8,16 @@
"version": "2.2.1",
"resolved": "https://registry.npmjs.org/@mrmlnc/readdir-enhanced/-/readdir-enhanced-2.2.1.tgz",
"integrity": "sha512-bPHp6Ji8b41szTOcaP63VlnbbO5Ny6dwAATtY6JTjh5N2OLrb5Qk/Th5cRkRQhkWCt+EJsYrNB0MiL+Gpn6e3g==",
- "dev": true,
"requires": {
- "call-me-maybe": "1.0.1",
- "glob-to-regexp": "0.3.0"
+ "call-me-maybe": "^1.0.1",
+ "glob-to-regexp": "^0.3.0"
}
},
+ "@nodelib/fs.stat": {
+ "version": "1.0.2",
+ "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-1.0.2.tgz",
+ "integrity": "sha512-vCpf75JDcdomXvUd7Rn6DfYAVqPAFI66FVjxiWGwh85OLdvfo3paBoPJaam5keIYRyUolnS7SleS/ZPCidCvzw=="
+ },
"@posthtml/esm": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/@posthtml/esm/-/esm-1.0.0.tgz",
@@ -25,9 +29,9 @@
"integrity": "sha512-ONhaKPIufzzrlNbqtWFFd+jlnemX6lJAgq9ZeiZtS7I1PIf/la7CW4m83rTXRnVnsMbW2k56pGYu7AUFJD9Pow=="
},
"@types/angular": {
- "version": "1.6.43",
- "resolved": "https://registry.npmjs.org/@types/angular/-/angular-1.6.43.tgz",
- "integrity": "sha512-3GrHCRZS62ruJjHMtOx3WYsS0I8i0FRcIqOwqIfWXnlR9g2FebEhUNdMk3LZIvfhZ08xe+S1x2iwP1t9vKCHag==",
+ "version": "1.6.45",
+ "resolved": "https://registry.npmjs.org/@types/angular/-/angular-1.6.45.tgz",
+ "integrity": "sha512-eXm3F/z2j8lVq7yBLL2G8QAygzYAboIJbJ46g26t71hgPtlxV9ibEJIBNj4KxCIZf7DcQo/KSnqaQ/0D9Rx2GA==",
"dev": true
},
"@types/angular-animate": {
@@ -36,7 +40,7 @@
"integrity": "sha512-kRUrLBKCBNQQUMGf4OIEe3MchzWVVyLFvRDkQ4f3aUc+FAUabRmQeATRY8CZpSD7Lcw3efKIKzWsmm7Aenfy5A==",
"dev": true,
"requires": {
- "@types/angular": "1.6.43"
+ "@types/angular": "*"
}
},
"@types/angular-mocks": {
@@ -45,7 +49,7 @@
"integrity": "sha512-C8ipXVKQvw+w64kH97Npa3a7uZB7ZL9Kr4+sOe33oYIyxeg09M8bzAWCIYCmPRRV0px6ozFTZeSVjBXDikz2zw==",
"dev": true,
"requires": {
- "@types/angular": "1.6.43"
+ "@types/angular": "*"
}
},
"@types/angular-strap": {
@@ -54,20 +58,20 @@
"integrity": "sha512-PIIQbwgbxHRHeZ5sfGwjKG9PL2P6zh7KVt+V4lkHlNZSQctxRmu2fd0wfAurnwTnC0l+6SdgL+KEIghe7GOjYw==",
"dev": true,
"requires": {
- "@types/angular": "1.6.43"
+ "@types/angular": "*"
}
},
"@types/babel-types": {
- "version": "7.0.1",
- "resolved": "https://registry.npmjs.org/@types/babel-types/-/babel-types-7.0.1.tgz",
- "integrity": "sha512-EkcOk09rjhivbovP8WreGRbXW20YRfe/qdgXOGq3it3u3aAOWDRNsQhL/XPAWFF7zhZZ+uR+nT+3b+TCkIap1w=="
+ "version": "7.0.2",
+ "resolved": "https://registry.npmjs.org/@types/babel-types/-/babel-types-7.0.2.tgz",
+ "integrity": "sha512-ylggu8DwwxT6mk3jVoJeohWAePWMNWEYm06MSoJ19kwp3hT9eY2Z4NNZn3oevzgFmClgNQ2GQF500hPDvNsGHg=="
},
"@types/babylon": {
"version": "6.16.2",
"resolved": "https://registry.npmjs.org/@types/babylon/-/babylon-6.16.2.tgz",
"integrity": "sha512-+Jty46mPaWe1VAyZbfvgJM4BAdklLWxrT5tc/RjvCgLrtk6gzRY6AOnoWFv4p6hVxhJshDdr2hGVn56alBp97Q==",
"requires": {
- "@types/babel-types": "7.0.1"
+ "@types/babel-types": "*"
}
},
"@types/chai": {
@@ -77,15 +81,15 @@
"dev": true
},
"@types/jquery": {
- "version": "3.3.1",
- "resolved": "https://registry.npmjs.org/@types/jquery/-/jquery-3.3.1.tgz",
- "integrity": "sha512-N3h+rzN518yl2xKrW0o6KKdNmWZ+OwG6SoM5TBEQFF0tTv5wXPEsoOuYQ2Kt3/89XbcSZUJLdjiT/2c3BR/ApQ==",
+ "version": "3.3.2",
+ "resolved": "https://registry.npmjs.org/@types/jquery/-/jquery-3.3.2.tgz",
+ "integrity": "sha512-ByZwKSEqteAta4VrIalqGJZmMq9lWPD3H3f5Xs6RR8B7zQRDPGUtjoKBYNtKTz/7LgBEQMdlxVbbjQfUaEIItA==",
"dev": true
},
"@types/lodash": {
- "version": "4.14.107",
- "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.107.tgz",
- "integrity": "sha512-afvjfP2rl3yvtv2qrCRN23zIQcDinF+munMJCoHEw2BXF22QJogTlVfNPTACQ6ieDyA6VnyKT4WLuN/wK368ng==",
+ "version": "4.14.109",
+ "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.109.tgz",
+ "integrity": "sha512-hop8SdPUEzbcJm6aTsmuwjIYQo1tqLseKCM+s2bBqTU2gErwI4fE+aqUVOlscPSQbKHKgtMMPoC+h4AIGOJYvw==",
"dev": true
},
"@types/mocha": {
@@ -95,15 +99,15 @@
"dev": true
},
"@types/node": {
- "version": "9.6.6",
- "resolved": "https://registry.npmjs.org/@types/node/-/node-9.6.6.tgz",
- "integrity": "sha512-SJe0g5cZeGNDP5sD8mIX3scb+eq8LQQZ60FXiKZHipYSeEFZ5EKml+NNMiO76F74TY4PoMWlNxF/YRY40FOvZQ==",
+ "version": "10.1.2",
+ "resolved": "https://registry.npmjs.org/@types/node/-/node-10.1.2.tgz",
+ "integrity": "sha512-bjk1RIeZBCe/WukrFToIVegOf91Pebr8cXYBwLBIsfiGWVQ+ifwWsT59H3RxrWzWrzd1l/Amk1/ioY5Fq3/bpA==",
"dev": true
},
"@types/sinon": {
- "version": "4.3.1",
- "resolved": "https://registry.npmjs.org/@types/sinon/-/sinon-4.3.1.tgz",
- "integrity": "sha512-DK4YtH30I67k4klURIBS4VAe1aBISfS9lgNlHFkibSmKem2tLQc5VkKoJreT3dCJAd+xRyCS8bx1o97iq3yUVg==",
+ "version": "4.3.3",
+ "resolved": "https://registry.npmjs.org/@types/sinon/-/sinon-4.3.3.tgz",
+ "integrity": "sha512-Tt7w/ylBS/OEAlSCwzB0Db1KbxnkycP/1UkQpbvKFYoUuRn4uYsC3xh5TRPrOjTy0i8TIkSz1JdNL4GPVdf3KQ==",
"dev": true
},
"@types/tapable": {
@@ -118,7 +122,7 @@
"integrity": "sha512-o8hU2+4xsyGC27Vujoklvxl88Ew5zmJuTBYMX1Uro2rYUt4HEFJKL6fuq8aGykvS+ssIsIzerWWP2DRxonownQ==",
"dev": true,
"requires": {
- "source-map": "0.6.1"
+ "source-map": "^0.6.1"
},
"dependencies": {
"source-map": {
@@ -135,20 +139,20 @@
"integrity": "sha512-xOe0ySy+PlaBf1lD9VQY9KRT3zpegDb80ivTj9lzwaQA4/mnA4tk9aFJQu4eKdKlivczA91WzFR53SyPCyTQvg==",
"dev": true,
"requires": {
- "@types/angular": "1.6.43",
- "@types/jquery": "3.3.1"
+ "@types/angular": "*",
+ "@types/jquery": "*"
}
},
"@types/webpack": {
- "version": "4.1.3",
- "resolved": "https://registry.npmjs.org/@types/webpack/-/webpack-4.1.3.tgz",
- "integrity": "sha512-NoGVTCumOsyFfuy3934f3ktiJi+wcXHJFxT47tby3iCpuo6M/WjFA9VqT5bYO+FE46i3R0N00RpJX75HxHKDaQ==",
+ "version": "4.4.0",
+ "resolved": "https://registry.npmjs.org/@types/webpack/-/webpack-4.4.0.tgz",
+ "integrity": "sha512-G7TXt4IRP7NTQO8R8QyDN7YwkQzlxjiKhA+z7W5FvkGbK7kIdOUtW2e7AE2w33Q10uphyG+vr8pfRy7wBWLmsA==",
"dev": true,
"requires": {
- "@types/node": "9.6.6",
- "@types/tapable": "1.0.2",
- "@types/uglify-js": "3.0.2",
- "source-map": "0.6.1"
+ "@types/node": "*",
+ "@types/tapable": "*",
+ "@types/uglify-js": "*",
+ "source-map": "^0.6.0"
},
"dependencies": {
"source-map": {
@@ -165,34 +169,34 @@
"integrity": "sha512-VdmNuYIvIouYlCI73NLKOE1pOVAxv5m5eupvTemojZz9dqghoQXmeEveI6CqeuWpCH6x6FLp6+tXM2sls20/MA==",
"dev": true,
"requires": {
- "@types/webpack": "4.1.3"
+ "@types/webpack": "*"
}
},
"@uirouter/angularjs": {
- "version": "1.0.15",
- "resolved": "https://registry.npmjs.org/@uirouter/angularjs/-/angularjs-1.0.15.tgz",
- "integrity": "sha512-qV+fz+OV5WRNNCXfeVO7nEcSSNESXOxLC0lXM9sv+IwTW6gyiynZ2wHP7fP2ETbr20sPxtbFC+kMVLzyiw/yIg==",
+ "version": "1.0.18",
+ "resolved": "https://registry.npmjs.org/@uirouter/angularjs/-/angularjs-1.0.18.tgz",
+ "integrity": "sha512-tswhwMMBDnbGOZnnCVpnA0pbd7dXkBck1HO0WY7fw8GO3dKbWAAc/rL0479dLypR89UDDGym5leTvZCLW4cJnA==",
"requires": {
- "@uirouter/core": "5.0.17"
+ "@uirouter/core": "5.0.19"
}
},
"@uirouter/core": {
- "version": "5.0.17",
- "resolved": "https://registry.npmjs.org/@uirouter/core/-/core-5.0.17.tgz",
- "integrity": "sha512-aJOSpaRbctGw24Mh74sonLwCyskl7KzFz7M0jRDqrd+eHZK6s/xxi4ZSNuGHRy6kF4x7195buQSJEo7u82t+rA=="
+ "version": "5.0.19",
+ "resolved": "https://registry.npmjs.org/@uirouter/core/-/core-5.0.19.tgz",
+ "integrity": "sha512-wow+CKRThUAQkiTLNQCBsKQIU3NbH8GGH/w/TrcjKdvkZQA2jQB9QSqmmZxj7XNoZXY7QVcSSc4DWmxuSeAWmQ=="
},
"@uirouter/rx": {
"version": "0.4.5",
"resolved": "https://registry.npmjs.org/@uirouter/rx/-/rx-0.4.5.tgz",
"integrity": "sha512-lfYfNE1n9At5Sl7if73XT6iqHKBz0ZQhVbvQ6WZ8zjnBDGEjvIK03IgIYI/YudJmQd1t5my/WSt5+Bygbhw/Mw==",
"requires": {
- "rollup": "0.41.6",
- "rollup-plugin-commonjs": "8.4.1",
- "rollup-plugin-node-resolve": "3.3.0",
- "rollup-plugin-progress": "0.2.1",
- "rollup-plugin-sourcemaps": "0.4.2",
- "rollup-plugin-uglify": "1.0.2",
- "rollup-plugin-visualizer": "0.2.1"
+ "rollup": "^0.41.6",
+ "rollup-plugin-commonjs": "^8.0.2",
+ "rollup-plugin-node-resolve": "^3.0.0",
+ "rollup-plugin-progress": "^0.2.1",
+ "rollup-plugin-sourcemaps": "^0.4.2",
+ "rollup-plugin-uglify": "^1.0.2",
+ "rollup-plugin-visualizer": "^0.2.1"
}
},
"@uirouter/visualizer": {
@@ -200,9 +204,9 @@
"resolved": "https://registry.npmjs.org/@uirouter/visualizer/-/visualizer-4.0.2.tgz",
"integrity": "sha512-95T0g9HHAjEa+sqwzfSbF6HxBG3shp2oTeGvqYk3VcLEHzrgNopEKJojd+3GNcVznQ+MUAaX4EDHXrzaHKJT6Q==",
"requires": {
- "d3-hierarchy": "1.1.6",
- "d3-interpolate": "1.1.6",
- "preact": "7.2.1"
+ "d3-hierarchy": "^1.0.3",
+ "d3-interpolate": "^1.1.3",
+ "preact": "^7.2.0"
}
},
"JSONStream": {
@@ -211,8 +215,8 @@
"integrity": "sha1-wQI3G27Dp887hHygDCC7D85Mbeo=",
"dev": true,
"requires": {
- "jsonparse": "1.3.1",
- "through": "2.3.8"
+ "jsonparse": "^1.2.0",
+ "through": ">=2.2.7 <3"
}
},
"abbrev": {
@@ -225,7 +229,7 @@
"resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.5.tgz",
"integrity": "sha1-63d99gEXI6OxTopywIBcjoZ0a9I=",
"requires": {
- "mime-types": "2.1.18",
+ "mime-types": "~2.1.18",
"negotiator": "0.6.1"
}
},
@@ -239,7 +243,7 @@
"resolved": "https://registry.npmjs.org/acorn-dynamic-import/-/acorn-dynamic-import-3.0.0.tgz",
"integrity": "sha512-zVWV8Z8lislJoOKKqdNMOB+s6+XV5WERty8MnKBeFgwA+19XJjJHs2RP5dzM57FftIs+jQnRToLiWazKr6sSWg==",
"requires": {
- "acorn": "5.5.3"
+ "acorn": "^5.0.0"
}
},
"acorn-globals": {
@@ -247,7 +251,7 @@
"resolved": "https://registry.npmjs.org/acorn-globals/-/acorn-globals-3.1.0.tgz",
"integrity": "sha1-/YJw9x+7SZawBPqIDuXUZXOnMb8=",
"requires": {
- "acorn": "4.0.13"
+ "acorn": "^4.0.4"
},
"dependencies": {
"acorn": {
@@ -262,7 +266,7 @@
"resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-3.0.1.tgz",
"integrity": "sha1-r9+UiPsezvyDSPb7IvRk4ypYs2s=",
"requires": {
- "acorn": "3.3.0"
+ "acorn": "^3.0.4"
},
"dependencies": {
"acorn": {
@@ -278,22 +282,29 @@
"integrity": "sha512-efP54n3d1aLfjL2UMdaXa6DsswwzJeI5rqhbFvXMrKiJ6eJFpf+7R0zN7t8IC+XKn2YOAFAv6xbBNgHUkoHWLw==",
"dev": true,
"requires": {
- "acorn": "5.5.3",
- "xtend": "4.0.1"
+ "acorn": "^5.4.1",
+ "xtend": "^4.0.1"
}
},
+ "addressparser": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/addressparser/-/addressparser-1.0.1.tgz",
+ "integrity": "sha1-R6++GiqSYhkdtoOOT9HTm0CCF0Y=",
+ "dev": true,
+ "optional": true
+ },
"adjust-sourcemap-loader": {
"version": "1.2.0",
"resolved": "https://registry.npmjs.org/adjust-sourcemap-loader/-/adjust-sourcemap-loader-1.2.0.tgz",
"integrity": "sha512-958oaHHVEXMvsY7v7cC5gEkNIcoaAVIhZ4mBReYVZJOTP9IgKmzLjIOhTtzpLMu+qriXvLsVjJ155EeInp45IQ==",
"requires": {
- "assert": "1.4.1",
- "camelcase": "1.2.1",
- "loader-utils": "1.1.0",
- "lodash.assign": "4.2.0",
- "lodash.defaults": "3.1.2",
- "object-path": "0.9.2",
- "regex-parser": "2.2.9"
+ "assert": "^1.3.0",
+ "camelcase": "^1.2.1",
+ "loader-utils": "^1.1.0",
+ "lodash.assign": "^4.0.1",
+ "lodash.defaults": "^3.1.2",
+ "object-path": "^0.9.2",
+ "regex-parser": "^2.2.9"
},
"dependencies": {
"lodash.defaults": {
@@ -301,8 +312,8 @@
"resolved": "https://registry.npmjs.org/lodash.defaults/-/lodash.defaults-3.1.2.tgz",
"integrity": "sha1-xzCLGNv4vJNy1wGnNJPGEZK9Liw=",
"requires": {
- "lodash.assign": "3.2.0",
- "lodash.restparam": "3.6.1"
+ "lodash.assign": "^3.0.0",
+ "lodash.restparam": "^3.0.0"
},
"dependencies": {
"lodash.assign": {
@@ -310,9 +321,9 @@
"resolved": "https://registry.npmjs.org/lodash.assign/-/lodash.assign-3.2.0.tgz",
"integrity": "sha1-POnwI0tLIiPilrj6CsH+6OvKZPo=",
"requires": {
- "lodash._baseassign": "3.2.0",
- "lodash._createassigner": "3.1.1",
- "lodash.keys": "3.1.2"
+ "lodash._baseassign": "^3.0.0",
+ "lodash._createassigner": "^3.0.0",
+ "lodash.keys": "^3.0.0"
}
}
}
@@ -324,30 +335,39 @@
"resolved": "https://registry.npmjs.org/after/-/after-0.8.2.tgz",
"integrity": "sha1-/ts5T58OAqqXaOcCvaI7UF+ufh8="
},
+ "agent-base": {
+ "version": "4.2.0",
+ "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-4.2.0.tgz",
+ "integrity": "sha512-c+R/U5X+2zz2+UCrCFv6odQzJdoqI+YecuhnAJLa1zYaMc13zPfwMwZrr91Pd1DYNo/yPRbiM4WVf9whgwFsIg==",
+ "dev": true,
+ "requires": {
+ "es6-promisify": "^5.0.0"
+ }
+ },
"ajv": {
"version": "5.5.2",
"resolved": "https://registry.npmjs.org/ajv/-/ajv-5.5.2.tgz",
"integrity": "sha1-c7Xuyj+rZT49P5Qis0GtQiBdyWU=",
"requires": {
- "co": "4.6.0",
- "fast-deep-equal": "1.1.0",
- "fast-json-stable-stringify": "2.0.0",
- "json-schema-traverse": "0.3.1"
+ "co": "^4.6.0",
+ "fast-deep-equal": "^1.0.0",
+ "fast-json-stable-stringify": "^2.0.0",
+ "json-schema-traverse": "^0.3.0"
}
},
"ajv-keywords": {
- "version": "3.1.0",
- "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.1.0.tgz",
- "integrity": "sha1-rCsnk5xUPpXSwG5/f1wnvkqlQ74="
+ "version": "3.2.0",
+ "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.2.0.tgz",
+ "integrity": "sha1-6GuBnGAs+IIa1jdBNpjx3sAhhHo="
},
"align-text": {
"version": "0.1.4",
"resolved": "https://registry.npmjs.org/align-text/-/align-text-0.1.4.tgz",
"integrity": "sha1-DNkKVhCT810KmSVsIrcGlDP60Rc=",
"requires": {
- "kind-of": "3.2.2",
- "longest": "1.0.1",
- "repeat-string": "1.6.1"
+ "kind-of": "^3.0.2",
+ "longest": "^1.0.1",
+ "repeat-string": "^1.5.2"
}
},
"alphanum-sort": {
@@ -360,6 +380,49 @@
"resolved": "https://registry.npmjs.org/amdefine/-/amdefine-1.0.1.tgz",
"integrity": "sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU="
},
+ "amqplib": {
+ "version": "0.5.2",
+ "resolved": "https://registry.npmjs.org/amqplib/-/amqplib-0.5.2.tgz",
+ "integrity": "sha512-l9mCs6LbydtHqRniRwYkKdqxVa6XMz3Vw1fh+2gJaaVgTM6Jk3o8RccAKWKtlhT1US5sWrFh+KKxsVUALURSIA==",
+ "dev": true,
+ "optional": true,
+ "requires": {
+ "bitsyntax": "~0.0.4",
+ "bluebird": "^3.4.6",
+ "buffer-more-ints": "0.0.2",
+ "readable-stream": "1.x >=1.1.9",
+ "safe-buffer": "^5.0.1"
+ },
+ "dependencies": {
+ "isarray": {
+ "version": "0.0.1",
+ "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
+ "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=",
+ "dev": true,
+ "optional": true
+ },
+ "readable-stream": {
+ "version": "1.1.14",
+ "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz",
+ "integrity": "sha1-fPTFTvZI44EwhMY23SB54WbAgdk=",
+ "dev": true,
+ "optional": true,
+ "requires": {
+ "core-util-is": "~1.0.0",
+ "inherits": "~2.0.1",
+ "isarray": "0.0.1",
+ "string_decoder": "~0.10.x"
+ }
+ },
+ "string_decoder": {
+ "version": "0.10.31",
+ "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
+ "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
+ "dev": true,
+ "optional": true
+ }
+ }
+ },
"angular": {
"version": "1.6.6",
"resolved": "https://registry.npmjs.org/angular/-/angular-1.6.6.tgz",
@@ -401,9 +464,9 @@
"integrity": "sha512-/2xvG6vDC+Us8h0baSa1siDKwPj5R2A7LldxxhK2339HInc09bq9shMVCUy9zqnuvwnDUJ/DSgkSaBoSHSZrqg=="
},
"angular-mocks": {
- "version": "1.6.10",
- "resolved": "https://registry.npmjs.org/angular-mocks/-/angular-mocks-1.6.10.tgz",
- "integrity": "sha512-1865/NmqHNogibNoglY1MGBjx882iu2hI46BBhYDWyz0C4TDM5ER8H8SnYwQKUUG4RXMDsJizszEQ2BEoYKV9w==",
+ "version": "1.7.0",
+ "resolved": "https://registry.npmjs.org/angular-mocks/-/angular-mocks-1.7.0.tgz",
+ "integrity": "sha512-tBlj9jIEpbgiYY1VpV6XAi+5JSAO0AXFziVW4TSIFETB23fautoREI7XbOeRgy/QmOhZA4P320gs2XgpbvLd0w==",
"dev": true
},
"angular-motion": {
@@ -416,16 +479,11 @@
"resolved": "https://registry.npmjs.org/angular-nvd3/-/angular-nvd3-1.0.9.tgz",
"integrity": "sha1-jYpxSH2eWhIuil0PXNJqsOSRpvU=",
"requires": {
- "angular": "1.6.6",
- "d3": "3.5.17",
- "nvd3": "1.8.6"
+ "angular": "^1.x",
+ "d3": "^3.3",
+ "nvd3": "^1.7.1"
}
},
- "angular-retina": {
- "version": "0.4.0",
- "resolved": "https://registry.npmjs.org/angular-retina/-/angular-retina-0.4.0.tgz",
- "integrity": "sha1-JcxPXAf+rgHku3/8KBZL2JiAcmE="
- },
"angular-sanitize": {
"version": "1.6.6",
"resolved": "https://registry.npmjs.org/angular-sanitize/-/angular-sanitize-1.6.6.tgz",
@@ -451,7 +509,7 @@
"resolved": "https://registry.npmjs.org/angular-translate/-/angular-translate-2.16.0.tgz",
"integrity": "sha512-kMPOh6lQMF/dji0iq+G/hM8HodxfHV/1VqnvaoklMZXHQOdBP1ucGDuWrWIte/dZ/tbW7MbnE1vOmZY152nwVw==",
"requires": {
- "angular": "1.6.6"
+ "angular": ">=1.2.26 <=1.6"
}
},
"angular-tree-control": {
@@ -465,11 +523,18 @@
"integrity": "sha1-ClsQZgGLQOcAuMbuNLDJf8MhlSs="
},
"angular-ui-grid": {
- "version": "4.4.7",
- "resolved": "https://registry.npmjs.org/angular-ui-grid/-/angular-ui-grid-4.4.7.tgz",
- "integrity": "sha512-z592OgLcVkyfGVMU2M0ymTPjBh/F+0/fAy/Yzj19Cs7wmuYcb13+iGFPskas27uDdxKv4mkJqmGeklyh5NxJEw==",
+ "version": "4.4.11",
+ "resolved": "https://registry.npmjs.org/angular-ui-grid/-/angular-ui-grid-4.4.11.tgz",
+ "integrity": "sha512-tOZrlgmmV8LXS5yDXxry53uibZxFOC3dNNUOH+5AA0SwVTg1B0rE4+4zdU7NfW6bKClshoPE7mik8/VrS1rXAQ==",
"requires": {
- "angular": "1.6.6"
+ "angular": ">=1.4.0 1.7.x"
+ },
+ "dependencies": {
+ "angular": {
+ "version": "1.7.0",
+ "resolved": "https://registry.npmjs.org/angular/-/angular-1.7.0.tgz",
+ "integrity": "sha512-3LboCLjrOuC7dWh953O0+dI3dJ7PexYRSCIrfqoN5qoHyja/wak3eWoxPKb2Sl2qwiPbrUV5KJXwgpUQ48McBQ=="
+ }
}
},
"angular-ui-validate": {
@@ -512,8 +577,8 @@
"resolved": "https://registry.npmjs.org/anymatch/-/anymatch-2.0.0.tgz",
"integrity": "sha512-5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw==",
"requires": {
- "micromatch": "3.1.10",
- "normalize-path": "2.1.1"
+ "micromatch": "^3.1.4",
+ "normalize-path": "^2.1.1"
},
"dependencies": {
"arr-diff": {
@@ -531,16 +596,16 @@
"resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
"integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
"requires": {
- "arr-flatten": "1.1.0",
- "array-unique": "0.3.2",
- "extend-shallow": "2.0.1",
- "fill-range": "4.0.0",
- "isobject": "3.0.1",
- "repeat-element": "1.1.2",
- "snapdragon": "0.8.2",
- "snapdragon-node": "2.1.1",
- "split-string": "3.1.0",
- "to-regex": "3.0.2"
+ "arr-flatten": "^1.1.0",
+ "array-unique": "^0.3.2",
+ "extend-shallow": "^2.0.1",
+ "fill-range": "^4.0.0",
+ "isobject": "^3.0.1",
+ "repeat-element": "^1.1.2",
+ "snapdragon": "^0.8.1",
+ "snapdragon-node": "^2.0.1",
+ "split-string": "^3.0.2",
+ "to-regex": "^3.0.1"
},
"dependencies": {
"extend-shallow": {
@@ -548,7 +613,7 @@
"resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
"integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
"requires": {
- "is-extendable": "0.1.1"
+ "is-extendable": "^0.1.0"
}
}
}
@@ -558,8 +623,8 @@
"resolved": "https://registry.npmjs.org/define-property/-/define-property-2.0.2.tgz",
"integrity": "sha512-jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ==",
"requires": {
- "is-descriptor": "1.0.2",
- "isobject": "3.0.1"
+ "is-descriptor": "^1.0.2",
+ "isobject": "^3.0.1"
}
},
"expand-brackets": {
@@ -567,13 +632,13 @@
"resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz",
"integrity": "sha1-t3c14xXOMPa27/D4OwQVGiJEliI=",
"requires": {
- "debug": "2.6.9",
- "define-property": "0.2.5",
- "extend-shallow": "2.0.1",
- "posix-character-classes": "0.1.1",
- "regex-not": "1.0.2",
- "snapdragon": "0.8.2",
- "to-regex": "3.0.2"
+ "debug": "^2.3.3",
+ "define-property": "^0.2.5",
+ "extend-shallow": "^2.0.1",
+ "posix-character-classes": "^0.1.0",
+ "regex-not": "^1.0.0",
+ "snapdragon": "^0.8.1",
+ "to-regex": "^3.0.1"
},
"dependencies": {
"define-property": {
@@ -581,7 +646,7 @@
"resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
"integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
"requires": {
- "is-descriptor": "0.1.6"
+ "is-descriptor": "^0.1.0"
}
},
"extend-shallow": {
@@ -589,7 +654,7 @@
"resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
"integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
"requires": {
- "is-extendable": "0.1.1"
+ "is-extendable": "^0.1.0"
}
},
"is-accessor-descriptor": {
@@ -597,7 +662,7 @@
"resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
"integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
"requires": {
- "kind-of": "3.2.2"
+ "kind-of": "^3.0.2"
},
"dependencies": {
"kind-of": {
@@ -605,7 +670,7 @@
"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
"integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
"requires": {
- "is-buffer": "1.1.6"
+ "is-buffer": "^1.1.5"
}
}
}
@@ -615,7 +680,7 @@
"resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
"integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
"requires": {
- "kind-of": "3.2.2"
+ "kind-of": "^3.0.2"
},
"dependencies": {
"kind-of": {
@@ -623,7 +688,7 @@
"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
"integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
"requires": {
- "is-buffer": "1.1.6"
+ "is-buffer": "^1.1.5"
}
}
}
@@ -633,9 +698,9 @@
"resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
"integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
"requires": {
- "is-accessor-descriptor": "0.1.6",
- "is-data-descriptor": "0.1.4",
- "kind-of": "5.1.0"
+ "is-accessor-descriptor": "^0.1.6",
+ "is-data-descriptor": "^0.1.4",
+ "kind-of": "^5.0.0"
}
},
"kind-of": {
@@ -650,8 +715,8 @@
"resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz",
"integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=",
"requires": {
- "assign-symbols": "1.0.0",
- "is-extendable": "1.0.1"
+ "assign-symbols": "^1.0.0",
+ "is-extendable": "^1.0.1"
},
"dependencies": {
"is-extendable": {
@@ -659,7 +724,7 @@
"resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
"integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
"requires": {
- "is-plain-object": "2.0.4"
+ "is-plain-object": "^2.0.4"
}
}
}
@@ -669,14 +734,14 @@
"resolved": "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz",
"integrity": "sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==",
"requires": {
- "array-unique": "0.3.2",
- "define-property": "1.0.0",
- "expand-brackets": "2.1.4",
- "extend-shallow": "2.0.1",
- "fragment-cache": "0.2.1",
- "regex-not": "1.0.2",
- "snapdragon": "0.8.2",
- "to-regex": "3.0.2"
+ "array-unique": "^0.3.2",
+ "define-property": "^1.0.0",
+ "expand-brackets": "^2.1.4",
+ "extend-shallow": "^2.0.1",
+ "fragment-cache": "^0.2.1",
+ "regex-not": "^1.0.0",
+ "snapdragon": "^0.8.1",
+ "to-regex": "^3.0.1"
},
"dependencies": {
"define-property": {
@@ -684,7 +749,7 @@
"resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
"integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
"requires": {
- "is-descriptor": "1.0.2"
+ "is-descriptor": "^1.0.0"
}
},
"extend-shallow": {
@@ -692,7 +757,7 @@
"resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
"integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
"requires": {
- "is-extendable": "0.1.1"
+ "is-extendable": "^0.1.0"
}
}
}
@@ -702,10 +767,10 @@
"resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
"integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=",
"requires": {
- "extend-shallow": "2.0.1",
- "is-number": "3.0.0",
- "repeat-string": "1.6.1",
- "to-regex-range": "2.1.1"
+ "extend-shallow": "^2.0.1",
+ "is-number": "^3.0.0",
+ "repeat-string": "^1.6.1",
+ "to-regex-range": "^2.1.0"
},
"dependencies": {
"extend-shallow": {
@@ -713,7 +778,7 @@
"resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
"integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
"requires": {
- "is-extendable": "0.1.1"
+ "is-extendable": "^0.1.0"
}
}
}
@@ -723,7 +788,7 @@
"resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
"integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
"requires": {
- "kind-of": "6.0.2"
+ "kind-of": "^6.0.0"
}
},
"is-data-descriptor": {
@@ -731,7 +796,7 @@
"resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
"integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
"requires": {
- "kind-of": "6.0.2"
+ "kind-of": "^6.0.0"
}
},
"is-descriptor": {
@@ -739,9 +804,9 @@
"resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
"integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
"requires": {
- "is-accessor-descriptor": "1.0.0",
- "is-data-descriptor": "1.0.0",
- "kind-of": "6.0.2"
+ "is-accessor-descriptor": "^1.0.0",
+ "is-data-descriptor": "^1.0.0",
+ "kind-of": "^6.0.2"
}
},
"is-number": {
@@ -749,7 +814,7 @@
"resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
"integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
"requires": {
- "kind-of": "3.2.2"
+ "kind-of": "^3.0.2"
},
"dependencies": {
"kind-of": {
@@ -757,7 +822,7 @@
"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
"integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
"requires": {
- "is-buffer": "1.1.6"
+ "is-buffer": "^1.1.5"
}
}
}
@@ -777,19 +842,19 @@
"resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
"integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
"requires": {
- "arr-diff": "4.0.0",
- "array-unique": "0.3.2",
- "braces": "2.3.2",
- "define-property": "2.0.2",
- "extend-shallow": "3.0.2",
- "extglob": "2.0.4",
- "fragment-cache": "0.2.1",
- "kind-of": "6.0.2",
- "nanomatch": "1.2.9",
- "object.pick": "1.3.0",
- "regex-not": "1.0.2",
- "snapdragon": "0.8.2",
- "to-regex": "3.0.2"
+ "arr-diff": "^4.0.0",
+ "array-unique": "^0.3.2",
+ "braces": "^2.3.1",
+ "define-property": "^2.0.2",
+ "extend-shallow": "^3.0.2",
+ "extglob": "^2.0.4",
+ "fragment-cache": "^0.2.1",
+ "kind-of": "^6.0.2",
+ "nanomatch": "^1.2.9",
+ "object.pick": "^1.3.0",
+ "regex-not": "^1.0.0",
+ "snapdragon": "^0.8.1",
+ "to-regex": "^3.0.2"
}
}
}
@@ -810,8 +875,8 @@
"resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.4.tgz",
"integrity": "sha1-u13KOCu5TwXhUZQ3PRb9O6HKEQ0=",
"requires": {
- "delegates": "1.0.0",
- "readable-stream": "2.3.6"
+ "delegates": "^1.0.0",
+ "readable-stream": "^2.0.6"
}
},
"argparse": {
@@ -819,7 +884,7 @@
"resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",
"integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
"requires": {
- "sprintf-js": "1.0.3"
+ "sprintf-js": "~1.0.2"
}
},
"arr-diff": {
@@ -827,7 +892,7 @@
"resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-2.0.0.tgz",
"integrity": "sha1-jzuCf5Vai9ZpaX5KQlasPOrjVs8=",
"requires": {
- "arr-flatten": "1.1.0"
+ "arr-flatten": "^1.0.1"
}
},
"arr-flatten": {
@@ -866,8 +931,8 @@
"resolved": "https://registry.npmjs.org/array-includes/-/array-includes-3.0.3.tgz",
"integrity": "sha1-GEtI9i2S10UrsxsyMWXH+L0CJm0=",
"requires": {
- "define-properties": "1.1.2",
- "es-abstract": "1.11.0"
+ "define-properties": "^1.1.2",
+ "es-abstract": "^1.7.0"
}
},
"array-map": {
@@ -893,7 +958,7 @@
"resolved": "https://registry.npmjs.org/array-union/-/array-union-1.0.2.tgz",
"integrity": "sha1-mjRBDk9OPaI96jdb5b5w8kd47Dk=",
"requires": {
- "array-uniq": "1.0.3"
+ "array-uniq": "^1.0.1"
}
},
"array-uniq": {
@@ -931,9 +996,9 @@
"resolved": "https://registry.npmjs.org/asn1.js/-/asn1.js-4.10.1.tgz",
"integrity": "sha512-p32cOF5q0Zqs9uBiONKYLm6BClCoBCM5O9JfeUSlnQLBTxYdTK+pW+nXflm8UkKd2UYlEbYz5qEi0JuZR9ckSw==",
"requires": {
- "bn.js": "4.11.8",
- "inherits": "2.0.3",
- "minimalistic-assert": "1.0.1"
+ "bn.js": "^4.0.0",
+ "inherits": "^2.0.1",
+ "minimalistic-assert": "^1.0.0"
}
},
"assert": {
@@ -971,7 +1036,7 @@
"integrity": "sha1-e9QXhNMkk5h66yOba04cV6hzuRc=",
"dev": true,
"requires": {
- "acorn": "4.0.13"
+ "acorn": "^4.0.3"
},
"dependencies": {
"acorn": {
@@ -983,11 +1048,18 @@
}
},
"async": {
- "version": "2.6.0",
- "resolved": "https://registry.npmjs.org/async/-/async-2.6.0.tgz",
- "integrity": "sha512-xAfGg1/NTLBBKlHFmnd7PlmUW9KhVQIUuSrYem9xzFUZy13ScvtyGGejaae9iAVRiRq9+Cx7DPFaAAhCpyxyPw==",
+ "version": "2.6.1",
+ "resolved": "https://registry.npmjs.org/async/-/async-2.6.1.tgz",
+ "integrity": "sha512-fNEiL2+AZt6AlAw/29Cr0UDe4sRAHCpEHh54WMz+Bb7QfNcFw4h3loofyJpLeQs4Yx7yuqu/2dLgM5hKOs6HlQ==",
"requires": {
- "lodash": "4.17.5"
+ "lodash": "^4.17.10"
+ },
+ "dependencies": {
+ "lodash": {
+ "version": "4.17.10",
+ "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.10.tgz",
+ "integrity": "sha512-UejweD1pDoXu+AD825lWwp4ZGtSwgnpZxb3JDViD7StjQz+Nb/6l093lx4OQ0foGWNRoc19mWy7BzL+UAK2iVg=="
+ }
}
},
"async-each": {
@@ -1012,21 +1084,21 @@
"integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k="
},
"atob": {
- "version": "2.1.0",
- "resolved": "https://registry.npmjs.org/atob/-/atob-2.1.0.tgz",
- "integrity": "sha512-SuiKH8vbsOyCALjA/+EINmt/Kdl+TQPrtFgW7XZZcwtryFu9e5kQoX3bjCW6mIvGH1fbeAZZuvwGR5IlBRznGw=="
+ "version": "2.1.1",
+ "resolved": "https://registry.npmjs.org/atob/-/atob-2.1.1.tgz",
+ "integrity": "sha1-ri1acpR38onWDdf5amMUoi3Wwio="
},
"autoprefixer": {
"version": "6.7.7",
"resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-6.7.7.tgz",
"integrity": "sha1-Hb0cg1ZY41zj+ZhAmdsAWFx4IBQ=",
"requires": {
- "browserslist": "1.7.7",
- "caniuse-db": "1.0.30000830",
- "normalize-range": "0.1.2",
- "num2fraction": "1.2.2",
- "postcss": "5.2.18",
- "postcss-value-parser": "3.3.0"
+ "browserslist": "^1.7.6",
+ "caniuse-db": "^1.0.30000634",
+ "normalize-range": "^0.1.2",
+ "num2fraction": "^1.2.2",
+ "postcss": "^5.2.16",
+ "postcss-value-parser": "^3.2.3"
}
},
"aws-sign2": {
@@ -1039,14 +1111,36 @@
"resolved": "https://registry.npmjs.org/aws4/-/aws4-1.7.0.tgz",
"integrity": "sha512-32NDda82rhwD9/JBCCkB+MRYDp0oSvlo2IL6rQWA10PQi7tDUM3eqMSltXmY+Oyl/7N3P3qNtAlv7X0d9bI28w=="
},
+ "axios": {
+ "version": "0.15.3",
+ "resolved": "https://registry.npmjs.org/axios/-/axios-0.15.3.tgz",
+ "integrity": "sha1-LJ1jiy4ZGgjqHWzJiOrda6W9wFM=",
+ "dev": true,
+ "optional": true,
+ "requires": {
+ "follow-redirects": "1.0.0"
+ },
+ "dependencies": {
+ "follow-redirects": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.0.0.tgz",
+ "integrity": "sha1-jjQpjL0uF28lTv/sdaHHjMhJ/Tc=",
+ "dev": true,
+ "optional": true,
+ "requires": {
+ "debug": "^2.2.0"
+ }
+ }
+ }
+ },
"babel-code-frame": {
"version": "6.26.0",
"resolved": "https://registry.npmjs.org/babel-code-frame/-/babel-code-frame-6.26.0.tgz",
"integrity": "sha1-Y/1D99weO7fONZR9uP42mj9Yx0s=",
"requires": {
- "chalk": "1.1.3",
- "esutils": "2.0.2",
- "js-tokens": "3.0.2"
+ "chalk": "^1.1.3",
+ "esutils": "^2.0.2",
+ "js-tokens": "^3.0.2"
},
"dependencies": {
"chalk": {
@@ -1054,11 +1148,11 @@
"resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
"integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
"requires": {
- "ansi-styles": "2.2.1",
- "escape-string-regexp": "1.0.5",
- "has-ansi": "2.0.0",
- "strip-ansi": "3.0.1",
- "supports-color": "2.0.0"
+ "ansi-styles": "^2.2.1",
+ "escape-string-regexp": "^1.0.2",
+ "has-ansi": "^2.0.0",
+ "strip-ansi": "^3.0.0",
+ "supports-color": "^2.0.0"
}
}
}
@@ -1068,25 +1162,25 @@
"resolved": "https://registry.npmjs.org/babel-core/-/babel-core-6.26.0.tgz",
"integrity": "sha1-rzL3izGm/O8RnIew/Y2XU/A6C7g=",
"requires": {
- "babel-code-frame": "6.26.0",
- "babel-generator": "6.26.1",
- "babel-helpers": "6.24.1",
- "babel-messages": "6.23.0",
- "babel-register": "6.26.0",
- "babel-runtime": "6.26.0",
- "babel-template": "6.26.0",
- "babel-traverse": "6.26.0",
- "babel-types": "6.26.0",
- "babylon": "6.18.0",
- "convert-source-map": "1.5.1",
- "debug": "2.6.9",
- "json5": "0.5.1",
- "lodash": "4.17.5",
- "minimatch": "3.0.4",
- "path-is-absolute": "1.0.1",
- "private": "0.1.8",
- "slash": "1.0.0",
- "source-map": "0.5.7"
+ "babel-code-frame": "^6.26.0",
+ "babel-generator": "^6.26.0",
+ "babel-helpers": "^6.24.1",
+ "babel-messages": "^6.23.0",
+ "babel-register": "^6.26.0",
+ "babel-runtime": "^6.26.0",
+ "babel-template": "^6.26.0",
+ "babel-traverse": "^6.26.0",
+ "babel-types": "^6.26.0",
+ "babylon": "^6.18.0",
+ "convert-source-map": "^1.5.0",
+ "debug": "^2.6.8",
+ "json5": "^0.5.1",
+ "lodash": "^4.17.4",
+ "minimatch": "^3.0.4",
+ "path-is-absolute": "^1.0.1",
+ "private": "^0.1.7",
+ "slash": "^1.0.0",
+ "source-map": "^0.5.6"
}
},
"babel-eslint": {
@@ -1094,10 +1188,10 @@
"resolved": "https://registry.npmjs.org/babel-eslint/-/babel-eslint-7.2.3.tgz",
"integrity": "sha1-sv4tgBJkcPXBlELcdXJTqJdxCCc=",
"requires": {
- "babel-code-frame": "6.26.0",
- "babel-traverse": "6.26.0",
- "babel-types": "6.26.0",
- "babylon": "6.18.0"
+ "babel-code-frame": "^6.22.0",
+ "babel-traverse": "^6.23.1",
+ "babel-types": "^6.23.0",
+ "babylon": "^6.17.0"
}
},
"babel-generator": {
@@ -1105,14 +1199,14 @@
"resolved": "https://registry.npmjs.org/babel-generator/-/babel-generator-6.26.1.tgz",
"integrity": "sha512-HyfwY6ApZj7BYTcJURpM5tznulaBvyio7/0d4zFOeMPUmfxkCjHocCuoLa2SAGzBI8AREcH3eP3758F672DppA==",
"requires": {
- "babel-messages": "6.23.0",
- "babel-runtime": "6.26.0",
- "babel-types": "6.26.0",
- "detect-indent": "4.0.0",
- "jsesc": "1.3.0",
- "lodash": "4.17.5",
- "source-map": "0.5.7",
- "trim-right": "1.0.1"
+ "babel-messages": "^6.23.0",
+ "babel-runtime": "^6.26.0",
+ "babel-types": "^6.26.0",
+ "detect-indent": "^4.0.0",
+ "jsesc": "^1.3.0",
+ "lodash": "^4.17.4",
+ "source-map": "^0.5.7",
+ "trim-right": "^1.0.1"
}
},
"babel-helper-bindify-decorators": {
@@ -1120,9 +1214,9 @@
"resolved": "https://registry.npmjs.org/babel-helper-bindify-decorators/-/babel-helper-bindify-decorators-6.24.1.tgz",
"integrity": "sha1-FMGeXxQte0fxmlJDHlKxzLxAozA=",
"requires": {
- "babel-runtime": "6.26.0",
- "babel-traverse": "6.26.0",
- "babel-types": "6.26.0"
+ "babel-runtime": "^6.22.0",
+ "babel-traverse": "^6.24.1",
+ "babel-types": "^6.24.1"
}
},
"babel-helper-builder-binary-assignment-operator-visitor": {
@@ -1130,9 +1224,9 @@
"resolved": "https://registry.npmjs.org/babel-helper-builder-binary-assignment-operator-visitor/-/babel-helper-builder-binary-assignment-operator-visitor-6.24.1.tgz",
"integrity": "sha1-zORReto1b0IgvK6KAsKzRvmlZmQ=",
"requires": {
- "babel-helper-explode-assignable-expression": "6.24.1",
- "babel-runtime": "6.26.0",
- "babel-types": "6.26.0"
+ "babel-helper-explode-assignable-expression": "^6.24.1",
+ "babel-runtime": "^6.22.0",
+ "babel-types": "^6.24.1"
}
},
"babel-helper-call-delegate": {
@@ -1140,10 +1234,10 @@
"resolved": "https://registry.npmjs.org/babel-helper-call-delegate/-/babel-helper-call-delegate-6.24.1.tgz",
"integrity": "sha1-7Oaqzdx25Bw0YfiL/Fdb0Nqi340=",
"requires": {
- "babel-helper-hoist-variables": "6.24.1",
- "babel-runtime": "6.26.0",
- "babel-traverse": "6.26.0",
- "babel-types": "6.26.0"
+ "babel-helper-hoist-variables": "^6.24.1",
+ "babel-runtime": "^6.22.0",
+ "babel-traverse": "^6.24.1",
+ "babel-types": "^6.24.1"
}
},
"babel-helper-define-map": {
@@ -1151,10 +1245,10 @@
"resolved": "https://registry.npmjs.org/babel-helper-define-map/-/babel-helper-define-map-6.26.0.tgz",
"integrity": "sha1-pfVtq0GiX5fstJjH66ypgZ+Vvl8=",
"requires": {
- "babel-helper-function-name": "6.24.1",
- "babel-runtime": "6.26.0",
- "babel-types": "6.26.0",
- "lodash": "4.17.5"
+ "babel-helper-function-name": "^6.24.1",
+ "babel-runtime": "^6.26.0",
+ "babel-types": "^6.26.0",
+ "lodash": "^4.17.4"
}
},
"babel-helper-explode-assignable-expression": {
@@ -1162,9 +1256,9 @@
"resolved": "https://registry.npmjs.org/babel-helper-explode-assignable-expression/-/babel-helper-explode-assignable-expression-6.24.1.tgz",
"integrity": "sha1-8luCz33BBDPFX3BZLVdGQArCLKo=",
"requires": {
- "babel-runtime": "6.26.0",
- "babel-traverse": "6.26.0",
- "babel-types": "6.26.0"
+ "babel-runtime": "^6.22.0",
+ "babel-traverse": "^6.24.1",
+ "babel-types": "^6.24.1"
}
},
"babel-helper-explode-class": {
@@ -1172,10 +1266,10 @@
"resolved": "https://registry.npmjs.org/babel-helper-explode-class/-/babel-helper-explode-class-6.24.1.tgz",
"integrity": "sha1-fcKjkQ3uAHBW4eMdZAztPVTqqes=",
"requires": {
- "babel-helper-bindify-decorators": "6.24.1",
- "babel-runtime": "6.26.0",
- "babel-traverse": "6.26.0",
- "babel-types": "6.26.0"
+ "babel-helper-bindify-decorators": "^6.24.1",
+ "babel-runtime": "^6.22.0",
+ "babel-traverse": "^6.24.1",
+ "babel-types": "^6.24.1"
}
},
"babel-helper-function-name": {
@@ -1183,11 +1277,11 @@
"resolved": "https://registry.npmjs.org/babel-helper-function-name/-/babel-helper-function-name-6.24.1.tgz",
"integrity": "sha1-00dbjAPtmCQqJbSDUasYOZ01gKk=",
"requires": {
- "babel-helper-get-function-arity": "6.24.1",
- "babel-runtime": "6.26.0",
- "babel-template": "6.26.0",
- "babel-traverse": "6.26.0",
- "babel-types": "6.26.0"
+ "babel-helper-get-function-arity": "^6.24.1",
+ "babel-runtime": "^6.22.0",
+ "babel-template": "^6.24.1",
+ "babel-traverse": "^6.24.1",
+ "babel-types": "^6.24.1"
}
},
"babel-helper-get-function-arity": {
@@ -1195,8 +1289,8 @@
"resolved": "https://registry.npmjs.org/babel-helper-get-function-arity/-/babel-helper-get-function-arity-6.24.1.tgz",
"integrity": "sha1-j3eCqpNAfEHTqlCQj4mwMbG2hT0=",
"requires": {
- "babel-runtime": "6.26.0",
- "babel-types": "6.26.0"
+ "babel-runtime": "^6.22.0",
+ "babel-types": "^6.24.1"
}
},
"babel-helper-hoist-variables": {
@@ -1204,8 +1298,8 @@
"resolved": "https://registry.npmjs.org/babel-helper-hoist-variables/-/babel-helper-hoist-variables-6.24.1.tgz",
"integrity": "sha1-HssnaJydJVE+rbyZFKc/VAi+enY=",
"requires": {
- "babel-runtime": "6.26.0",
- "babel-types": "6.26.0"
+ "babel-runtime": "^6.22.0",
+ "babel-types": "^6.24.1"
}
},
"babel-helper-optimise-call-expression": {
@@ -1213,8 +1307,8 @@
"resolved": "https://registry.npmjs.org/babel-helper-optimise-call-expression/-/babel-helper-optimise-call-expression-6.24.1.tgz",
"integrity": "sha1-96E0J7qfc/j0+pk8VKl4gtEkQlc=",
"requires": {
- "babel-runtime": "6.26.0",
- "babel-types": "6.26.0"
+ "babel-runtime": "^6.22.0",
+ "babel-types": "^6.24.1"
}
},
"babel-helper-regex": {
@@ -1222,9 +1316,9 @@
"resolved": "https://registry.npmjs.org/babel-helper-regex/-/babel-helper-regex-6.26.0.tgz",
"integrity": "sha1-MlxZ+QL4LyS3T6zu0DY5VPZJXnI=",
"requires": {
- "babel-runtime": "6.26.0",
- "babel-types": "6.26.0",
- "lodash": "4.17.5"
+ "babel-runtime": "^6.26.0",
+ "babel-types": "^6.26.0",
+ "lodash": "^4.17.4"
}
},
"babel-helper-remap-async-to-generator": {
@@ -1232,11 +1326,11 @@
"resolved": "https://registry.npmjs.org/babel-helper-remap-async-to-generator/-/babel-helper-remap-async-to-generator-6.24.1.tgz",
"integrity": "sha1-XsWBgnrXI/7N04HxySg5BnbkVRs=",
"requires": {
- "babel-helper-function-name": "6.24.1",
- "babel-runtime": "6.26.0",
- "babel-template": "6.26.0",
- "babel-traverse": "6.26.0",
- "babel-types": "6.26.0"
+ "babel-helper-function-name": "^6.24.1",
+ "babel-runtime": "^6.22.0",
+ "babel-template": "^6.24.1",
+ "babel-traverse": "^6.24.1",
+ "babel-types": "^6.24.1"
}
},
"babel-helper-replace-supers": {
@@ -1244,12 +1338,12 @@
"resolved": "https://registry.npmjs.org/babel-helper-replace-supers/-/babel-helper-replace-supers-6.24.1.tgz",
"integrity": "sha1-v22/5Dk40XNpohPKiov3S2qQqxo=",
"requires": {
- "babel-helper-optimise-call-expression": "6.24.1",
- "babel-messages": "6.23.0",
- "babel-runtime": "6.26.0",
- "babel-template": "6.26.0",
- "babel-traverse": "6.26.0",
- "babel-types": "6.26.0"
+ "babel-helper-optimise-call-expression": "^6.24.1",
+ "babel-messages": "^6.23.0",
+ "babel-runtime": "^6.22.0",
+ "babel-template": "^6.24.1",
+ "babel-traverse": "^6.24.1",
+ "babel-types": "^6.24.1"
}
},
"babel-helpers": {
@@ -1257,8 +1351,8 @@
"resolved": "https://registry.npmjs.org/babel-helpers/-/babel-helpers-6.24.1.tgz",
"integrity": "sha1-NHHenK7DiOXIUOWX5Yom3fN2ArI=",
"requires": {
- "babel-runtime": "6.26.0",
- "babel-template": "6.26.0"
+ "babel-runtime": "^6.22.0",
+ "babel-template": "^6.24.1"
}
},
"babel-loader": {
@@ -1266,9 +1360,9 @@
"resolved": "https://registry.npmjs.org/babel-loader/-/babel-loader-7.1.4.tgz",
"integrity": "sha512-/hbyEvPzBJuGpk9o80R0ZyTej6heEOr59GoEUtn8qFKbnx4cJm9FWES6J/iv644sYgrtVw9JJQkjaLW/bqb5gw==",
"requires": {
- "find-cache-dir": "1.0.0",
- "loader-utils": "1.1.0",
- "mkdirp": "0.5.1"
+ "find-cache-dir": "^1.0.0",
+ "loader-utils": "^1.0.2",
+ "mkdirp": "^0.5.1"
}
},
"babel-messages": {
@@ -1276,7 +1370,7 @@
"resolved": "https://registry.npmjs.org/babel-messages/-/babel-messages-6.23.0.tgz",
"integrity": "sha1-8830cDhYA1sqKVHG7F7fbGLyYw4=",
"requires": {
- "babel-runtime": "6.26.0"
+ "babel-runtime": "^6.22.0"
}
},
"babel-plugin-add-module-exports": {
@@ -1289,7 +1383,7 @@
"resolved": "https://registry.npmjs.org/babel-plugin-check-es2015-constants/-/babel-plugin-check-es2015-constants-6.22.0.tgz",
"integrity": "sha1-NRV7EBQm/S/9PaP3XH0ekYNbv4o=",
"requires": {
- "babel-runtime": "6.26.0"
+ "babel-runtime": "^6.22.0"
}
},
"babel-plugin-syntax-async-functions": {
@@ -1352,9 +1446,9 @@
"resolved": "https://registry.npmjs.org/babel-plugin-transform-async-generator-functions/-/babel-plugin-transform-async-generator-functions-6.24.1.tgz",
"integrity": "sha1-8FiQAUX9PpkHpt3yjaWfIVJYpds=",
"requires": {
- "babel-helper-remap-async-to-generator": "6.24.1",
- "babel-plugin-syntax-async-generators": "6.13.0",
- "babel-runtime": "6.26.0"
+ "babel-helper-remap-async-to-generator": "^6.24.1",
+ "babel-plugin-syntax-async-generators": "^6.5.0",
+ "babel-runtime": "^6.22.0"
}
},
"babel-plugin-transform-async-to-generator": {
@@ -1362,9 +1456,9 @@
"resolved": "https://registry.npmjs.org/babel-plugin-transform-async-to-generator/-/babel-plugin-transform-async-to-generator-6.24.1.tgz",
"integrity": "sha1-ZTbjeK/2yx1VF6wOQOs+n8jQh2E=",
"requires": {
- "babel-helper-remap-async-to-generator": "6.24.1",
- "babel-plugin-syntax-async-functions": "6.13.0",
- "babel-runtime": "6.26.0"
+ "babel-helper-remap-async-to-generator": "^6.24.1",
+ "babel-plugin-syntax-async-functions": "^6.8.0",
+ "babel-runtime": "^6.22.0"
}
},
"babel-plugin-transform-class-constructor-call": {
@@ -1372,9 +1466,9 @@
"resolved": "https://registry.npmjs.org/babel-plugin-transform-class-constructor-call/-/babel-plugin-transform-class-constructor-call-6.24.1.tgz",
"integrity": "sha1-gNwoVQWsBn3LjWxl4vbxGrd2Xvk=",
"requires": {
- "babel-plugin-syntax-class-constructor-call": "6.18.0",
- "babel-runtime": "6.26.0",
- "babel-template": "6.26.0"
+ "babel-plugin-syntax-class-constructor-call": "^6.18.0",
+ "babel-runtime": "^6.22.0",
+ "babel-template": "^6.24.1"
}
},
"babel-plugin-transform-class-properties": {
@@ -1382,10 +1476,10 @@
"resolved": "https://registry.npmjs.org/babel-plugin-transform-class-properties/-/babel-plugin-transform-class-properties-6.24.1.tgz",
"integrity": "sha1-anl2PqYdM9NvN7YRqp3vgagbRqw=",
"requires": {
- "babel-helper-function-name": "6.24.1",
- "babel-plugin-syntax-class-properties": "6.13.0",
- "babel-runtime": "6.26.0",
- "babel-template": "6.26.0"
+ "babel-helper-function-name": "^6.24.1",
+ "babel-plugin-syntax-class-properties": "^6.8.0",
+ "babel-runtime": "^6.22.0",
+ "babel-template": "^6.24.1"
}
},
"babel-plugin-transform-decorators": {
@@ -1393,11 +1487,11 @@
"resolved": "https://registry.npmjs.org/babel-plugin-transform-decorators/-/babel-plugin-transform-decorators-6.24.1.tgz",
"integrity": "sha1-eIAT2PjGtSIr33s0Q5Df13Vp4k0=",
"requires": {
- "babel-helper-explode-class": "6.24.1",
- "babel-plugin-syntax-decorators": "6.13.0",
- "babel-runtime": "6.26.0",
- "babel-template": "6.26.0",
- "babel-types": "6.26.0"
+ "babel-helper-explode-class": "^6.24.1",
+ "babel-plugin-syntax-decorators": "^6.13.0",
+ "babel-runtime": "^6.22.0",
+ "babel-template": "^6.24.1",
+ "babel-types": "^6.24.1"
}
},
"babel-plugin-transform-es2015-arrow-functions": {
@@ -1405,7 +1499,7 @@
"resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-arrow-functions/-/babel-plugin-transform-es2015-arrow-functions-6.22.0.tgz",
"integrity": "sha1-RSaSy3EdX3ncf4XkQM5BufJE0iE=",
"requires": {
- "babel-runtime": "6.26.0"
+ "babel-runtime": "^6.22.0"
}
},
"babel-plugin-transform-es2015-block-scoped-functions": {
@@ -1413,7 +1507,7 @@
"resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-block-scoped-functions/-/babel-plugin-transform-es2015-block-scoped-functions-6.22.0.tgz",
"integrity": "sha1-u8UbSflk1wy42OC5ToICRs46YUE=",
"requires": {
- "babel-runtime": "6.26.0"
+ "babel-runtime": "^6.22.0"
}
},
"babel-plugin-transform-es2015-block-scoping": {
@@ -1421,11 +1515,11 @@
"resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-block-scoping/-/babel-plugin-transform-es2015-block-scoping-6.26.0.tgz",
"integrity": "sha1-1w9SmcEwjQXBL0Y4E7CgnnOxiV8=",
"requires": {
- "babel-runtime": "6.26.0",
- "babel-template": "6.26.0",
- "babel-traverse": "6.26.0",
- "babel-types": "6.26.0",
- "lodash": "4.17.5"
+ "babel-runtime": "^6.26.0",
+ "babel-template": "^6.26.0",
+ "babel-traverse": "^6.26.0",
+ "babel-types": "^6.26.0",
+ "lodash": "^4.17.4"
}
},
"babel-plugin-transform-es2015-classes": {
@@ -1433,15 +1527,15 @@
"resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-classes/-/babel-plugin-transform-es2015-classes-6.24.1.tgz",
"integrity": "sha1-WkxYpQyclGHlZLSyo7+ryXolhNs=",
"requires": {
- "babel-helper-define-map": "6.26.0",
- "babel-helper-function-name": "6.24.1",
- "babel-helper-optimise-call-expression": "6.24.1",
- "babel-helper-replace-supers": "6.24.1",
- "babel-messages": "6.23.0",
- "babel-runtime": "6.26.0",
- "babel-template": "6.26.0",
- "babel-traverse": "6.26.0",
- "babel-types": "6.26.0"
+ "babel-helper-define-map": "^6.24.1",
+ "babel-helper-function-name": "^6.24.1",
+ "babel-helper-optimise-call-expression": "^6.24.1",
+ "babel-helper-replace-supers": "^6.24.1",
+ "babel-messages": "^6.23.0",
+ "babel-runtime": "^6.22.0",
+ "babel-template": "^6.24.1",
+ "babel-traverse": "^6.24.1",
+ "babel-types": "^6.24.1"
}
},
"babel-plugin-transform-es2015-computed-properties": {
@@ -1449,8 +1543,8 @@
"resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-computed-properties/-/babel-plugin-transform-es2015-computed-properties-6.24.1.tgz",
"integrity": "sha1-b+Ko0WiV1WNPTNmZttNICjCBWbM=",
"requires": {
- "babel-runtime": "6.26.0",
- "babel-template": "6.26.0"
+ "babel-runtime": "^6.22.0",
+ "babel-template": "^6.24.1"
}
},
"babel-plugin-transform-es2015-destructuring": {
@@ -1458,7 +1552,7 @@
"resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-destructuring/-/babel-plugin-transform-es2015-destructuring-6.23.0.tgz",
"integrity": "sha1-mXux8auWf2gtKwh2/jWNYOdlxW0=",
"requires": {
- "babel-runtime": "6.26.0"
+ "babel-runtime": "^6.22.0"
}
},
"babel-plugin-transform-es2015-duplicate-keys": {
@@ -1466,8 +1560,8 @@
"resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-duplicate-keys/-/babel-plugin-transform-es2015-duplicate-keys-6.24.1.tgz",
"integrity": "sha1-c+s9MQypaePvnskcU3QabxV2Qj4=",
"requires": {
- "babel-runtime": "6.26.0",
- "babel-types": "6.26.0"
+ "babel-runtime": "^6.22.0",
+ "babel-types": "^6.24.1"
}
},
"babel-plugin-transform-es2015-for-of": {
@@ -1475,7 +1569,7 @@
"resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-for-of/-/babel-plugin-transform-es2015-for-of-6.23.0.tgz",
"integrity": "sha1-9HyVsrYT3x0+zC/bdXNiPHUkhpE=",
"requires": {
- "babel-runtime": "6.26.0"
+ "babel-runtime": "^6.22.0"
}
},
"babel-plugin-transform-es2015-function-name": {
@@ -1483,9 +1577,9 @@
"resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-function-name/-/babel-plugin-transform-es2015-function-name-6.24.1.tgz",
"integrity": "sha1-g0yJhTvDaxrw86TF26qU/Y6sqos=",
"requires": {
- "babel-helper-function-name": "6.24.1",
- "babel-runtime": "6.26.0",
- "babel-types": "6.26.0"
+ "babel-helper-function-name": "^6.24.1",
+ "babel-runtime": "^6.22.0",
+ "babel-types": "^6.24.1"
}
},
"babel-plugin-transform-es2015-literals": {
@@ -1493,7 +1587,7 @@
"resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-literals/-/babel-plugin-transform-es2015-literals-6.22.0.tgz",
"integrity": "sha1-T1SgLWzWbPkVKAAZox0xklN3yi4=",
"requires": {
- "babel-runtime": "6.26.0"
+ "babel-runtime": "^6.22.0"
}
},
"babel-plugin-transform-es2015-modules-amd": {
@@ -1501,20 +1595,20 @@
"resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-modules-amd/-/babel-plugin-transform-es2015-modules-amd-6.24.1.tgz",
"integrity": "sha1-Oz5UAXI5hC1tGcMBHEvS8AoA0VQ=",
"requires": {
- "babel-plugin-transform-es2015-modules-commonjs": "6.26.0",
- "babel-runtime": "6.26.0",
- "babel-template": "6.26.0"
+ "babel-plugin-transform-es2015-modules-commonjs": "^6.24.1",
+ "babel-runtime": "^6.22.0",
+ "babel-template": "^6.24.1"
}
},
"babel-plugin-transform-es2015-modules-commonjs": {
- "version": "6.26.0",
- "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-modules-commonjs/-/babel-plugin-transform-es2015-modules-commonjs-6.26.0.tgz",
- "integrity": "sha1-DYOUApt9xqvhqX7xgeAHWN0uXYo=",
+ "version": "6.26.2",
+ "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-modules-commonjs/-/babel-plugin-transform-es2015-modules-commonjs-6.26.2.tgz",
+ "integrity": "sha512-CV9ROOHEdrjcwhIaJNBGMBCodN+1cfkwtM1SbUHmvyy35KGT7fohbpOxkE2uLz1o6odKK2Ck/tz47z+VqQfi9Q==",
"requires": {
- "babel-plugin-transform-strict-mode": "6.24.1",
- "babel-runtime": "6.26.0",
- "babel-template": "6.26.0",
- "babel-types": "6.26.0"
+ "babel-plugin-transform-strict-mode": "^6.24.1",
+ "babel-runtime": "^6.26.0",
+ "babel-template": "^6.26.0",
+ "babel-types": "^6.26.0"
}
},
"babel-plugin-transform-es2015-modules-systemjs": {
@@ -1522,9 +1616,9 @@
"resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-modules-systemjs/-/babel-plugin-transform-es2015-modules-systemjs-6.24.1.tgz",
"integrity": "sha1-/4mhQrkRmpBhlfXxBuzzBdlAfSM=",
"requires": {
- "babel-helper-hoist-variables": "6.24.1",
- "babel-runtime": "6.26.0",
- "babel-template": "6.26.0"
+ "babel-helper-hoist-variables": "^6.24.1",
+ "babel-runtime": "^6.22.0",
+ "babel-template": "^6.24.1"
}
},
"babel-plugin-transform-es2015-modules-umd": {
@@ -1532,9 +1626,9 @@
"resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-modules-umd/-/babel-plugin-transform-es2015-modules-umd-6.24.1.tgz",
"integrity": "sha1-rJl+YoXNGO1hdq22B9YCNErThGg=",
"requires": {
- "babel-plugin-transform-es2015-modules-amd": "6.24.1",
- "babel-runtime": "6.26.0",
- "babel-template": "6.26.0"
+ "babel-plugin-transform-es2015-modules-amd": "^6.24.1",
+ "babel-runtime": "^6.22.0",
+ "babel-template": "^6.24.1"
}
},
"babel-plugin-transform-es2015-object-super": {
@@ -1542,8 +1636,8 @@
"resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-object-super/-/babel-plugin-transform-es2015-object-super-6.24.1.tgz",
"integrity": "sha1-JM72muIcuDp/hgPa0CH1cusnj40=",
"requires": {
- "babel-helper-replace-supers": "6.24.1",
- "babel-runtime": "6.26.0"
+ "babel-helper-replace-supers": "^6.24.1",
+ "babel-runtime": "^6.22.0"
}
},
"babel-plugin-transform-es2015-parameters": {
@@ -1551,12 +1645,12 @@
"resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-parameters/-/babel-plugin-transform-es2015-parameters-6.24.1.tgz",
"integrity": "sha1-V6w1GrScrxSpfNE7CfZv3wpiXys=",
"requires": {
- "babel-helper-call-delegate": "6.24.1",
- "babel-helper-get-function-arity": "6.24.1",
- "babel-runtime": "6.26.0",
- "babel-template": "6.26.0",
- "babel-traverse": "6.26.0",
- "babel-types": "6.26.0"
+ "babel-helper-call-delegate": "^6.24.1",
+ "babel-helper-get-function-arity": "^6.24.1",
+ "babel-runtime": "^6.22.0",
+ "babel-template": "^6.24.1",
+ "babel-traverse": "^6.24.1",
+ "babel-types": "^6.24.1"
}
},
"babel-plugin-transform-es2015-shorthand-properties": {
@@ -1564,8 +1658,8 @@
"resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-shorthand-properties/-/babel-plugin-transform-es2015-shorthand-properties-6.24.1.tgz",
"integrity": "sha1-JPh11nIch2YbvZmkYi5R8U3jiqA=",
"requires": {
- "babel-runtime": "6.26.0",
- "babel-types": "6.26.0"
+ "babel-runtime": "^6.22.0",
+ "babel-types": "^6.24.1"
}
},
"babel-plugin-transform-es2015-spread": {
@@ -1573,7 +1667,7 @@
"resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-spread/-/babel-plugin-transform-es2015-spread-6.22.0.tgz",
"integrity": "sha1-1taKmfia7cRTbIGlQujdnxdG+NE=",
"requires": {
- "babel-runtime": "6.26.0"
+ "babel-runtime": "^6.22.0"
}
},
"babel-plugin-transform-es2015-sticky-regex": {
@@ -1581,9 +1675,9 @@
"resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-sticky-regex/-/babel-plugin-transform-es2015-sticky-regex-6.24.1.tgz",
"integrity": "sha1-AMHNsaynERLN8M9hJsLta0V8zbw=",
"requires": {
- "babel-helper-regex": "6.26.0",
- "babel-runtime": "6.26.0",
- "babel-types": "6.26.0"
+ "babel-helper-regex": "^6.24.1",
+ "babel-runtime": "^6.22.0",
+ "babel-types": "^6.24.1"
}
},
"babel-plugin-transform-es2015-template-literals": {
@@ -1591,7 +1685,7 @@
"resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-template-literals/-/babel-plugin-transform-es2015-template-literals-6.22.0.tgz",
"integrity": "sha1-qEs0UPfp+PH2g51taH2oS7EjbY0=",
"requires": {
- "babel-runtime": "6.26.0"
+ "babel-runtime": "^6.22.0"
}
},
"babel-plugin-transform-es2015-typeof-symbol": {
@@ -1599,7 +1693,7 @@
"resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-typeof-symbol/-/babel-plugin-transform-es2015-typeof-symbol-6.23.0.tgz",
"integrity": "sha1-3sCfHN3/lLUqxz1QXITfWdzOs3I=",
"requires": {
- "babel-runtime": "6.26.0"
+ "babel-runtime": "^6.22.0"
}
},
"babel-plugin-transform-es2015-unicode-regex": {
@@ -1607,9 +1701,9 @@
"resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-unicode-regex/-/babel-plugin-transform-es2015-unicode-regex-6.24.1.tgz",
"integrity": "sha1-04sS9C6nMj9yk4fxinxa4frrNek=",
"requires": {
- "babel-helper-regex": "6.26.0",
- "babel-runtime": "6.26.0",
- "regexpu-core": "2.0.0"
+ "babel-helper-regex": "^6.24.1",
+ "babel-runtime": "^6.22.0",
+ "regexpu-core": "^2.0.0"
}
},
"babel-plugin-transform-exponentiation-operator": {
@@ -1617,9 +1711,9 @@
"resolved": "https://registry.npmjs.org/babel-plugin-transform-exponentiation-operator/-/babel-plugin-transform-exponentiation-operator-6.24.1.tgz",
"integrity": "sha1-KrDJx/MJj6SJB3cruBP+QejeOg4=",
"requires": {
- "babel-helper-builder-binary-assignment-operator-visitor": "6.24.1",
- "babel-plugin-syntax-exponentiation-operator": "6.13.0",
- "babel-runtime": "6.26.0"
+ "babel-helper-builder-binary-assignment-operator-visitor": "^6.24.1",
+ "babel-plugin-syntax-exponentiation-operator": "^6.8.0",
+ "babel-runtime": "^6.22.0"
}
},
"babel-plugin-transform-export-extensions": {
@@ -1627,8 +1721,8 @@
"resolved": "https://registry.npmjs.org/babel-plugin-transform-export-extensions/-/babel-plugin-transform-export-extensions-6.22.0.tgz",
"integrity": "sha1-U3OLR+deghhYnuqUbLvTkQm75lM=",
"requires": {
- "babel-plugin-syntax-export-extensions": "6.13.0",
- "babel-runtime": "6.26.0"
+ "babel-plugin-syntax-export-extensions": "^6.8.0",
+ "babel-runtime": "^6.22.0"
}
},
"babel-plugin-transform-flow-strip-types": {
@@ -1636,8 +1730,8 @@
"resolved": "https://registry.npmjs.org/babel-plugin-transform-flow-strip-types/-/babel-plugin-transform-flow-strip-types-6.22.0.tgz",
"integrity": "sha1-hMtnKTXUNxT9wyvOhFaNh0Qc988=",
"requires": {
- "babel-plugin-syntax-flow": "6.18.0",
- "babel-runtime": "6.26.0"
+ "babel-plugin-syntax-flow": "^6.18.0",
+ "babel-runtime": "^6.22.0"
}
},
"babel-plugin-transform-object-rest-spread": {
@@ -1645,8 +1739,8 @@
"resolved": "https://registry.npmjs.org/babel-plugin-transform-object-rest-spread/-/babel-plugin-transform-object-rest-spread-6.26.0.tgz",
"integrity": "sha1-DzZpLVD+9rfi1LOsFHgTepY7ewY=",
"requires": {
- "babel-plugin-syntax-object-rest-spread": "6.13.0",
- "babel-runtime": "6.26.0"
+ "babel-plugin-syntax-object-rest-spread": "^6.8.0",
+ "babel-runtime": "^6.26.0"
}
},
"babel-plugin-transform-regenerator": {
@@ -1654,7 +1748,7 @@
"resolved": "https://registry.npmjs.org/babel-plugin-transform-regenerator/-/babel-plugin-transform-regenerator-6.26.0.tgz",
"integrity": "sha1-4HA2lvveJ/Cj78rPi03KL3s6jy8=",
"requires": {
- "regenerator-transform": "0.10.1"
+ "regenerator-transform": "^0.10.0"
}
},
"babel-plugin-transform-runtime": {
@@ -1662,7 +1756,7 @@
"resolved": "https://registry.npmjs.org/babel-plugin-transform-runtime/-/babel-plugin-transform-runtime-6.23.0.tgz",
"integrity": "sha1-iEkNRGUC6puOfvsP4J7E2ZR5se4=",
"requires": {
- "babel-runtime": "6.26.0"
+ "babel-runtime": "^6.22.0"
}
},
"babel-plugin-transform-strict-mode": {
@@ -1670,8 +1764,8 @@
"resolved": "https://registry.npmjs.org/babel-plugin-transform-strict-mode/-/babel-plugin-transform-strict-mode-6.24.1.tgz",
"integrity": "sha1-1fr3qleKZbvlkc9e2uBKDGcCB1g=",
"requires": {
- "babel-runtime": "6.26.0",
- "babel-types": "6.26.0"
+ "babel-runtime": "^6.22.0",
+ "babel-types": "^6.24.1"
}
},
"babel-polyfill": {
@@ -1679,9 +1773,9 @@
"resolved": "https://registry.npmjs.org/babel-polyfill/-/babel-polyfill-6.26.0.tgz",
"integrity": "sha1-N5k3q8Z9eJWXCtxiHyhM2WbPIVM=",
"requires": {
- "babel-runtime": "6.26.0",
- "core-js": "2.5.5",
- "regenerator-runtime": "0.10.5"
+ "babel-runtime": "^6.26.0",
+ "core-js": "^2.5.0",
+ "regenerator-runtime": "^0.10.5"
},
"dependencies": {
"regenerator-runtime": {
@@ -1696,30 +1790,30 @@
"resolved": "https://registry.npmjs.org/babel-preset-es2015/-/babel-preset-es2015-6.24.1.tgz",
"integrity": "sha1-1EBQ1rwsn+6nAqrzjXJ6AhBTiTk=",
"requires": {
- "babel-plugin-check-es2015-constants": "6.22.0",
- "babel-plugin-transform-es2015-arrow-functions": "6.22.0",
- "babel-plugin-transform-es2015-block-scoped-functions": "6.22.0",
- "babel-plugin-transform-es2015-block-scoping": "6.26.0",
- "babel-plugin-transform-es2015-classes": "6.24.1",
- "babel-plugin-transform-es2015-computed-properties": "6.24.1",
- "babel-plugin-transform-es2015-destructuring": "6.23.0",
- "babel-plugin-transform-es2015-duplicate-keys": "6.24.1",
- "babel-plugin-transform-es2015-for-of": "6.23.0",
- "babel-plugin-transform-es2015-function-name": "6.24.1",
- "babel-plugin-transform-es2015-literals": "6.22.0",
- "babel-plugin-transform-es2015-modules-amd": "6.24.1",
- "babel-plugin-transform-es2015-modules-commonjs": "6.26.0",
- "babel-plugin-transform-es2015-modules-systemjs": "6.24.1",
- "babel-plugin-transform-es2015-modules-umd": "6.24.1",
- "babel-plugin-transform-es2015-object-super": "6.24.1",
- "babel-plugin-transform-es2015-parameters": "6.24.1",
- "babel-plugin-transform-es2015-shorthand-properties": "6.24.1",
- "babel-plugin-transform-es2015-spread": "6.22.0",
- "babel-plugin-transform-es2015-sticky-regex": "6.24.1",
- "babel-plugin-transform-es2015-template-literals": "6.22.0",
- "babel-plugin-transform-es2015-typeof-symbol": "6.23.0",
- "babel-plugin-transform-es2015-unicode-regex": "6.24.1",
- "babel-plugin-transform-regenerator": "6.26.0"
+ "babel-plugin-check-es2015-constants": "^6.22.0",
+ "babel-plugin-transform-es2015-arrow-functions": "^6.22.0",
+ "babel-plugin-transform-es2015-block-scoped-functions": "^6.22.0",
+ "babel-plugin-transform-es2015-block-scoping": "^6.24.1",
+ "babel-plugin-transform-es2015-classes": "^6.24.1",
+ "babel-plugin-transform-es2015-computed-properties": "^6.24.1",
+ "babel-plugin-transform-es2015-destructuring": "^6.22.0",
+ "babel-plugin-transform-es2015-duplicate-keys": "^6.24.1",
+ "babel-plugin-transform-es2015-for-of": "^6.22.0",
+ "babel-plugin-transform-es2015-function-name": "^6.24.1",
+ "babel-plugin-transform-es2015-literals": "^6.22.0",
+ "babel-plugin-transform-es2015-modules-amd": "^6.24.1",
+ "babel-plugin-transform-es2015-modules-commonjs": "^6.24.1",
+ "babel-plugin-transform-es2015-modules-systemjs": "^6.24.1",
+ "babel-plugin-transform-es2015-modules-umd": "^6.24.1",
+ "babel-plugin-transform-es2015-object-super": "^6.24.1",
+ "babel-plugin-transform-es2015-parameters": "^6.24.1",
+ "babel-plugin-transform-es2015-shorthand-properties": "^6.24.1",
+ "babel-plugin-transform-es2015-spread": "^6.22.0",
+ "babel-plugin-transform-es2015-sticky-regex": "^6.24.1",
+ "babel-plugin-transform-es2015-template-literals": "^6.22.0",
+ "babel-plugin-transform-es2015-typeof-symbol": "^6.22.0",
+ "babel-plugin-transform-es2015-unicode-regex": "^6.24.1",
+ "babel-plugin-transform-regenerator": "^6.24.1"
}
},
"babel-preset-stage-1": {
@@ -1727,9 +1821,9 @@
"resolved": "https://registry.npmjs.org/babel-preset-stage-1/-/babel-preset-stage-1-6.24.1.tgz",
"integrity": "sha1-dpLNfc1oSZB+auSgqFWJz7niv7A=",
"requires": {
- "babel-plugin-transform-class-constructor-call": "6.24.1",
- "babel-plugin-transform-export-extensions": "6.22.0",
- "babel-preset-stage-2": "6.24.1"
+ "babel-plugin-transform-class-constructor-call": "^6.24.1",
+ "babel-plugin-transform-export-extensions": "^6.22.0",
+ "babel-preset-stage-2": "^6.24.1"
}
},
"babel-preset-stage-2": {
@@ -1737,10 +1831,10 @@
"resolved": "https://registry.npmjs.org/babel-preset-stage-2/-/babel-preset-stage-2-6.24.1.tgz",
"integrity": "sha1-2eKWD7PXEYfw5k7sYrwHdnIZvcE=",
"requires": {
- "babel-plugin-syntax-dynamic-import": "6.18.0",
- "babel-plugin-transform-class-properties": "6.24.1",
- "babel-plugin-transform-decorators": "6.24.1",
- "babel-preset-stage-3": "6.24.1"
+ "babel-plugin-syntax-dynamic-import": "^6.18.0",
+ "babel-plugin-transform-class-properties": "^6.24.1",
+ "babel-plugin-transform-decorators": "^6.24.1",
+ "babel-preset-stage-3": "^6.24.1"
}
},
"babel-preset-stage-3": {
@@ -1748,11 +1842,11 @@
"resolved": "https://registry.npmjs.org/babel-preset-stage-3/-/babel-preset-stage-3-6.24.1.tgz",
"integrity": "sha1-g2raCp56f6N8sTj7kyb4eTSkg5U=",
"requires": {
- "babel-plugin-syntax-trailing-function-commas": "6.22.0",
- "babel-plugin-transform-async-generator-functions": "6.24.1",
- "babel-plugin-transform-async-to-generator": "6.24.1",
- "babel-plugin-transform-exponentiation-operator": "6.24.1",
- "babel-plugin-transform-object-rest-spread": "6.26.0"
+ "babel-plugin-syntax-trailing-function-commas": "^6.22.0",
+ "babel-plugin-transform-async-generator-functions": "^6.24.1",
+ "babel-plugin-transform-async-to-generator": "^6.24.1",
+ "babel-plugin-transform-exponentiation-operator": "^6.24.1",
+ "babel-plugin-transform-object-rest-spread": "^6.22.0"
}
},
"babel-register": {
@@ -1760,13 +1854,13 @@
"resolved": "https://registry.npmjs.org/babel-register/-/babel-register-6.26.0.tgz",
"integrity": "sha1-btAhFz4vy0htestFxgCahW9kcHE=",
"requires": {
- "babel-core": "6.26.0",
- "babel-runtime": "6.26.0",
- "core-js": "2.5.5",
- "home-or-tmp": "2.0.0",
- "lodash": "4.17.5",
- "mkdirp": "0.5.1",
- "source-map-support": "0.4.18"
+ "babel-core": "^6.26.0",
+ "babel-runtime": "^6.26.0",
+ "core-js": "^2.5.0",
+ "home-or-tmp": "^2.0.0",
+ "lodash": "^4.17.4",
+ "mkdirp": "^0.5.1",
+ "source-map-support": "^0.4.15"
}
},
"babel-runtime": {
@@ -1774,8 +1868,8 @@
"resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.26.0.tgz",
"integrity": "sha1-llxwWGaOgrVde/4E/yM3vItWR/4=",
"requires": {
- "core-js": "2.5.5",
- "regenerator-runtime": "0.11.1"
+ "core-js": "^2.4.0",
+ "regenerator-runtime": "^0.11.0"
}
},
"babel-template": {
@@ -1783,11 +1877,11 @@
"resolved": "https://registry.npmjs.org/babel-template/-/babel-template-6.26.0.tgz",
"integrity": "sha1-3gPi0WOWsGn0bdn/+FIfsaDjXgI=",
"requires": {
- "babel-runtime": "6.26.0",
- "babel-traverse": "6.26.0",
- "babel-types": "6.26.0",
- "babylon": "6.18.0",
- "lodash": "4.17.5"
+ "babel-runtime": "^6.26.0",
+ "babel-traverse": "^6.26.0",
+ "babel-types": "^6.26.0",
+ "babylon": "^6.18.0",
+ "lodash": "^4.17.4"
}
},
"babel-traverse": {
@@ -1795,15 +1889,15 @@
"resolved": "https://registry.npmjs.org/babel-traverse/-/babel-traverse-6.26.0.tgz",
"integrity": "sha1-RqnL1+3MYsjlwGTi0tjQ9ANXZu4=",
"requires": {
- "babel-code-frame": "6.26.0",
- "babel-messages": "6.23.0",
- "babel-runtime": "6.26.0",
- "babel-types": "6.26.0",
- "babylon": "6.18.0",
- "debug": "2.6.9",
- "globals": "9.18.0",
- "invariant": "2.2.4",
- "lodash": "4.17.5"
+ "babel-code-frame": "^6.26.0",
+ "babel-messages": "^6.23.0",
+ "babel-runtime": "^6.26.0",
+ "babel-types": "^6.26.0",
+ "babylon": "^6.18.0",
+ "debug": "^2.6.8",
+ "globals": "^9.18.0",
+ "invariant": "^2.2.2",
+ "lodash": "^4.17.4"
}
},
"babel-types": {
@@ -1811,10 +1905,10 @@
"resolved": "https://registry.npmjs.org/babel-types/-/babel-types-6.26.0.tgz",
"integrity": "sha1-o7Bz+Uq0nrb6Vc1lInozQ4BjJJc=",
"requires": {
- "babel-runtime": "6.26.0",
- "esutils": "2.0.2",
- "lodash": "4.17.5",
- "to-fast-properties": "1.0.3"
+ "babel-runtime": "^6.26.0",
+ "esutils": "^2.0.2",
+ "lodash": "^4.17.4",
+ "to-fast-properties": "^1.0.3"
}
},
"babylon": {
@@ -1837,13 +1931,13 @@
"resolved": "https://registry.npmjs.org/base/-/base-0.11.2.tgz",
"integrity": "sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg==",
"requires": {
- "cache-base": "1.0.1",
- "class-utils": "0.3.6",
- "component-emitter": "1.2.1",
- "define-property": "1.0.0",
- "isobject": "3.0.1",
- "mixin-deep": "1.3.1",
- "pascalcase": "0.1.1"
+ "cache-base": "^1.0.1",
+ "class-utils": "^0.3.5",
+ "component-emitter": "^1.2.1",
+ "define-property": "^1.0.0",
+ "isobject": "^3.0.1",
+ "mixin-deep": "^1.2.0",
+ "pascalcase": "^0.1.1"
},
"dependencies": {
"isobject": {
@@ -1874,6 +1968,15 @@
"resolved": "https://registry.npmjs.org/batch/-/batch-0.6.1.tgz",
"integrity": "sha1-3DQxT05nkxgJP8dgJyUl+UvyXBY="
},
+ "bcrypt-pbkdf": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.1.tgz",
+ "integrity": "sha1-Y7xdy2EzG5K8Bf1SiVPDNGKgb40=",
+ "optional": true,
+ "requires": {
+ "tweetnacl": "^0.14.3"
+ }
+ },
"better-assert": {
"version": "1.0.2",
"resolved": "https://registry.npmjs.org/better-assert/-/better-assert-1.0.2.tgz",
@@ -1902,6 +2005,57 @@
"resolved": "https://registry.npmjs.org/binaryextensions/-/binaryextensions-2.1.1.tgz",
"integrity": "sha512-XBaoWE9RW8pPdPQNibZsW2zh8TW6gcarXp1FZPwT8Uop8ScSNldJEWf2k9l3HeTqdrEwsOsFcq74RiJECW34yA=="
},
+ "bitsyntax": {
+ "version": "0.0.4",
+ "resolved": "https://registry.npmjs.org/bitsyntax/-/bitsyntax-0.0.4.tgz",
+ "integrity": "sha1-6xDMb4K4xJDj6FaY8H6D1G4MuoI=",
+ "dev": true,
+ "optional": true,
+ "requires": {
+ "buffer-more-ints": "0.0.2"
+ }
+ },
+ "bl": {
+ "version": "1.1.2",
+ "resolved": "https://registry.npmjs.org/bl/-/bl-1.1.2.tgz",
+ "integrity": "sha1-/cqHGplxOqANGeO7ukHER4emU5g=",
+ "dev": true,
+ "optional": true,
+ "requires": {
+ "readable-stream": "~2.0.5"
+ },
+ "dependencies": {
+ "process-nextick-args": {
+ "version": "1.0.7",
+ "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz",
+ "integrity": "sha1-FQ4gt1ZZCtP5EJPyWk8q2L/zC6M=",
+ "dev": true,
+ "optional": true
+ },
+ "readable-stream": {
+ "version": "2.0.6",
+ "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.0.6.tgz",
+ "integrity": "sha1-j5A0HmilPMySh4jaz80Rs265t44=",
+ "dev": true,
+ "optional": true,
+ "requires": {
+ "core-util-is": "~1.0.0",
+ "inherits": "~2.0.1",
+ "isarray": "~1.0.0",
+ "process-nextick-args": "~1.0.6",
+ "string_decoder": "~0.10.x",
+ "util-deprecate": "~1.0.1"
+ }
+ },
+ "string_decoder": {
+ "version": "0.10.31",
+ "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
+ "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
+ "dev": true,
+ "optional": true
+ }
+ }
+ },
"blob": {
"version": "0.0.4",
"resolved": "https://registry.npmjs.org/blob/-/blob-0.0.4.tgz",
@@ -1912,7 +2066,7 @@
"resolved": "https://registry.npmjs.org/block-stream/-/block-stream-0.0.9.tgz",
"integrity": "sha1-E+v+d4oDIFz+A3UUgeu0szAMEmo=",
"requires": {
- "inherits": "2.0.3"
+ "inherits": "~2.0.0"
}
},
"bluebird": {
@@ -1931,15 +2085,15 @@
"integrity": "sha1-h2eKGdhLR9hZuDGZvVm84iKxBFQ=",
"requires": {
"bytes": "3.0.0",
- "content-type": "1.0.4",
+ "content-type": "~1.0.4",
"debug": "2.6.9",
- "depd": "1.1.2",
- "http-errors": "1.6.3",
+ "depd": "~1.1.1",
+ "http-errors": "~1.6.2",
"iconv-lite": "0.4.19",
- "on-finished": "2.3.0",
+ "on-finished": "~2.3.0",
"qs": "6.5.1",
"raw-body": "2.3.2",
- "type-is": "1.6.16"
+ "type-is": "~1.6.15"
},
"dependencies": {
"iconv-lite": {
@@ -1959,12 +2113,12 @@
"resolved": "https://registry.npmjs.org/bonjour/-/bonjour-3.5.0.tgz",
"integrity": "sha1-jokKGD2O6aI5OzhExpGkK897yfU=",
"requires": {
- "array-flatten": "2.1.1",
- "deep-equal": "1.0.1",
- "dns-equal": "1.0.0",
- "dns-txt": "2.0.2",
- "multicast-dns": "6.2.3",
- "multicast-dns-service-types": "1.1.0"
+ "array-flatten": "^2.1.0",
+ "deep-equal": "^1.0.1",
+ "dns-equal": "^1.0.0",
+ "dns-txt": "^2.0.2",
+ "multicast-dns": "^6.0.1",
+ "multicast-dns-service-types": "^1.1.0"
}
},
"boolbase": {
@@ -1977,7 +2131,7 @@
"resolved": "https://registry.npmjs.org/boom/-/boom-2.10.1.tgz",
"integrity": "sha1-OciRjO/1eZ+D+UkqhI9iWt0Mdm8=",
"requires": {
- "hoek": "2.16.3"
+ "hoek": "2.x.x"
}
},
"bootstrap-sass": {
@@ -1998,7 +2152,7 @@
"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
"integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
"requires": {
- "balanced-match": "1.0.0",
+ "balanced-match": "^1.0.0",
"concat-map": "0.0.1"
}
},
@@ -2007,9 +2161,9 @@
"resolved": "https://registry.npmjs.org/braces/-/braces-1.8.5.tgz",
"integrity": "sha1-uneWLhLf+WnWt2cR6RS3N4V79qc=",
"requires": {
- "expand-range": "1.8.2",
- "preserve": "0.2.0",
- "repeat-element": "1.1.2"
+ "expand-range": "^1.8.1",
+ "preserve": "^0.2.0",
+ "repeat-element": "^1.1.2"
}
},
"brorand": {
@@ -2023,12 +2177,12 @@
"integrity": "sha512-erYug8XoqzU3IfcU8fUgyHqyOXqIE4tUTTQ+7mqUjQlvnXkOO6OlT9c/ZoJVHYoAaqGxr09CN53G7XIsO4KtWA==",
"dev": true,
"requires": {
- "JSONStream": "1.3.2",
- "combine-source-map": "0.8.0",
- "defined": "1.0.0",
- "safe-buffer": "5.1.1",
- "through2": "2.0.3",
- "umd": "3.0.3"
+ "JSONStream": "^1.0.3",
+ "combine-source-map": "~0.8.0",
+ "defined": "^1.0.0",
+ "safe-buffer": "^5.1.1",
+ "through2": "^2.0.0",
+ "umd": "^3.0.0"
}
},
"browser-resolve": {
@@ -2065,53 +2219,53 @@
"integrity": "sha512-gKfOsNQv/toWz+60nSPfYzuwSEdzvV2WdxrVPUbPD/qui44rAkB3t3muNtmmGYHqrG56FGwX9SUEQmzNLAeS7g==",
"dev": true,
"requires": {
- "JSONStream": "1.3.2",
- "assert": "1.4.1",
- "browser-pack": "6.1.0",
- "browser-resolve": "1.11.2",
- "browserify-zlib": "0.2.0",
- "buffer": "5.1.0",
- "cached-path-relative": "1.0.1",
- "concat-stream": "1.5.2",
- "console-browserify": "1.1.0",
- "constants-browserify": "1.0.0",
- "crypto-browserify": "3.12.0",
- "defined": "1.0.0",
- "deps-sort": "2.0.0",
- "domain-browser": "1.1.7",
- "duplexer2": "0.1.4",
- "events": "1.1.1",
- "glob": "7.1.2",
- "has": "1.0.1",
- "htmlescape": "1.1.1",
- "https-browserify": "1.0.0",
- "inherits": "2.0.3",
- "insert-module-globals": "7.0.6",
- "labeled-stream-splicer": "2.0.1",
- "module-deps": "4.1.1",
- "os-browserify": "0.3.0",
- "parents": "1.0.1",
- "path-browserify": "0.0.0",
- "process": "0.11.10",
- "punycode": "1.4.1",
- "querystring-es3": "0.2.1",
- "read-only-stream": "2.0.0",
- "readable-stream": "2.3.6",
- "resolve": "1.7.1",
- "shasum": "1.0.2",
- "shell-quote": "1.6.1",
- "stream-browserify": "2.0.1",
- "stream-http": "2.8.1",
- "string_decoder": "1.0.3",
- "subarg": "1.0.0",
- "syntax-error": "1.4.0",
- "through2": "2.0.3",
- "timers-browserify": "1.4.2",
- "tty-browserify": "0.0.0",
- "url": "0.11.0",
- "util": "0.10.3",
- "vm-browserify": "0.0.4",
- "xtend": "4.0.1"
+ "JSONStream": "^1.0.3",
+ "assert": "^1.4.0",
+ "browser-pack": "^6.0.1",
+ "browser-resolve": "^1.11.0",
+ "browserify-zlib": "~0.2.0",
+ "buffer": "^5.0.2",
+ "cached-path-relative": "^1.0.0",
+ "concat-stream": "~1.5.1",
+ "console-browserify": "^1.1.0",
+ "constants-browserify": "~1.0.0",
+ "crypto-browserify": "^3.0.0",
+ "defined": "^1.0.0",
+ "deps-sort": "^2.0.0",
+ "domain-browser": "~1.1.0",
+ "duplexer2": "~0.1.2",
+ "events": "~1.1.0",
+ "glob": "^7.1.0",
+ "has": "^1.0.0",
+ "htmlescape": "^1.1.0",
+ "https-browserify": "^1.0.0",
+ "inherits": "~2.0.1",
+ "insert-module-globals": "^7.0.0",
+ "labeled-stream-splicer": "^2.0.0",
+ "module-deps": "^4.0.8",
+ "os-browserify": "~0.3.0",
+ "parents": "^1.0.1",
+ "path-browserify": "~0.0.0",
+ "process": "~0.11.0",
+ "punycode": "^1.3.2",
+ "querystring-es3": "~0.2.0",
+ "read-only-stream": "^2.0.0",
+ "readable-stream": "^2.0.2",
+ "resolve": "^1.1.4",
+ "shasum": "^1.0.0",
+ "shell-quote": "^1.6.1",
+ "stream-browserify": "^2.0.0",
+ "stream-http": "^2.0.0",
+ "string_decoder": "~1.0.0",
+ "subarg": "^1.0.0",
+ "syntax-error": "^1.1.1",
+ "through2": "^2.0.0",
+ "timers-browserify": "^1.0.1",
+ "tty-browserify": "~0.0.0",
+ "url": "~0.11.0",
+ "util": "~0.10.1",
+ "vm-browserify": "~0.0.1",
+ "xtend": "^4.0.0"
},
"dependencies": {
"buffer": {
@@ -2120,8 +2274,8 @@
"integrity": "sha512-YkIRgwsZwJWTnyQrsBTWefizHh+8GYj3kbL1BTiAQ/9pwpino0G7B2gp5tx/FUBqUlvtxV85KNR3mwfAtv15Yw==",
"dev": true,
"requires": {
- "base64-js": "1.3.0",
- "ieee754": "1.1.11"
+ "base64-js": "^1.0.2",
+ "ieee754": "^1.1.4"
}
},
"concat-stream": {
@@ -2130,9 +2284,9 @@
"integrity": "sha1-cIl4Yk2FavQaWnQd790mHadSwmY=",
"dev": true,
"requires": {
- "inherits": "2
<TRUNCATED>
[30/50] [abbrv] ignite git commit: IGNITE-8491 Add JMX flag: Is the
node in baseline or not - fixed license header
Posted by dp...@apache.org.
IGNITE-8491 Add JMX flag: Is the node in baseline or not - fixed license header
Signed-off-by: Ivan Rakov <ir...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/e227f22a
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/e227f22a
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/e227f22a
Branch: refs/heads/ignite-5789-1
Commit: e227f22adb99767f8f4e7b2be024cab5c9a82c30
Parents: 7c118e4
Author: vd-pyatkov <vp...@gridgain.com>
Authored: Tue May 22 12:49:21 2018 +0300
Committer: Ivan Rakov <ir...@apache.org>
Committed: Tue May 22 12:49:51 2018 +0300
----------------------------------------------------------------------
.../ignite/util/mbeans/GridMBeanBaselineTest.java | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/e227f22a/modules/core/src/test/java/org/apache/ignite/util/mbeans/GridMBeanBaselineTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/util/mbeans/GridMBeanBaselineTest.java b/modules/core/src/test/java/org/apache/ignite/util/mbeans/GridMBeanBaselineTest.java
index 00dce83..390eb21 100644
--- a/modules/core/src/test/java/org/apache/ignite/util/mbeans/GridMBeanBaselineTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/util/mbeans/GridMBeanBaselineTest.java
@@ -1,3 +1,19 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements. See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You under the Apache License, Version 2.0
+* (the "License"); you may not use this file except in compliance with
+* the License. You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
package org.apache.ignite.util.mbeans;
import org.apache.ignite.Ignite;
[49/50] [abbrv] ignite git commit: IGNITE-8577: Fixed RAT validation
for MIGRATION_GUIDE.
Posted by dp...@apache.org.
IGNITE-8577: Fixed RAT validation for MIGRATION_GUIDE.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/88d5ff8f
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/88d5ff8f
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/88d5ff8f
Branch: refs/heads/ignite-5789-1
Commit: 88d5ff8f91a5d4ef57bd9c5357e676c0ee0a4293
Parents: 0bdfa20
Author: devozerov <vo...@gridgain.com>
Authored: Thu May 24 11:59:28 2018 +0300
Committer: devozerov <vo...@gridgain.com>
Committed: Thu May 24 11:59:28 2018 +0300
----------------------------------------------------------------------
parent/pom.xml | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/88d5ff8f/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 929e43c..fb5eb52 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -838,6 +838,7 @@
<exclude>**/DEVNOTES*.txt</exclude>
<exclude>**/NOTICE*</exclude>
<exclude>**/LICENSE*</exclude>
+ <exclude>**/MIGRATION_GUIDE*</exclude>
<exclude>src/main/java/org/apache/ignite/internal/util/offheap/unsafe/GridOffHeapSnapTreeMap.java</exclude><!--BSD license-->
<exclude>src/main/java/org/apache/ignite/internal/util/nio/SelectedSelectionKeySet.java</exclude><!-- Apache 2.0 license -->
<exclude>src/main/java/org/apache/ignite/internal/util/snaptree/*.java</exclude><!--BSD license-->
[50/50] [abbrv] ignite git commit: Merge branch 'master' into
ignite-5789-1
Posted by dp...@apache.org.
Merge branch 'master' into ignite-5789-1
# Conflicts:
# modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java
# modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/ClientReconnectAfterClusterRestartTest.java
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/fbf252ba
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/fbf252ba
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/fbf252ba
Branch: refs/heads/ignite-5789-1
Commit: fbf252ba7aedc6c0e36ef50d9a37ef0311439209
Parents: 3daf812 88d5ff8
Author: dpavlov <dp...@apache.org>
Authored: Thu May 24 15:51:01 2018 +0300
Committer: dpavlov <dp...@apache.org>
Committed: Thu May 24 15:51:01 2018 +0300
----------------------------------------------------------------------
MIGRATION_GUIDE.txt | 2 +
assembly/release-base.xml | 5 +
bin/control.bat | 2 +-
bin/control.sh | 2 +-
...heContinuousQueryWithTransformerExample.java | 20 +-
.../CholeskyDecompositionExample.java | 80 -
.../EigenDecompositionExample.java | 69 -
.../decompositions/LUDecompositionExample.java | 83 -
.../decompositions/QRDecompositionExample.java | 82 -
.../SingularValueDecompositionExample.java | 70 -
.../ml/math/decompositions/package-info.java | 22 -
.../ml/math/matrix/CacheMatrixExample.java | 102 -
.../math/matrix/MatrixCustomStorageExample.java | 14 -
.../examples/ml/math/matrix/MatrixExample.java | 14 -
.../ml/math/matrix/OffHeapMatrixExample.java | 14 -
.../matrix/SparseDistributedMatrixExample.java | 70 -
.../ml/math/matrix/SparseMatrixExample.java | 15 -
.../ml/math/vector/CacheVectorExample.java | 109 -
.../LogisticRegressionSGDTrainerSample.java | 239 -
.../LogisticRegressionSGDTrainerSample.java | 239 +
.../logistic/binary/package-info.java | 22 +
...gressionMultiClassClassificationExample.java | 301 +
.../logistic/multiclass/package-info.java | 22 +
.../optimized/OptimizedMarshallerAopTest.java | 7 -
modules/cassandra/store/pom.xml | 6 +-
.../cassandra/session/CassandraSessionImpl.java | 284 +-
.../session/WrappedPreparedStatement.java | 181 +
.../store/cassandra/session/WrappedSession.java | 91 +
.../cassandra/session/pool/IdleSession.java | 72 +
.../cassandra/session/pool/SessionPool.java | 22 +-
.../cassandra/session/pool/SessionWrapper.java | 74 -
.../ignite/tests/CassandraConfigTest.java | 141 +
.../ignite/tests/CassandraSessionImplTest.java | 8 +-
.../internal/TaskEventSubjectIdSelfTest.java | 2 -
.../ClientAbstractMultiThreadedSelfTest.java | 5 -
.../client/ClientDefaultCacheSelfTest.java | 2 -
.../ClientAbstractMultiNodeSelfTest.java | 7 -
.../integration/ClientAbstractSelfTest.java | 5 -
.../integration/ClientPreferDirectSelfTest.java | 7 -
.../router/TcpRouterAbstractSelfTest.java | 2 -
.../router/TcpRouterMultiNodeSelfTest.java | 2 -
.../jdbc2/JdbcAbstractDmlStatementSelfTest.java | 5 -
.../internal/jdbc2/JdbcBulkLoadSelfTest.java | 5 -
.../jdbc2/JdbcComplexQuerySelfTest.java | 5 -
.../internal/jdbc2/JdbcConnectionSelfTest.java | 5 -
.../jdbc2/JdbcDistributedJoinsQueryTest.java | 5 -
.../internal/jdbc2/JdbcEmptyCacheSelfTest.java | 5 -
.../internal/jdbc2/JdbcLocalCachesSelfTest.java | 5 -
.../internal/jdbc2/JdbcMetadataSelfTest.java | 5 -
.../jdbc2/JdbcNoCacheStreamingSelfTest.java | 5 -
.../internal/jdbc2/JdbcNoDefaultCacheTest.java | 5 -
.../jdbc2/JdbcPreparedStatementSelfTest.java | 5 -
.../internal/jdbc2/JdbcResultSetSelfTest.java | 5 -
.../internal/jdbc2/JdbcStatementSelfTest.java | 5 -
.../internal/jdbc2/JdbcStreamingSelfTest.java | 8 -
.../jdbc2/JdbcStreamingToPublicCacheTest.java | 5 -
.../rest/AbstractRestProcessorSelfTest.java | 5 -
.../rest/ChangeStateCommandHandlerTest.java | 6 -
.../JettyRestProcessorAbstractSelfTest.java | 25 +-
.../rest/RestBinaryProtocolSelfTest.java | 5 -
.../rest/RestMemcacheProtocolSelfTest.java | 5 -
.../rest/TaskCommandHandlerSelfTest.java | 2 -
.../tcp/redis/RedisCommonAbstractTest.java | 2 -
.../jdbc/AbstractJdbcPojoQuerySelfTest.java | 2 -
.../ignite/jdbc/JdbcComplexQuerySelfTest.java | 5 -
.../ignite/jdbc/JdbcConnectionSelfTest.java | 5 -
.../ignite/jdbc/JdbcEmptyCacheSelfTest.java | 5 -
.../ignite/jdbc/JdbcErrorsAbstractSelfTest.java | 7 -
.../ignite/jdbc/JdbcLocalCachesSelfTest.java | 5 -
.../ignite/jdbc/JdbcMetadataSelfTest.java | 5 -
.../ignite/jdbc/JdbcNoDefaultCacheTest.java | 5 -
.../jdbc/JdbcPreparedStatementSelfTest.java | 5 -
.../ignite/jdbc/JdbcResultSetSelfTest.java | 5 -
.../ignite/jdbc/JdbcStatementSelfTest.java | 5 -
.../jdbc/suite/IgniteJdbcDriverTestSuite.java | 6 +-
.../JdbcThinAbstractDmlStatementSelfTest.java | 5 -
.../thin/JdbcThinAutoCloseServerCursorTest.java | 5 -
.../thin/JdbcThinComplexDmlDdlSelfTest.java | 5 -
.../jdbc/thin/JdbcThinComplexQuerySelfTest.java | 5 -
...JdbcThinConnectionMultipleAddressesTest.java | 7 +-
.../jdbc/thin/JdbcThinConnectionSelfTest.java | 5 -
.../jdbc/thin/JdbcThinEmptyCacheSelfTest.java | 5 -
.../jdbc/thin/JdbcThinMetadataSelfTest.java | 5 -
.../JdbcThinMissingLongArrayResultsTest.java | 6 +-
.../jdbc/thin/JdbcThinNoDefaultSchemaTest.java | 5 -
.../thin/JdbcThinPreparedStatementSelfTest.java | 5 -
.../jdbc/thin/JdbcThinResultSetSelfTest.java | 5 -
.../jdbc/thin/JdbcThinSchemaCaseTest.java | 5 -
.../thin/JdbcThinSelectAfterAlterTable.java | 5 -
.../jdbc/thin/JdbcThinStatementSelfTest.java | 5 -
.../thin/JdbcThinStreamingAbstractSelfTest.java | 505 ++
.../JdbcThinStreamingNotOrderedSelfTest.java | 38 +
.../thin/JdbcThinStreamingOrderedSelfTest.java | 39 +
.../jdbc/thin/JdbcThinStreamingSelfTest.java | 486 --
.../PdsWithTtlCompatibilityTest.java | 191 +
.../FoldersReuseCompatibilityTest.java | 2 +-
.../IgniteCompatibilityBasicTestSuite.java | 3 +
.../org/apache/ignite/IgniteDataStreamer.java | 23 +-
.../apache/ignite/IgniteSystemProperties.java | 15 +
.../configuration/DataRegionConfiguration.java | 10 +-
.../configuration/DataStorageConfiguration.java | 32 +-
.../configuration/FileSystemConfiguration.java | 2 +-
.../configuration/MemoryConfiguration.java | 10 +-
.../MemoryPolicyConfiguration.java | 8 +-
.../failure/StopNodeOrHaltFailureHandler.java | 18 +
.../apache/ignite/internal/GridDiagnostic.java | 2 +-
.../apache/ignite/internal/IgniteKernal.java | 38 +-
.../internal/commandline/CommandHandler.java | 80 +-
.../internal/jdbc/thin/JdbcThinConnection.java | 312 +-
.../internal/jdbc/thin/JdbcThinTcpIo.java | 92 +-
.../mem/file/MappedFileMemoryProvider.java | 8 +
.../mem/unsafe/UnsafeMemoryProvider.java | 8 +
.../ignite/internal/pagemem/PageIdUtils.java | 5 +-
.../pagemem/impl/PageMemoryNoStoreImpl.java | 5 +-
.../internal/pagemem/wal/record/WALRecord.java | 5 +-
.../delta/MetaPageUpdateLastAllocatedIndex.java | 6 +-
.../wal/record/delta/RotatedIdPartRecord.java | 66 +
.../processors/cache/CacheGroupContext.java | 16 +-
.../processors/cache/GridCacheMapEntry.java | 41 +-
.../GridCachePartitionExchangeManager.java | 115 +-
.../cache/IgniteCacheOffheapManager.java | 21 +-
.../cache/IgniteCacheOffheapManagerImpl.java | 128 +-
.../cache/WalStateNodeLeaveExchangeTask.java | 2 +-
.../distributed/dht/GridDhtLocalPartition.java | 209 +-
.../dht/GridDhtPartitionsStateValidator.java | 1 +
.../dht/atomic/GridNearAtomicUpdateFuture.java | 6 +-
.../GridDhtPartitionsExchangeFuture.java | 22 +-
.../cache/persistence/DataStructure.java | 34 +-
.../GridCacheDatabaseSharedManager.java | 401 +-
.../persistence/GridCacheOffheapManager.java | 441 +-
.../IgniteCacheDatabaseSharedManager.java | 2 +-
.../cache/persistence/file/FilePageStore.java | 43 +-
.../persistence/file/FilePageStoreManager.java | 12 +
.../persistence/freelist/AbstractFreeList.java | 104 +-
.../cache/persistence/freelist/PagesList.java | 60 +-
.../UpgradePendingTreeToPerPartitionTask.java | 380 +
.../cache/persistence/tree/BPlusTree.java | 29 +-
.../cache/persistence/tree/io/PageIO.java | 46 +-
.../tree/io/PagePartitionMetaIO.java | 35 +-
.../tree/io/PagePartitionMetaIOV2.java | 90 +
.../tree/reuse/LongListReuseBag.java | 46 +
.../wal/AbstractWalRecordsIterator.java | 11 +-
.../wal/FileWriteAheadLogManager.java | 92 +-
.../wal/FsyncModeFileWriteAheadLogManager.java | 92 +-
.../SingleSegmentLogicalRecordsIterator.java | 7 +-
.../persistence/wal/record/RecordTypes.java | 1 +
.../wal/serializer/RecordDataV1Serializer.java | 24 +
.../wal/serializer/RecordDataV2Serializer.java | 2 +-
.../wal/serializer/RecordV1Serializer.java | 61 +
.../wal/serializer/SegmentHeader.java | 58 +
.../continuous/CacheContinuousQueryManager.java | 3 +-
.../cache/transactions/IgniteTxManager.java | 15 +-
.../odbc/ClientListenerNioListener.java | 23 +-
.../odbc/jdbc/JdbcBatchExecuteRequest.java | 27 +
.../odbc/jdbc/JdbcBatchExecuteResult.java | 26 +-
.../odbc/jdbc/JdbcConnectionContext.java | 34 +-
.../jdbc/JdbcOrderedBatchExecuteRequest.java | 85 +
.../jdbc/JdbcOrderedBatchExecuteResult.java | 75 +
.../processors/odbc/jdbc/JdbcRequest.java | 8 +
.../odbc/jdbc/JdbcRequestHandler.java | 119 +-
.../odbc/jdbc/JdbcResponseSender.java | 31 +
.../processors/odbc/jdbc/JdbcResult.java | 8 +
.../utils/PlatformConfigurationUtils.java | 47 +
.../processors/query/SqlClientContext.java | 147 +-
.../processors/service/GridServiceProxy.java | 22 +-
.../apache/ignite/internal/sql/SqlKeyword.java | 3 +
.../sql/command/SqlSetStreamingCommand.java | 19 +
.../apache/ignite/internal/util/GridDebug.java | 56 +-
.../ignite/internal/util/GridLogThrottle.java | 28 +-
.../ignite/internal/util/GridLongList.java | 2 +-
.../internal/util/GridPartitionStateMap.java | 2 +-
.../apache/ignite/internal/util/typedef/X.java | 44 +-
.../verify/ValidateIndexesPartitionResult.java | 31 +-
.../verify/VisorValidateIndexesJobResult.java | 38 +-
.../apache/ignite/logger/java/JavaLogger.java | 2 +-
.../org/apache/ignite/mxbean/IgniteMXBean.java | 8 +
.../ignite/spi/IgniteSpiMBeanAdapter.java | 2 +-
.../cache/IgniteWarmupClosureSelfTest.java | 5 -
.../affinity/AffinityClientNodeSelfTest.java | 5 -
.../AffinityDistributionLoggingTest.java | 2 -
.../local/LocalAffinityFunctionTest.java | 5 -
.../RendezvousAffinityFunctionSelfTest.java | 5 -
...ndezvousAffinityFunctionSimpleBenchmark.java | 5 -
...cheStoreSessionListenerAbstractSelfTest.java | 5 -
.../StopNodeOrHaltFailureHandlerTest.java | 5 -
.../ignite/igfs/IgfsEventsAbstractSelfTest.java | 5 -
.../igfs/IgfsFragmentizerAbstractSelfTest.java | 5 -
.../ignite/internal/ClusterGroupSelfTest.java | 6 -
.../ignite/internal/ClusterMetricsSelfTest.java | 5 -
.../ignite/internal/GridAffinityMappedTest.java | 7 -
.../internal/GridAffinityNoCacheSelfTest.java | 7 -
...chePartitionExchangeManagerHistSizeTest.java | 2 -
.../internal/GridJobServicesAddNodeTest.java | 5 -
.../GridKernalConcurrentAccessStopSelfTest.java | 6 -
.../internal/GridListenActorSelfTest.java | 5 -
.../internal/GridMultipleJobsSelfTest.java | 8 -
.../ignite/internal/GridNodeFilterSelfTest.java | 10 -
.../GridProjectionForCachesSelfTest.java | 5 -
.../internal/GridRuntimeExceptionSelfTest.java | 5 -
.../apache/ignite/internal/GridSelfTest.java | 5 -
.../GridTaskExecutionContextSelfTest.java | 5 -
.../internal/GridTaskExecutionSelfTest.java | 5 -
.../internal/GridTaskJobRejectSelfTest.java | 6 -
.../IgniteClientReconnectAbstractTest.java | 4 -
.../IgniteClientReconnectCacheTest.java | 41 +
.../IgniteComputeEmptyClusterGroupTest.java | 5 -
...eConcurrentEntryProcessorAccessStopTest.java | 7 -
.../IgniteSlowClientDetectionSelfTest.java | 7 -
.../internal/MemoryLeaksOnRestartNodeTest.java | 4 -
.../ignite/internal/TaskNodeRestartTest.java | 7 -
.../BinaryArrayIdentityResolverSelfTest.java | 7 -
.../BinaryObjectBuilderAdditionalSelfTest.java | 5 -
...naryObjectBuilderDefaultMappersSelfTest.java | 5 -
.../BinarySerialiedFieldComparatorSelfTest.java | 7 -
.../internal/binary/BinaryTreeSelfTest.java | 2 -
.../binary/GridBinaryAffinityKeySelfTest.java | 5 -
.../managers/IgniteDiagnosticMessagesTest.java | 3 -
.../communication/IgniteIoTestMessagesTest.java | 7 -
.../IgniteVariousConnectionNumberTest.java | 7 -
.../GridDeploymentMessageCountSelfTest.java | 7 -
.../OptimizedMarshallerPooledSelfTest.java | 2 -
.../pagemem/impl/PageIdUtilsSelfTest.java | 3 +-
.../GridCacheTxLoadFromStoreOnLockSelfTest.java | 5 -
.../GridAffinityProcessorAbstractSelfTest.java | 5 -
.../cache/CacheAffinityCallSelfTest.java | 5 -
.../cache/CacheConnectionLeakStoreTxTest.java | 5 -
.../cache/CacheDataRegionConfigurationTest.java | 4 +-
.../cache/CacheDeferredDeleteQueueTest.java | 4 -
.../CacheDeferredDeleteSanitySelfTest.java | 5 -
...cheDhtLocalPartitionAfterRemoveSelfTest.java | 5 -
.../cache/CacheEnumOperationsAbstractTest.java | 7 -
...CacheExchangeMessageDuplicatedStateTest.java | 7 -
.../cache/CacheGroupMetricsMBeanTest.java | 5 -
.../cache/CacheGroupsMetricsRebalanceTest.java | 53 +-
...erceptorPartitionCounterLocalSanityTest.java | 7 -
...torPartitionCounterRandomOperationsTest.java | 7 -
.../cache/CacheKeepBinaryTransactionTest.java | 7 -
.../cache/CacheMetricsEntitiesCountTest.java | 5 -
.../CacheMetricsForClusterGroupSelfTest.java | 5 -
.../cache/CacheOffheapMapEntrySelfTest.java | 5 -
...cheOptimisticTransactionsWithFilterTest.java | 7 -
.../CachePutEventListenerErrorSelfTest.java | 5 -
.../processors/cache/CachePutIfAbsentTest.java | 7 -
.../CacheSerializableTransactionsTest.java | 7 -
...eUsageMultinodeDynamicStartAbstractTest.java | 7 -
.../CacheTxNotAllowReadFromBackupTest.java | 7 -
.../cache/CacheValidatorMetricsTest.java | 5 -
.../processors/cache/CrossCacheLockTest.java | 7 -
.../cache/CrossCacheTxRandomOperationsTest.java | 7 -
.../EntryVersionConsistencyReadThroughTest.java | 7 -
...ridCacheAbstractByteArrayValuesSelfTest.java | 5 -
.../GridCacheAbstractLocalStoreSelfTest.java | 5 -
.../GridCacheAbstractRemoveFailureTest.java | 4 -
.../cache/GridCacheAbstractSelfTest.java | 2 -
.../cache/GridCacheAffinityMapperSelfTest.java | 5 -
.../cache/GridCacheAffinityRoutingSelfTest.java | 10 -
.../cache/GridCacheClearSelfTest.java | 5 -
...ridCacheConfigurationValidationSelfTest.java | 7 -
.../cache/GridCacheEntryMemorySizeSelfTest.java | 5 -
.../GridCacheMarshallingNodeJoinSelfTest.java | 5 -
.../cache/GridCacheNestedTxAbstractTest.java | 5 -
.../cache/GridCachePartitionedGetSelfTest.java | 5 -
.../cache/GridCachePutAllFailoverSelfTest.java | 2 -
...ProjectionForCachesOnDaemonNodeSelfTest.java | 5 -
.../cache/IgniteCacheAbstractTest.java | 2 -
...IgniteCacheBinaryEntryProcessorSelfTest.java | 7 -
.../IgniteCacheBinaryObjectsScanSelfTest.java | 2 -
.../cache/IgniteCacheDynamicStopSelfTest.java | 7 -
...niteCacheEntryListenerExpiredEventsTest.java | 7 -
.../IgniteCacheEntryProcessorCallTest.java | 7 -
...niteCacheExpireAndUpdateConsistencyTest.java | 7 -
.../cache/IgniteCacheIncrementTxTest.java | 7 -
...gniteCacheInvokeReadThroughAbstractTest.java | 7 -
.../cache/IgniteCacheNearLockValueSelfTest.java | 7 -
.../cache/IgniteCacheNoSyncForGetTest.java | 7 -
.../cache/IgniteCacheObjectPutSelfTest.java | 5 -
.../cache/IgniteCachePutAllRestartTest.java | 2 -
.../IgniteCachePutStackOverflowSelfTest.java | 5 -
.../cache/IgniteCacheSerializationSelfTest.java | 7 -
.../cache/IgniteCacheStartStopLoadTest.java | 5 -
.../cache/IgniteCacheStoreCollectionTest.java | 7 -
...IgniteClientCacheInitializationFailTest.java | 5 -
.../IgniteClusterActivateDeactivateTest.java | 4 +-
.../cache/IgniteDynamicCacheMultinodeTest.java | 7 -
.../cache/IgniteDynamicCacheStartSelfTest.java | 7 -
...niteDynamicCacheStartStopConcurrentTest.java | 7 -
.../cache/IgniteInternalCacheTypesTest.java | 7 -
.../cache/IgniteOutOfMemoryPropagationTest.java | 9 +-
.../IgniteStartCacheInTransactionSelfTest.java | 5 -
.../cache/IgniteSystemCacheOnClientTest.java | 7 -
.../processors/cache/IgniteTxAbstractTest.java | 7 -
.../cache/IgniteTxConfigCacheSelfTest.java | 5 -
.../cache/MemoryPolicyConfigValidationTest.java | 20 +-
...AffinityCoordinatorDynamicStartStopTest.java | 2 +-
...heapCacheMetricsForClusterGroupSelfTest.java | 5 -
.../cache/WalModeChangeAbstractSelfTest.java | 7 -
.../CacheKeepBinaryWithInterceptorTest.java | 7 -
...naryObjectsAbstractDataStreamerSelfTest.java | 5 -
...aryObjectsAbstractMultiThreadedSelfTest.java | 5 -
.../GridCacheBinaryObjectsAbstractSelfTest.java | 5 -
.../GridCacheBinaryStoreAbstractSelfTest.java | 5 -
.../GridCacheSequenceApiSelfAbstractTest.java | 17 +-
.../IgniteAtomicsAbstractTest.java | 4 -
.../IgniteClientDataStructuresAbstractTest.java | 5 -
.../IgniteCollectionAbstractTest.java | 5 -
.../IgniteDataStructureWithJobTest.java | 7 -
.../distributed/CacheAsyncOperationsTest.java | 7 -
.../distributed/CacheBaselineTopologyTest.java | 8 +-
.../distributed/CacheExchangeMergeTest.java | 27 +-
.../CacheGetFutureHangsSelfTest.java | 7 -
.../CacheGetInsideLockChangingTopologyTest.java | 4 -
.../CacheLateAffinityAssignmentTest.java | 9 +-
...CacheLoadingConcurrentGridStartSelfTest.java | 22 +-
.../cache/distributed/CacheStartOnJoinTest.java | 6 +-
.../CacheTryLockMultithreadedTest.java | 7 -
...tractDistributedByteArrayValuesSelfTest.java | 2 -
.../GridCacheAbstractJobExecutionTest.java | 5 -
.../GridCacheAbstractNodeRestartSelfTest.java | 2 -
.../GridCacheAbstractPrimarySyncSelfTest.java | 5 -
.../GridCacheBasicOpAbstractTest.java | 2 -
.../distributed/GridCacheLockAbstractTest.java | 5 -
.../distributed/GridCacheMixedModeSelfTest.java | 5 -
.../GridCacheMultiNodeAbstractTest.java | 2 -
.../GridCacheMultiNodeLockAbstractTest.java | 2 -
.../GridCacheNodeFailureAbstractTest.java | 2 -
...chePartitionedReloadAllAbstractSelfTest.java | 4 -
...GridCachePreloadRestartAbstractSelfTest.java | 5 -
...yMetadataUpdateChangingTopologySelfTest.java | 5 -
...niteBinaryMetadataUpdateNodeRestartTest.java | 4 -
.../IgniteCacheClientReconnectTest.java | 7 -
.../IgniteCacheConnectionRecoveryTest.java | 7 -
.../distributed/IgniteCacheGetRestartTest.java | 4 -
.../distributed/IgniteCacheManyClientsTest.java | 7 -
.../IgniteCacheMessageRecoveryAbstractTest.java | 5 -
...eCacheMessageRecoveryIdleConnectionTest.java | 7 -
.../IgniteCacheNearRestartRollbackSelfTest.java | 2 -
.../distributed/IgniteCachePrimarySyncTest.java | 7 -
.../IgniteCacheReadFromBackupTest.java | 7 -
.../IgniteCacheSingleGetMessageTest.java | 7 -
.../IgniteCrossCacheTxStoreSelfTest.java | 2 -
.../IgniteOptimisticTxSuspendResumeTest.java | 4 +-
.../IgniteTxCachePrimarySyncTest.java | 7 -
...teSynchronizationModesMultithreadedTest.java | 4 -
.../IgniteTxTimeoutAbstractTest.java | 2 -
...heAbstractTransformWriteThroughSelfTest.java | 2 -
.../dht/GridCacheDhtEntrySelfTest.java | 5 -
...GridCacheDhtEvictionNearReadersSelfTest.java | 7 -
.../dht/GridCacheDhtMappingSelfTest.java | 7 -
...idCachePartitionsStateValidatorSelfTest.java | 10 +-
.../IgniteCacheCommitDelayTxRecoveryTest.java | 7 -
.../IgniteCacheCrossCacheTxFailoverTest.java | 7 -
.../dht/IgniteCacheMultiTxLockSelfTest.java | 7 -
.../IgniteCachePutRetryAbstractSelfTest.java | 4 -
.../dht/IgniteCrossCacheTxSelfTest.java | 5 -
.../near/GridCacheNearMultiGetSelfTest.java | 5 -
.../near/GridCacheNearMultiNodeSelfTest.java | 7 -
.../near/GridCacheNearTxForceKeyTest.java | 7 -
.../GridCachePartitionedAffinitySelfTest.java | 5 -
...ePartitionedBasicStoreMultiNodeSelfTest.java | 2 -
...ePartitionedMultiThreadedPutGetSelfTest.java | 5 -
.../near/NearCacheMultithreadedUpdateTest.java | 7 -
.../near/NoneRebalanceModeSelfTest.java | 5 -
.../rebalancing/CacheManualRebalancingTest.java | 5 -
.../GridCacheRebalancingOrderingTest.java | 7 -
.../GridCacheRebalancingSyncCheckDataTest.java | 8 -
.../cache/eviction/EvictionAbstractTest.java | 2 -
.../EvictionPolicyFactoryAbstractTest.java | 2 -
.../PageEvictionMultinodeMixedRegionsTest.java | 4 +-
.../paged/PageEvictionMultinodeTest.java | 5 -
...ageEvictionPagesRecyclingAndReusingTest.java | 153 +
.../SortedEvictionPolicyPerformanceTest.java | 5 -
.../GridCacheLocalByteArrayValuesSelfTest.java | 2 -
...eBaselineAffinityTopologyActivationTest.java | 2 +-
.../IgniteDataStorageMetricsSelfTest.java | 4 +-
...tePdsBinaryMetadataOnClusterRestartTest.java | 2 +-
...gnitePdsCacheAssignmentNodeRestartsTest.java | 4 +-
.../IgnitePdsCacheRebalancingAbstractTest.java | 4 +-
.../IgnitePdsContinuousRestartTest.java | 89 +-
.../IgnitePdsContinuousRestartTest2.java | 281 -
...dsContinuousRestartTestWithExpiryPolicy.java | 67 +
.../IgnitePdsCorruptedCacheDataTest.java | 2 -
.../IgnitePdsCorruptedIndexTest.java | 341 +
.../persistence/IgnitePdsDynamicCacheTest.java | 2 +-
.../IgnitePdsExchangeDuringCheckpointTest.java | 4 +-
.../IgnitePdsMultiNodePutGetRestartTest.java | 2 +-
.../persistence/IgnitePdsPageSizesTest.java | 2 +-
.../IgnitePdsPartitionFilesDestroyTest.java | 472 +
.../IgnitePdsPartitionFilesTruncateTest.java | 153 -
...gnitePdsRecoveryAfterFileCorruptionTest.java | 2 +-
.../IgnitePdsRemoveDuringRebalancingTest.java | 2 +-
.../IgnitePersistentStoreCacheGroupsTest.java | 2 +-
...lWalModeChangeDuringRebalancingSelfTest.java | 66 +
.../MemoryPolicyInitializationTest.java | 4 +-
.../PersistenceDirectoryWarningLoggingTest.java | 85 +
.../IgniteBaselineAbstractFullApiSelfTest.java | 9 +-
...gingBaselineDownCachePutAllFailoverTest.java | 8 +-
...gingBaselineDownCacheRemoveFailoverTest.java | 8 +-
...angingBaselineUpCachePutAllFailoverTest.java | 8 +-
...angingBaselineUpCacheRemoveFailoverTest.java | 8 +-
...teStableBaselineCachePutAllFailoverTest.java | 8 +-
...teStableBaselineCacheRemoveFailoverTest.java | 8 +-
.../db/IgnitePdsCacheRestoreTest.java | 4 +-
.../db/IgnitePdsMultiNodePutGetRestartTest.java | 2 +-
...PdsPageEvictionDuringPartitionClearTest.java | 2 +-
.../db/IgnitePdsPageEvictionTest.java | 2 +-
...tePdsRebalancingOnNotStableTopologyTest.java | 2 +-
.../db/IgnitePdsTransactionsHangTest.java | 10 +-
.../db/IgnitePdsWholeClusterRestartTest.java | 2 +-
.../persistence/db/IgnitePdsWithTtlTest.java | 197 +
...faultPageSizeBackwardsCompatibilityTest.java | 2 +-
...nitePdsCacheDestroyDuringCheckpointTest.java | 4 -
.../db/file/IgnitePdsCacheIntegrationTest.java | 2 +-
.../file/IgnitePdsDiskErrorsRecoveringTest.java | 2 +-
.../file/IgnitePdsNoActualWalHistoryTest.java | 2 +-
.../db/file/IgnitePdsPageReplacementTest.java | 4 -
.../file/IgnitePdsThreadInterruptionTest.java | 2 -
.../IgniteUidAsConsistentIdMigrationTest.java | 2 +-
...alFlushBackgroundWithMmapBufferSelfTest.java | 28 +
.../db/wal/IgniteWalFlushDefaultSelfTest.java | 35 -
.../db/wal/IgniteWalFlushFsyncSelfTest.java | 35 +
...alFlushFsyncWithDedicatedWorkerSelfTest.java | 39 +
...niteWalFlushFsyncWithMmapBufferSelfTest.java | 28 +
...teWalFlushLogOnlyWithMmapBufferSelfTest.java | 28 +
...lFlushMultiNodeFailoverAbstractSelfTest.java | 56 +-
.../wal/IgniteWalHistoryReservationsTest.java | 2 +-
.../db/wal/IgniteWalRecoveryPPCTest.java | 8 +-
.../IgniteWalRecoverySeveralRestartsTest.java | 2 +-
.../db/wal/IgniteWalRecoveryTest.java | 4 +-
.../db/wal/IgniteWalSerializerVersionTest.java | 2 +-
.../persistence/db/wal/WalCompactionTest.java | 2 +-
.../db/wal/WalRecoveryTxLogicalRecordsTest.java | 2 +-
.../db/wal/reader/IgniteWalReaderTest.java | 48 +-
.../pagemem/FillFactorMetricTest.java | 5 +-
.../pagemem/PageMemoryNoStoreLeakTest.java | 82 +
.../pagemem/PagesWriteThrottleSmokeTest.java | 4 +-
.../IgniteChangeGlobalStateAbstractTest.java | 2 +-
.../IgniteStandByClusterTest.java | 2 +-
.../extended/GridActivateExtensionTest.java | 4 +-
...gniteAbstractStandByClientReconnectTest.java | 2 +-
.../GridCacheQueryTransformerSelfTest.java | 5 -
.../ScanQueryOffheapExpiryPolicySelfTest.java | 7 -
.../continuous/CacheContinuousBatchAckTest.java | 7 -
...eContinuousQueryAsyncFilterListenerTest.java | 7 -
...CacheContinuousQueryCounterAbstractTest.java | 5 -
...acheContinuousQueryExecuteInPrimaryTest.java | 5 -
...ontinuousQueryOperationFromCallbackTest.java | 7 -
.../CacheContinuousQueryOperationP2PTest.java | 7 -
.../CacheContinuousQueryOrderingEventTest.java | 7 -
...acheContinuousQueryRandomOperationsTest.java | 7 -
...inuousWithTransformerReplicatedSelfTest.java | 2 -
...eEntryProcessorExternalizableFailedTest.java | 7 -
.../CacheEntryProcessorNonSerializableTest.java | 7 -
.../CacheKeepBinaryIterationTest.java | 7 -
...ridCacheContinuousQueryAbstractSelfTest.java | 5 -
.../GridCacheContinuousQueryConcurrentTest.java | 7 -
...idCacheWriteBehindStoreAbstractSelfTest.java | 2 -
...BehindStorePartitionedMultiNodeSelfTest.java | 2 -
.../IgniteCacheWriteBehindNoUpdateSelfTest.java | 5 -
.../cache/transactions/TxDeadlockCauseTest.java | 9 +-
.../TxDeadlockDetectionNoHangsTest.java | 2 -
.../transactions/TxDeadlockDetectionTest.java | 7 -
.../TxDeadlockDetectionUnmasrhalErrorsTest.java | 7 -
.../transactions/TxMultiCacheAsyncOpsTest.java | 7 -
.../TxOptimisticDeadlockDetectionTest.java | 7 -
.../TxOptimisticOnPartitionExchangeTest.java | 7 -
...simisticDeadlockDetectionCrossCacheTest.java | 7 -
.../TxPessimisticDeadlockDetectionTest.java | 7 -
.../TxRollbackAsyncWithPersistenceTest.java | 2 -
...ollbackOnTimeoutNoDeadlockDetectionTest.java | 2 -
.../closure/GridClosureProcessorRemoteTest.java | 5 -
.../closure/GridClosureProcessorSelfTest.java | 5 -
.../closure/GridClosureSerializationTest.java | 7 -
.../cluster/GridUpdateNotifierSelfTest.java | 2 -
...ComputeJobExecutionErrorToLogManualTest.java | 5 -
.../database/IgniteDbDynamicCacheSelfTest.java | 2 +-
.../IgniteDbPutGetWithCacheStoreTest.java | 2 +-
.../database/IndexStorageSelfTest.java | 2 +-
.../database/SwapPathConstructionSelfTest.java | 2 +-
.../DataStreamerUpdateAfterLoadTest.java | 7 -
.../igfs/IgfsAbstractBaseSelfTest.java | 2 +-
.../processors/igfs/IgfsCacheSelfTest.java | 5 -
.../igfs/IgfsDataManagerSelfTest.java | 5 -
...fsLocalSecondaryFileSystemProxySelfTest.java | 2 +-
.../igfs/IgfsMetaManagerSelfTest.java | 5 -
.../processors/igfs/IgfsMetricsSelfTest.java | 5 -
.../processors/igfs/IgfsProcessorSelfTest.java | 5 -
.../processors/igfs/IgfsSizeSelfTest.java | 2 +-
.../processors/igfs/IgfsStreamsSelfTest.java | 5 -
.../processors/igfs/IgfsTaskSelfTest.java | 5 -
.../IgfsAbstractRecordResolverSelfTest.java | 5 -
.../handlers/log/GridLogCommandHandlerTest.java | 2 -
.../query/GridQueryCommandHandlerTest.java | 7 -
.../service/ClosureServiceClientsNodesTest.java | 5 -
...ServiceDeploymentCompoundFutureSelfTest.java | 5 -
...rviceDeploymentExceptionPropagationTest.java | 7 -
.../GridServiceProcessorAbstractSelfTest.java | 9 +-
...ServiceProcessorMultiNodeConfigSelfTest.java | 13 +-
...GridServiceProxyClientReconnectSelfTest.java | 62 +-
...gniteServiceConfigVariationsFullApiTest.java | 22 +-
.../IgniteServiceDynamicCachesSelfTest.java | 5 -
.../ServicePredicateAccessCacheTest.java | 7 -
.../sql/SqlParserSetStreamingSelfTest.java | 39 +-
.../offheap/GridOffHeapMapAbstractSelfTest.java | 2 +-
...idOffHeapPartitionedMapAbstractSelfTest.java | 2 +-
.../org/apache/ignite/lang/GridXSelfTest.java | 13 +
.../loadtests/GridCacheMultiNodeLoadTest.java | 2 -
.../communication/GridIoManagerBenchmark0.java | 5 -
.../direct/stealing/GridStealingLoadTest.java | 5 -
.../GridP2PContinuousDeploymentSelfTest.java | 5 -
.../GridSessionWaitAttributeSelfTest.java | 6 -
...redFsCheckpointSpiMultiThreadedSelfTest.java | 2 -
...CommunicationRecoveryAckClosureSelfTest.java | 26 +-
.../tcp/TcpCommunicationSpiDropNodesTest.java | 2 -
.../TcpCommunicationSpiFaultyClientTest.java | 2 -
.../discovery/AuthenticationRestartTest.java | 2 -
.../tcp/TcpDiscoveryConcurrentStartTest.java | 5 -
.../stream/socket/SocketStreamerSelfTest.java | 5 -
.../ignite/testframework/GridTestUtils.java | 11 +-
.../testframework/junits/GridAbstractTest.java | 10 +-
.../common/GridRollingRestartAbstractTest.java | 4 -
.../junits/multijvm/IgniteProcessProxy.java | 23 +-
.../IgniteCacheEvictionSelfTestSuite.java | 3 +
.../ignite/testsuites/IgnitePdsTestSuite.java | 6 +
.../ignite/testsuites/IgnitePdsTestSuite2.java | 29 +-
.../ignite/util/GridCommandHandlerTest.java | 152 +-
.../apache/ignite/util/GridLogThrottleTest.java | 128 +-
.../util/GridTopologyHeapSizeSelfTest.java | 4 +-
.../util/mbeans/GridMBeanBaselineTest.java | 112 +
.../util/mbeans/GridMBeanDisableSelfTest.java | 2 -
modules/flink/pom.xml | 12 +
modules/flume/pom.xml | 6 +
.../ignite/stream/flume/IgniteSinkTest.java | 5 -
modules/gce/pom.xml | 7 +
...pDiscoveryGoogleStorageIpFinderSelfTest.java | 2 -
modules/hadoop/pom.xml | 32 +
.../hadoop/impl/HadoopAbstractSelfTest.java | 2 -
.../hadoop/impl/HadoopCommandLineTest.java | 2 -
.../hadoop/impl/HadoopJobTrackerSelfTest.java | 7 -
.../hadoop/impl/HadoopPopularWordsTest.java | 2 +-
.../impl/HadoopTaskExecutionSelfTest.java | 7 -
.../client/HadoopClientProtocolSelfTest.java | 7 -
.../impl/igfs/Hadoop1OverIgfsProxyTest.java | 2 +-
.../hadoop/impl/igfs/IgfsEventsTestSuite.java | 2 -
.../igfs/IgfsNearOnlyMultiNodeSelfTest.java | 8 +-
...niteHadoopFileSystemClientBasedOpenTest.java | 7 -
.../HibernateL2CacheConfigurationSelfTest.java | 5 -
.../hibernate/HibernateL2CacheMultiJvmTest.java | 7 -
.../hibernate/HibernateL2CacheSelfTest.java | 5 -
.../HibernateL2CacheStrategySelfTest.java | 5 -
.../HibernateL2CacheTransactionalSelfTest.java | 2 -
.../HibernateL2CacheConfigurationSelfTest.java | 5 -
.../hibernate/HibernateL2CacheMultiJvmTest.java | 7 -
.../hibernate/HibernateL2CacheSelfTest.java | 5 -
.../HibernateL2CacheStrategySelfTest.java | 5 -
.../HibernateL2CacheTransactionalSelfTest.java | 2 -
.../processors/query/h2/IgniteH2Indexing.java | 2 +-
.../query/h2/database/InlineIndexHelper.java | 1 -
.../visor/verify/ValidateIndexesClosure.java | 264 +-
.../visor/verify/VisorValidateIndexesTask.java | 6 +-
.../CacheBinaryKeyConcurrentQueryTest.java | 7 -
.../cache/CacheIteratorScanQueryTest.java | 5 -
.../CacheOffheapBatchIndexingBaseTest.java | 5 -
.../CacheOperationsWithExpirationTest.java | 7 -
.../cache/CacheQueryBuildValueTest.java | 7 -
.../CacheRandomOperationsMultithreadedTest.java | 7 -
.../cache/CacheSqlQueryValueCopySelfTest.java | 7 -
.../ClientReconnectAfterClusterRestartTest.java | 4 +-
.../cache/GridCacheFullTextQuerySelfTest.java | 5 -
.../cache/GridCacheOffHeapSelfTest.java | 2 -
.../GridCacheOffheapIndexEntryEvictTest.java | 5 -
.../cache/GridCacheOffheapIndexGetSelfTest.java | 5 -
.../IgniteBinaryObjectFieldsQuerySelfTest.java | 2 -
.../IgniteBinaryObjectQueryArgumentsTest.java | 7 -
.../IgniteCacheAbstractFieldsQuerySelfTest.java | 2 -
...niteCacheAbstractInsertSqlQuerySelfTest.java | 5 -
.../cache/IgniteCacheAbstractQuerySelfTest.java | 4 -
.../IgniteCacheAbstractSqlDmlQuerySelfTest.java | 5 -
.../IgniteCacheCollocatedQuerySelfTest.java | 5 -
.../IgniteCacheCrossCacheJoinRandomTest.java | 2 -
...acheDistributedJoinCollocatedAndNotTest.java | 7 -
...acheDistributedJoinCustomAffinityMapper.java | 7 -
.../IgniteCacheDistributedJoinNoIndexTest.java | 7 -
...ributedJoinPartitionedAndReplicatedTest.java | 7 -
...CacheDistributedJoinQueryConditionsTest.java | 7 -
.../cache/IgniteCacheDistributedJoinTest.java | 1 -
...cheDuplicateEntityConfigurationSelfTest.java | 5 -
.../IgniteCacheFieldsQueryNoDataSelfTest.java | 5 -
...PartitionedAndReplicatedCollocationTest.java | 7 -
...teCacheJoinPartitionedAndReplicatedTest.java | 7 -
...IgniteCacheJoinQueryWithAffinityKeyTest.java | 7 -
.../cache/IgniteCacheLargeResultSelfTest.java | 5 -
.../IgniteCacheObjectKeyIndexingSelfTest.java | 2 -
.../cache/IgniteCacheOffheapIndexScanTest.java | 5 -
...hePartitionedQueryMultiThreadedSelfTest.java | 5 -
...IgniteCachePrimitiveFieldsQuerySelfTest.java | 5 -
.../cache/IgniteCacheQueriesLoadTest1.java | 7 -
.../IgniteCacheQueryH2IndexingLeakTest.java | 2 -
.../IgniteCacheQueryMultiThreadedSelfTest.java | 5 -
...gniteCacheSqlQueryMultiThreadedSelfTest.java | 7 -
...CheckClusterStateBeforeExecuteQueryTest.java | 2 +-
.../cache/IgniteErrorOnRebalanceTest.java | 2 +-
...leNodeWithIndexingPutGetPersistenceTest.java | 2 -
...stributedPartitionQueryAbstractSelfTest.java | 9 +-
...butedQueryStopOnCancelOrTimeoutSelfTest.java | 7 -
...cheQueryAbstractDistributedJoinSelfTest.java | 5 -
.../IgniteCacheQueryNoRebalanceSelfTest.java | 7 -
.../near/IgniteCacheQueryNodeFailTest.java | 7 -
.../IgniteCacheQueryNodeRestartSelfTest2.java | 7 +-
.../index/DuplicateKeyValueClassesSelfTest.java | 5 -
.../cache/index/DynamicColumnsAbstractTest.java | 2 +-
.../index/DynamicIndexAbstractSelfTest.java | 9 +-
.../cache/index/H2ConnectionLeaksSelfTest.java | 5 -
.../H2DynamicColumnsAbstractBasicSelfTest.java | 7 -
.../index/H2DynamicIndexAbstractSelfTest.java | 7 -
.../index/H2DynamicIndexingComplexTest.java | 7 -
.../cache/index/H2DynamicTableSelfTest.java | 7 -
.../index/OptimizedMarshallerIndexNameTest.java | 9 +-
.../index/QueryEntityValidationSelfTest.java | 5 -
...eCacheLocalQueryCancelOrTimeoutSelfTest.java | 7 -
...eDbSingleNodeWithIndexingWalRestoreTest.java | 2 +-
.../IgnitePersistentStoreSchemaLoadTest.java | 2 +-
...ckPartitionOnAffinityRunAtomicCacheTest.java | 6 +-
...neLockPartitionOnAffinityRunTxCacheTest.java | 6 +-
...ngBaselineCacheQueryNodeRestartSelfTest.java | 4 +-
...StableBaselineBinObjFieldsQuerySelfTest.java | 2 +-
...eBaselineCacheQueryNodeRestartsSelfTest.java | 4 +-
.../query/IgniteSqlDefaultValueTest.java | 7 -
.../query/IgniteSqlDistributedJoinSelfTest.java | 5 -
.../query/IgniteSqlNotNullConstraintTest.java | 95 +-
.../processors/query/IgniteSqlRoutingTest.java | 7 -
.../query/IgniteSqlSegmentedIndexSelfTest.java | 5 -
...teSqlSkipReducerOnUpdateDmlFlagSelfTest.java | 8 -
...IgniteSqlSkipReducerOnUpdateDmlSelfTest.java | 4 -
.../query/IgniteSqlSplitterSelfTest.java | 5 -
.../query/h2/IgniteSqlBigIntegerKeyTest.java | 5 -
.../h2/sql/AbstractH2CompareQueryTest.java | 4 -
.../query/h2/sql/GridQueryParsingTest.java | 4 -
.../IgniteCacheWithIndexingTestSuite.java | 3 +
.../IgnitePdsWithIndexingCoreTestSuite.java | 5 +
.../util/GridCommandHandlerIndexingTest.java | 203 +-
.../cache/CacheJndiTmFactorySelfTest.java | 2 -
.../GridJtaTransactionManagerSelfTest.java | 4 -
.../kafka/connect/IgniteSinkConnectorTest.java | 5 -
.../connect/IgniteSourceConnectorTest.java | 5 -
.../java/org/apache/ignite/ml/math/Algebra.java | 590 --
.../java/org/apache/ignite/ml/math/Blas.java | 8 +-
.../org/apache/ignite/ml/math/Constants.java | 59 -
.../ignite/ml/math/IdentityValueMapper.java | 56 -
.../org/apache/ignite/ml/math/MathUtils.java | 32 -
.../java/org/apache/ignite/ml/math/Matrix.java | 15 -
.../org/apache/ignite/ml/math/VectorUtils.java | 3 +-
.../decompositions/CholeskyDecomposition.java | 309 -
.../decompositions/DecompositionSupport.java | 105 -
.../math/decompositions/EigenDecomposition.java | 936 --
.../ml/math/decompositions/LUDecomposition.java | 383 -
.../ml/math/decompositions/QRDSolver.java | 197 -
.../ml/math/decompositions/QRDecomposition.java | 212 -
.../SingularValueDecomposition.java | 623 --
.../ml/math/decompositions/package-info.java | 22 -
.../ignite/ml/math/distributed/CacheUtils.java | 734 --
.../ml/math/distributed/DistributedStorage.java | 35 -
.../ml/math/distributed/MatrixKeyMapper.java | 33 -
.../ignite/ml/math/distributed/ValueMapper.java | 37 -
.../ml/math/distributed/VectorKeyMapper.java | 32 -
.../distributed/keys/DataStructureCacheKey.java | 35 -
.../math/distributed/keys/MatrixBlockKey.java | 38 -
.../math/distributed/keys/RowColMatrixKey.java | 30 -
.../math/distributed/keys/VectorBlockKey.java | 34 -
.../distributed/keys/impl/MatrixBlockKey.java | 166 -
.../distributed/keys/impl/SparseMatrixKey.java | 119 -
.../distributed/keys/impl/VectorBlockKey.java | 152 -
.../distributed/keys/impl/package-info.java | 22 -
.../ml/math/distributed/keys/package-info.java | 22 -
.../ml/math/distributed/package-info.java | 22 -
.../ml/math/impls/matrix/AbstractMatrix.java | 24 -
.../ml/math/impls/matrix/CacheMatrix.java | 158 -
.../ml/math/impls/matrix/DiagonalMatrix.java | 101 -
.../ml/math/impls/matrix/FunctionMatrix.java | 95 -
.../ml/math/impls/matrix/MatrixBlockEntry.java | 50 -
.../ml/math/impls/matrix/PivotedMatrixView.java | 241 -
.../ml/math/impls/matrix/RandomMatrix.java | 97 -
.../matrix/SparseBlockDistributedMatrix.java | 314 -
.../impls/matrix/SparseDistributedMatrix.java | 290 -
.../math/impls/matrix/TransposedMatrixView.java | 84 -
.../storage/matrix/BlockMatrixStorage.java | 434 -
.../storage/matrix/BlockVectorStorage.java | 368 -
.../storage/matrix/CacheMatrixStorage.java | 196 -
.../storage/matrix/DiagonalMatrixStorage.java | 158 -
.../storage/matrix/FunctionMatrixStorage.java | 190 -
.../storage/matrix/PivotedMatrixStorage.java | 266 -
.../storage/matrix/RandomMatrixStorage.java | 187 -
.../matrix/SparseDistributedMatrixStorage.java | 330 -
.../storage/vector/CacheVectorStorage.java | 175 -
.../storage/vector/ConstantVectorStorage.java | 134 -
.../storage/vector/FunctionVectorStorage.java | 143 -
.../storage/vector/PivotedVectorStorage.java | 176 -
.../storage/vector/RandomVectorStorage.java | 152 -
.../SingleElementVectorDelegateStorage.java | 145 -
.../vector/SingleElementVectorStorage.java | 145 -
.../vector/SparseDistributedVectorStorage.java | 281 -
.../impls/vector/AbstractReadOnlyVector.java | 131 -
.../ml/math/impls/vector/CacheVector.java | 140 -
.../ml/math/impls/vector/ConstantVector.java | 84 -
.../ml/math/impls/vector/FunctionVector.java | 112 -
.../ml/math/impls/vector/PivotedVectorView.java | 163 -
.../ml/math/impls/vector/RandomVector.java | 130 -
.../math/impls/vector/SingleElementVector.java | 102 -
.../impls/vector/SingleElementVectorView.java | 97 -
.../vector/SparseBlockDistributedVector.java | 135 -
.../impls/vector/SparseDistributedVector.java | 147 -
.../ml/math/impls/vector/VectorBlockEntry.java | 47 -
.../apache/ignite/ml/math/util/MatrixUtil.java | 17 +-
.../ignite/ml/nn/ReplicatedVectorMatrix.java | 14 -
.../LogRegressionMultiClassModel.java | 96 +
.../LogRegressionMultiClassTrainer.java | 222 +
.../logistic/multiclass/package-info.java | 22 +
.../ignite/ml/structures/LabeledDataset.java | 4 -
.../ignite/ml/structures/package-info.java | 2 +-
.../ml/structures/partition/package-info.java | 22 +
.../structures/preprocessing/package-info.java | 2 +-
.../impl/cache/CacheBasedDatasetTest.java | 2 +-
.../ml/math/MathImplDistributedTestSuite.java | 47 -
.../ignite/ml/math/MathImplLocalTestSuite.java | 39 -
.../ignite/ml/math/MathImplMainTestSuite.java | 1 -
.../CholeskyDecompositionTest.java | 160 -
.../decompositions/EigenDecompositionTest.java | 193 -
.../decompositions/LUDecompositionTest.java | 252 -
.../ml/math/decompositions/QRDSolverTest.java | 87 -
.../decompositions/QRDecompositionTest.java | 141 -
.../SingularValueDecompositionTest.java | 122 -
.../ml/math/impls/matrix/CacheMatrixTest.java | 371 -
.../math/impls/matrix/DiagonalMatrixTest.java | 209 -
.../matrix/FunctionMatrixConstructorTest.java | 113 -
.../math/impls/matrix/MatrixAttributeTest.java | 14 +-
.../matrix/MatrixImplementationFixtures.java | 135 +-
.../impls/matrix/MatrixImplementationsTest.java | 196 +-
.../impls/matrix/MatrixKeyMapperForTests.java | 74 -
.../PivotedMatrixViewConstructorTest.java | 129 -
.../matrix/RandomMatrixConstructorTest.java | 71 -
.../SparseDistributedBlockMatrixTest.java | 408 -
.../matrix/SparseDistributedMatrixTest.java | 316 -
.../impls/matrix/TransposedMatrixViewTest.java | 87 -
.../SparseDistributedMatrixStorageTest.java | 126 -
.../SparseDistributedVectorStorageTest.java | 123 -
.../ml/math/impls/vector/CacheVectorTest.java | 430 -
.../vector/ConstantVectorConstructorTest.java | 52 -
.../vector/FunctionVectorConstructorTest.java | 121 -
.../PivotedVectorViewConstructorTest.java | 211 -
.../vector/RandomVectorConstructorTest.java | 145 -
.../SingleElementVectorConstructorTest.java | 159 -
.../SingleElementVectorViewConstructorTest.java | 137 -
.../SparseBlockDistributedVectorTest.java | 186 -
.../vector/SparseDistributedVectorTest.java | 191 -
.../math/impls/vector/VectorAttributesTest.java | 25 +-
.../vector/VectorImplementationsFixtures.java | 203 -
.../impls/vector/VectorImplementationsTest.java | 30 +-
.../math/impls/vector/VectorIterableTest.java | 376 -
.../math/impls/vector/VectorToMatrixTest.java | 50 +-
.../ml/regressions/RegressionsTestSuite.java | 6 +-
.../linear/LinearRegressionModelTest.java | 17 +
.../logistic/LogRegMultiClassTrainerTest.java | 98 +
.../Apache.Ignite.Core.Tests.csproj | 3 +
.../ApiParity/IgniteConfigurationParityTest.cs | 3 +-
.../Cache/Store/CacheStoreTest.cs | 44 +-
.../Config/full-config.xml | 3 +-
.../Config/ignite-halthandler-dotnet-cfg.xml | 54 +
.../Config/ignite-stophandler-dotnet-cfg.xml | 54 +
.../FailureHandlerTest.cs | 133 +
.../IgniteConfigurationSerializerTest.cs | 15 +-
.../TestUtils.Windows.cs | 2 +
.../Apache.Ignite.Core.csproj | 5 +-
.../Failure/IFailureHandler.cs | 33 +
.../Failure/NoOpFailureHandler.cs | 28 +
.../Failure/StopNodeFailureHandler.cs | 28 +
.../Failure/StopNodeOrHaltFailureHandler.cs | 97 +
.../Apache.Ignite.Core/IgniteConfiguration.cs | 86 +-
.../IgniteConfigurationSection.xsd | 21 +-
.../schedule/GridScheduleSelfTest.java | 7 -
modules/spark-2.10/pom.xml | 10 +
modules/spark/pom.xml | 20 +
.../spark/JavaStandaloneIgniteRDDSelfTest.java | 6 -
.../IgniteSpringDataCrudSelfTest.java | 2 -
.../IgniteSpringDataQueriesSelfTest.java | 2 -
.../IgniteSpringDataCrudSelfTest.java | 2 -
.../IgniteSpringDataQueriesSelfTest.java | 3 +-
.../GridSpringCacheManagerMultiJvmSelfTest.java | 5 -
.../spring/GridSpringCacheManagerSelfTest.java | 5 -
.../ignite/cache/spring/SpringCacheTest.java | 2 -
.../resource/GridLoggerInjectionSelfTest.java | 7 -
.../resource/GridServiceInjectionSelfTest.java | 7 -
.../GridSpringResourceInjectionSelfTest.java | 5 -
.../GridSpringTransactionManagerSelfTest.java | 5 -
modules/sqlline/bin/sqlline.bat | 8 +-
.../util/nodestart/StartNodeCallableImpl.java | 4 +-
.../testcafe/fixtures/auth/forgot-password.js | 3 +-
.../fixtures/auth/signup-validation-local.js | 52 +
.../e2e/testcafe/fixtures/auth/signup.js | 15 +-
.../e2e/testcafe/page-models/pageSignin.js | 32 +
modules/web-console/frontend/app/app.js | 10 +-
.../app/components/bs-select-menu/controller.js | 5 +-
.../app/components/bs-select-menu/index.js | 2 +
.../app/components/bs-select-menu/index.spec.js | 67 +
.../app/components/bs-select-menu/style.scss | 18 +-
.../app/components/bs-select-menu/template.pug | 3 +-
.../transcludeToBody.directive.js | 50 +
.../components/cluster-selector/template.pug | 4 +-
.../frontend/app/components/form-field/index.js | 23 +
.../form-field/showValidationError.directive.js | 47 +
.../list-editable-transclude/directive.js | 2 +-
.../page-configure/components/pcValidation.js | 22 -
.../page-forgot-password/controller.js | 22 +-
.../page-forgot-password/template.pug | 3 +-
.../app/components/page-landing/template.pug | 20 +-
.../components/queries-notebook/controller.js | 2 +-
.../queries-notebook/template.tpl.pug | 6 +-
.../app/components/page-signin/controller.js | 24 +-
.../app/components/page-signin/template.pug | 5 +-
.../app/components/page-signup/controller.js | 21 +-
.../app/components/page-signup/template.pug | 1 -
.../app/components/panel-collapsible/style.scss | 3 +-
.../components/password-visibility/style.scss | 4 +
.../ui-grid-column-resizer/directive.js | 29 +
.../components/ui-grid-column-resizer/index.js | 24 +
.../controllers/reset-password.controller.js | 50 -
.../helpers/jade/form/form-field-feedback.pug | 2 +-
.../helpers/jade/form/form-field-password.pug | 2 +-
.../app/helpers/jade/form/form-field-text.pug | 2 +-
.../app/modules/branding/header-logo.pug | 2 +-
.../app/modules/branding/powered-by-apache.pug | 2 +-
.../frontend/app/modules/user/Auth.service.js | 10 +-
.../app/primitives/form-field/dropdown.pug | 1 +
.../app/primitives/form-field/index.scss | 28 +
.../app/primitives/ui-grid-header/index.scss | 4 +
.../frontend/app/primitives/ui-grid/index.scss | 4 +
.../frontend/app/services/FormUtils.service.js | 6 +-
.../app/services/LegacyUtils.service.js | 2 +-
.../frontend/app/services/Messages.service.js | 8 +-
modules/web-console/frontend/app/vendor.js | 1 -
modules/web-console/frontend/package-lock.json | 8166 ++++++++++--------
modules/web-console/frontend/package.json | 3 +-
.../frontend/public/images/pb-ignite@2x.png | Bin 8558 -> 0 bytes
.../frontend/views/templates/confirm.tpl.pug | 4 +-
.../frontend/webpack/webpack.common.js | 7 +-
.../frontend/webpack/webpack.dev.babel.js | 5 +-
.../config/ignite-localhost-config.xml | 2 -
.../benchmark-jdbc-thin-streaming.properties | 132 +
.../apache/ignite/yardstick/ml/DataChanger.java | 65 -
.../IgniteCholeskyDecompositionBenchmark.java | 69 -
.../IgniteEigenDecompositionBenchmark.java | 69 -
.../IgniteLUDecompositionBenchmark.java | 75 -
...niteSingularValueDecompositionBenchmark.java | 59 -
.../ml/decomposition/package-info.java | 22 -
.../math/IgniteAbstractMatrixMulBenchmark.java | 120 -
...niteDenseLocalOffHeapMatrixMulBenchmark.java | 32 -
...gniteDenseLocalOnHeapMatrixMulBenchmark.java | 32 -
...parseBlockDistributedMatrixMulBenchmark.java | 32 -
...iteSparseDistributedMatrixMul2Benchmark.java | 74 -
...niteSparseDistributedMatrixMulBenchmark.java | 49 -
.../IgniteSparseLocalMatrixMulBenchmark.java | 32 -
.../ignite/yardstick/ml/math/package-info.java | 22 -
.../ignite/yardstick/ml/package-info.java | 22 -
.../ignite/yardstick/upload/StreamerParams.java | 7 +-
.../upload/UploadBenchmarkArguments.java | 19 +-
.../yardstick/upload/model/QueryFactory.java | 2 +
modules/yarn/pom.xml | 20 +
.../stream/zeromq/IgniteZeroMqStreamer.java | 43 +-
.../stream/zeromq/IgniteZeroMqStreamerTest.java | 29 +-
.../zk/internal/ZkDiscoveryEventsData.java | 11 +
.../zk/internal/ZookeeperDiscoveryImpl.java | 2 +-
.../ignite/spi/discovery/zk/package-info.java | 21 +
.../ZookeeperDiscoverySpiAbstractTestSuite.java | 7 +-
.../zk/internal/ZookeeperClientTest.java | 3 +-
.../zk/internal/ZookeeperDiscoverySpiTest.java | 40 +-
packaging/package.sh | 9 +-
packaging/rpm/apache-ignite.spec | 11 +
parent/pom.xml | 7 +-
pom.xml | 2 +-
877 files changed, 15252 insertions(+), 27114 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/fbf252ba/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java
----------------------------------------------------------------------
diff --cc modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java
index 3e0b1de,fe0ce2b..4cda72a
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java
@@@ -43,8 -43,8 +43,9 @@@ import org.apache.ignite.IgniteSystemPr
import org.apache.ignite.cache.CacheMode;
import org.apache.ignite.cache.CacheRebalanceMode;
import org.apache.ignite.cluster.ClusterNode;
+import org.apache.ignite.configuration.CacheConfiguration;
import org.apache.ignite.configuration.IgniteConfiguration;
+ import org.apache.ignite.configuration.CacheConfiguration;
import org.apache.ignite.configuration.NearCacheConfiguration;
import org.apache.ignite.events.DiscoveryEvent;
import org.apache.ignite.internal.IgniteClientDisconnectedCheckedException;
http://git-wip-us.apache.org/repos/asf/ignite/blob/fbf252ba/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/ClientReconnectAfterClusterRestartTest.java
----------------------------------------------------------------------
diff --cc modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/ClientReconnectAfterClusterRestartTest.java
index 8c0cb1a,9012161..85bad0f
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/ClientReconnectAfterClusterRestartTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/ClientReconnectAfterClusterRestartTest.java
@@@ -117,7 -116,9 +116,8 @@@ public class ClientReconnectAfterCluste
public void testReconnectClient() throws Exception {
try {
startGrid(SERVER_ID);
+
Ignite client = startGrid(CLIENT_ID);
-
checkTopology(2);
IgniteCache<Long, BinaryObject> cache = client.getOrCreateCache(CACHE_PARAMS).withKeepBinary();
[42/50] [abbrv] ignite git commit: IGNITE-8561
SingleSegmentLogicalRecordsIterator is broken - Fixes #4045.
Posted by dp...@apache.org.
IGNITE-8561 SingleSegmentLogicalRecordsIterator is broken - Fixes #4045.
Signed-off-by: Ivan Rakov <ir...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/21678bcc
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/21678bcc
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/21678bcc
Branch: refs/heads/ignite-5789-1
Commit: 21678bcc4c10a62d796ce580ffd7684012335535
Parents: 2cad0ab
Author: Anton Kalashnikov <ka...@yandex.ru>
Authored: Wed May 23 12:24:51 2018 +0300
Committer: Ivan Rakov <ir...@apache.org>
Committed: Wed May 23 12:24:51 2018 +0300
----------------------------------------------------------------------
.../persistence/wal/SingleSegmentLogicalRecordsIterator.java | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/21678bcc/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/wal/SingleSegmentLogicalRecordsIterator.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/wal/SingleSegmentLogicalRecordsIterator.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/wal/SingleSegmentLogicalRecordsIterator.java
index d5c10cf..36e5b0e 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/wal/SingleSegmentLogicalRecordsIterator.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/wal/SingleSegmentLogicalRecordsIterator.java
@@ -47,9 +47,6 @@ public class SingleSegmentLogicalRecordsIterator extends AbstractWalRecordsItera
/** Segment initialized flag. */
private boolean segmentInitialized;
- /** Archived segment index. */
- private long archivedSegIdx;
-
/** Archive directory. */
private File archiveDir;
@@ -76,7 +73,7 @@ public class SingleSegmentLogicalRecordsIterator extends AbstractWalRecordsItera
) throws IgniteCheckedException {
super(log, sharedCtx, initLogicalRecordsSerializerFactory(sharedCtx), ioFactory, bufSize);
- this.archivedSegIdx = archivedSegIdx;
+ curWalSegmIdx = archivedSegIdx;
this.archiveDir = archiveDir;
this.advanceC = advanceC;
@@ -106,7 +103,7 @@ public class SingleSegmentLogicalRecordsIterator extends AbstractWalRecordsItera
segmentInitialized = true;
FileWriteAheadLogManager.FileDescriptor fd = new FileWriteAheadLogManager.FileDescriptor(
- new File(archiveDir, FileWriteAheadLogManager.FileDescriptor.fileName(archivedSegIdx)));
+ new File(archiveDir, FileWriteAheadLogManager.FileDescriptor.fileName(curWalSegmIdx)));
try {
return initReadHandle(fd, null);
[33/50] [abbrv] ignite git commit: IGNITE-8516 Not null constraint
doesn't checked
Posted by dp...@apache.org.
IGNITE-8516 Not null constraint doesn't checked
Signed-off-by: Anton Vinogradov <av...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/409a5522
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/409a5522
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/409a5522
Branch: refs/heads/ignite-5789-1
Commit: 409a55226a6f180293793d617f5eb65dd51aee69
Parents: 306f778
Author: sbt-garus-dg <ga...@gmail.com>
Authored: Tue May 22 14:05:58 2018 +0300
Committer: Anton Vinogradov <av...@apache.org>
Committed: Tue May 22 14:05:58 2018 +0300
----------------------------------------------------------------------
.../dht/atomic/GridNearAtomicUpdateFuture.java | 6 +-
.../query/IgniteSqlNotNullConstraintTest.java | 88 ++++++++++++--------
2 files changed, 59 insertions(+), 35 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/409a5522/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateFuture.java
index e516a99..78725d6 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateFuture.java
@@ -1105,8 +1105,12 @@ public class GridNearAtomicUpdateFuture extends GridNearAtomicAbstractUpdateFutu
KeyCacheObject cacheKey = cctx.toCacheKeyObject(key);
- if (op != TRANSFORM)
+ if (op != TRANSFORM) {
val = cctx.toCacheObject(val);
+
+ if (op == CREATE || op == UPDATE)
+ cctx.validateKeyAndValue(cacheKey, (CacheObject)val);
+ }
else
val = EntryProcessorResourceInjectorProxy.wrap(cctx.kernalContext(), (EntryProcessor)val);
http://git-wip-us.apache.org/repos/asf/ignite/blob/409a5522/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/IgniteSqlNotNullConstraintTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/IgniteSqlNotNullConstraintTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/IgniteSqlNotNullConstraintTest.java
index 7a62931..3a90c99 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/IgniteSqlNotNullConstraintTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/IgniteSqlNotNullConstraintTest.java
@@ -389,25 +389,12 @@ public class IgniteSqlNotNullConstraintTest extends GridCommonAbstractTest {
/** */
public void testAtomicOrImplicitTxPutAll() throws Exception {
- executeWithAllCaches(new TestClosure() {
- @Override public void run() throws Exception {
- Throwable t = GridTestUtils.assertThrowsWithCause(new Callable<Object>() {
- @Override public Object call() throws Exception {
- cache.putAll(F.asMap(key1, okValue, key2, badValue));
-
- return null;
- }
- }, IgniteSQLException.class);
-
- IgniteSQLException ex = X.cause(t, IgniteSQLException.class);
-
- assertNotNull(ex);
-
- assertTrue(ex.getMessage().contains(ERR_MSG));
+ doAtomicOrImplicitTxPutAll(F.asMap(1, okValue, 5, badValue), 1);
+ }
- assertEquals(isLocalAtomic() ? 1 : 0, cache.size());
- }
- });
+ /** */
+ public void testAtomicOrImplicitTxPutAllForSingleValue() throws Exception {
+ doAtomicOrImplicitTxPutAll(F.asMap(5, badValue), 0);
}
/** */
@@ -604,23 +591,12 @@ public class IgniteSqlNotNullConstraintTest extends GridCommonAbstractTest {
/** */
public void testTxPutAll() throws Exception {
- executeWithAllTxCaches(new TestClosure() {
- @Override public void run() throws Exception {
- GridTestUtils.assertThrows(log, new Callable<Object>() {
- @Override public Object call() throws Exception {
- try (Transaction tx = ignite.transactions().txStart(concurrency, isolation)) {
- cache.putAll(F.asMap(key1, okValue, key2, badValue));
-
- tx.commit();
- }
-
- assertEquals(0, cache.size());
+ doTxPutAll(F.asMap(1, okValue, 5, badValue));
+ }
- return null;
- }
- }, CacheException.class, ERR_MSG);
- }
- });
+ /** */
+ public void testTxPutAllForSingleValue() throws Exception {
+ doTxPutAll(F.asMap(5, badValue));
}
/** */
@@ -1016,6 +992,50 @@ public class IgniteSqlNotNullConstraintTest extends GridCommonAbstractTest {
}
/** */
+ private void doAtomicOrImplicitTxPutAll(final Map<Integer, Person> values, int expAtomicCacheSize) throws Exception {
+ executeWithAllCaches(new TestClosure() {
+ @Override public void run() throws Exception {
+ Throwable t = GridTestUtils.assertThrowsWithCause(new Callable<Object>() {
+ @Override public Object call() throws Exception {
+ cache.putAll(values);
+
+ return null;
+ }
+ }, IgniteSQLException.class);
+
+ IgniteSQLException ex = X.cause(t, IgniteSQLException.class);
+
+ assertNotNull(ex);
+
+ assertTrue(ex.getMessage().contains(ERR_MSG));
+
+ assertEquals(isLocalAtomic() ? expAtomicCacheSize : 0, cache.size());
+ }
+ });
+ }
+
+ /** */
+ private void doTxPutAll(Map<Integer, Person> values) throws Exception {
+ executeWithAllTxCaches(new TestClosure() {
+ @Override public void run() throws Exception {
+ GridTestUtils.assertThrows(log, new Callable<Object>() {
+ @Override public Object call() throws Exception {
+ try (Transaction tx = ignite.transactions().txStart(concurrency, isolation)) {
+ cache.putAll(values);
+
+ tx.commit();
+ }
+
+ assertEquals(0, cache.size());
+
+ return null;
+ }
+ }, CacheException.class, ERR_MSG);
+ }
+ });
+ }
+
+ /** */
private void executeWithAllCaches(TestClosure clo) throws Exception {
for (CacheConfiguration ccfg : cacheConfigurations())
executeForCache(ccfg, clo, TransactionConcurrency.OPTIMISTIC, TransactionIsolation.READ_COMMITTED);
[45/50] [abbrv] ignite git commit: IGNITE-8577: Migration guide.
Posted by dp...@apache.org.
IGNITE-8577: Migration guide.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/b582171c
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/b582171c
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/b582171c
Branch: refs/heads/ignite-5789-1
Commit: b582171c8f99745f93c16b69d1aa0df4dee4b45b
Parents: d821d09
Author: devozerov <vo...@gridgain.com>
Authored: Wed May 23 16:58:48 2018 +0300
Committer: devozerov <vo...@gridgain.com>
Committed: Wed May 23 16:58:48 2018 +0300
----------------------------------------------------------------------
MIGRATION_GUIDE.txt | 2 ++
assembly/release-base.xml | 5 +++++
packaging/rpm/apache-ignite.spec | 1 +
3 files changed, 8 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/b582171c/MIGRATION_GUIDE.txt
----------------------------------------------------------------------
diff --git a/MIGRATION_GUIDE.txt b/MIGRATION_GUIDE.txt
new file mode 100644
index 0000000..5b0c36f
--- /dev/null
+++ b/MIGRATION_GUIDE.txt
@@ -0,0 +1,2 @@
+Apache Ignite Migration Guide
+===========================
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ignite/blob/b582171c/assembly/release-base.xml
----------------------------------------------------------------------
diff --git a/assembly/release-base.xml b/assembly/release-base.xml
index bc3d473..df8598f 100644
--- a/assembly/release-base.xml
+++ b/assembly/release-base.xml
@@ -33,6 +33,11 @@
</file>
<file>
+ <source>MIGRATION_GUIDE.txt</source>
+ <outputDirectory>/</outputDirectory>
+ </file>
+
+ <file>
<source>config/ignite-log4j.xml</source>
<outputDirectory>/config</outputDirectory>
</file>
http://git-wip-us.apache.org/repos/asf/ignite/blob/b582171c/packaging/rpm/apache-ignite.spec
----------------------------------------------------------------------
diff --git a/packaging/rpm/apache-ignite.spec b/packaging/rpm/apache-ignite.spec
index c735a92..5929ea9 100644
--- a/packaging/rpm/apache-ignite.spec
+++ b/packaging/rpm/apache-ignite.spec
@@ -239,6 +239,7 @@ ln -sf %{_log}/%{name} %{buildroot}%{_sharedstatedir}/%{name}/log
%doc README.txt
%doc NOTICE
%doc RELEASE_NOTES.txt
+%doc MIGRATION_GUIDE.txt
%license LICENSE
[47/50] [abbrv] ignite git commit: IGNITE-8586 Minor fix for Apache
Ignite's release procedure
Posted by dp...@apache.org.
IGNITE-8586 Minor fix for Apache Ignite's release procedure
Signed-off-by: Andrey Gura <ag...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/24cee46b
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/24cee46b
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/24cee46b
Branch: refs/heads/ignite-5789-1
Commit: 24cee46b18fe4dfc3302e93c28d0e0cac5910852
Parents: fed2c02
Author: Ivanov Petr <pi...@gridgain.com>
Authored: Wed May 23 19:55:53 2018 +0300
Committer: Andrey Gura <ag...@apache.org>
Committed: Wed May 23 19:55:53 2018 +0300
----------------------------------------------------------------------
packaging/package.sh | 9 +--------
1 file changed, 1 insertion(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/24cee46b/packaging/package.sh
----------------------------------------------------------------------
diff --git a/packaging/package.sh b/packaging/package.sh
index 622fd32..def4aeb 100755
--- a/packaging/package.sh
+++ b/packaging/package.sh
@@ -169,7 +169,7 @@ buildDEB () {
# Assemble DEB packages
cd ${DEB_WORK_DIR}/apache-ignite-${buildDirVersion}
- debian/rules binary
+ fakeroot debian/rules binary
# Gather DEBs
find ${DEB_WORK_DIR} -name "*.deb" -exec mv -fv {} ${PACKAGING_DIR} \;
@@ -198,13 +198,6 @@ START_TIME=$(date +%s)
clear
-# Check for sudo
-if [ $EUID -ne 0 ]; then
- echo "[ERROR] Packages building requires root | sudo privileges"
- exit 1
-fi
-
-
# Parse input options
while [ $# -gt 0 ]; do
case "$1" in
[13/50] [abbrv] ignite git commit: IGNITE-8511: [ML] Add support for
Multi-Class Logistic Regression
Posted by dp...@apache.org.
IGNITE-8511: [ML] Add support for Multi-Class Logistic Regression
this closes #4008
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/cb8fb736
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/cb8fb736
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/cb8fb736
Branch: refs/heads/ignite-5789-1
Commit: cb8fb736597e9b3f25ef6d55a8dc4d8ad0d23b60
Parents: 436d123
Author: zaleslaw <za...@gmail.com>
Authored: Mon May 21 15:31:16 2018 +0300
Committer: Yury Babak <yb...@gridgain.com>
Committed: Mon May 21 15:31:16 2018 +0300
----------------------------------------------------------------------
.../LogisticRegressionSGDTrainerSample.java | 239 ---------------
.../LogisticRegressionSGDTrainerSample.java | 239 +++++++++++++++
.../logistic/binary/package-info.java | 22 ++
...gressionMultiClassClassificationExample.java | 301 +++++++++++++++++++
.../logistic/multiclass/package-info.java | 22 ++
.../LogRegressionMultiClassModel.java | 96 ++++++
.../LogRegressionMultiClassTrainer.java | 222 ++++++++++++++
.../logistic/multiclass/package-info.java | 22 ++
.../ml/regressions/RegressionsTestSuite.java | 6 +-
.../linear/LinearRegressionModelTest.java | 17 ++
.../logistic/LogRegMultiClassTrainerTest.java | 98 ++++++
11 files changed, 1043 insertions(+), 241 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/cb8fb736/examples/src/main/java/org/apache/ignite/examples/ml/regression/logistic/LogisticRegressionSGDTrainerSample.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/apache/ignite/examples/ml/regression/logistic/LogisticRegressionSGDTrainerSample.java b/examples/src/main/java/org/apache/ignite/examples/ml/regression/logistic/LogisticRegressionSGDTrainerSample.java
deleted file mode 100644
index 0505ddd..0000000
--- a/examples/src/main/java/org/apache/ignite/examples/ml/regression/logistic/LogisticRegressionSGDTrainerSample.java
+++ /dev/null
@@ -1,239 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ignite.examples.ml.regression.logistic;
-
-import org.apache.ignite.Ignite;
-import org.apache.ignite.IgniteCache;
-import org.apache.ignite.Ignition;
-import org.apache.ignite.cache.affinity.rendezvous.RendezvousAffinityFunction;
-import org.apache.ignite.cache.query.QueryCursor;
-import org.apache.ignite.cache.query.ScanQuery;
-import org.apache.ignite.configuration.CacheConfiguration;
-import org.apache.ignite.ml.math.impls.vector.DenseLocalOnHeapVector;
-import org.apache.ignite.ml.nn.UpdatesStrategy;
-import org.apache.ignite.ml.optimization.updatecalculators.SimpleGDParameterUpdate;
-import org.apache.ignite.ml.optimization.updatecalculators.SimpleGDUpdateCalculator;
-import org.apache.ignite.ml.regressions.logistic.binomial.LogisticRegressionModel;
-import org.apache.ignite.ml.regressions.logistic.binomial.LogisticRegressionSGDTrainer;
-import org.apache.ignite.thread.IgniteThread;
-
-import javax.cache.Cache;
-import java.util.Arrays;
-import java.util.UUID;
-
-/**
- * Run logistic regression model over distributed cache.
- *
- * @see LogisticRegressionSGDTrainer
- */
-public class LogisticRegressionSGDTrainerSample {
- /** Run example. */
- public static void main(String[] args) throws InterruptedException {
- System.out.println();
- System.out.println(">>> Logistic regression model over partitioned dataset usage example started.");
- // Start ignite grid.
- try (Ignite ignite = Ignition.start("examples/config/example-ignite.xml")) {
- System.out.println(">>> Ignite grid started.");
- IgniteThread igniteThread = new IgniteThread(ignite.configuration().getIgniteInstanceName(),
- LogisticRegressionSGDTrainerSample.class.getSimpleName(), () -> {
-
- IgniteCache<Integer, double[]> dataCache = getTestCache(ignite);
-
- System.out.println(">>> Create new logistic regression trainer object.");
- LogisticRegressionSGDTrainer<?> trainer = new LogisticRegressionSGDTrainer<>(new UpdatesStrategy<>(
- new SimpleGDUpdateCalculator(0.2),
- SimpleGDParameterUpdate::sumLocal,
- SimpleGDParameterUpdate::avg
- ), 100000, 10, 100, 123L);
-
- System.out.println(">>> Perform the training to get the model.");
- LogisticRegressionModel mdl = trainer.fit(
- ignite,
- dataCache,
- (k, v) -> Arrays.copyOfRange(v, 1, v.length),
- (k, v) -> v[0]
- ).withRawLabels(true);
-
- System.out.println(">>> Logistic regression model: " + mdl);
-
- int amountOfErrors = 0;
- int totalAmount = 0;
-
- // Build confusion matrix. See https://en.wikipedia.org/wiki/Confusion_matrix
- int[][] confusionMtx = {{0, 0}, {0, 0}};
-
- try (QueryCursor<Cache.Entry<Integer, double[]>> observations = dataCache.query(new ScanQuery<>())) {
- for (Cache.Entry<Integer, double[]> observation : observations) {
- double[] val = observation.getValue();
- double[] inputs = Arrays.copyOfRange(val, 1, val.length);
- double groundTruth = val[0];
-
- double prediction = mdl.apply(new DenseLocalOnHeapVector(inputs));
-
- totalAmount++;
- if(groundTruth != prediction)
- amountOfErrors++;
-
- int idx1 = (int)prediction;
- int idx2 = (int)groundTruth;
-
- confusionMtx[idx1][idx2]++;
-
- System.out.printf(">>> | %.4f\t\t| %.4f\t\t|\n", prediction, groundTruth);
- }
-
- System.out.println(">>> ---------------------------------");
-
- System.out.println("\n>>> Absolute amount of errors " + amountOfErrors);
- System.out.println("\n>>> Accuracy " + (1 - amountOfErrors / (double)totalAmount));
- }
-
- System.out.println("\n>>> Confusion matrix is " + Arrays.deepToString(confusionMtx));
- System.out.println(">>> ---------------------------------");
- });
-
- igniteThread.start();
-
- igniteThread.join();
- }
- }
- /**
- * Fills cache with data and returns it.
- *
- * @param ignite Ignite instance.
- * @return Filled Ignite Cache.
- */
- private static IgniteCache<Integer, double[]> getTestCache(Ignite ignite) {
- CacheConfiguration<Integer, double[]> cacheConfiguration = new CacheConfiguration<>();
- cacheConfiguration.setName("TEST_" + UUID.randomUUID());
- cacheConfiguration.setAffinity(new RendezvousAffinityFunction(false, 10));
-
- IgniteCache<Integer, double[]> cache = ignite.createCache(cacheConfiguration);
-
- for (int i = 0; i < data.length; i++)
- cache.put(i, data[i]);
-
- return cache;
- }
-
-
- /** The 1st and 2nd classes from the Iris dataset. */
- private static final double[][] data = {
- {0, 5.1, 3.5, 1.4, 0.2},
- {0, 4.9, 3, 1.4, 0.2},
- {0, 4.7, 3.2, 1.3, 0.2},
- {0, 4.6, 3.1, 1.5, 0.2},
- {0, 5, 3.6, 1.4, 0.2},
- {0, 5.4, 3.9, 1.7, 0.4},
- {0, 4.6, 3.4, 1.4, 0.3},
- {0, 5, 3.4, 1.5, 0.2},
- {0, 4.4, 2.9, 1.4, 0.2},
- {0, 4.9, 3.1, 1.5, 0.1},
- {0, 5.4, 3.7, 1.5, 0.2},
- {0, 4.8, 3.4, 1.6, 0.2},
- {0, 4.8, 3, 1.4, 0.1},
- {0, 4.3, 3, 1.1, 0.1},
- {0, 5.8, 4, 1.2, 0.2},
- {0, 5.7, 4.4, 1.5, 0.4},
- {0, 5.4, 3.9, 1.3, 0.4},
- {0, 5.1, 3.5, 1.4, 0.3},
- {0, 5.7, 3.8, 1.7, 0.3},
- {0, 5.1, 3.8, 1.5, 0.3},
- {0, 5.4, 3.4, 1.7, 0.2},
- {0, 5.1, 3.7, 1.5, 0.4},
- {0, 4.6, 3.6, 1, 0.2},
- {0, 5.1, 3.3, 1.7, 0.5},
- {0, 4.8, 3.4, 1.9, 0.2},
- {0, 5, 3, 1.6, 0.2},
- {0, 5, 3.4, 1.6, 0.4},
- {0, 5.2, 3.5, 1.5, 0.2},
- {0, 5.2, 3.4, 1.4, 0.2},
- {0, 4.7, 3.2, 1.6, 0.2},
- {0, 4.8, 3.1, 1.6, 0.2},
- {0, 5.4, 3.4, 1.5, 0.4},
- {0, 5.2, 4.1, 1.5, 0.1},
- {0, 5.5, 4.2, 1.4, 0.2},
- {0, 4.9, 3.1, 1.5, 0.1},
- {0, 5, 3.2, 1.2, 0.2},
- {0, 5.5, 3.5, 1.3, 0.2},
- {0, 4.9, 3.1, 1.5, 0.1},
- {0, 4.4, 3, 1.3, 0.2},
- {0, 5.1, 3.4, 1.5, 0.2},
- {0, 5, 3.5, 1.3, 0.3},
- {0, 4.5, 2.3, 1.3, 0.3},
- {0, 4.4, 3.2, 1.3, 0.2},
- {0, 5, 3.5, 1.6, 0.6},
- {0, 5.1, 3.8, 1.9, 0.4},
- {0, 4.8, 3, 1.4, 0.3},
- {0, 5.1, 3.8, 1.6, 0.2},
- {0, 4.6, 3.2, 1.4, 0.2},
- {0, 5.3, 3.7, 1.5, 0.2},
- {0, 5, 3.3, 1.4, 0.2},
- {1, 7, 3.2, 4.7, 1.4},
- {1, 6.4, 3.2, 4.5, 1.5},
- {1, 6.9, 3.1, 4.9, 1.5},
- {1, 5.5, 2.3, 4, 1.3},
- {1, 6.5, 2.8, 4.6, 1.5},
- {1, 5.7, 2.8, 4.5, 1.3},
- {1, 6.3, 3.3, 4.7, 1.6},
- {1, 4.9, 2.4, 3.3, 1},
- {1, 6.6, 2.9, 4.6, 1.3},
- {1, 5.2, 2.7, 3.9, 1.4},
- {1, 5, 2, 3.5, 1},
- {1, 5.9, 3, 4.2, 1.5},
- {1, 6, 2.2, 4, 1},
- {1, 6.1, 2.9, 4.7, 1.4},
- {1, 5.6, 2.9, 3.6, 1.3},
- {1, 6.7, 3.1, 4.4, 1.4},
- {1, 5.6, 3, 4.5, 1.5},
- {1, 5.8, 2.7, 4.1, 1},
- {1, 6.2, 2.2, 4.5, 1.5},
- {1, 5.6, 2.5, 3.9, 1.1},
- {1, 5.9, 3.2, 4.8, 1.8},
- {1, 6.1, 2.8, 4, 1.3},
- {1, 6.3, 2.5, 4.9, 1.5},
- {1, 6.1, 2.8, 4.7, 1.2},
- {1, 6.4, 2.9, 4.3, 1.3},
- {1, 6.6, 3, 4.4, 1.4},
- {1, 6.8, 2.8, 4.8, 1.4},
- {1, 6.7, 3, 5, 1.7},
- {1, 6, 2.9, 4.5, 1.5},
- {1, 5.7, 2.6, 3.5, 1},
- {1, 5.5, 2.4, 3.8, 1.1},
- {1, 5.5, 2.4, 3.7, 1},
- {1, 5.8, 2.7, 3.9, 1.2},
- {1, 6, 2.7, 5.1, 1.6},
- {1, 5.4, 3, 4.5, 1.5},
- {1, 6, 3.4, 4.5, 1.6},
- {1, 6.7, 3.1, 4.7, 1.5},
- {1, 6.3, 2.3, 4.4, 1.3},
- {1, 5.6, 3, 4.1, 1.3},
- {1, 5.5, 2.5, 4, 1.3},
- {1, 5.5, 2.6, 4.4, 1.2},
- {1, 6.1, 3, 4.6, 1.4},
- {1, 5.8, 2.6, 4, 1.2},
- {1, 5, 2.3, 3.3, 1},
- {1, 5.6, 2.7, 4.2, 1.3},
- {1, 5.7, 3, 4.2, 1.2},
- {1, 5.7, 2.9, 4.2, 1.3},
- {1, 6.2, 2.9, 4.3, 1.3},
- {1, 5.1, 2.5, 3, 1.1},
- {1, 5.7, 2.8, 4.1, 1.3},
- };
-
-}
http://git-wip-us.apache.org/repos/asf/ignite/blob/cb8fb736/examples/src/main/java/org/apache/ignite/examples/ml/regression/logistic/binary/LogisticRegressionSGDTrainerSample.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/apache/ignite/examples/ml/regression/logistic/binary/LogisticRegressionSGDTrainerSample.java b/examples/src/main/java/org/apache/ignite/examples/ml/regression/logistic/binary/LogisticRegressionSGDTrainerSample.java
new file mode 100644
index 0000000..215d7a4
--- /dev/null
+++ b/examples/src/main/java/org/apache/ignite/examples/ml/regression/logistic/binary/LogisticRegressionSGDTrainerSample.java
@@ -0,0 +1,239 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.examples.ml.regression.logistic.binary;
+
+import org.apache.ignite.Ignite;
+import org.apache.ignite.IgniteCache;
+import org.apache.ignite.Ignition;
+import org.apache.ignite.cache.affinity.rendezvous.RendezvousAffinityFunction;
+import org.apache.ignite.cache.query.QueryCursor;
+import org.apache.ignite.cache.query.ScanQuery;
+import org.apache.ignite.configuration.CacheConfiguration;
+import org.apache.ignite.ml.math.impls.vector.DenseLocalOnHeapVector;
+import org.apache.ignite.ml.nn.UpdatesStrategy;
+import org.apache.ignite.ml.optimization.updatecalculators.SimpleGDParameterUpdate;
+import org.apache.ignite.ml.optimization.updatecalculators.SimpleGDUpdateCalculator;
+import org.apache.ignite.ml.regressions.logistic.binomial.LogisticRegressionModel;
+import org.apache.ignite.ml.regressions.logistic.binomial.LogisticRegressionSGDTrainer;
+import org.apache.ignite.thread.IgniteThread;
+
+import javax.cache.Cache;
+import java.util.Arrays;
+import java.util.UUID;
+
+/**
+ * Run logistic regression model over distributed cache.
+ *
+ * @see LogisticRegressionSGDTrainer
+ */
+public class LogisticRegressionSGDTrainerSample {
+ /** Run example. */
+ public static void main(String[] args) throws InterruptedException {
+ System.out.println();
+ System.out.println(">>> Logistic regression model over partitioned dataset usage example started.");
+ // Start ignite grid.
+ try (Ignite ignite = Ignition.start("examples/config/example-ignite.xml")) {
+ System.out.println(">>> Ignite grid started.");
+ IgniteThread igniteThread = new IgniteThread(ignite.configuration().getIgniteInstanceName(),
+ LogisticRegressionSGDTrainerSample.class.getSimpleName(), () -> {
+
+ IgniteCache<Integer, double[]> dataCache = getTestCache(ignite);
+
+ System.out.println(">>> Create new logistic regression trainer object.");
+ LogisticRegressionSGDTrainer<?> trainer = new LogisticRegressionSGDTrainer<>(new UpdatesStrategy<>(
+ new SimpleGDUpdateCalculator(0.2),
+ SimpleGDParameterUpdate::sumLocal,
+ SimpleGDParameterUpdate::avg
+ ), 100000, 10, 100, 123L);
+
+ System.out.println(">>> Perform the training to get the model.");
+ LogisticRegressionModel mdl = trainer.fit(
+ ignite,
+ dataCache,
+ (k, v) -> Arrays.copyOfRange(v, 1, v.length),
+ (k, v) -> v[0]
+ ).withRawLabels(true);
+
+ System.out.println(">>> Logistic regression model: " + mdl);
+
+ int amountOfErrors = 0;
+ int totalAmount = 0;
+
+ // Build confusion matrix. See https://en.wikipedia.org/wiki/Confusion_matrix
+ int[][] confusionMtx = {{0, 0}, {0, 0}};
+
+ try (QueryCursor<Cache.Entry<Integer, double[]>> observations = dataCache.query(new ScanQuery<>())) {
+ for (Cache.Entry<Integer, double[]> observation : observations) {
+ double[] val = observation.getValue();
+ double[] inputs = Arrays.copyOfRange(val, 1, val.length);
+ double groundTruth = val[0];
+
+ double prediction = mdl.apply(new DenseLocalOnHeapVector(inputs));
+
+ totalAmount++;
+ if(groundTruth != prediction)
+ amountOfErrors++;
+
+ int idx1 = (int)prediction;
+ int idx2 = (int)groundTruth;
+
+ confusionMtx[idx1][idx2]++;
+
+ System.out.printf(">>> | %.4f\t\t| %.4f\t\t|\n", prediction, groundTruth);
+ }
+
+ System.out.println(">>> ---------------------------------");
+
+ System.out.println("\n>>> Absolute amount of errors " + amountOfErrors);
+ System.out.println("\n>>> Accuracy " + (1 - amountOfErrors / (double)totalAmount));
+ }
+
+ System.out.println("\n>>> Confusion matrix is " + Arrays.deepToString(confusionMtx));
+ System.out.println(">>> ---------------------------------");
+ });
+
+ igniteThread.start();
+
+ igniteThread.join();
+ }
+ }
+ /**
+ * Fills cache with data and returns it.
+ *
+ * @param ignite Ignite instance.
+ * @return Filled Ignite Cache.
+ */
+ private static IgniteCache<Integer, double[]> getTestCache(Ignite ignite) {
+ CacheConfiguration<Integer, double[]> cacheConfiguration = new CacheConfiguration<>();
+ cacheConfiguration.setName("TEST_" + UUID.randomUUID());
+ cacheConfiguration.setAffinity(new RendezvousAffinityFunction(false, 10));
+
+ IgniteCache<Integer, double[]> cache = ignite.createCache(cacheConfiguration);
+
+ for (int i = 0; i < data.length; i++)
+ cache.put(i, data[i]);
+
+ return cache;
+ }
+
+
+ /** The 1st and 2nd classes from the Iris dataset. */
+ private static final double[][] data = {
+ {0, 5.1, 3.5, 1.4, 0.2},
+ {0, 4.9, 3, 1.4, 0.2},
+ {0, 4.7, 3.2, 1.3, 0.2},
+ {0, 4.6, 3.1, 1.5, 0.2},
+ {0, 5, 3.6, 1.4, 0.2},
+ {0, 5.4, 3.9, 1.7, 0.4},
+ {0, 4.6, 3.4, 1.4, 0.3},
+ {0, 5, 3.4, 1.5, 0.2},
+ {0, 4.4, 2.9, 1.4, 0.2},
+ {0, 4.9, 3.1, 1.5, 0.1},
+ {0, 5.4, 3.7, 1.5, 0.2},
+ {0, 4.8, 3.4, 1.6, 0.2},
+ {0, 4.8, 3, 1.4, 0.1},
+ {0, 4.3, 3, 1.1, 0.1},
+ {0, 5.8, 4, 1.2, 0.2},
+ {0, 5.7, 4.4, 1.5, 0.4},
+ {0, 5.4, 3.9, 1.3, 0.4},
+ {0, 5.1, 3.5, 1.4, 0.3},
+ {0, 5.7, 3.8, 1.7, 0.3},
+ {0, 5.1, 3.8, 1.5, 0.3},
+ {0, 5.4, 3.4, 1.7, 0.2},
+ {0, 5.1, 3.7, 1.5, 0.4},
+ {0, 4.6, 3.6, 1, 0.2},
+ {0, 5.1, 3.3, 1.7, 0.5},
+ {0, 4.8, 3.4, 1.9, 0.2},
+ {0, 5, 3, 1.6, 0.2},
+ {0, 5, 3.4, 1.6, 0.4},
+ {0, 5.2, 3.5, 1.5, 0.2},
+ {0, 5.2, 3.4, 1.4, 0.2},
+ {0, 4.7, 3.2, 1.6, 0.2},
+ {0, 4.8, 3.1, 1.6, 0.2},
+ {0, 5.4, 3.4, 1.5, 0.4},
+ {0, 5.2, 4.1, 1.5, 0.1},
+ {0, 5.5, 4.2, 1.4, 0.2},
+ {0, 4.9, 3.1, 1.5, 0.1},
+ {0, 5, 3.2, 1.2, 0.2},
+ {0, 5.5, 3.5, 1.3, 0.2},
+ {0, 4.9, 3.1, 1.5, 0.1},
+ {0, 4.4, 3, 1.3, 0.2},
+ {0, 5.1, 3.4, 1.5, 0.2},
+ {0, 5, 3.5, 1.3, 0.3},
+ {0, 4.5, 2.3, 1.3, 0.3},
+ {0, 4.4, 3.2, 1.3, 0.2},
+ {0, 5, 3.5, 1.6, 0.6},
+ {0, 5.1, 3.8, 1.9, 0.4},
+ {0, 4.8, 3, 1.4, 0.3},
+ {0, 5.1, 3.8, 1.6, 0.2},
+ {0, 4.6, 3.2, 1.4, 0.2},
+ {0, 5.3, 3.7, 1.5, 0.2},
+ {0, 5, 3.3, 1.4, 0.2},
+ {1, 7, 3.2, 4.7, 1.4},
+ {1, 6.4, 3.2, 4.5, 1.5},
+ {1, 6.9, 3.1, 4.9, 1.5},
+ {1, 5.5, 2.3, 4, 1.3},
+ {1, 6.5, 2.8, 4.6, 1.5},
+ {1, 5.7, 2.8, 4.5, 1.3},
+ {1, 6.3, 3.3, 4.7, 1.6},
+ {1, 4.9, 2.4, 3.3, 1},
+ {1, 6.6, 2.9, 4.6, 1.3},
+ {1, 5.2, 2.7, 3.9, 1.4},
+ {1, 5, 2, 3.5, 1},
+ {1, 5.9, 3, 4.2, 1.5},
+ {1, 6, 2.2, 4, 1},
+ {1, 6.1, 2.9, 4.7, 1.4},
+ {1, 5.6, 2.9, 3.6, 1.3},
+ {1, 6.7, 3.1, 4.4, 1.4},
+ {1, 5.6, 3, 4.5, 1.5},
+ {1, 5.8, 2.7, 4.1, 1},
+ {1, 6.2, 2.2, 4.5, 1.5},
+ {1, 5.6, 2.5, 3.9, 1.1},
+ {1, 5.9, 3.2, 4.8, 1.8},
+ {1, 6.1, 2.8, 4, 1.3},
+ {1, 6.3, 2.5, 4.9, 1.5},
+ {1, 6.1, 2.8, 4.7, 1.2},
+ {1, 6.4, 2.9, 4.3, 1.3},
+ {1, 6.6, 3, 4.4, 1.4},
+ {1, 6.8, 2.8, 4.8, 1.4},
+ {1, 6.7, 3, 5, 1.7},
+ {1, 6, 2.9, 4.5, 1.5},
+ {1, 5.7, 2.6, 3.5, 1},
+ {1, 5.5, 2.4, 3.8, 1.1},
+ {1, 5.5, 2.4, 3.7, 1},
+ {1, 5.8, 2.7, 3.9, 1.2},
+ {1, 6, 2.7, 5.1, 1.6},
+ {1, 5.4, 3, 4.5, 1.5},
+ {1, 6, 3.4, 4.5, 1.6},
+ {1, 6.7, 3.1, 4.7, 1.5},
+ {1, 6.3, 2.3, 4.4, 1.3},
+ {1, 5.6, 3, 4.1, 1.3},
+ {1, 5.5, 2.5, 4, 1.3},
+ {1, 5.5, 2.6, 4.4, 1.2},
+ {1, 6.1, 3, 4.6, 1.4},
+ {1, 5.8, 2.6, 4, 1.2},
+ {1, 5, 2.3, 3.3, 1},
+ {1, 5.6, 2.7, 4.2, 1.3},
+ {1, 5.7, 3, 4.2, 1.2},
+ {1, 5.7, 2.9, 4.2, 1.3},
+ {1, 6.2, 2.9, 4.3, 1.3},
+ {1, 5.1, 2.5, 3, 1.1},
+ {1, 5.7, 2.8, 4.1, 1.3},
+ };
+
+}
http://git-wip-us.apache.org/repos/asf/ignite/blob/cb8fb736/examples/src/main/java/org/apache/ignite/examples/ml/regression/logistic/binary/package-info.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/apache/ignite/examples/ml/regression/logistic/binary/package-info.java b/examples/src/main/java/org/apache/ignite/examples/ml/regression/logistic/binary/package-info.java
new file mode 100644
index 0000000..6ea42e7
--- /dev/null
+++ b/examples/src/main/java/org/apache/ignite/examples/ml/regression/logistic/binary/package-info.java
@@ -0,0 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * <!-- Package description. -->
+ * ML binary logistic regression examples.
+ */
+package org.apache.ignite.examples.ml.regression.logistic.binary;
http://git-wip-us.apache.org/repos/asf/ignite/blob/cb8fb736/examples/src/main/java/org/apache/ignite/examples/ml/regression/logistic/multiclass/LogRegressionMultiClassClassificationExample.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/apache/ignite/examples/ml/regression/logistic/multiclass/LogRegressionMultiClassClassificationExample.java b/examples/src/main/java/org/apache/ignite/examples/ml/regression/logistic/multiclass/LogRegressionMultiClassClassificationExample.java
new file mode 100644
index 0000000..f089923
--- /dev/null
+++ b/examples/src/main/java/org/apache/ignite/examples/ml/regression/logistic/multiclass/LogRegressionMultiClassClassificationExample.java
@@ -0,0 +1,301 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.examples.ml.regression.logistic.multiclass;
+
+import java.util.Arrays;
+import java.util.UUID;
+import javax.cache.Cache;
+import org.apache.ignite.Ignite;
+import org.apache.ignite.IgniteCache;
+import org.apache.ignite.Ignition;
+import org.apache.ignite.cache.affinity.rendezvous.RendezvousAffinityFunction;
+import org.apache.ignite.cache.query.QueryCursor;
+import org.apache.ignite.cache.query.ScanQuery;
+import org.apache.ignite.configuration.CacheConfiguration;
+import org.apache.ignite.ml.math.functions.IgniteBiFunction;
+import org.apache.ignite.ml.math.impls.vector.DenseLocalOnHeapVector;
+import org.apache.ignite.ml.nn.UpdatesStrategy;
+import org.apache.ignite.ml.optimization.updatecalculators.SimpleGDParameterUpdate;
+import org.apache.ignite.ml.optimization.updatecalculators.SimpleGDUpdateCalculator;
+import org.apache.ignite.ml.preprocessing.normalization.NormalizationTrainer;
+import org.apache.ignite.ml.regressions.logistic.multiclass.LogRegressionMultiClassModel;
+import org.apache.ignite.ml.regressions.logistic.multiclass.LogRegressionMultiClassTrainer;
+import org.apache.ignite.ml.svm.SVMLinearMultiClassClassificationModel;
+import org.apache.ignite.thread.IgniteThread;
+
+/**
+ * Run Logistic Regression multi-class classification trainer over distributed dataset to build two models:
+ * one with normalization and one without normalization.
+ *
+ * @see SVMLinearMultiClassClassificationModel
+ */
+public class LogRegressionMultiClassClassificationExample {
+ /** Run example. */
+ public static void main(String[] args) throws InterruptedException {
+ System.out.println();
+ System.out.println(">>> Logistic Regression Multi-class classification model over cached dataset usage example started.");
+ // Start ignite grid.
+ try (Ignite ignite = Ignition.start("examples/config/example-ignite.xml")) {
+ System.out.println(">>> Ignite grid started.");
+
+ IgniteThread igniteThread = new IgniteThread(ignite.configuration().getIgniteInstanceName(),
+ LogRegressionMultiClassClassificationExample.class.getSimpleName(), () -> {
+ IgniteCache<Integer, double[]> dataCache = getTestCache(ignite);
+
+ LogRegressionMultiClassTrainer<?> trainer = new LogRegressionMultiClassTrainer<>()
+ .withUpdatesStgy(new UpdatesStrategy<>(
+ new SimpleGDUpdateCalculator(0.2),
+ SimpleGDParameterUpdate::sumLocal,
+ SimpleGDParameterUpdate::avg
+ ))
+ .withAmountOfIterations(100000)
+ .withAmountOfLocIterations(10)
+ .withBatchSize(100)
+ .withSeed(123L);
+
+ LogRegressionMultiClassModel mdl = trainer.fit(
+ ignite,
+ dataCache,
+ (k, v) -> Arrays.copyOfRange(v, 1, v.length),
+ (k, v) -> v[0]
+ );
+
+ System.out.println(">>> SVM Multi-class model");
+ System.out.println(mdl.toString());
+
+ NormalizationTrainer<Integer, double[]> normalizationTrainer = new NormalizationTrainer<>();
+
+ IgniteBiFunction<Integer, double[], double[]> preprocessor = normalizationTrainer.fit(
+ ignite,
+ dataCache,
+ (k, v) -> Arrays.copyOfRange(v, 1, v.length)
+ );
+
+ LogRegressionMultiClassModel mdlWithNormalization = trainer.fit(
+ ignite,
+ dataCache,
+ preprocessor,
+ (k, v) -> v[0]
+ );
+
+ System.out.println(">>> Logistic Regression Multi-class model with normalization");
+ System.out.println(mdlWithNormalization.toString());
+
+ System.out.println(">>> ----------------------------------------------------------------");
+ System.out.println(">>> | Prediction\t| Prediction with Normalization\t| Ground Truth\t|");
+ System.out.println(">>> ----------------------------------------------------------------");
+
+ int amountOfErrors = 0;
+ int amountOfErrorsWithNormalization = 0;
+ int totalAmount = 0;
+
+ // Build confusion matrix. See https://en.wikipedia.org/wiki/Confusion_matrix
+ int[][] confusionMtx = {{0, 0, 0}, {0, 0, 0}, {0, 0, 0}};
+ int[][] confusionMtxWithNormalization = {{0, 0, 0}, {0, 0, 0}, {0, 0, 0}};
+
+ try (QueryCursor<Cache.Entry<Integer, double[]>> observations = dataCache.query(new ScanQuery<>())) {
+ for (Cache.Entry<Integer, double[]> observation : observations) {
+ double[] val = observation.getValue();
+ double[] inputs = Arrays.copyOfRange(val, 1, val.length);
+ double groundTruth = val[0];
+
+ double prediction = mdl.apply(new DenseLocalOnHeapVector(inputs));
+ double predictionWithNormalization = mdlWithNormalization.apply(new DenseLocalOnHeapVector(inputs));
+
+ totalAmount++;
+
+ // Collect data for model
+ if(groundTruth != prediction)
+ amountOfErrors++;
+
+ int idx1 = (int)prediction == 1 ? 0 : ((int)prediction == 3 ? 1 : 2);
+ int idx2 = (int)groundTruth == 1 ? 0 : ((int)groundTruth == 3 ? 1 : 2);
+
+ confusionMtx[idx1][idx2]++;
+
+ // Collect data for model with normalization
+ if(groundTruth != predictionWithNormalization)
+ amountOfErrorsWithNormalization++;
+
+ idx1 = (int)predictionWithNormalization == 1 ? 0 : ((int)predictionWithNormalization == 3 ? 1 : 2);
+ idx2 = (int)groundTruth == 1 ? 0 : ((int)groundTruth == 3 ? 1 : 2);
+
+ confusionMtxWithNormalization[idx1][idx2]++;
+
+ System.out.printf(">>> | %.4f\t\t| %.4f\t\t\t\t\t\t| %.4f\t\t|\n", prediction, predictionWithNormalization, groundTruth);
+ }
+ System.out.println(">>> ----------------------------------------------------------------");
+ System.out.println("\n>>> -----------------Logistic Regression model-------------");
+ System.out.println("\n>>> Absolute amount of errors " + amountOfErrors);
+ System.out.println("\n>>> Accuracy " + (1 - amountOfErrors / (double)totalAmount));
+ System.out.println("\n>>> Confusion matrix is " + Arrays.deepToString(confusionMtx));
+
+ System.out.println("\n>>> -----------------Logistic Regression model with Normalization-------------");
+ System.out.println("\n>>> Absolute amount of errors " + amountOfErrorsWithNormalization);
+ System.out.println("\n>>> Accuracy " + (1 - amountOfErrorsWithNormalization / (double)totalAmount));
+ System.out.println("\n>>> Confusion matrix is " + Arrays.deepToString(confusionMtxWithNormalization));
+ }
+ });
+
+ igniteThread.start();
+ igniteThread.join();
+ }
+ }
+
+ /**
+ * Fills cache with data and returns it.
+ *
+ * @param ignite Ignite instance.
+ * @return Filled Ignite Cache.
+ */
+ private static IgniteCache<Integer, double[]> getTestCache(Ignite ignite) {
+ CacheConfiguration<Integer, double[]> cacheConfiguration = new CacheConfiguration<>();
+ cacheConfiguration.setName("TEST_" + UUID.randomUUID());
+ cacheConfiguration.setAffinity(new RendezvousAffinityFunction(false, 10));
+
+ IgniteCache<Integer, double[]> cache = ignite.createCache(cacheConfiguration);
+
+ for (int i = 0; i < data.length; i++)
+ cache.put(i, data[i]);
+
+ return cache;
+ }
+
+ /** The preprocessed Glass dataset from the Machine Learning Repository https://archive.ics.uci.edu/ml/datasets/Glass+Identification
+ * There are 3 classes with labels: 1 {building_windows_float_processed}, 3 {vehicle_windows_float_processed}, 7 {headlamps}.
+ * Feature names: 'Na-Sodium', 'Mg-Magnesium', 'Al-Aluminum', 'Ba-Barium', 'Fe-Iron'.
+ */
+ private static final double[][] data = {
+ {1, 1.52101, 4.49, 1.10, 0.00, 0.00},
+ {1, 1.51761, 3.60, 1.36, 0.00, 0.00},
+ {1, 1.51618, 3.55, 1.54, 0.00, 0.00},
+ {1, 1.51766, 3.69, 1.29, 0.00, 0.00},
+ {1, 1.51742, 3.62, 1.24, 0.00, 0.00},
+ {1, 1.51596, 3.61, 1.62, 0.00, 0.26},
+ {1, 1.51743, 3.60, 1.14, 0.00, 0.00},
+ {1, 1.51756, 3.61, 1.05, 0.00, 0.00},
+ {1, 1.51918, 3.58, 1.37, 0.00, 0.00},
+ {1, 1.51755, 3.60, 1.36, 0.00, 0.11},
+ {1, 1.51571, 3.46, 1.56, 0.00, 0.24},
+ {1, 1.51763, 3.66, 1.27, 0.00, 0.00},
+ {1, 1.51589, 3.43, 1.40, 0.00, 0.24},
+ {1, 1.51748, 3.56, 1.27, 0.00, 0.17},
+ {1, 1.51763, 3.59, 1.31, 0.00, 0.00},
+ {1, 1.51761, 3.54, 1.23, 0.00, 0.00},
+ {1, 1.51784, 3.67, 1.16, 0.00, 0.00},
+ {1, 1.52196, 3.85, 0.89, 0.00, 0.00},
+ {1, 1.51911, 3.73, 1.18, 0.00, 0.00},
+ {1, 1.51735, 3.54, 1.69, 0.00, 0.07},
+ {1, 1.51750, 3.55, 1.49, 0.00, 0.19},
+ {1, 1.51966, 3.75, 0.29, 0.00, 0.00},
+ {1, 1.51736, 3.62, 1.29, 0.00, 0.00},
+ {1, 1.51751, 3.57, 1.35, 0.00, 0.00},
+ {1, 1.51720, 3.50, 1.15, 0.00, 0.00},
+ {1, 1.51764, 3.54, 1.21, 0.00, 0.00},
+ {1, 1.51793, 3.48, 1.41, 0.00, 0.00},
+ {1, 1.51721, 3.48, 1.33, 0.00, 0.00},
+ {1, 1.51768, 3.52, 1.43, 0.00, 0.00},
+ {1, 1.51784, 3.49, 1.28, 0.00, 0.00},
+ {1, 1.51768, 3.56, 1.30, 0.00, 0.14},
+ {1, 1.51747, 3.50, 1.14, 0.00, 0.00},
+ {1, 1.51775, 3.48, 1.23, 0.09, 0.22},
+ {1, 1.51753, 3.47, 1.38, 0.00, 0.06},
+ {1, 1.51783, 3.54, 1.34, 0.00, 0.00},
+ {1, 1.51567, 3.45, 1.21, 0.00, 0.00},
+ {1, 1.51909, 3.53, 1.32, 0.11, 0.00},
+ {1, 1.51797, 3.48, 1.35, 0.00, 0.00},
+ {1, 1.52213, 3.82, 0.47, 0.00, 0.00},
+ {1, 1.52213, 3.82, 0.47, 0.00, 0.00},
+ {1, 1.51793, 3.50, 1.12, 0.00, 0.00},
+ {1, 1.51755, 3.42, 1.20, 0.00, 0.00},
+ {1, 1.51779, 3.39, 1.33, 0.00, 0.00},
+ {1, 1.52210, 3.84, 0.72, 0.00, 0.00},
+ {1, 1.51786, 3.43, 1.19, 0.00, 0.30},
+ {1, 1.51900, 3.48, 1.35, 0.00, 0.00},
+ {1, 1.51869, 3.37, 1.18, 0.00, 0.16},
+ {1, 1.52667, 3.70, 0.71, 0.00, 0.10},
+ {1, 1.52223, 3.77, 0.79, 0.00, 0.00},
+ {1, 1.51898, 3.35, 1.23, 0.00, 0.00},
+ {1, 1.52320, 3.72, 0.51, 0.00, 0.16},
+ {1, 1.51926, 3.33, 1.28, 0.00, 0.11},
+ {1, 1.51808, 2.87, 1.19, 0.00, 0.00},
+ {1, 1.51837, 2.84, 1.28, 0.00, 0.00},
+ {1, 1.51778, 2.81, 1.29, 0.00, 0.09},
+ {1, 1.51769, 2.71, 1.29, 0.00, 0.24},
+ {1, 1.51215, 3.47, 1.12, 0.00, 0.31},
+ {1, 1.51824, 3.48, 1.29, 0.00, 0.00},
+ {1, 1.51754, 3.74, 1.17, 0.00, 0.00},
+ {1, 1.51754, 3.66, 1.19, 0.00, 0.11},
+ {1, 1.51905, 3.62, 1.11, 0.00, 0.00},
+ {1, 1.51977, 3.58, 1.32, 0.69, 0.00},
+ {1, 1.52172, 3.86, 0.88, 0.00, 0.11},
+ {1, 1.52227, 3.81, 0.78, 0.00, 0.00},
+ {1, 1.52172, 3.74, 0.90, 0.00, 0.07},
+ {1, 1.52099, 3.59, 1.12, 0.00, 0.00},
+ {1, 1.52152, 3.65, 0.87, 0.00, 0.17},
+ {1, 1.52152, 3.65, 0.87, 0.00, 0.17},
+ {1, 1.52152, 3.58, 0.90, 0.00, 0.16},
+ {1, 1.52300, 3.58, 0.82, 0.00, 0.03},
+ {3, 1.51769, 3.66, 1.11, 0.00, 0.00},
+ {3, 1.51610, 3.53, 1.34, 0.00, 0.00},
+ {3, 1.51670, 3.57, 1.38, 0.00, 0.10},
+ {3, 1.51643, 3.52, 1.35, 0.00, 0.00},
+ {3, 1.51665, 3.45, 1.76, 0.00, 0.17},
+ {3, 1.52127, 3.90, 0.83, 0.00, 0.00},
+ {3, 1.51779, 3.65, 0.65, 0.00, 0.00},
+ {3, 1.51610, 3.40, 1.22, 0.00, 0.00},
+ {3, 1.51694, 3.58, 1.31, 0.00, 0.00},
+ {3, 1.51646, 3.40, 1.26, 0.00, 0.00},
+ {3, 1.51655, 3.39, 1.28, 0.00, 0.00},
+ {3, 1.52121, 3.76, 0.58, 0.00, 0.00},
+ {3, 1.51776, 3.41, 1.52, 0.00, 0.00},
+ {3, 1.51796, 3.36, 1.63, 0.00, 0.09},
+ {3, 1.51832, 3.34, 1.54, 0.00, 0.00},
+ {3, 1.51934, 3.54, 0.75, 0.15, 0.24},
+ {3, 1.52211, 3.78, 0.91, 0.00, 0.37},
+ {7, 1.51131, 3.20, 1.81, 1.19, 0.00},
+ {7, 1.51838, 3.26, 2.22, 1.63, 0.00},
+ {7, 1.52315, 3.34, 1.23, 0.00, 0.00},
+ {7, 1.52247, 2.20, 2.06, 0.00, 0.00},
+ {7, 1.52365, 1.83, 1.31, 1.68, 0.00},
+ {7, 1.51613, 1.78, 1.79, 0.76, 0.00},
+ {7, 1.51602, 0.00, 2.38, 0.64, 0.09},
+ {7, 1.51623, 0.00, 2.79, 0.40, 0.09},
+ {7, 1.51719, 0.00, 2.00, 1.59, 0.08},
+ {7, 1.51683, 0.00, 1.98, 1.57, 0.07},
+ {7, 1.51545, 0.00, 2.68, 0.61, 0.05},
+ {7, 1.51556, 0.00, 2.54, 0.81, 0.01},
+ {7, 1.51727, 0.00, 2.34, 0.66, 0.00},
+ {7, 1.51531, 0.00, 2.66, 0.64, 0.00},
+ {7, 1.51609, 0.00, 2.51, 0.53, 0.00},
+ {7, 1.51508, 0.00, 2.25, 0.63, 0.00},
+ {7, 1.51653, 0.00, 1.19, 0.00, 0.00},
+ {7, 1.51514, 0.00, 2.42, 0.56, 0.00},
+ {7, 1.51658, 0.00, 1.99, 1.71, 0.00},
+ {7, 1.51617, 0.00, 2.27, 0.67, 0.00},
+ {7, 1.51732, 0.00, 1.80, 1.55, 0.00},
+ {7, 1.51645, 0.00, 1.87, 1.38, 0.00},
+ {7, 1.51831, 0.00, 1.82, 2.88, 0.00},
+ {7, 1.51640, 0.00, 2.74, 0.54, 0.00},
+ {7, 1.51623, 0.00, 2.88, 1.06, 0.00},
+ {7, 1.51685, 0.00, 1.99, 1.59, 0.00},
+ {7, 1.52065, 0.00, 2.02, 1.64, 0.00},
+ {7, 1.51651, 0.00, 1.94, 1.57, 0.00},
+ {7, 1.51711, 0.00, 2.08, 1.67, 0.00},
+ };
+}
http://git-wip-us.apache.org/repos/asf/ignite/blob/cb8fb736/examples/src/main/java/org/apache/ignite/examples/ml/regression/logistic/multiclass/package-info.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/apache/ignite/examples/ml/regression/logistic/multiclass/package-info.java b/examples/src/main/java/org/apache/ignite/examples/ml/regression/logistic/multiclass/package-info.java
new file mode 100644
index 0000000..c7b7fe8
--- /dev/null
+++ b/examples/src/main/java/org/apache/ignite/examples/ml/regression/logistic/multiclass/package-info.java
@@ -0,0 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * <!-- Package description. -->
+ * ML multi-class logistic regression examples.
+ */
+package org.apache.ignite.examples.ml.regression.logistic.multiclass;
http://git-wip-us.apache.org/repos/asf/ignite/blob/cb8fb736/modules/ml/src/main/java/org/apache/ignite/ml/regressions/logistic/multiclass/LogRegressionMultiClassModel.java
----------------------------------------------------------------------
diff --git a/modules/ml/src/main/java/org/apache/ignite/ml/regressions/logistic/multiclass/LogRegressionMultiClassModel.java b/modules/ml/src/main/java/org/apache/ignite/ml/regressions/logistic/multiclass/LogRegressionMultiClassModel.java
new file mode 100644
index 0000000..0817432
--- /dev/null
+++ b/modules/ml/src/main/java/org/apache/ignite/ml/regressions/logistic/multiclass/LogRegressionMultiClassModel.java
@@ -0,0 +1,96 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.ml.regressions.logistic.multiclass;
+
+import java.io.Serializable;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Objects;
+import java.util.TreeMap;
+import org.apache.ignite.ml.Exportable;
+import org.apache.ignite.ml.Exporter;
+import org.apache.ignite.ml.Model;
+import org.apache.ignite.ml.math.Vector;
+import org.apache.ignite.ml.regressions.logistic.binomial.LogisticRegressionModel;
+
+/** Base class for multi-classification model for set of Logistic Regression classifiers. */
+public class LogRegressionMultiClassModel implements Model<Vector, Double>, Exportable<LogRegressionMultiClassModel>, Serializable {
+ /** */
+ private static final long serialVersionUID = -114986533350117L;
+
+ /** List of models associated with each class. */
+ private Map<Double, LogisticRegressionModel> models;
+
+ /** */
+ public LogRegressionMultiClassModel() {
+ this.models = new HashMap<>();
+ }
+
+ /** {@inheritDoc} */
+ @Override public Double apply(Vector input) {
+ TreeMap<Double, Double> maxMargins = new TreeMap<>();
+
+ models.forEach((k, v) -> maxMargins.put(1.0 / (1.0 + Math.exp(-(input.dot(v.weights()) + v.intercept()))), k));
+
+ return maxMargins.lastEntry().getValue();
+ }
+
+ /** {@inheritDoc} */
+ @Override public <P> void saveModel(Exporter<LogRegressionMultiClassModel, P> exporter, P path) {
+ exporter.save(this, path);
+ }
+
+ /** {@inheritDoc} */
+ @Override public boolean equals(Object o) {
+ if (this == o)
+ return true;
+
+ if (o == null || getClass() != o.getClass())
+ return false;
+
+ LogRegressionMultiClassModel mdl = (LogRegressionMultiClassModel)o;
+
+ return Objects.equals(models, mdl.models);
+ }
+
+ /** {@inheritDoc} */
+ @Override public int hashCode() {
+ return Objects.hash(models);
+ }
+
+ /** {@inheritDoc} */
+ @Override public String toString() {
+ StringBuilder wholeStr = new StringBuilder();
+
+ models.forEach((clsLb, mdl) -> {
+ wholeStr.append("The class with label ").append(clsLb).append(" has classifier: ").append(mdl.toString()).append(System.lineSeparator());
+ });
+
+ return wholeStr.toString();
+ }
+
+ /**
+ * Adds a specific Log Regression binary classifier to the bunch of same classifiers.
+ *
+ * @param clsLb The class label for the added model.
+ * @param mdl The model.
+ */
+ public void add(double clsLb, LogisticRegressionModel mdl) {
+ models.put(clsLb, mdl);
+ }
+}
http://git-wip-us.apache.org/repos/asf/ignite/blob/cb8fb736/modules/ml/src/main/java/org/apache/ignite/ml/regressions/logistic/multiclass/LogRegressionMultiClassTrainer.java
----------------------------------------------------------------------
diff --git a/modules/ml/src/main/java/org/apache/ignite/ml/regressions/logistic/multiclass/LogRegressionMultiClassTrainer.java b/modules/ml/src/main/java/org/apache/ignite/ml/regressions/logistic/multiclass/LogRegressionMultiClassTrainer.java
new file mode 100644
index 0000000..e8ed67b
--- /dev/null
+++ b/modules/ml/src/main/java/org/apache/ignite/ml/regressions/logistic/multiclass/LogRegressionMultiClassTrainer.java
@@ -0,0 +1,222 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.ml.regressions.logistic.multiclass;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+import org.apache.ignite.ml.dataset.Dataset;
+import org.apache.ignite.ml.dataset.DatasetBuilder;
+import org.apache.ignite.ml.dataset.PartitionDataBuilder;
+import org.apache.ignite.ml.dataset.primitive.context.EmptyContext;
+import org.apache.ignite.ml.math.functions.IgniteBiFunction;
+import org.apache.ignite.ml.nn.MultilayerPerceptron;
+import org.apache.ignite.ml.nn.UpdatesStrategy;
+import org.apache.ignite.ml.regressions.logistic.binomial.LogisticRegressionSGDTrainer;
+import org.apache.ignite.ml.structures.partition.LabelPartitionDataBuilderOnHeap;
+import org.apache.ignite.ml.structures.partition.LabelPartitionDataOnHeap;
+import org.apache.ignite.ml.trainers.SingleLabelDatasetTrainer;
+
+/**
+ * All common parameters are shared with bunch of binary classification trainers.
+ */
+public class LogRegressionMultiClassTrainer<P extends Serializable>
+ implements SingleLabelDatasetTrainer<LogRegressionMultiClassModel> {
+ /** Update strategy. */
+ private UpdatesStrategy<? super MultilayerPerceptron, P> updatesStgy;
+
+ /** Max number of iteration. */
+ private int amountOfIterations;
+
+ /** Batch size. */
+ private int batchSize;
+
+ /** Number of local iterations. */
+ private int amountOfLocIterations;
+
+ /** Seed for random generator. */
+ private long seed;
+
+ /**
+ * Trains model based on the specified data.
+ *
+ * @param datasetBuilder Dataset builder.
+ * @param featureExtractor Feature extractor.
+ * @param lbExtractor Label extractor.
+ * @return Model.
+ */
+ @Override public <K, V> LogRegressionMultiClassModel fit(DatasetBuilder<K, V> datasetBuilder,
+ IgniteBiFunction<K, V, double[]> featureExtractor,
+ IgniteBiFunction<K, V, Double> lbExtractor) {
+ List<Double> classes = extractClassLabels(datasetBuilder, lbExtractor);
+
+ LogRegressionMultiClassModel multiClsMdl = new LogRegressionMultiClassModel();
+
+ classes.forEach(clsLb -> {
+ LogisticRegressionSGDTrainer<?> trainer =
+ new LogisticRegressionSGDTrainer<>(updatesStgy, amountOfIterations, batchSize, amountOfLocIterations, seed);
+
+ IgniteBiFunction<K, V, Double> lbTransformer = (k, v) -> {
+ Double lb = lbExtractor.apply(k, v);
+
+ if (lb.equals(clsLb))
+ return 1.0;
+ else
+ return 0.0;
+ };
+ multiClsMdl.add(clsLb, trainer.fit(datasetBuilder, featureExtractor, lbTransformer));
+ });
+
+ return multiClsMdl;
+ }
+
+ /** Iterates among dataset and collects class labels. */
+ private <K, V> List<Double> extractClassLabels(DatasetBuilder<K, V> datasetBuilder, IgniteBiFunction<K, V, Double> lbExtractor) {
+ assert datasetBuilder != null;
+
+ PartitionDataBuilder<K, V, EmptyContext, LabelPartitionDataOnHeap> partDataBuilder = new LabelPartitionDataBuilderOnHeap<>(lbExtractor);
+
+ List<Double> res = new ArrayList<>();
+
+ try (Dataset<EmptyContext, LabelPartitionDataOnHeap> dataset = datasetBuilder.build(
+ (upstream, upstreamSize) -> new EmptyContext(),
+ partDataBuilder
+ )) {
+ final Set<Double> clsLabels = dataset.compute(data -> {
+ final Set<Double> locClsLabels = new HashSet<>();
+
+ final double[] lbs = data.getY();
+
+ for (double lb : lbs) locClsLabels.add(lb);
+
+ return locClsLabels;
+ }, (a, b) -> a == null ? b : Stream.of(a, b).flatMap(Collection::stream).collect(Collectors.toSet()));
+
+ res.addAll(clsLabels);
+
+ } catch (Exception e) {
+ throw new RuntimeException(e);
+ }
+ return res;
+ }
+
+ /**
+ * Set up the regularization parameter.
+ *
+ * @param batchSize The size of learning batch.
+ * @return Trainer with new batch size parameter value.
+ */
+ public LogRegressionMultiClassTrainer withBatchSize(int batchSize) {
+ this.batchSize = batchSize;
+ return this;
+ }
+
+ /**
+ * Gets the batch size.
+ *
+ * @return The parameter value.
+ */
+ public double batchSize() {
+ return batchSize;
+ }
+
+ /**
+ * Gets the amount of outer iterations of SGD algorithm.
+ *
+ * @return The parameter value.
+ */
+ public int amountOfIterations() {
+ return amountOfIterations;
+ }
+
+ /**
+ * Set up the amount of outer iterations.
+ *
+ * @param amountOfIterations The parameter value.
+ * @return Trainer with new amountOfIterations parameter value.
+ */
+ public LogRegressionMultiClassTrainer withAmountOfIterations(int amountOfIterations) {
+ this.amountOfIterations = amountOfIterations;
+ return this;
+ }
+
+ /**
+ * Gets the amount of local iterations.
+ *
+ * @return The parameter value.
+ */
+ public int amountOfLocIterations() {
+ return amountOfLocIterations;
+ }
+
+ /**
+ * Set up the amount of local iterations of SGD algorithm.
+ *
+ * @param amountOfLocIterations The parameter value.
+ * @return Trainer with new amountOfLocIterations parameter value.
+ */
+ public LogRegressionMultiClassTrainer withAmountOfLocIterations(int amountOfLocIterations) {
+ this.amountOfLocIterations = amountOfLocIterations;
+ return this;
+ }
+
+ /**
+ * Set up the regularization parameter.
+ *
+ * @param seed Seed for random generator.
+ * @return Trainer with new seed parameter value.
+ */
+ public LogRegressionMultiClassTrainer withSeed(long seed) {
+ this.seed = seed;
+ return this;
+ }
+
+ /**
+ * Gets the seed for random generator.
+ *
+ * @return The parameter value.
+ */
+ public long seed() {
+ return seed;
+ }
+
+ /**
+ * Set up the regularization parameter.
+ *
+ * @param updatesStgy Update strategy.
+ * @return Trainer with new update strategy parameter value.
+ */
+ public LogRegressionMultiClassTrainer withUpdatesStgy(UpdatesStrategy updatesStgy) {
+ this.updatesStgy = updatesStgy;
+ return this;
+ }
+
+ /**
+ * Gets the update strategy..
+ *
+ * @return The parameter value.
+ */
+ public UpdatesStrategy<? super MultilayerPerceptron, P> updatesStgy() {
+ return updatesStgy;
+ }
+}
http://git-wip-us.apache.org/repos/asf/ignite/blob/cb8fb736/modules/ml/src/main/java/org/apache/ignite/ml/regressions/logistic/multiclass/package-info.java
----------------------------------------------------------------------
diff --git a/modules/ml/src/main/java/org/apache/ignite/ml/regressions/logistic/multiclass/package-info.java b/modules/ml/src/main/java/org/apache/ignite/ml/regressions/logistic/multiclass/package-info.java
new file mode 100644
index 0000000..2e7b947
--- /dev/null
+++ b/modules/ml/src/main/java/org/apache/ignite/ml/regressions/logistic/multiclass/package-info.java
@@ -0,0 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * <!-- Package description. -->
+ * Contains multi-class logistic regression.
+ */
+package org.apache.ignite.ml.regressions.logistic.multiclass;
http://git-wip-us.apache.org/repos/asf/ignite/blob/cb8fb736/modules/ml/src/test/java/org/apache/ignite/ml/regressions/RegressionsTestSuite.java
----------------------------------------------------------------------
diff --git a/modules/ml/src/test/java/org/apache/ignite/ml/regressions/RegressionsTestSuite.java b/modules/ml/src/test/java/org/apache/ignite/ml/regressions/RegressionsTestSuite.java
index 2d21d3b..021b567 100644
--- a/modules/ml/src/test/java/org/apache/ignite/ml/regressions/RegressionsTestSuite.java
+++ b/modules/ml/src/test/java/org/apache/ignite/ml/regressions/RegressionsTestSuite.java
@@ -20,6 +20,7 @@ package org.apache.ignite.ml.regressions;
import org.apache.ignite.ml.regressions.linear.LinearRegressionLSQRTrainerTest;
import org.apache.ignite.ml.regressions.linear.LinearRegressionModelTest;
import org.apache.ignite.ml.regressions.linear.LinearRegressionSGDTrainerTest;
+import org.apache.ignite.ml.regressions.logistic.LogRegMultiClassTrainerTest;
import org.apache.ignite.ml.regressions.logistic.LogisticRegressionModelTest;
import org.apache.ignite.ml.regressions.logistic.LogisticRegressionSGDTrainerTest;
import org.junit.runner.RunWith;
@@ -34,8 +35,9 @@ import org.junit.runners.Suite;
LinearRegressionLSQRTrainerTest.class,
LinearRegressionSGDTrainerTest.class,
LogisticRegressionModelTest.class,
- LogisticRegressionSGDTrainerTest.class
+ LogisticRegressionSGDTrainerTest.class,
+ LogRegMultiClassTrainerTest.class
})
public class RegressionsTestSuite {
// No-op.
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/ignite/blob/cb8fb736/modules/ml/src/test/java/org/apache/ignite/ml/regressions/linear/LinearRegressionModelTest.java
----------------------------------------------------------------------
diff --git a/modules/ml/src/test/java/org/apache/ignite/ml/regressions/linear/LinearRegressionModelTest.java b/modules/ml/src/test/java/org/apache/ignite/ml/regressions/linear/LinearRegressionModelTest.java
index aac24f4..7ca9121 100644
--- a/modules/ml/src/test/java/org/apache/ignite/ml/regressions/linear/LinearRegressionModelTest.java
+++ b/modules/ml/src/test/java/org/apache/ignite/ml/regressions/linear/LinearRegressionModelTest.java
@@ -21,6 +21,8 @@ import org.apache.ignite.ml.TestUtils;
import org.apache.ignite.ml.math.Vector;
import org.apache.ignite.ml.math.exceptions.CardinalityException;
import org.apache.ignite.ml.math.impls.vector.DenseLocalOnHeapVector;
+import org.apache.ignite.ml.regressions.logistic.binomial.LogisticRegressionModel;
+import org.apache.ignite.ml.regressions.logistic.multiclass.LogRegressionMultiClassModel;
import org.junit.Test;
/**
@@ -53,6 +55,21 @@ public class LinearRegressionModelTest {
}
/** */
+ @Test
+ public void testPredictWithMultiClasses() {
+ Vector weights1 = new DenseLocalOnHeapVector(new double[]{10.0, 0.0});
+ Vector weights2 = new DenseLocalOnHeapVector(new double[]{0.0, 10.0});
+ Vector weights3 = new DenseLocalOnHeapVector(new double[]{-1.0, -1.0});
+ LogRegressionMultiClassModel mdl = new LogRegressionMultiClassModel();
+ mdl.add(1, new LogisticRegressionModel(weights1, 0.0).withRawLabels(true));
+ mdl.add(2, new LogisticRegressionModel(weights2, 0.0).withRawLabels(true));
+ mdl.add(2, new LogisticRegressionModel(weights3, 0.0).withRawLabels(true));
+
+ Vector observation = new DenseLocalOnHeapVector(new double[]{1.0, 1.0});
+ TestUtils.assertEquals( 1.0, mdl.apply(observation), PRECISION);
+ }
+
+ /** */
@Test(expected = CardinalityException.class)
public void testPredictOnAnObservationWithWrongCardinality() {
Vector weights = new DenseLocalOnHeapVector(new double[]{2.0, 3.0});
http://git-wip-us.apache.org/repos/asf/ignite/blob/cb8fb736/modules/ml/src/test/java/org/apache/ignite/ml/regressions/logistic/LogRegMultiClassTrainerTest.java
----------------------------------------------------------------------
diff --git a/modules/ml/src/test/java/org/apache/ignite/ml/regressions/logistic/LogRegMultiClassTrainerTest.java b/modules/ml/src/test/java/org/apache/ignite/ml/regressions/logistic/LogRegMultiClassTrainerTest.java
new file mode 100644
index 0000000..d26a4ca
--- /dev/null
+++ b/modules/ml/src/test/java/org/apache/ignite/ml/regressions/logistic/LogRegMultiClassTrainerTest.java
@@ -0,0 +1,98 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.ml.regressions.logistic;
+
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.concurrent.ThreadLocalRandom;
+import org.apache.ignite.ml.TestUtils;
+import org.apache.ignite.ml.math.impls.vector.DenseLocalOnHeapVector;
+import org.apache.ignite.ml.nn.UpdatesStrategy;
+import org.apache.ignite.ml.optimization.SmoothParametrized;
+import org.apache.ignite.ml.optimization.updatecalculators.SimpleGDParameterUpdate;
+import org.apache.ignite.ml.optimization.updatecalculators.SimpleGDUpdateCalculator;
+import org.apache.ignite.ml.regressions.logistic.multiclass.LogRegressionMultiClassModel;
+import org.apache.ignite.ml.regressions.logistic.multiclass.LogRegressionMultiClassTrainer;
+import org.apache.ignite.ml.svm.SVMLinearBinaryClassificationTrainer;
+import org.junit.Assert;
+import org.junit.Test;
+
+/**
+ * Tests for {@link SVMLinearBinaryClassificationTrainer}.
+ */
+public class LogRegMultiClassTrainerTest {
+ /** Fixed size of Dataset. */
+ private static final int AMOUNT_OF_OBSERVATIONS = 1000;
+
+ /** Fixed size of columns in Dataset. */
+ private static final int AMOUNT_OF_FEATURES = 2;
+
+ /** Precision in test checks. */
+ private static final double PRECISION = 1e-2;
+
+ /**
+ * Test trainer on classification model y = x.
+ */
+ @Test
+ public void testTrainWithTheLinearlySeparableCase() {
+ Map<Integer, double[]> data = new HashMap<>();
+
+ ThreadLocalRandom rndX = ThreadLocalRandom.current();
+ ThreadLocalRandom rndY = ThreadLocalRandom.current();
+
+ for (int i = 0; i < AMOUNT_OF_OBSERVATIONS; i++) {
+ double x = rndX.nextDouble(-1000, 1000);
+ double y = rndY.nextDouble(-1000, 1000);
+ double[] vec = new double[AMOUNT_OF_FEATURES + 1];
+ vec[0] = y - x > 0 ? 1 : -1; // assign label.
+ vec[1] = x;
+ vec[2] = y;
+ data.put(i, vec);
+ }
+
+ final UpdatesStrategy<SmoothParametrized, SimpleGDParameterUpdate> stgy = new UpdatesStrategy<>(
+ new SimpleGDUpdateCalculator(0.2),
+ SimpleGDParameterUpdate::sumLocal,
+ SimpleGDParameterUpdate::avg
+ );
+
+ LogRegressionMultiClassTrainer<?> trainer = new LogRegressionMultiClassTrainer<>()
+ .withUpdatesStgy(stgy)
+ .withAmountOfIterations(1000)
+ .withAmountOfLocIterations(10)
+ .withBatchSize(100)
+ .withSeed(123L);
+
+ Assert.assertEquals(trainer.amountOfIterations(), 1000);
+ Assert.assertEquals(trainer.amountOfLocIterations(), 10);
+ Assert.assertEquals(trainer.batchSize(), 100, PRECISION);
+ Assert.assertEquals(trainer.seed(), 123L);
+ Assert.assertEquals(trainer.updatesStgy(), stgy);
+
+ LogRegressionMultiClassModel mdl = trainer.fit(
+ data,
+ 10,
+ (k, v) -> Arrays.copyOfRange(v, 1, v.length),
+ (k, v) -> v[0]
+ );
+
+ TestUtils.assertEquals(-1, mdl.apply(new DenseLocalOnHeapVector(new double[]{100, 10})), PRECISION);
+ TestUtils.assertEquals(1, mdl.apply(new DenseLocalOnHeapVector(new double[]{10, 100})), PRECISION);
+ }
+}
[18/50] [abbrv] ignite git commit: IGNITE-8266: stopAllGrids in
afterAllTests removed. - Fixes #3844.
Posted by dp...@apache.org.
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheExpireAndUpdateConsistencyTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheExpireAndUpdateConsistencyTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheExpireAndUpdateConsistencyTest.java
index bd8d44e..5257a4a 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheExpireAndUpdateConsistencyTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheExpireAndUpdateConsistencyTest.java
@@ -94,13 +94,6 @@ public class IgniteCacheExpireAndUpdateConsistencyTest extends GridCommonAbstrac
assertTrue(client.configuration().isClientMode());
}
- /** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- stopAllGrids();
-
- super.afterTestsStopped();
- }
-
/**
* @throws Exception If failed.
*/
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheIncrementTxTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheIncrementTxTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheIncrementTxTest.java
index f6341ec..b3a5055 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheIncrementTxTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheIncrementTxTest.java
@@ -77,13 +77,6 @@ public class IgniteCacheIncrementTxTest extends GridCommonAbstractTest {
startGrid(SRVS);
}
- /** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- stopAllGrids();
-
- super.afterTestsStopped();
- }
-
/**
* @throws Exception If failed.
*/
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheInvokeReadThroughAbstractTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheInvokeReadThroughAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheInvokeReadThroughAbstractTest.java
index 963271f..9baa176 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheInvokeReadThroughAbstractTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheInvokeReadThroughAbstractTest.java
@@ -96,13 +96,6 @@ public abstract class IgniteCacheInvokeReadThroughAbstractTest extends GridCommo
ignite(0).destroyCache(DEFAULT_CACHE_NAME);
}
- /** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- stopAllGrids();
-
- super.afterTestsStopped();
- }
-
/**
* @return Store factory.
*/
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheNearLockValueSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheNearLockValueSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheNearLockValueSelfTest.java
index c135f2d..37fe5fa 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheNearLockValueSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheNearLockValueSelfTest.java
@@ -51,13 +51,6 @@ public class IgniteCacheNearLockValueSelfTest extends GridCommonAbstractTest {
}
/** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- super.afterTestsStopped();
-
- stopAllGrids();
- }
-
- /** {@inheritDoc} */
@Override protected IgniteConfiguration getConfiguration(String igniteInstanceName) throws Exception {
IgniteConfiguration cfg = super.getConfiguration(igniteInstanceName);
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheNoSyncForGetTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheNoSyncForGetTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheNoSyncForGetTest.java
index 9250e0b..b14fecc 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheNoSyncForGetTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheNoSyncForGetTest.java
@@ -88,13 +88,6 @@ public class IgniteCacheNoSyncForGetTest extends GridCommonAbstractTest {
startGrid(1);
}
- /** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- stopAllGrids();
-
- super.afterTestsStopped();
- }
-
/**
* @throws Exception If failed.
*/
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheObjectPutSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheObjectPutSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheObjectPutSelfTest.java
index 11e81c2..f924e83 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheObjectPutSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheObjectPutSelfTest.java
@@ -55,11 +55,6 @@ public class IgniteCacheObjectPutSelfTest extends GridCommonAbstractTest {
startGrid(0);
}
- /** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- stopAllGrids();
- }
-
/**
* @throws Exception If failed.
*/
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCachePutAllRestartTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCachePutAllRestartTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCachePutAllRestartTest.java
index 5adafb1..c90030e 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCachePutAllRestartTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCachePutAllRestartTest.java
@@ -88,8 +88,6 @@ public class IgniteCachePutAllRestartTest extends GridCommonAbstractTest {
/** {@inheritDoc} */
@Override protected void afterTestsStopped() throws Exception {
- super.afterTestsStopped();
-
System.clearProperty(IgniteSystemProperties.IGNITE_ENABLE_FORCIBLE_NODE_KILL);
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCachePutStackOverflowSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCachePutStackOverflowSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCachePutStackOverflowSelfTest.java
index 6b991c6..86f34fe 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCachePutStackOverflowSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCachePutStackOverflowSelfTest.java
@@ -58,11 +58,6 @@ public class IgniteCachePutStackOverflowSelfTest extends GridCommonAbstractTest
startGrid(0);
}
- /** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- stopAllGrids();
- }
-
/**
* @throws Exception if failed.
*/
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheSerializationSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheSerializationSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheSerializationSelfTest.java
index 06d82e2..436c198 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheSerializationSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheSerializationSelfTest.java
@@ -58,13 +58,6 @@ public class IgniteCacheSerializationSelfTest extends GridCommonAbstractTest {
}
/** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- stopAllGrids();
-
- super.afterTestsStopped();
- }
-
- /** {@inheritDoc} */
@Override protected void beforeTestsStarted() throws Exception {
super.beforeTestsStarted();
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheStartStopLoadTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheStartStopLoadTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheStartStopLoadTest.java
index 25b90c4..941906b 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheStartStopLoadTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheStartStopLoadTest.java
@@ -73,11 +73,6 @@ public class IgniteCacheStartStopLoadTest extends GridCommonAbstractTest {
startGridsMultiThreaded(nodeCount());
}
- /** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- stopAllGrids();
- }
-
/**
* @throws Exception If failed.
*/
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheStoreCollectionTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheStoreCollectionTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheStoreCollectionTest.java
index 0aa007c..13841e3 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheStoreCollectionTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheStoreCollectionTest.java
@@ -71,13 +71,6 @@ public class IgniteCacheStoreCollectionTest extends GridCommonAbstractTest {
startGrid(0);
}
- /** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- stopAllGrids();
-
- super.afterTestsStopped();
- }
-
/**
* @throws Exception If failed.
*/
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteClientCacheInitializationFailTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteClientCacheInitializationFailTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteClientCacheInitializationFailTest.java
index 6d7e9ae..4ef1dc3 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteClientCacheInitializationFailTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteClientCacheInitializationFailTest.java
@@ -104,11 +104,6 @@ public class IgniteClientCacheInitializationFailTest extends GridCommonAbstractT
}
/** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- stopAllGrids();
- }
-
- /** {@inheritDoc} */
@Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception {
IgniteConfiguration cfg = super.getConfiguration(gridName);
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteDynamicCacheMultinodeTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteDynamicCacheMultinodeTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteDynamicCacheMultinodeTest.java
index 28edb5e..fb1643e 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteDynamicCacheMultinodeTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteDynamicCacheMultinodeTest.java
@@ -70,13 +70,6 @@ public class IgniteDynamicCacheMultinodeTest extends GridCommonAbstractTest {
startGridsMultiThreaded(NODES - 2, 2);
}
- /** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- stopAllGrids();
-
- super.afterTestsStopped();
- }
-
/**
* @throws Exception If failed.
*/
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteDynamicCacheStartSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteDynamicCacheStartSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteDynamicCacheStartSelfTest.java
index 50c0579..53de23f 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteDynamicCacheStartSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteDynamicCacheStartSelfTest.java
@@ -138,13 +138,6 @@ public class IgniteDynamicCacheStartSelfTest extends GridCommonAbstractTest {
}
/**
- * {@inheritDoc}
- */
- @Override protected void afterTestsStopped() throws Exception {
- stopAllGrids();
- }
-
- /**
* @throws Exception If failed.
*/
public void testStartStopCacheMultithreadedSameNode() throws Exception {
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteDynamicCacheStartStopConcurrentTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteDynamicCacheStartStopConcurrentTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteDynamicCacheStartStopConcurrentTest.java
index 3adb73f..15d10fc 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteDynamicCacheStartStopConcurrentTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteDynamicCacheStartStopConcurrentTest.java
@@ -56,13 +56,6 @@ public class IgniteDynamicCacheStartStopConcurrentTest extends GridCommonAbstrac
startGridsMultiThreaded(NODES);
}
- /** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- stopAllGrids();
-
- super.afterTestsStopped();
- }
-
/**
* @throws Exception If failed.
*/
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteInternalCacheTypesTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteInternalCacheTypesTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteInternalCacheTypesTest.java
index 8eee79a..7f3807e 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteInternalCacheTypesTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteInternalCacheTypesTest.java
@@ -62,13 +62,6 @@ public class IgniteInternalCacheTypesTest extends GridCommonAbstractTest {
return cfg;
}
- /** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- super.afterTestsStopped();
-
- stopAllGrids();
- }
-
/**
* @throws Exception If failed.
*/
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteOutOfMemoryPropagationTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteOutOfMemoryPropagationTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteOutOfMemoryPropagationTest.java
index 24ff3fc..39c6d4a 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteOutOfMemoryPropagationTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteOutOfMemoryPropagationTest.java
@@ -62,13 +62,6 @@ public class IgniteOutOfMemoryPropagationTest extends GridCommonAbstractTest {
private IgniteEx client;
/** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- stopAllGrids();
-
- assert G.allGrids().isEmpty();
- }
-
- /** {@inheritDoc} */
@Override protected long getTestTimeout() {
return 20 * 60 * 1000;
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteStartCacheInTransactionSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteStartCacheInTransactionSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteStartCacheInTransactionSelfTest.java
index 782b333..3fa81e0 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteStartCacheInTransactionSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteStartCacheInTransactionSelfTest.java
@@ -86,11 +86,6 @@ public class IgniteStartCacheInTransactionSelfTest extends GridCommonAbstractTes
startGrids(2);
}
- /** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- stopAllGrids();
- }
-
/**
* @throws Exception If failed.
*/
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteSystemCacheOnClientTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteSystemCacheOnClientTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteSystemCacheOnClientTest.java
index b5dacf1..cc83c8f 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteSystemCacheOnClientTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteSystemCacheOnClientTest.java
@@ -48,13 +48,6 @@ public class IgniteSystemCacheOnClientTest extends GridCommonAbstractTest {
return cfg;
}
- /** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- super.afterTestsStopped();
-
- stopAllGrids();
- }
-
/**
* @throws Exception If failed.
*/
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxAbstractTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxAbstractTest.java
index 5340f63..1830db0 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxAbstractTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxAbstractTest.java
@@ -124,13 +124,6 @@ abstract class IgniteTxAbstractTest extends GridCommonAbstractTest {
}
/**
- * @throws Exception If failed.
- */
- @Override protected void afterTestsStopped() throws Exception {
- stopAllGrids();
- }
-
- /**
* @return Keys.
*/
protected Iterable<Integer> getKeys() {
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxConfigCacheSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxConfigCacheSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxConfigCacheSelfTest.java
index f2e17e4..680381a 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxConfigCacheSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxConfigCacheSelfTest.java
@@ -103,11 +103,6 @@ public class IgniteTxConfigCacheSelfTest extends GridCommonAbstractTest {
startGrids(2);
}
- /** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- stopAllGrids();
- }
-
/**
* Success if user tx was timed out.
*
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/OffheapCacheMetricsForClusterGroupSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/OffheapCacheMetricsForClusterGroupSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/OffheapCacheMetricsForClusterGroupSelfTest.java
index e13f99b..9ff6db7 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/OffheapCacheMetricsForClusterGroupSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/OffheapCacheMetricsForClusterGroupSelfTest.java
@@ -63,11 +63,6 @@ public class OffheapCacheMetricsForClusterGroupSelfTest extends GridCommonAbstra
startGrid("client-" + i);
}
- /** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- stopAllGrids();
- }
-
public void testGetOffHeapPrimaryEntriesCount() throws Exception {
String cacheName = "testGetOffHeapPrimaryEntriesCount";
IgniteCache<Integer, Integer> cache = grid("client-0").createCache(cacheConfiguration(cacheName));
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/WalModeChangeAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/WalModeChangeAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/WalModeChangeAbstractSelfTest.java
index a4e65aa..1537641 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/WalModeChangeAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/WalModeChangeAbstractSelfTest.java
@@ -67,13 +67,6 @@ public abstract class WalModeChangeAbstractSelfTest extends WalModeChangeCommonA
cli.cluster().active(true);
}
- /** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- stopAllGrids();
-
- cleanReferences();
- }
-
/**
* Negative case: cache name is null.
*
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/CacheKeepBinaryWithInterceptorTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/CacheKeepBinaryWithInterceptorTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/CacheKeepBinaryWithInterceptorTest.java
index 8a2d0bf..6cef6d2 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/CacheKeepBinaryWithInterceptorTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/CacheKeepBinaryWithInterceptorTest.java
@@ -61,13 +61,6 @@ public class CacheKeepBinaryWithInterceptorTest extends GridCommonAbstractTest {
startGrid(0);
}
- /** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- stopAllGrids();
-
- super.afterTestsStopped();
- }
-
/**
* @throws Exception If failed.
*/
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/GridCacheBinaryObjectsAbstractDataStreamerSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/GridCacheBinaryObjectsAbstractDataStreamerSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/GridCacheBinaryObjectsAbstractDataStreamerSelfTest.java
index 2f8c2a5..472a7a0 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/GridCacheBinaryObjectsAbstractDataStreamerSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/GridCacheBinaryObjectsAbstractDataStreamerSelfTest.java
@@ -85,11 +85,6 @@ public abstract class GridCacheBinaryObjectsAbstractDataStreamerSelfTest extends
startGridsMultiThreaded(gridCount());
}
- /** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- stopAllGrids();
- }
-
/**
* @return Cache mode.
*/
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/GridCacheBinaryObjectsAbstractMultiThreadedSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/GridCacheBinaryObjectsAbstractMultiThreadedSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/GridCacheBinaryObjectsAbstractMultiThreadedSelfTest.java
index 5129d83..e2a1a8b 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/GridCacheBinaryObjectsAbstractMultiThreadedSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/GridCacheBinaryObjectsAbstractMultiThreadedSelfTest.java
@@ -99,11 +99,6 @@ public abstract class GridCacheBinaryObjectsAbstractMultiThreadedSelfTest extend
startGridsMultiThreaded(gridCount());
}
- /** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- stopAllGrids();
- }
-
/**
* @return Cache mode.
*/
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/GridCacheBinaryObjectsAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/GridCacheBinaryObjectsAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/GridCacheBinaryObjectsAbstractSelfTest.java
index b98615c..cc2f2c4 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/GridCacheBinaryObjectsAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/GridCacheBinaryObjectsAbstractSelfTest.java
@@ -167,11 +167,6 @@ public abstract class GridCacheBinaryObjectsAbstractSelfTest extends GridCommonA
}
/** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- stopAllGrids();
- }
-
- /** {@inheritDoc} */
@Override protected void afterTest() throws Exception {
for (int i = 0; i < gridCount(); i++) {
GridCacheAdapter<Object, Object> c = ((IgniteKernal)grid(i)).internalCache(DEFAULT_CACHE_NAME);
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/GridCacheBinaryStoreAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/GridCacheBinaryStoreAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/GridCacheBinaryStoreAbstractSelfTest.java
index f1ca871..1b7cb29 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/GridCacheBinaryStoreAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/binary/GridCacheBinaryStoreAbstractSelfTest.java
@@ -99,11 +99,6 @@ public abstract class GridCacheBinaryStoreAbstractSelfTest extends GridCommonAbs
}
/** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- stopGrid();
- }
-
- /** {@inheritDoc} */
@Override protected void beforeTest() throws Exception {
STORE.map().clear();
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheSequenceApiSelfAbstractTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheSequenceApiSelfAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheSequenceApiSelfAbstractTest.java
index debf09b..45275f4 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheSequenceApiSelfAbstractTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheSequenceApiSelfAbstractTest.java
@@ -125,20 +125,15 @@ public abstract class GridCacheSequenceApiSelfAbstractTest extends IgniteAtomics
/** {@inheritDoc} */
@Override protected void afterTestsStopped() throws Exception {
- try {
- // Remove mandatory sequences from cache.
- for (String seqName : seqNames) {
- IgniteAtomicSequence seq = grid().atomicSequence(seqName, 0, false);
+ // Remove mandatory sequences from cache.
+ for (String seqName : seqNames) {
+ IgniteAtomicSequence seq = grid().atomicSequence(seqName, 0, false);
- assertNotNull(seq);
+ assertNotNull(seq);
- seq.close();
+ seq.close();
- assertNull(grid().atomicSequence(seqName, 0, false));
- }
- }
- finally {
- super.afterTestsStopped();
+ assertNull(grid().atomicSequence(seqName, 0, false));
}
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/IgniteAtomicsAbstractTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/IgniteAtomicsAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/IgniteAtomicsAbstractTest.java
index 04aa69e..8c8e30f 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/IgniteAtomicsAbstractTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/IgniteAtomicsAbstractTest.java
@@ -77,8 +77,4 @@ public abstract class IgniteAtomicsAbstractTest extends GridCommonAbstractTest {
startGridsMultiThreaded(gridCount());
}
- /** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- stopAllGrids();
- }
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/IgniteClientDataStructuresAbstractTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/IgniteClientDataStructuresAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/IgniteClientDataStructuresAbstractTest.java
index d85201a..6633f4a 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/IgniteClientDataStructuresAbstractTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/IgniteClientDataStructuresAbstractTest.java
@@ -75,11 +75,6 @@ public abstract class IgniteClientDataStructuresAbstractTest extends GridCommonA
startGrids(NODE_CNT);
}
- /** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- stopAllGrids();
- }
-
/**
* @return {@code True} if use client discovery.
*/
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/IgniteCollectionAbstractTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/IgniteCollectionAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/IgniteCollectionAbstractTest.java
index faf1f8a..a9abfd3 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/IgniteCollectionAbstractTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/IgniteCollectionAbstractTest.java
@@ -115,11 +115,6 @@ public abstract class IgniteCollectionAbstractTest extends GridCommonAbstractTes
startGridsMultiThreaded(gridCount());
}
- /** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- stopAllGrids();
- }
-
/**
* @param queue Ignite queue.
* @return Cache configuration.
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/IgniteDataStructureWithJobTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/IgniteDataStructureWithJobTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/IgniteDataStructureWithJobTest.java
index 7c03d39..4ae50c1 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/IgniteDataStructureWithJobTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/IgniteDataStructureWithJobTest.java
@@ -54,13 +54,6 @@ public class IgniteDataStructureWithJobTest extends GridCommonAbstractTest {
return 2 * 60_000;
}
- /** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- super.afterTestsStopped();
-
- stopAllGrids();
- }
-
/**
* @throws Exception If failed.
*/
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheAsyncOperationsTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheAsyncOperationsTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheAsyncOperationsTest.java
index 3b0dbb9..0b6d7b1 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheAsyncOperationsTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheAsyncOperationsTest.java
@@ -69,13 +69,6 @@ public class CacheAsyncOperationsTest extends GridCommonAbstractTest {
startGrids(2);
}
- /** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- super.afterTestsStopped();
-
- stopAllGrids();
- }
-
/**
* @throws Exception If failed.
*/
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheExchangeMergeTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheExchangeMergeTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheExchangeMergeTest.java
index 53a75d4..4b281b0 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheExchangeMergeTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheExchangeMergeTest.java
@@ -167,8 +167,6 @@ public class CacheExchangeMergeTest extends GridCommonAbstractTest {
@Override protected void afterTestsStopped() throws Exception {
if (executor != null)
executor.shutdown();
-
- super.afterTestsStopped();
}
/** {@inheritDoc} */
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheGetFutureHangsSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheGetFutureHangsSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheGetFutureHangsSelfTest.java
index eb430f6..3d1fe11 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheGetFutureHangsSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheGetFutureHangsSelfTest.java
@@ -83,13 +83,6 @@ public class CacheGetFutureHangsSelfTest extends GridCommonAbstractTest {
}
/** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- super.afterTestsStopped();
-
- stopAllGrids();
- }
-
- /** {@inheritDoc} */
@Override protected long getTestTimeout() {
return 10 * 60_000;
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheGetInsideLockChangingTopologyTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheGetInsideLockChangingTopologyTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheGetInsideLockChangingTopologyTest.java
index 6ec1440..944b8b9 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheGetInsideLockChangingTopologyTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheGetInsideLockChangingTopologyTest.java
@@ -149,10 +149,6 @@ public class CacheGetInsideLockChangingTopologyTest extends GridCommonAbstractTe
/** {@inheritDoc} */
@Override protected void afterTestsStopped() throws Exception {
- stopAllGrids();
-
- super.afterTestsStopped();
-
System.clearProperty(IgniteSystemProperties.IGNITE_ENABLE_FORCIBLE_NODE_KILL);
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheLateAffinityAssignmentTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheLateAffinityAssignmentTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheLateAffinityAssignmentTest.java
index 0b6fd83..9c61ccb 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheLateAffinityAssignmentTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheLateAffinityAssignmentTest.java
@@ -229,13 +229,6 @@ public class CacheLateAffinityAssignmentTest extends GridCommonAbstractTest {
}
}
- /** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- super.afterTestsStopped();
-
- stopAllGrids();
- }
-
/**
* Checks that new joined primary is not assigned immediately.
*
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheStartOnJoinTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheStartOnJoinTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheStartOnJoinTest.java
index 44d8b44..9d4083f 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheStartOnJoinTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheStartOnJoinTest.java
@@ -123,8 +123,6 @@ public class CacheStartOnJoinTest extends GridCommonAbstractTest {
/** {@inheritDoc} */
@Override protected void afterTestsStopped() throws Exception {
System.clearProperty(IgniteSystemProperties.IGNITE_START_CACHES_ON_JOIN);
-
- super.afterTestsStopped();
}
/**
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheTryLockMultithreadedTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheTryLockMultithreadedTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheTryLockMultithreadedTest.java
index f2a9e5a..82d9c12 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheTryLockMultithreadedTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheTryLockMultithreadedTest.java
@@ -77,13 +77,6 @@ public class CacheTryLockMultithreadedTest extends GridCommonAbstractTest {
startGrid(SRVS);
}
- /** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- stopAllGrids();
-
- super.afterTestsStopped();
- }
-
/**
* @throws Exception If failed.
*/
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheAbstractDistributedByteArrayValuesSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheAbstractDistributedByteArrayValuesSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheAbstractDistributedByteArrayValuesSelfTest.java
index 01202fd..6210a30 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheAbstractDistributedByteArrayValuesSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheAbstractDistributedByteArrayValuesSelfTest.java
@@ -104,8 +104,6 @@ public abstract class GridCacheAbstractDistributedByteArrayValuesSelfTest extend
/** {@inheritDoc} */
@Override protected void afterTestsStopped() throws Exception {
- super.afterTestsStopped();
-
caches = null;
ignites = null;
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheAbstractJobExecutionTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheAbstractJobExecutionTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheAbstractJobExecutionTest.java
index f96014e..5894359 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheAbstractJobExecutionTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheAbstractJobExecutionTest.java
@@ -73,11 +73,6 @@ public abstract class GridCacheAbstractJobExecutionTest extends GridCommonAbstra
}
/** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- stopAllGrids();
- }
-
- /** {@inheritDoc} */
@Override protected void afterTest() throws Exception {
grid(0).cache(DEFAULT_CACHE_NAME).removeAll();
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheAbstractNodeRestartSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheAbstractNodeRestartSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheAbstractNodeRestartSelfTest.java
index d849559..b3cac1c 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheAbstractNodeRestartSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheAbstractNodeRestartSelfTest.java
@@ -169,8 +169,6 @@ public abstract class GridCacheAbstractNodeRestartSelfTest extends GridCommonAbs
/** {@inheritDoc} */
@Override protected void afterTestsStopped() throws Exception {
- super.afterTestsStopped();
-
System.clearProperty(IgniteSystemProperties.IGNITE_ENABLE_FORCIBLE_NODE_KILL);
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheAbstractPrimarySyncSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheAbstractPrimarySyncSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheAbstractPrimarySyncSelfTest.java
index 7fafa3a..625cb18 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheAbstractPrimarySyncSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheAbstractPrimarySyncSelfTest.java
@@ -75,11 +75,6 @@ public abstract class GridCacheAbstractPrimarySyncSelfTest extends GridCommonAbs
startGrids(GRID_CNT);
}
- /** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- stopAllGrids();
- }
-
/**
* @return Distribution mode.
*/
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheBasicOpAbstractTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheBasicOpAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheBasicOpAbstractTest.java
index e4099ca..a55ff2d 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheBasicOpAbstractTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheBasicOpAbstractTest.java
@@ -82,8 +82,6 @@ public abstract class GridCacheBasicOpAbstractTest extends GridCommonAbstractTes
/** {@inheritDoc} */
@Override protected void afterTestsStopped() throws Exception {
- stopAllGrids();
-
ignite1 = null;
ignite2 = null;
ignite3 = null;
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheLockAbstractTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheLockAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheLockAbstractTest.java
index 0bd2d1e..16c1f5a 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheLockAbstractTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheLockAbstractTest.java
@@ -116,11 +116,6 @@ public abstract class GridCacheLockAbstractTest extends GridCommonAbstractTest {
}
/** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- stopAllGrids();
- }
-
- /** {@inheritDoc} */
@Override protected void afterTest() throws Exception {
super.afterTest();
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheMixedModeSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheMixedModeSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheMixedModeSelfTest.java
index fee1355..3d6c088 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheMixedModeSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheMixedModeSelfTest.java
@@ -60,11 +60,6 @@ public class GridCacheMixedModeSelfTest extends GridCommonAbstractTest {
startGrids(4);
}
- /** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- stopAllGrids();
- }
-
/**
* @throws Exception If failed.
*/
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheMultiNodeAbstractTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheMultiNodeAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheMultiNodeAbstractTest.java
index 4406800..1d56ab6 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheMultiNodeAbstractTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheMultiNodeAbstractTest.java
@@ -98,8 +98,6 @@ public abstract class GridCacheMultiNodeAbstractTest extends GridCommonAbstractT
/** {@inheritDoc} */
@Override protected void afterTestsStopped() throws Exception {
- stopAllGrids();
-
cache1 = null;
cache2 = null;
cache3 = null;
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheMultiNodeLockAbstractTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheMultiNodeLockAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheMultiNodeLockAbstractTest.java
index 822a7c4..cc3b894 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheMultiNodeLockAbstractTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheMultiNodeLockAbstractTest.java
@@ -110,8 +110,6 @@ public abstract class GridCacheMultiNodeLockAbstractTest extends GridCommonAbstr
/** {@inheritDoc} */
@Override protected void afterTestsStopped() throws Exception {
- stopAllGrids();
-
ignite1 = null;
ignite2 = null;
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheNodeFailureAbstractTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheNodeFailureAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheNodeFailureAbstractTest.java
index 5dea5d9..d98903f 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheNodeFailureAbstractTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheNodeFailureAbstractTest.java
@@ -110,8 +110,6 @@ public abstract class GridCacheNodeFailureAbstractTest extends GridCommonAbstrac
* @throws Exception If failed.
*/
@Override protected void afterTestsStopped() throws Exception {
- stopAllGrids();
-
IGNITEs.clear();
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePartitionedReloadAllAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePartitionedReloadAllAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePartitionedReloadAllAbstractSelfTest.java
index 2b7f2a8..d718644 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePartitionedReloadAllAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePartitionedReloadAllAbstractSelfTest.java
@@ -134,11 +134,7 @@ public abstract class GridCachePartitionedReloadAllAbstractSelfTest extends Grid
/** {@inheritDoc} */
@Override protected void afterTestsStopped() throws Exception {
- stopAllGrids();
-
map.clear();
-
- caches = null;
}
/**
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePreloadRestartAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePreloadRestartAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePreloadRestartAbstractSelfTest.java
index e6007f1..2ea1ed8 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePreloadRestartAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCachePreloadRestartAbstractSelfTest.java
@@ -133,11 +133,6 @@ public abstract class GridCachePreloadRestartAbstractSelfTest extends GridCommon
protected abstract boolean nearEnabled();
/** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- stopAllGrids();
- }
-
- /** {@inheritDoc} */
@Override protected void beforeTest() throws Exception {
backups = DFLT_BACKUPS;
partitions = DFLT_PARTITIONS;
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteBinaryMetadataUpdateChangingTopologySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteBinaryMetadataUpdateChangingTopologySelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteBinaryMetadataUpdateChangingTopologySelfTest.java
index 68bce5e..edfeb96 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteBinaryMetadataUpdateChangingTopologySelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteBinaryMetadataUpdateChangingTopologySelfTest.java
@@ -89,11 +89,6 @@ public class IgniteBinaryMetadataUpdateChangingTopologySelfTest extends GridComm
startGrids(4);
}
- /** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- stopAllGrids();
- }
-
/**
* @throws Exception If failed.
*/
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteBinaryMetadataUpdateNodeRestartTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteBinaryMetadataUpdateNodeRestartTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteBinaryMetadataUpdateNodeRestartTest.java
index 420fdd8..b95ad4a 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteBinaryMetadataUpdateNodeRestartTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteBinaryMetadataUpdateNodeRestartTest.java
@@ -98,11 +98,7 @@ public class IgniteBinaryMetadataUpdateNodeRestartTest extends GridCommonAbstrac
/** {@inheritDoc} */
@Override protected void afterTestsStopped() throws Exception {
- stopAllGrids();
-
System.clearProperty(IgniteSystemProperties.IGNITE_ENABLE_FORCIBLE_NODE_KILL);
-
- super.afterTestsStopped();
}
/**
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheClientReconnectTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheClientReconnectTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheClientReconnectTest.java
index ced1a7d..29072e8 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheClientReconnectTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheClientReconnectTest.java
@@ -94,13 +94,6 @@ public class IgniteCacheClientReconnectTest extends GridCommonAbstractTest {
}
/** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- super.afterTestsStopped();
-
- stopAllGrids();
- }
-
- /** {@inheritDoc} */
@Override protected long getTestTimeout() {
return TEST_TIME + 60_000;
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheConnectionRecoveryTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheConnectionRecoveryTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheConnectionRecoveryTest.java
index 5578640..5241c37 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheConnectionRecoveryTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheConnectionRecoveryTest.java
@@ -91,13 +91,6 @@ public class IgniteCacheConnectionRecoveryTest extends GridCommonAbstractTest {
startGridsMultiThreaded(SRVS, CLIENTS);
}
- /** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- stopAllGrids();
-
- super.afterTestsStopped();
- }
-
/**
* @throws Exception If failed.
*/
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheGetRestartTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheGetRestartTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheGetRestartTest.java
index aa82b9a..e194e28 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheGetRestartTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheGetRestartTest.java
@@ -108,10 +108,6 @@ public class IgniteCacheGetRestartTest extends GridCommonAbstractTest {
/** {@inheritDoc} */
@Override protected void afterTestsStopped() throws Exception {
- super.afterTestsStopped();
-
- stopAllGrids();
-
System.clearProperty(IgniteSystemProperties.IGNITE_ENABLE_FORCIBLE_NODE_KILL);
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheManyClientsTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheManyClientsTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheManyClientsTest.java
index 7785a3c..1e7b32a 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheManyClientsTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheManyClientsTest.java
@@ -107,13 +107,6 @@ public class IgniteCacheManyClientsTest extends GridCommonAbstractTest {
}
/** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- super.afterTestsStopped();
-
- stopAllGrids();
- }
-
- /** {@inheritDoc} */
@Override protected long getTestTimeout() {
return 10 * 60_000;
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheMessageRecoveryAbstractTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheMessageRecoveryAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheMessageRecoveryAbstractTest.java
index f80985d..8b75695 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheMessageRecoveryAbstractTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheMessageRecoveryAbstractTest.java
@@ -92,11 +92,6 @@ public abstract class IgniteCacheMessageRecoveryAbstractTest extends GridCommonA
}
/** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- stopAllGrids();
- }
-
- /** {@inheritDoc} */
@Override protected void afterTest() throws Exception {
for (int i = 0; i < GRID_CNT; i++) {
final IgniteKernal grid = (IgniteKernal)grid(i);
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheMessageRecoveryIdleConnectionTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheMessageRecoveryIdleConnectionTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheMessageRecoveryIdleConnectionTest.java
index 25cb400..0f4aaa7 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheMessageRecoveryIdleConnectionTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheMessageRecoveryIdleConnectionTest.java
@@ -81,13 +81,6 @@ public class IgniteCacheMessageRecoveryIdleConnectionTest extends GridCommonAbst
startGridsMultiThreaded(NODES);
}
- /** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- super.afterTestsStopped();
-
- stopAllGrids();
- }
-
/**
* @throws Exception If failed.
*/
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheNearRestartRollbackSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheNearRestartRollbackSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheNearRestartRollbackSelfTest.java
index 1a9e13a..54b7820 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheNearRestartRollbackSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheNearRestartRollbackSelfTest.java
@@ -102,8 +102,6 @@ public class IgniteCacheNearRestartRollbackSelfTest extends GridCommonAbstractTe
/** {@inheritDoc} */
@Override protected void afterTestsStopped() throws Exception {
- super.afterTestsStopped();
-
System.clearProperty(IgniteSystemProperties.IGNITE_ENABLE_FORCIBLE_NODE_KILL);
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCachePrimarySyncTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCachePrimarySyncTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCachePrimarySyncTest.java
index 4faf76b..e9e22ee 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCachePrimarySyncTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCachePrimarySyncTest.java
@@ -93,13 +93,6 @@ public class IgniteCachePrimarySyncTest extends GridCommonAbstractTest {
assertTrue(client.configuration().isClientMode());
}
- /** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- super.afterTestsStopped();
-
- stopAllGrids();
- }
-
/**
* @throws Exception If failed.
*/
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheReadFromBackupTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheReadFromBackupTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheReadFromBackupTest.java
index 9907937..2bb5fbb 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheReadFromBackupTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheReadFromBackupTest.java
@@ -83,13 +83,6 @@ public class IgniteCacheReadFromBackupTest extends GridCommonAbstractTest {
startGridsMultiThreaded(NODES);
}
- /** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- super.afterTestsStopped();
-
- stopAllGrids();
- }
-
/**
* @throws Exception If failed.
*/
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheSingleGetMessageTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheSingleGetMessageTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheSingleGetMessageTest.java
index d8d5374..974bcf2 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheSingleGetMessageTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheSingleGetMessageTest.java
@@ -84,13 +84,6 @@ public class IgniteCacheSingleGetMessageTest extends GridCommonAbstractTest {
client = false;
}
- /** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- super.afterTestsStopped();
-
- stopAllGrids();
- }
-
/**
* @throws Exception If failed.
*/
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCrossCacheTxStoreSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCrossCacheTxStoreSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCrossCacheTxStoreSelfTest.java
index bf5ba61..870ce67 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCrossCacheTxStoreSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCrossCacheTxStoreSelfTest.java
@@ -97,8 +97,6 @@ public class IgniteCrossCacheTxStoreSelfTest extends GridCommonAbstractTest {
/** {@inheritDoc} */
@Override protected void afterTestsStopped() throws Exception {
- stopAllGrids();
-
firstStores.clear();
secondStores.clear();
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteOptimisticTxSuspendResumeTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteOptimisticTxSuspendResumeTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteOptimisticTxSuspendResumeTest.java
index 42996d1..6751b1e 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteOptimisticTxSuspendResumeTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteOptimisticTxSuspendResumeTest.java
@@ -135,8 +135,6 @@ public class IgniteOptimisticTxSuspendResumeTest extends GridCommonAbstractTest
/** {@inheritDoc} */
@Override protected void afterTestsStopped() throws Exception {
- super.afterTestsStopped();
-
stopAllGrids(true);
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteTxCachePrimarySyncTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteTxCachePrimarySyncTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteTxCachePrimarySyncTest.java
index 1fcbd21..bdf0b12 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteTxCachePrimarySyncTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteTxCachePrimarySyncTest.java
@@ -130,13 +130,6 @@ public class IgniteTxCachePrimarySyncTest extends GridCommonAbstractTest {
}
}
- /** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- stopAllGrids();
-
- super.afterTestsStopped();
- }
-
/**
* @throws Exception If failed.
*/
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteTxCacheWriteSynchronizationModesMultithreadedTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteTxCacheWriteSynchronizationModesMultithreadedTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteTxCacheWriteSynchronizationModesMultithreadedTest.java
index 8e57387..bed8a41 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteTxCacheWriteSynchronizationModesMultithreadedTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteTxCacheWriteSynchronizationModesMultithreadedTest.java
@@ -122,11 +122,7 @@ public class IgniteTxCacheWriteSynchronizationModesMultithreadedTest extends Gri
/** {@inheritDoc} */
@Override protected void afterTestsStopped() throws Exception {
- stopAllGrids();
-
System.clearProperty(IgniteSystemProperties.IGNITE_ENABLE_FORCIBLE_NODE_KILL);
-
- super.afterTestsStopped();
}
/**
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteTxTimeoutAbstractTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteTxTimeoutAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteTxTimeoutAbstractTest.java
index 0af84d6..a0ec70a 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteTxTimeoutAbstractTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteTxTimeoutAbstractTest.java
@@ -64,8 +64,6 @@ public class IgniteTxTimeoutAbstractTest extends GridCommonAbstractTest {
* @throws Exception If failed.
*/
@Override protected void afterTestsStopped() throws Exception {
- stopAllGrids();
-
IGNITEs.clear();
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheAbstractTransformWriteThroughSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheAbstractTransformWriteThroughSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheAbstractTransformWriteThroughSelfTest.java
index cc6b058..34c96fd 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheAbstractTransformWriteThroughSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheAbstractTransformWriteThroughSelfTest.java
@@ -143,8 +143,6 @@ public abstract class GridCacheAbstractTransformWriteThroughSelfTest extends Gri
stopAllGrids(true);
stores.clear();
-
- super.afterTestsStopped();
}
/** {@inheritDoc} */
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtEntrySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtEntrySelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtEntrySelfTest.java
index db8a3cb..7767da9 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtEntrySelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtEntrySelfTest.java
@@ -82,11 +82,6 @@ public class GridCacheDhtEntrySelfTest extends GridCommonAbstractTest {
}
/** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- stopAllGrids();
- }
-
- /** {@inheritDoc} */
@SuppressWarnings({"SizeReplaceableByIsEmpty"})
@Override protected void beforeTest() throws Exception {
for (int i = 0; i < GRID_CNT; i++) {
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtEvictionNearReadersSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtEvictionNearReadersSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtEvictionNearReadersSelfTest.java
index dc5e3ac..36da261 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtEvictionNearReadersSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtEvictionNearReadersSelfTest.java
@@ -119,13 +119,6 @@ public class GridCacheDhtEvictionNearReadersSelfTest extends GridCommonAbstractT
}
/** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- super.afterTestsStopped();
-
- stopAllGrids();
- }
-
- /** {@inheritDoc} */
@SuppressWarnings({"SizeReplaceableByIsEmpty"})
@Override protected void beforeTest() throws Exception {
for (int i = 0; i < GRID_CNT; i++) {
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtMappingSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtMappingSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtMappingSelfTest.java
index 35ef4f0..bd0af34 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtMappingSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtMappingSelfTest.java
@@ -65,13 +65,6 @@ public class GridCacheDhtMappingSelfTest extends GridCommonAbstractTest {
return cfg;
}
- /** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- super.afterTestsStopped();
-
- stopAllGrids();
- }
-
/** @throws Exception If failed. */
public void testMapping() throws Exception {
int nodeCnt = 5;
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteCacheCommitDelayTxRecoveryTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteCacheCommitDelayTxRecoveryTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteCacheCommitDelayTxRecoveryTest.java
index b61d718..7b8854d 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteCacheCommitDelayTxRecoveryTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteCacheCommitDelayTxRecoveryTest.java
@@ -88,13 +88,6 @@ public class IgniteCacheCommitDelayTxRecoveryTest extends GridCommonAbstractTest
}
/** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- stopAllGrids();
-
- super.afterTestsStopped();
- }
-
- /** {@inheritDoc} */
@Override protected void afterTest() throws Exception {
stopAllGrids();
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteCacheCrossCacheTxFailoverTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteCacheCrossCacheTxFailoverTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteCacheCrossCacheTxFailoverTest.java
index 6638626..40f9dc4 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteCacheCrossCacheTxFailoverTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteCacheCrossCacheTxFailoverTest.java
@@ -103,13 +103,6 @@ public class IgniteCacheCrossCacheTxFailoverTest extends GridCommonAbstractTest
startGrids(4);
}
- /** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- super.afterTestsStopped();
-
- stopAllGrids();
- }
-
/**
* @param name Cache name.
* @param cacheMode Cache mode.
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteCacheMultiTxLockSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteCacheMultiTxLockSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteCacheMultiTxLockSelfTest.java
index 11b0eea..b577105 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteCacheMultiTxLockSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteCacheMultiTxLockSelfTest.java
@@ -57,13 +57,6 @@ public class IgniteCacheMultiTxLockSelfTest extends GridCommonAbstractTest {
private boolean client;
/** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- stopAllGrids();
-
- assertEquals(0, G.allGrids().size());
- }
-
- /** {@inheritDoc} */
@Override protected IgniteConfiguration getConfiguration(String igniteInstanceName) throws Exception {
IgniteConfiguration c = super.getConfiguration(igniteInstanceName);
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteCachePutRetryAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteCachePutRetryAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteCachePutRetryAbstractSelfTest.java
index 0620f60..fbb7c3a 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteCachePutRetryAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteCachePutRetryAbstractSelfTest.java
@@ -146,10 +146,6 @@ public abstract class IgniteCachePutRetryAbstractSelfTest extends GridCommonAbst
/** {@inheritDoc} */
@Override protected void afterTestsStopped() throws Exception {
- super.afterTestsStopped();
-
- stopAllGrids();
-
System.clearProperty(IgniteSystemProperties.IGNITE_ENABLE_FORCIBLE_NODE_KILL);
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteCrossCacheTxSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteCrossCacheTxSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteCrossCacheTxSelfTest.java
index 6dcb539..91c6685 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteCrossCacheTxSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteCrossCacheTxSelfTest.java
@@ -104,11 +104,6 @@ public class IgniteCrossCacheTxSelfTest extends GridCommonAbstractTest {
grid(0).createCache(secondCfg);
}
- /** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- stopAllGrids();
- }
-
/**
* @throws Exception If failed.
*/
[08/50] [abbrv] ignite git commit: IGNITE-8488 Web Console: Fixed
scrolling issues in bs-select-menu.
Posted by dp...@apache.org.
http://git-wip-us.apache.org/repos/asf/ignite/blob/381448ea/modules/web-console/frontend/package.json
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/package.json b/modules/web-console/frontend/package.json
index f9d0b48..9e591db 100644
--- a/modules/web-console/frontend/package.json
+++ b/modules/web-console/frontend/package.json
@@ -91,7 +91,7 @@
"jszip": "3.1.5",
"lodash": "4.17.5",
"natural-compare-lite": "^1.4.0",
- "node-sass": "4.8.3",
+ "node-sass": "^4.8.3",
"nvd3": "1.8.6",
"outdent": "^0.5.0",
"pako": "1.0.6",
[25/50] [abbrv] ignite git commit: IGNITE-7894 Web Console:
Refactored panel-collapsible to component.
Posted by dp...@apache.org.
IGNITE-7894 Web Console: Refactored panel-collapsible to component.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/1098ba5f
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/1098ba5f
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/1098ba5f
Branch: refs/heads/ignite-5789-1
Commit: 1098ba5f8e83e2a5c5e7ba42faf0594bbb47b6dd
Parents: baf4ec2
Author: Ilya Borisov <kl...@gmail.com>
Authored: Tue May 22 15:33:38 2018 +0700
Committer: Alexey Kuznetsov <ak...@apache.org>
Committed: Tue May 22 15:33:38 2018 +0700
----------------------------------------------------------------------
.../frontend/app/components/panel-collapsible/style.scss | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/1098ba5f/modules/web-console/frontend/app/components/panel-collapsible/style.scss
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/app/components/panel-collapsible/style.scss b/modules/web-console/frontend/app/components/panel-collapsible/style.scss
index 73eba25..f421862 100644
--- a/modules/web-console/frontend/app/components/panel-collapsible/style.scss
+++ b/modules/web-console/frontend/app/components/panel-collapsible/style.scss
@@ -59,6 +59,7 @@ panel-collapsible {
.#{&}__actions {
margin-left: auto;
+ flex: 0 0 auto;
& > panel-actions {
display: flex;
@@ -76,4 +77,4 @@ panel-collapsible {
padding: 15px 20px;
contain: content;
}
-}
\ No newline at end of file
+}
[22/50] [abbrv] ignite git commit: IGNITE-8533 Fix timeout collision
in Client Nodes test suite introduced by IGNITE-8085 - Fixes #4030.
Posted by dp...@apache.org.
IGNITE-8533 Fix timeout collision in Client Nodes test suite introduced by IGNITE-8085 - Fixes #4030.
Signed-off-by: dpavlov <dp...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/028df980
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/028df980
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/028df980
Branch: refs/heads/ignite-5789-1
Commit: 028df980a1ced2c582e351dc3d87260f7afa856a
Parents: 9a4a145
Author: AMedvedev <AM...@gridgain.com>
Authored: Mon May 21 18:02:36 2018 +0300
Committer: dpavlov <dp...@apache.org>
Committed: Mon May 21 18:02:36 2018 +0300
----------------------------------------------------------------------
.../ignite/internal/util/nodestart/StartNodeCallableImpl.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/028df980/modules/ssh/src/main/java/org/apache/ignite/internal/util/nodestart/StartNodeCallableImpl.java
----------------------------------------------------------------------
diff --git a/modules/ssh/src/main/java/org/apache/ignite/internal/util/nodestart/StartNodeCallableImpl.java b/modules/ssh/src/main/java/org/apache/ignite/internal/util/nodestart/StartNodeCallableImpl.java
index 976bb07..1bf23b3 100644
--- a/modules/ssh/src/main/java/org/apache/ignite/internal/util/nodestart/StartNodeCallableImpl.java
+++ b/modules/ssh/src/main/java/org/apache/ignite/internal/util/nodestart/StartNodeCallableImpl.java
@@ -82,7 +82,7 @@ public class StartNodeCallableImpl implements StartNodeCallable {
private static final long NODE_START_CHECK_PERIOD = 2000;
/** */
- private static final long NODE_START_CHECK_LIMIT = 25;
+ private static final long NODE_START_CHECK_LIMIT = 15;
/** Specification. */
private final IgniteRemoteStartSpecification spec;
@@ -517,4 +517,4 @@ public class StartNodeCallableImpl implements StartNodeCallable {
if (logger != null && logger.isInfoEnabled())
logger.info(msg);
}
-}
\ No newline at end of file
+}
[04/50] [abbrv] ignite git commit: IGNITE-8528: Example fixed - Fixes
#4025.
Posted by dp...@apache.org.
IGNITE-8528: Example fixed - Fixes #4025.
Signed-off-by: Nikolay Izhikov <ni...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/e078245d
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/e078245d
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/e078245d
Branch: refs/heads/ignite-5789-1
Commit: e078245d3813eb2ea26fc7b27d8e171942053c0d
Parents: f8ae30d
Author: Nikolay Izhikov <ni...@apache.org>
Authored: Fri May 18 17:05:01 2018 +0300
Committer: Nikolay Izhikov <ni...@apache.org>
Committed: Fri May 18 17:05:01 2018 +0300
----------------------------------------------------------------------
...heContinuousQueryWithTransformerExample.java | 20 +++++++-------------
1 file changed, 7 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/e078245d/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheContinuousQueryWithTransformerExample.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheContinuousQueryWithTransformerExample.java b/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheContinuousQueryWithTransformerExample.java
index ece4f88..674ebd5 100644
--- a/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheContinuousQueryWithTransformerExample.java
+++ b/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheContinuousQueryWithTransformerExample.java
@@ -21,19 +21,16 @@ import java.sql.Timestamp;
import java.util.HashMap;
import java.util.Map;
import javax.cache.Cache;
-import javax.cache.configuration.Factory;
-import javax.cache.configuration.FactoryBuilder;
-import javax.cache.event.CacheEntryEvent;
import org.apache.ignite.Ignite;
import org.apache.ignite.IgniteCache;
import org.apache.ignite.Ignition;
+import org.apache.ignite.binary.BinaryObject;
import org.apache.ignite.cache.query.ContinuousQueryWithTransformer;
import org.apache.ignite.cache.query.QueryCursor;
import org.apache.ignite.examples.ExampleNodeStartup;
import org.apache.ignite.examples.model.Address;
import org.apache.ignite.examples.model.Organization;
import org.apache.ignite.examples.model.OrganizationType;
-import org.apache.ignite.lang.IgniteClosure;
/**
* This example demonstrates how to use continuous queries together with the transformer APIs.
@@ -71,20 +68,17 @@ public class CacheContinuousQueryWithTransformerExample {
System.out.println(">>> Cache continuous query with transformer example started.");
// Auto-close cache at the end of the example.
- try (IgniteCache<Integer, Organization> cache = ignite.getOrCreateCache(CACHE_NAME)) {
+ try (IgniteCache<Integer, Organization> cache = ignite.getOrCreateCache(CACHE_NAME).withKeepBinary()) {
// Create new continuous query with transformer.
ContinuousQueryWithTransformer<Integer, Organization, String> qry =
new ContinuousQueryWithTransformer<>();
// Factory to create transformers.
- Factory<IgniteClosure<CacheEntryEvent<? extends Integer, ? extends Organization>, String>> factory =
- FactoryBuilder.factoryOf(
- // Return one field of complex object.
- // Only this field will be sent over to a local node over the network.
- (IgniteClosure<CacheEntryEvent<? extends Integer, ? extends Organization>, String>)
- event -> event.getValue().name());
-
- qry.setRemoteTransformerFactory(factory);
+ qry.setRemoteTransformerFactory(() -> {
+ // Return one field of complex object.
+ // Only this field will be sent over to a local node over the network.
+ return event -> ((BinaryObject)event.getValue()).field("name");
+ });
// Listener that will receive transformed data.
qry.setLocalListener(names -> {
[44/50] [abbrv] ignite git commit: IGNITE-5789 Fix for case server
was restarted,
client doesn't create caches defined in client's configuration. - Fixes #3905.
Posted by dp...@apache.org.
IGNITE-5789 Fix for case server was restarted, client doesn't create caches defined in client's configuration. - Fixes #3905.
Signed-off-by: dpavlov <dp...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/d821d099
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/d821d099
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/d821d099
Branch: refs/heads/ignite-5789-1
Commit: d821d0999749a1be318a2106d736542272a42ab0
Parents: a3a619b
Author: vk <ka...@gmail.com>
Authored: Wed May 23 14:59:58 2018 +0300
Committer: dpavlov <dp...@apache.org>
Committed: Wed May 23 14:59:58 2018 +0300
----------------------------------------------------------------------
.../GridDhtPartitionsExchangeFuture.java | 24 +++++++++++++++++
.../ClientReconnectAfterClusterRestartTest.java | 27 ++++++++++----------
2 files changed, 38 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/d821d099/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java
index c62b067..fe0ce2b 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java
@@ -44,6 +44,7 @@ import org.apache.ignite.cache.CacheMode;
import org.apache.ignite.cache.CacheRebalanceMode;
import org.apache.ignite.cluster.ClusterNode;
import org.apache.ignite.configuration.IgniteConfiguration;
+import org.apache.ignite.configuration.CacheConfiguration;
import org.apache.ignite.configuration.NearCacheConfiguration;
import org.apache.ignite.events.DiscoveryEvent;
import org.apache.ignite.internal.IgniteClientDisconnectedCheckedException;
@@ -72,6 +73,7 @@ import org.apache.ignite.internal.processors.cache.ExchangeContext;
import org.apache.ignite.internal.processors.cache.ExchangeDiscoveryEvents;
import org.apache.ignite.internal.processors.cache.GridCacheContext;
import org.apache.ignite.internal.processors.cache.GridCacheMvccCandidate;
+import org.apache.ignite.internal.processors.cache.GridCacheProcessor;
import org.apache.ignite.internal.processors.cache.GridCacheSharedContext;
import org.apache.ignite.internal.processors.cache.LocalJoinCachesContext;
import org.apache.ignite.internal.processors.cache.StateChangeRequest;
@@ -797,6 +799,27 @@ public class GridDhtPartitionsExchangeFuture extends GridDhtTopologyFutureAdapte
}
cctx.cache().startCachesOnLocalJoin(locJoinCtx, initialVersion());
+
+ ensureClientCachesStarted();
+ }
+
+ /**
+ * Start client caches if absent.
+ */
+ private void ensureClientCachesStarted() {
+ GridCacheProcessor cacheProcessor = cctx.cache();
+
+ Set<String> cacheNames = new HashSet<>(cacheProcessor.cacheNames());
+
+ List<CacheConfiguration> notStartedCacheConfigs = new ArrayList<>();
+
+ for (CacheConfiguration cCfg : cctx.gridConfig().getCacheConfiguration()) {
+ if (!cacheNames.contains(cCfg.getName()))
+ notStartedCacheConfigs.add(cCfg);
+ }
+
+ if (!notStartedCacheConfigs.isEmpty())
+ cacheProcessor.dynamicStartCaches(notStartedCacheConfigs, false, false, false);
}
/**
@@ -3854,6 +3877,7 @@ public class GridDhtPartitionsExchangeFuture extends GridDhtTopologyFutureAdapte
/** */
NONE
}
+
/**
*
*/
http://git-wip-us.apache.org/repos/asf/ignite/blob/d821d099/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/ClientReconnectAfterClusterRestartTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/ClientReconnectAfterClusterRestartTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/ClientReconnectAfterClusterRestartTest.java
index 505d373..9012161 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/ClientReconnectAfterClusterRestartTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/ClientReconnectAfterClusterRestartTest.java
@@ -18,6 +18,9 @@
package org.apache.ignite.internal.processors.cache;
import javax.cache.CacheException;
+import java.util.ArrayList;
+import java.util.LinkedHashMap;
+import java.util.List;
import org.apache.ignite.Ignite;
import org.apache.ignite.IgniteCache;
import org.apache.ignite.IgniteClientDisconnectedException;
@@ -33,23 +36,21 @@ import org.apache.ignite.configuration.IgniteConfiguration;
import org.apache.ignite.events.Event;
import org.apache.ignite.events.EventType;
import org.apache.ignite.internal.binary.BinaryMarshaller;
-import org.apache.ignite.lang.IgniteFuture;
import org.apache.ignite.lang.IgnitePredicate;
import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
import org.jetbrains.annotations.NotNull;
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.List;
-
/**
*/
public class ClientReconnectAfterClusterRestartTest extends GridCommonAbstractTest {
+ /** Server id. */
+ private static final int SERVER_ID = 0;
+
/** Client id. */
- public static final int CLIENT_ID = 1;
+ private static final int CLIENT_ID = 1;
/** Cache params. */
- public static final String CACHE_PARAMS = "PPRB_PARAMS";
+ private static final String CACHE_PARAMS = "PPRB_PARAMS";
/** {@inheritDoc} */
@Override protected IgniteConfiguration getConfiguration(String igniteInstanceName) throws Exception {
@@ -58,9 +59,9 @@ public class ClientReconnectAfterClusterRestartTest extends GridCommonAbstractTe
cfg.setMarshaller(new BinaryMarshaller());
cfg.setIncludeEventTypes(EventType.EVTS_CACHE);
- if (getTestIgniteInstanceName(CLIENT_ID).equals(igniteInstanceName))
+ if (getTestIgniteInstanceName(CLIENT_ID).equals(igniteInstanceName)) {
cfg.setClientMode(true);
- else {
+
CacheConfiguration ccfg = getCacheConfiguration();
cfg.setCacheConfiguration(ccfg);
@@ -88,7 +89,7 @@ public class ClientReconnectAfterClusterRestartTest extends GridCommonAbstractTe
LinkedHashMap<String, String> fields = new LinkedHashMap<>();
- fields.put("ID", "java.lang.Long" );
+ fields.put("ID", "java.lang.Long");
fields.put("PARTITIONID", "java.lang.Long");
fields.put("CLIENTID", "java.lang.Long");
fields.put("PARAMETRCODE", "java.lang.Long");
@@ -114,9 +115,9 @@ public class ClientReconnectAfterClusterRestartTest extends GridCommonAbstractTe
/** */
public void testReconnectClient() throws Exception {
try {
- startGrid(0);
+ startGrid(SERVER_ID);
- Ignite client = startGrid(1);
+ Ignite client = startGrid(CLIENT_ID);
checkTopology(2);
@@ -162,7 +163,7 @@ public class ClientReconnectAfterClusterRestartTest extends GridCommonAbstractTe
Thread.sleep(2_000);
- startGrid(0);
+ startGrid(SERVER_ID);
try {
assertNull(cache.get(1L));
[12/50] [abbrv] ignite git commit: IGNITE-8521 Do not attempt to
unregister continuous query if query ID is null
Posted by dp...@apache.org.
IGNITE-8521 Do not attempt to unregister continuous query if query ID is null
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/436d1230
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/436d1230
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/436d1230
Branch: refs/heads/ignite-5789-1
Commit: 436d1230efff5000decad30cfbc0a79b151f3e16
Parents: d0e26be
Author: Alexey Goncharuk <al...@gmail.com>
Authored: Mon May 21 15:13:37 2018 +0300
Committer: Alexey Goncharuk <al...@gmail.com>
Committed: Mon May 21 15:13:37 2018 +0300
----------------------------------------------------------------------
.../cache/query/continuous/CacheContinuousQueryManager.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/436d1230/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryManager.java
index 19225f8..55c44b4 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryManager.java
@@ -703,7 +703,8 @@ public class CacheContinuousQueryManager extends GridCacheManagerAdapter {
catch (IgniteCheckedException e) {
log.warning("Failed to start continuous query.", e);
- cctx.kernalContext().continuous().stopRoutine(id);
+ if (id != null)
+ cctx.kernalContext().continuous().stopRoutine(id);
throw new IgniteCheckedException("Failed to start continuous query.", e);
}
[06/50] [abbrv] ignite git commit: IGNITE-8531 Fixed NPE if
checkpoint has no pages to write,
but has partitions to destroy. - Fixes #4026.
Posted by dp...@apache.org.
IGNITE-8531 Fixed NPE if checkpoint has no pages to write, but has partitions to destroy. - Fixes #4026.
Signed-off-by: Alexey Goncharuk <al...@gmail.com>
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/5c8d9ffa
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/5c8d9ffa
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/5c8d9ffa
Branch: refs/heads/ignite-5789-1
Commit: 5c8d9ffa20fbe4497c5cd96a11f315df2baa9ba4
Parents: c2285c7
Author: Pavel Kovalenko <jo...@gmail.com>
Authored: Fri May 18 19:28:45 2018 +0300
Committer: Alexey Goncharuk <al...@gmail.com>
Committed: Fri May 18 19:28:45 2018 +0300
----------------------------------------------------------------------
.../GridCacheDatabaseSharedManager.java | 24 ++++++++++-------
.../IgnitePdsPartitionFilesDestroyTest.java | 28 ++++++++++++++++++++
2 files changed, 43 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/5c8d9ffa/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/GridCacheDatabaseSharedManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/GridCacheDatabaseSharedManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/GridCacheDatabaseSharedManager.java
index 7151d75..2eb6e6f 100755
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/GridCacheDatabaseSharedManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/GridCacheDatabaseSharedManager.java
@@ -3110,6 +3110,8 @@ public class GridCacheDatabaseSharedManager extends IgniteCacheDatabaseSharedMan
boolean success = false;
+ int destroyedPartitionsCnt;
+
try {
if (chp.hasDelta()) {
// Identity stores set.
@@ -3196,7 +3198,7 @@ public class GridCacheDatabaseSharedManager extends IgniteCacheDatabaseSharedMan
snapshotMgr.afterCheckpointPageWritten();
try {
- destroyEvictedPartitions();
+ destroyedPartitionsCnt = destroyEvictedPartitions();
}
catch (IgniteCheckedException e) {
chp.progress.cpFinishFut.onDone(e);
@@ -3216,15 +3218,15 @@ public class GridCacheDatabaseSharedManager extends IgniteCacheDatabaseSharedMan
tracker.onEnd();
- if (chp.hasDelta()) {
+ if (chp.hasDelta() || destroyedPartitionsCnt > 0) {
if (printCheckpointStats) {
if (log.isInfoEnabled())
log.info(String.format("Checkpoint finished [cpId=%s, pages=%d, markPos=%s, " +
"walSegmentsCleared=%d, markDuration=%dms, pagesWrite=%dms, fsync=%dms, " +
"total=%dms]",
- chp.cpEntry.checkpointId(),
+ chp.cpEntry != null ? chp.cpEntry.checkpointId() : "",
chp.pagesSize,
- chp.cpEntry.checkpointMark(),
+ chp.cpEntry != null ? chp.cpEntry.checkpointMark() : "",
chp.walFilesDeleted,
tracker.markDuration(),
tracker.pagesWriteDuration(),
@@ -3264,12 +3266,14 @@ public class GridCacheDatabaseSharedManager extends IgniteCacheDatabaseSharedMan
* Processes all evicted partitions scheduled for destroy.
*
* @throws IgniteCheckedException If failed.
+ *
+ * @return The number of destroyed partition files.
*/
- private void destroyEvictedPartitions() throws IgniteCheckedException {
+ private int destroyEvictedPartitions() throws IgniteCheckedException {
PartitionDestroyQueue destroyQueue = curCpProgress.destroyQueue;
if (destroyQueue.pendingReqs.isEmpty())
- return;
+ return 0;
List<PartitionDestroyRequest> reqs = null;
@@ -3327,6 +3331,8 @@ public class GridCacheDatabaseSharedManager extends IgniteCacheDatabaseSharedMan
req.waitCompleted();
destroyQueue.pendingReqs.clear();
+
+ return reqs != null ? reqs.size() : 0;
}
/**
@@ -3495,7 +3501,7 @@ public class GridCacheDatabaseSharedManager extends IgniteCacheDatabaseSharedMan
hasPages = hasPageForWrite(cpPagesTuple.get1());
- if (hasPages || curr.nextSnapshot) {
+ if (hasPages || curr.nextSnapshot || !curr.destroyQueue.pendingReqs.isEmpty()) {
// No page updates for this checkpoint are allowed from now on.
cpPtr = cctx.wal().log(cpRec);
@@ -3874,7 +3880,7 @@ public class GridCacheDatabaseSharedManager extends IgniteCacheDatabaseSharedMan
*/
private static class Checkpoint {
/** Checkpoint entry. */
- private final CheckpointEntry cpEntry;
+ @Nullable private final CheckpointEntry cpEntry;
/** Checkpoint pages. */
private final GridMultiCollectionWrapper<FullPageId> cpPages;
@@ -3894,7 +3900,7 @@ public class GridCacheDatabaseSharedManager extends IgniteCacheDatabaseSharedMan
* @param progress Checkpoint progress status.
*/
private Checkpoint(
- CheckpointEntry cpEntry,
+ @Nullable CheckpointEntry cpEntry,
@NotNull GridMultiCollectionWrapper<FullPageId> cpPages,
CheckpointProgress progress
) {
http://git-wip-us.apache.org/repos/asf/ignite/blob/5c8d9ffa/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsPartitionFilesDestroyTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsPartitionFilesDestroyTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsPartitionFilesDestroyTest.java
index b5afddf..5e0ccc9 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsPartitionFilesDestroyTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsPartitionFilesDestroyTest.java
@@ -19,6 +19,7 @@ package org.apache.ignite.internal.processors.cache.persistence;
import java.io.File;
import java.io.IOException;
import java.nio.file.OpenOption;
+import java.util.List;
import org.apache.ignite.Ignite;
import org.apache.ignite.IgniteCache;
import org.apache.ignite.IgniteCheckedException;
@@ -333,6 +334,33 @@ public class IgnitePdsPartitionFilesDestroyTest extends GridCommonAbstractTest {
}
/**
+ * Test destroy when partition files are empty and there are no pages for checkpoint.
+ *
+ * @throws Exception If failed.
+ */
+ public void testDestroyWhenPartitionsAreEmpty() throws Exception {
+ IgniteEx crd = (IgniteEx) startGrids(2);
+
+ crd.cluster().active(true);
+
+ forceCheckpoint();
+
+ // Evict arbitrary partition.
+ List<GridDhtLocalPartition> parts = crd.cachex(CACHE).context().topology().localPartitions();
+ for (GridDhtLocalPartition part : parts)
+ if (part.state() != GridDhtPartitionState.EVICTED) {
+ part.rent(false).get();
+
+ break;
+ }
+
+ // This checkpoint has no pages to write, but has one partition file to destroy.
+ forceCheckpoint(crd);
+
+ checkPartitionFiles(crd, false);
+ }
+
+ /**
* If {@code exists} is {@code true}, checks that all partition files exist
* if partition has state EVICTED.
*
[24/50] [abbrv] ignite git commit: IGNITE-7650 Web Console: Cleanup
unused code.
Posted by dp...@apache.org.
IGNITE-7650 Web Console: Cleanup unused code.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/baf4ec25
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/baf4ec25
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/baf4ec25
Branch: refs/heads/ignite-5789-1
Commit: baf4ec25809059b66f8fa5fc0611c9bf63ba9950
Parents: fe38f3e
Author: Alexey Kuznetsov <ak...@apache.org>
Authored: Tue May 22 13:46:44 2018 +0700
Committer: Alexey Kuznetsov <ak...@apache.org>
Committed: Tue May 22 13:46:44 2018 +0700
----------------------------------------------------------------------
modules/web-console/frontend/app/app.js | 5 --
.../controllers/reset-password.controller.js | 50 --------------------
2 files changed, 55 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/baf4ec25/modules/web-console/frontend/app/app.js
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/app/app.js b/modules/web-console/frontend/app/app.js
index d28f1bc..60b4ebc 100644
--- a/modules/web-console/frontend/app/app.js
+++ b/modules/web-console/frontend/app/app.js
@@ -105,9 +105,6 @@ import hasPojo from './filters/hasPojo.filter';
import uiGridSubcategories from './filters/uiGridSubcategories.filter';
import id8 from './filters/id8.filter';
-// Controllers
-import resetPassword from './controllers/reset-password.controller';
-
// Components
import igniteListOfRegisteredUsers from './components/list-of-registered-users';
import IgniteActivitiesUserDialog from './components/activities-user-dialog';
@@ -297,8 +294,6 @@ angular.module('ignite-console', [
.service(CSV.name, CSV)
.service('IGFSs', IGFSs)
.service('Models', Models)
-// Controllers.
-.controller(...resetPassword)
// Filters.
.filter('byName', byName)
.filter('defaultName', defaultName)
http://git-wip-us.apache.org/repos/asf/ignite/blob/baf4ec25/modules/web-console/frontend/app/controllers/reset-password.controller.js
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/app/controllers/reset-password.controller.js b/modules/web-console/frontend/app/controllers/reset-password.controller.js
deleted file mode 100644
index f84a876..0000000
--- a/modules/web-console/frontend/app/controllers/reset-password.controller.js
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-// Controller for password reset.
-export default ['resetPassword', [
- '$scope', '$modal', '$http', '$state', 'IgniteMessages', 'IgniteFocus',
- ($scope, $modal, $http, $state, Messages, Focus) => {
- if ($state.params.token) {
- $http.post('/api/v1/password/validate/token', {token: $state.params.token})
- .then(({data}) => {
- $scope.email = data.email;
- $scope.token = data.token;
- $scope.error = data.error;
-
- if ($scope.token && !$scope.error)
- Focus.move('user_password');
- });
- }
-
- // Try to reset user password for provided token.
- $scope.resetPassword = (reset_info) => {
- $http.post('/api/v1/password/reset', reset_info)
- .then(() => {
- $state.go('signin');
-
- Messages.showInfo('Password successfully changed');
- })
- .catch(({data, state}) => {
- if (state === 503)
- $state.go('signin');
-
- Messages.showError(data);
- });
- };
- }
-]];
[16/50] [abbrv] ignite git commit: IGNITE-8266: stopAllGrids in
afterAllTests removed. - Fixes #3844.
Posted by dp...@apache.org.
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/core/src/test/java/org/apache/ignite/internal/processors/service/IgniteServiceDynamicCachesSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/service/IgniteServiceDynamicCachesSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/service/IgniteServiceDynamicCachesSelfTest.java
index acd2b25..7e5a18d 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/service/IgniteServiceDynamicCachesSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/service/IgniteServiceDynamicCachesSelfTest.java
@@ -60,11 +60,6 @@ public class IgniteServiceDynamicCachesSelfTest extends GridCommonAbstractTest {
startGrids(GRID_CNT);
}
- /** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- stopAllGrids();
- }
-
/**
* @throws Exception If failed.
*/
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/core/src/test/java/org/apache/ignite/internal/processors/service/ServicePredicateAccessCacheTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/service/ServicePredicateAccessCacheTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/service/ServicePredicateAccessCacheTest.java
index 389cbba..02ba65e 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/service/ServicePredicateAccessCacheTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/service/ServicePredicateAccessCacheTest.java
@@ -69,13 +69,6 @@ public class ServicePredicateAccessCacheTest extends GridCommonAbstractTest {
return 60_000;
}
- /** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- stopAllGrids();
-
- super.afterTestsStopped();
- }
-
/**
* @throws Exception If failed.
*/
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/core/src/test/java/org/apache/ignite/loadtests/GridCacheMultiNodeLoadTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/loadtests/GridCacheMultiNodeLoadTest.java b/modules/core/src/test/java/org/apache/ignite/loadtests/GridCacheMultiNodeLoadTest.java
index 8c4b7d9..35c3405 100644
--- a/modules/core/src/test/java/org/apache/ignite/loadtests/GridCacheMultiNodeLoadTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/loadtests/GridCacheMultiNodeLoadTest.java
@@ -86,8 +86,6 @@ public class GridCacheMultiNodeLoadTest extends GridCommonAbstractTest {
/** {@inheritDoc} */
@Override protected void afterTestsStopped() throws Exception {
- stopAllGrids();
-
ignite1 = null;
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/core/src/test/java/org/apache/ignite/loadtests/communication/GridIoManagerBenchmark0.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/loadtests/communication/GridIoManagerBenchmark0.java b/modules/core/src/test/java/org/apache/ignite/loadtests/communication/GridIoManagerBenchmark0.java
index 063c790..58fc166 100644
--- a/modules/core/src/test/java/org/apache/ignite/loadtests/communication/GridIoManagerBenchmark0.java
+++ b/modules/core/src/test/java/org/apache/ignite/loadtests/communication/GridIoManagerBenchmark0.java
@@ -72,11 +72,6 @@ public class GridIoManagerBenchmark0 extends GridCommonAbstractTest {
}
/** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- stopAllGrids();
- }
-
- /** {@inheritDoc} */
@Override protected IgniteConfiguration getConfiguration(String igniteInstanceName) throws Exception {
IgniteConfiguration c = super.getConfiguration(igniteInstanceName);
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/core/src/test/java/org/apache/ignite/loadtests/direct/stealing/GridStealingLoadTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/loadtests/direct/stealing/GridStealingLoadTest.java b/modules/core/src/test/java/org/apache/ignite/loadtests/direct/stealing/GridStealingLoadTest.java
index cb55749..79ed3ed 100644
--- a/modules/core/src/test/java/org/apache/ignite/loadtests/direct/stealing/GridStealingLoadTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/loadtests/direct/stealing/GridStealingLoadTest.java
@@ -56,11 +56,6 @@ public class GridStealingLoadTest extends GridCommonAbstractTest {
}
/** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- stopAllGrids();
- }
-
- /** {@inheritDoc} */
@Override protected IgniteConfiguration getConfiguration(String igniteInstanceName) throws Exception {
IgniteConfiguration cfg = super.getConfiguration(igniteInstanceName);
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/core/src/test/java/org/apache/ignite/p2p/GridP2PContinuousDeploymentSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/p2p/GridP2PContinuousDeploymentSelfTest.java b/modules/core/src/test/java/org/apache/ignite/p2p/GridP2PContinuousDeploymentSelfTest.java
index 0c021b6..4ea9037 100644
--- a/modules/core/src/test/java/org/apache/ignite/p2p/GridP2PContinuousDeploymentSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/p2p/GridP2PContinuousDeploymentSelfTest.java
@@ -89,11 +89,6 @@ public class GridP2PContinuousDeploymentSelfTest extends GridCommonAbstractTest
startGridsMultiThreaded(GRID_CNT);
}
- /** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- stopAllGrids();
- }
-
/**
* @throws Exception If failed.
*/
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/core/src/test/java/org/apache/ignite/session/GridSessionWaitAttributeSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/session/GridSessionWaitAttributeSelfTest.java b/modules/core/src/test/java/org/apache/ignite/session/GridSessionWaitAttributeSelfTest.java
index 06f47b4..34f148d 100644
--- a/modules/core/src/test/java/org/apache/ignite/session/GridSessionWaitAttributeSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/session/GridSessionWaitAttributeSelfTest.java
@@ -109,12 +109,6 @@ public class GridSessionWaitAttributeSelfTest extends GridCommonAbstractTest {
startGrid(2);
}
- /** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- stopGrid(1);
- stopGrid(2);
- }
-
/**
* @param prefix Prefix.
* @param mtd Method.
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/core/src/test/java/org/apache/ignite/spi/checkpoint/sharedfs/GridSharedFsCheckpointSpiMultiThreadedSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/spi/checkpoint/sharedfs/GridSharedFsCheckpointSpiMultiThreadedSelfTest.java b/modules/core/src/test/java/org/apache/ignite/spi/checkpoint/sharedfs/GridSharedFsCheckpointSpiMultiThreadedSelfTest.java
index e4f1592..85c19bc 100644
--- a/modules/core/src/test/java/org/apache/ignite/spi/checkpoint/sharedfs/GridSharedFsCheckpointSpiMultiThreadedSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/spi/checkpoint/sharedfs/GridSharedFsCheckpointSpiMultiThreadedSelfTest.java
@@ -196,8 +196,6 @@ public class GridSharedFsCheckpointSpiMultiThreadedSelfTest extends
/** {@inheritDoc} */
@Override protected void afterTestsStopped() throws Exception {
- super.afterTestsStopped();
-
deleteFolder(new File(U.getIgniteHome(), PATH));
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpiDropNodesTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpiDropNodesTest.java b/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpiDropNodesTest.java
index 842f283..08cf1f7 100644
--- a/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpiDropNodesTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpiDropNodesTest.java
@@ -91,8 +91,6 @@ public class TcpCommunicationSpiDropNodesTest extends GridCommonAbstractTest {
/** {@inheritDoc} */
@Override protected void afterTestsStopped() throws Exception {
- super.afterTestsStopped();
-
System.clearProperty(IgniteSystemProperties.IGNITE_ENABLE_FORCIBLE_NODE_KILL);
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpiFaultyClientTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpiFaultyClientTest.java b/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpiFaultyClientTest.java
index bead697..00b1d90 100644
--- a/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpiFaultyClientTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpiFaultyClientTest.java
@@ -99,8 +99,6 @@ public class TcpCommunicationSpiFaultyClientTest extends GridCommonAbstractTest
/** {@inheritDoc} */
@Override protected void afterTestsStopped() throws Exception {
- super.afterTestsStopped();
-
System.clearProperty(IgniteSystemProperties.IGNITE_ENABLE_FORCIBLE_NODE_KILL);
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/core/src/test/java/org/apache/ignite/spi/discovery/AuthenticationRestartTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/spi/discovery/AuthenticationRestartTest.java b/modules/core/src/test/java/org/apache/ignite/spi/discovery/AuthenticationRestartTest.java
index 5841094..cf1836a 100644
--- a/modules/core/src/test/java/org/apache/ignite/spi/discovery/AuthenticationRestartTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/spi/discovery/AuthenticationRestartTest.java
@@ -57,8 +57,6 @@ public class AuthenticationRestartTest extends GridCommonAbstractTest {
@Override protected void afterTestsStopped() throws Exception {
TestReconnectPluginProvider.enabled = false;
TestReconnectProcessor.enabled = false;
-
- stopAllGrids();
}
/**
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoveryConcurrentStartTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoveryConcurrentStartTest.java b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoveryConcurrentStartTest.java
index f407523..a66fe71 100644
--- a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoveryConcurrentStartTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoveryConcurrentStartTest.java
@@ -108,9 +108,4 @@ public class TcpDiscoveryConcurrentStartTest extends GridCommonAbstractTest {
}
}
}
-
- /** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- stopAllGrids();
- }
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/core/src/test/java/org/apache/ignite/stream/socket/SocketStreamerSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/stream/socket/SocketStreamerSelfTest.java b/modules/core/src/test/java/org/apache/ignite/stream/socket/SocketStreamerSelfTest.java
index 42bea62..90ef8d7 100644
--- a/modules/core/src/test/java/org/apache/ignite/stream/socket/SocketStreamerSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/stream/socket/SocketStreamerSelfTest.java
@@ -100,11 +100,6 @@ public class SocketStreamerSelfTest extends GridCommonAbstractTest {
}
}
- /** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- stopAllGrids();
- }
-
/**
* @throws Exception If failed.
*/
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/core/src/test/java/org/apache/ignite/testframework/junits/common/GridRollingRestartAbstractTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/testframework/junits/common/GridRollingRestartAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/testframework/junits/common/GridRollingRestartAbstractTest.java
index 859eb3c..37e2f01 100644
--- a/modules/core/src/test/java/org/apache/ignite/testframework/junits/common/GridRollingRestartAbstractTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/testframework/junits/common/GridRollingRestartAbstractTest.java
@@ -122,10 +122,6 @@ public abstract class GridRollingRestartAbstractTest extends GridCommonAbstractT
/** {@inheritDoc} */
@Override protected void afterTestsStopped() throws Exception {
- super.afterTestsStopped();
-
- stopAllGrids();
-
rollingRestartThread.shutdown();
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/core/src/test/java/org/apache/ignite/util/mbeans/GridMBeanDisableSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/util/mbeans/GridMBeanDisableSelfTest.java b/modules/core/src/test/java/org/apache/ignite/util/mbeans/GridMBeanDisableSelfTest.java
index 9a23832..ac8f011 100644
--- a/modules/core/src/test/java/org/apache/ignite/util/mbeans/GridMBeanDisableSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/util/mbeans/GridMBeanDisableSelfTest.java
@@ -41,8 +41,6 @@ public class GridMBeanDisableSelfTest extends GridCommonAbstractTest {
/** {@inheritDoc} */
@Override protected void afterTestsStopped() throws Exception {
- super.afterTestsStopped();
-
IgniteUtils.IGNITE_MBEANS_DISABLED = false;
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/flume/src/test/java/org/apache/ignite/stream/flume/IgniteSinkTest.java
----------------------------------------------------------------------
diff --git a/modules/flume/src/test/java/org/apache/ignite/stream/flume/IgniteSinkTest.java b/modules/flume/src/test/java/org/apache/ignite/stream/flume/IgniteSinkTest.java
index 2f33ed4..031eb5d 100644
--- a/modules/flume/src/test/java/org/apache/ignite/stream/flume/IgniteSinkTest.java
+++ b/modules/flume/src/test/java/org/apache/ignite/stream/flume/IgniteSinkTest.java
@@ -46,11 +46,6 @@ public class IgniteSinkTest extends GridCommonAbstractTest {
/** Cache name. */
private static final String CACHE_NAME = "testCache";
- /** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- stopAllGrids();
- }
-
/**
* @throws Exception {@link Exception}.
*/
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/gce/src/test/java/org/apache/ignite/spi/discovery/tcp/ipfinder/gce/TcpDiscoveryGoogleStorageIpFinderSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/gce/src/test/java/org/apache/ignite/spi/discovery/tcp/ipfinder/gce/TcpDiscoveryGoogleStorageIpFinderSelfTest.java b/modules/gce/src/test/java/org/apache/ignite/spi/discovery/tcp/ipfinder/gce/TcpDiscoveryGoogleStorageIpFinderSelfTest.java
index 49555d6..ce30c3e 100644
--- a/modules/gce/src/test/java/org/apache/ignite/spi/discovery/tcp/ipfinder/gce/TcpDiscoveryGoogleStorageIpFinderSelfTest.java
+++ b/modules/gce/src/test/java/org/apache/ignite/spi/discovery/tcp/ipfinder/gce/TcpDiscoveryGoogleStorageIpFinderSelfTest.java
@@ -61,8 +61,6 @@ public class TcpDiscoveryGoogleStorageIpFinderSelfTest
catch (Exception e) {
log.warning("Failed to remove bucket on GCE [bucketName=" + bucketName + ", mes=" + e.getMessage() + ']');
}
-
- super.afterTestsStopped();
}
/** {@inheritDoc} */
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/HadoopAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/HadoopAbstractSelfTest.java b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/HadoopAbstractSelfTest.java
index 9e592de..77721ba 100644
--- a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/HadoopAbstractSelfTest.java
+++ b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/HadoopAbstractSelfTest.java
@@ -103,8 +103,6 @@ public abstract class HadoopAbstractSelfTest extends GridCommonAbstractTest {
/** {@inheritDoc} */
@Override protected void afterTestsStopped() throws Exception {
- super.afterTestsStopped();
-
// Restore classpath.
System.setProperty("java.class.path", initCp);
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/HadoopCommandLineTest.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/HadoopCommandLineTest.java b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/HadoopCommandLineTest.java
index ce34cb2..2bcc15c 100644
--- a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/HadoopCommandLineTest.java
+++ b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/HadoopCommandLineTest.java
@@ -213,8 +213,6 @@ public class HadoopCommandLineTest extends GridCommonAbstractTest {
/** {@inheritDoc} */
@Override protected void afterTestsStopped() throws Exception {
- super.afterTestsStopped();
-
U.delete(testWorkDir);
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/HadoopJobTrackerSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/HadoopJobTrackerSelfTest.java b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/HadoopJobTrackerSelfTest.java
index c3b3040..7f94def 100644
--- a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/HadoopJobTrackerSelfTest.java
+++ b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/HadoopJobTrackerSelfTest.java
@@ -71,13 +71,6 @@ public class HadoopJobTrackerSelfTest extends HadoopAbstractSelfTest {
}
/** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- stopAllGrids();
-
- super.afterTestsStopped();
- }
-
- /** {@inheritDoc} */
@Override protected void beforeTest() throws Exception {
latch.put("mapAwaitLatch", new CountDownLatch(1));
latch.put("reduceAwaitLatch", new CountDownLatch(1));
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/HadoopTaskExecutionSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/HadoopTaskExecutionSelfTest.java b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/HadoopTaskExecutionSelfTest.java
index 2394ada..bc59c76 100644
--- a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/HadoopTaskExecutionSelfTest.java
+++ b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/HadoopTaskExecutionSelfTest.java
@@ -88,13 +88,6 @@ public class HadoopTaskExecutionSelfTest extends HadoopAbstractSelfTest {
}
/** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- stopAllGrids();
-
- super.afterTestsStopped();
- }
-
- /** {@inheritDoc} */
@Override protected void beforeTest() throws Exception {
grid(0).fileSystem(igfsName).clear();
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/client/HadoopClientProtocolSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/client/HadoopClientProtocolSelfTest.java b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/client/HadoopClientProtocolSelfTest.java
index a8d58c2..0027b3e 100644
--- a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/client/HadoopClientProtocolSelfTest.java
+++ b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/client/HadoopClientProtocolSelfTest.java
@@ -108,13 +108,6 @@ public class HadoopClientProtocolSelfTest extends HadoopAbstractSelfTest {
}
/** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- stopAllGrids();
-
- super.afterTestsStopped();
- }
-
- /** {@inheritDoc} */
@Override protected void beforeTest() throws Exception {
setupLockFile.createNewFile();
mapLockFile.createNewFile();
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/IgfsEventsTestSuite.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/IgfsEventsTestSuite.java b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/IgfsEventsTestSuite.java
index 6934587..e3dac86 100644
--- a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/IgfsEventsTestSuite.java
+++ b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/IgfsEventsTestSuite.java
@@ -165,8 +165,6 @@ public class IgfsEventsTestSuite extends TestSuite {
/** {@inheritDoc} */
@Override protected void afterTestsStopped() throws Exception {
- super.afterTestsStopped();
-
G.stopAll(true);
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/IgniteHadoopFileSystemClientBasedOpenTest.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/IgniteHadoopFileSystemClientBasedOpenTest.java b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/IgniteHadoopFileSystemClientBasedOpenTest.java
index e2b94e4..289e63d 100644
--- a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/IgniteHadoopFileSystemClientBasedOpenTest.java
+++ b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/IgniteHadoopFileSystemClientBasedOpenTest.java
@@ -103,13 +103,6 @@ public class IgniteHadoopFileSystemClientBasedOpenTest extends GridCommonAbstrac
}
/** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- stopAllGrids();
-
- super.afterTestsStopped();
- }
-
- /** {@inheritDoc} */
@Override protected long getTestTimeout() {
return 15 * 60_000;
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/hibernate-4.2/src/test/java/org/apache/ignite/cache/hibernate/HibernateL2CacheConfigurationSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/hibernate-4.2/src/test/java/org/apache/ignite/cache/hibernate/HibernateL2CacheConfigurationSelfTest.java b/modules/hibernate-4.2/src/test/java/org/apache/ignite/cache/hibernate/HibernateL2CacheConfigurationSelfTest.java
index bde0845..a28c5da 100644
--- a/modules/hibernate-4.2/src/test/java/org/apache/ignite/cache/hibernate/HibernateL2CacheConfigurationSelfTest.java
+++ b/modules/hibernate-4.2/src/test/java/org/apache/ignite/cache/hibernate/HibernateL2CacheConfigurationSelfTest.java
@@ -88,11 +88,6 @@ public class HibernateL2CacheConfigurationSelfTest extends GridCommonAbstractTes
}
/** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- stopAllGrids();
- }
-
- /** {@inheritDoc} */
@Override protected void afterTest() throws Exception {
for (IgniteCacheProxy<?, ?> cache : ((IgniteKernal)grid(0)).caches())
cache.clear();
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/hibernate-4.2/src/test/java/org/apache/ignite/cache/hibernate/HibernateL2CacheMultiJvmTest.java
----------------------------------------------------------------------
diff --git a/modules/hibernate-4.2/src/test/java/org/apache/ignite/cache/hibernate/HibernateL2CacheMultiJvmTest.java b/modules/hibernate-4.2/src/test/java/org/apache/ignite/cache/hibernate/HibernateL2CacheMultiJvmTest.java
index 5160220..ed092aa 100644
--- a/modules/hibernate-4.2/src/test/java/org/apache/ignite/cache/hibernate/HibernateL2CacheMultiJvmTest.java
+++ b/modules/hibernate-4.2/src/test/java/org/apache/ignite/cache/hibernate/HibernateL2CacheMultiJvmTest.java
@@ -86,13 +86,6 @@ public class HibernateL2CacheMultiJvmTest extends GridCommonAbstractTest {
startGrid(2);
}
- /** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- stopAllGrids();
-
- super.afterTestsStopped();
- }
-
/**
* @throws Exception If failed.
*/
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/hibernate-4.2/src/test/java/org/apache/ignite/cache/hibernate/HibernateL2CacheSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/hibernate-4.2/src/test/java/org/apache/ignite/cache/hibernate/HibernateL2CacheSelfTest.java b/modules/hibernate-4.2/src/test/java/org/apache/ignite/cache/hibernate/HibernateL2CacheSelfTest.java
index 3030140..d69c61a 100644
--- a/modules/hibernate-4.2/src/test/java/org/apache/ignite/cache/hibernate/HibernateL2CacheSelfTest.java
+++ b/modules/hibernate-4.2/src/test/java/org/apache/ignite/cache/hibernate/HibernateL2CacheSelfTest.java
@@ -521,11 +521,6 @@ public class HibernateL2CacheSelfTest extends GridCommonAbstractTest {
}
/** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- stopAllGrids();
- }
-
- /** {@inheritDoc} */
@Override protected void afterTest() throws Exception {
cleanup();
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/hibernate-4.2/src/test/java/org/apache/ignite/cache/hibernate/HibernateL2CacheStrategySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/hibernate-4.2/src/test/java/org/apache/ignite/cache/hibernate/HibernateL2CacheStrategySelfTest.java b/modules/hibernate-4.2/src/test/java/org/apache/ignite/cache/hibernate/HibernateL2CacheStrategySelfTest.java
index 48a48dc..5e1fd32 100644
--- a/modules/hibernate-4.2/src/test/java/org/apache/ignite/cache/hibernate/HibernateL2CacheStrategySelfTest.java
+++ b/modules/hibernate-4.2/src/test/java/org/apache/ignite/cache/hibernate/HibernateL2CacheStrategySelfTest.java
@@ -86,11 +86,6 @@ public class HibernateL2CacheStrategySelfTest extends GridCommonAbstractTest {
}
/** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- stopAllGrids();
- }
-
- /** {@inheritDoc} */
@Override protected void afterTest() throws Exception {
for (IgniteCacheProxy<?, ?> cache : ((IgniteKernal)grid(0)).caches())
cache.clear();
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/hibernate-4.2/src/test/java/org/apache/ignite/cache/hibernate/HibernateL2CacheTransactionalSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/hibernate-4.2/src/test/java/org/apache/ignite/cache/hibernate/HibernateL2CacheTransactionalSelfTest.java b/modules/hibernate-4.2/src/test/java/org/apache/ignite/cache/hibernate/HibernateL2CacheTransactionalSelfTest.java
index deca893..5ec7812 100644
--- a/modules/hibernate-4.2/src/test/java/org/apache/ignite/cache/hibernate/HibernateL2CacheTransactionalSelfTest.java
+++ b/modules/hibernate-4.2/src/test/java/org/apache/ignite/cache/hibernate/HibernateL2CacheTransactionalSelfTest.java
@@ -82,8 +82,6 @@ public class HibernateL2CacheTransactionalSelfTest extends HibernateL2CacheSelfT
/** {@inheritDoc} */
@Override protected void afterTestsStopped() throws Exception {
- super.afterTestsStopped();
-
if (jotm != null)
jotm.stop();
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/hibernate-5.1/src/test/java/org/apache/ignite/cache/hibernate/HibernateL2CacheConfigurationSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/hibernate-5.1/src/test/java/org/apache/ignite/cache/hibernate/HibernateL2CacheConfigurationSelfTest.java b/modules/hibernate-5.1/src/test/java/org/apache/ignite/cache/hibernate/HibernateL2CacheConfigurationSelfTest.java
index 0363c41..2268b06 100644
--- a/modules/hibernate-5.1/src/test/java/org/apache/ignite/cache/hibernate/HibernateL2CacheConfigurationSelfTest.java
+++ b/modules/hibernate-5.1/src/test/java/org/apache/ignite/cache/hibernate/HibernateL2CacheConfigurationSelfTest.java
@@ -86,11 +86,6 @@ public class HibernateL2CacheConfigurationSelfTest extends GridCommonAbstractTes
}
/** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- stopAllGrids();
- }
-
- /** {@inheritDoc} */
@Override protected void afterTest() throws Exception {
for (IgniteCacheProxy<?, ?> cache : ((IgniteKernal)grid(0)).caches())
cache.clear();
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/hibernate-5.1/src/test/java/org/apache/ignite/cache/hibernate/HibernateL2CacheMultiJvmTest.java
----------------------------------------------------------------------
diff --git a/modules/hibernate-5.1/src/test/java/org/apache/ignite/cache/hibernate/HibernateL2CacheMultiJvmTest.java b/modules/hibernate-5.1/src/test/java/org/apache/ignite/cache/hibernate/HibernateL2CacheMultiJvmTest.java
index 57a3f71..268ea8c 100644
--- a/modules/hibernate-5.1/src/test/java/org/apache/ignite/cache/hibernate/HibernateL2CacheMultiJvmTest.java
+++ b/modules/hibernate-5.1/src/test/java/org/apache/ignite/cache/hibernate/HibernateL2CacheMultiJvmTest.java
@@ -86,13 +86,6 @@ public class HibernateL2CacheMultiJvmTest extends GridCommonAbstractTest {
startGrid(2);
}
- /** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- stopAllGrids();
-
- super.afterTestsStopped();
- }
-
/**
* @throws Exception If failed.
*/
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/hibernate-5.1/src/test/java/org/apache/ignite/cache/hibernate/HibernateL2CacheSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/hibernate-5.1/src/test/java/org/apache/ignite/cache/hibernate/HibernateL2CacheSelfTest.java b/modules/hibernate-5.1/src/test/java/org/apache/ignite/cache/hibernate/HibernateL2CacheSelfTest.java
index 7dc927d..798f73d 100644
--- a/modules/hibernate-5.1/src/test/java/org/apache/ignite/cache/hibernate/HibernateL2CacheSelfTest.java
+++ b/modules/hibernate-5.1/src/test/java/org/apache/ignite/cache/hibernate/HibernateL2CacheSelfTest.java
@@ -501,11 +501,6 @@ public class HibernateL2CacheSelfTest extends GridCommonAbstractTest {
}
/** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- stopAllGrids();
- }
-
- /** {@inheritDoc} */
@Override protected void afterTest() throws Exception {
cleanup();
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/hibernate-5.1/src/test/java/org/apache/ignite/cache/hibernate/HibernateL2CacheStrategySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/hibernate-5.1/src/test/java/org/apache/ignite/cache/hibernate/HibernateL2CacheStrategySelfTest.java b/modules/hibernate-5.1/src/test/java/org/apache/ignite/cache/hibernate/HibernateL2CacheStrategySelfTest.java
index af71981..8bd80da 100644
--- a/modules/hibernate-5.1/src/test/java/org/apache/ignite/cache/hibernate/HibernateL2CacheStrategySelfTest.java
+++ b/modules/hibernate-5.1/src/test/java/org/apache/ignite/cache/hibernate/HibernateL2CacheStrategySelfTest.java
@@ -82,11 +82,6 @@ public class HibernateL2CacheStrategySelfTest extends GridCommonAbstractTest {
}
/** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- stopAllGrids();
- }
-
- /** {@inheritDoc} */
@Override protected void afterTest() throws Exception {
for (IgniteCacheProxy<?, ?> cache : ((IgniteKernal)grid(0)).caches())
cache.clear();
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/hibernate-5.1/src/test/java/org/apache/ignite/cache/hibernate/HibernateL2CacheTransactionalSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/hibernate-5.1/src/test/java/org/apache/ignite/cache/hibernate/HibernateL2CacheTransactionalSelfTest.java b/modules/hibernate-5.1/src/test/java/org/apache/ignite/cache/hibernate/HibernateL2CacheTransactionalSelfTest.java
index 5175292..65f3240 100644
--- a/modules/hibernate-5.1/src/test/java/org/apache/ignite/cache/hibernate/HibernateL2CacheTransactionalSelfTest.java
+++ b/modules/hibernate-5.1/src/test/java/org/apache/ignite/cache/hibernate/HibernateL2CacheTransactionalSelfTest.java
@@ -82,8 +82,6 @@ public class HibernateL2CacheTransactionalSelfTest extends HibernateL2CacheSelfT
/** {@inheritDoc} */
@Override protected void afterTestsStopped() throws Exception {
- super.afterTestsStopped();
-
if (jotm != null)
jotm.stop();
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheBinaryKeyConcurrentQueryTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheBinaryKeyConcurrentQueryTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheBinaryKeyConcurrentQueryTest.java
index 0cc593b..0582132 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheBinaryKeyConcurrentQueryTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheBinaryKeyConcurrentQueryTest.java
@@ -81,13 +81,6 @@ public class CacheBinaryKeyConcurrentQueryTest extends GridCommonAbstractTest {
startGridsMultiThreaded(NODES);
}
- /** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- stopAllGrids();
-
- super.afterTestsStopped();
- }
-
/**
* @throws Exception If failed.
*/
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheIteratorScanQueryTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheIteratorScanQueryTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheIteratorScanQueryTest.java
index 0151471..951cddf 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheIteratorScanQueryTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheIteratorScanQueryTest.java
@@ -51,11 +51,6 @@ public class CacheIteratorScanQueryTest extends GridCommonAbstractTest {
}
/** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- stopAllGrids();
- }
-
- /** {@inheritDoc} */
@Override protected IgniteConfiguration getConfiguration(String name) throws Exception {
IgniteConfiguration cfg = super.getConfiguration(name);
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheOffheapBatchIndexingBaseTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheOffheapBatchIndexingBaseTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheOffheapBatchIndexingBaseTest.java
index 370fca3..f456c56 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheOffheapBatchIndexingBaseTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheOffheapBatchIndexingBaseTest.java
@@ -72,11 +72,6 @@ public abstract class CacheOffheapBatchIndexingBaseTest extends GridCommonAbstra
startGrid(0);
}
- /** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- stopAllGrids();
- }
-
/**
* @param base Base.
* @return Salary.
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheOperationsWithExpirationTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheOperationsWithExpirationTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheOperationsWithExpirationTest.java
index 4cd6960..76d2376 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheOperationsWithExpirationTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheOperationsWithExpirationTest.java
@@ -77,13 +77,6 @@ public class CacheOperationsWithExpirationTest extends GridCommonAbstractTest {
startGrid(0);
}
- /** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- stopAllGrids();
-
- super.afterTestsStopped();
- }
-
/**
* @throws Exception If failed.
*/
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheQueryBuildValueTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheQueryBuildValueTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheQueryBuildValueTest.java
index 0adad26..3bbb007 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheQueryBuildValueTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheQueryBuildValueTest.java
@@ -96,13 +96,6 @@ public class CacheQueryBuildValueTest extends GridCommonAbstractTest {
startGrid(0);
}
- /** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- stopAllGrids();
-
- super.afterTestsStopped();
- }
-
/**
* @throws Exception If failed.
*/
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheRandomOperationsMultithreadedTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheRandomOperationsMultithreadedTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheRandomOperationsMultithreadedTest.java
index 084b6d5..c2f31f7 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheRandomOperationsMultithreadedTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheRandomOperationsMultithreadedTest.java
@@ -90,13 +90,6 @@ public class CacheRandomOperationsMultithreadedTest extends GridCommonAbstractTe
super.beforeTestsStarted();
}
- /** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- stopAllGrids();
-
- super.afterTestsStopped();
- }
-
/**
* @throws Exception If failed.
*/
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheSqlQueryValueCopySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheSqlQueryValueCopySelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheSqlQueryValueCopySelfTest.java
index f30c52c..5b92726 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheSqlQueryValueCopySelfTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheSqlQueryValueCopySelfTest.java
@@ -93,13 +93,6 @@ public class CacheSqlQueryValueCopySelfTest extends GridCommonAbstractTest {
super.afterTest();
}
- /** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- super.afterTestsStopped();
-
- stopAllGrids();
- }
-
/**
* Tests two step query from dedicated client.
*
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheFullTextQuerySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheFullTextQuerySelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheFullTextQuerySelfTest.java
index a4d8955..14ad39a 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheFullTextQuerySelfTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheFullTextQuerySelfTest.java
@@ -99,11 +99,6 @@ public class GridCacheFullTextQuerySelfTest extends GridCommonAbstractTest {
startGrids(2);
}
- /** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- stopAllGrids();
- }
-
/**
* @throws Exception In case of error.
*/
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapSelfTest.java
index ee17a33..e06f6a6 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapSelfTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapSelfTest.java
@@ -73,8 +73,6 @@ public class GridCacheOffHeapSelfTest extends GridCommonAbstractTest {
/** {@inheritDoc} */
@Override protected void afterTestsStopped() throws Exception {
versions.clear();
-
- super.afterTestsStopped();
}
/**
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffheapIndexEntryEvictTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffheapIndexEntryEvictTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffheapIndexEntryEvictTest.java
index 33df513..e14da4a 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffheapIndexEntryEvictTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffheapIndexEntryEvictTest.java
@@ -77,11 +77,6 @@ public class GridCacheOffheapIndexEntryEvictTest extends GridCommonAbstractTest
startGrids(1);
}
- /** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- stopAllGrids();
- }
-
/**
* @throws Exception If failed.
*/
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffheapIndexGetSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffheapIndexGetSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffheapIndexGetSelfTest.java
index f9e555e..321a201 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffheapIndexGetSelfTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffheapIndexGetSelfTest.java
@@ -87,11 +87,6 @@ public class GridCacheOffheapIndexGetSelfTest extends GridCommonAbstractTest {
}
/** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- stopAllGrids();
- }
-
- /** {@inheritDoc} */
@Override protected void afterTest() throws Exception {
for(String cacheName : grid(0).cacheNames()) {
info("Clear cache: " + cacheName);
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteBinaryObjectFieldsQuerySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteBinaryObjectFieldsQuerySelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteBinaryObjectFieldsQuerySelfTest.java
index 62515c3..21e4852 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteBinaryObjectFieldsQuerySelfTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteBinaryObjectFieldsQuerySelfTest.java
@@ -115,8 +115,6 @@ public class IgniteBinaryObjectFieldsQuerySelfTest extends GridCommonAbstractTes
/** {@inheritDoc} */
@Override protected void afterTestsStopped() throws Exception {
- stopAllGrids();
-
extClassLoader = null;
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteBinaryObjectQueryArgumentsTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteBinaryObjectQueryArgumentsTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteBinaryObjectQueryArgumentsTest.java
index 19d3206..e239353 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteBinaryObjectQueryArgumentsTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteBinaryObjectQueryArgumentsTest.java
@@ -182,13 +182,6 @@ public class IgniteBinaryObjectQueryArgumentsTest extends GridCommonAbstractTest
startGridsMultiThreaded(nodes);
}
- /** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- stopAllGrids();
-
- super.afterTestsStopped();
- }
-
/**
* @throws Exception If failed.
*/
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractFieldsQuerySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractFieldsQuerySelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractFieldsQuerySelfTest.java
index a285a8b..361f8b4 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractFieldsQuerySelfTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractFieldsQuerySelfTest.java
@@ -202,8 +202,6 @@ public abstract class IgniteCacheAbstractFieldsQuerySelfTest extends GridCommonA
/** {@inheritDoc} */
@Override protected void afterTestsStopped() throws Exception {
- stopAllGrids();
-
orgCache = null;
personCache = null;
strCache = null;
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractInsertSqlQuerySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractInsertSqlQuerySelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractInsertSqlQuerySelfTest.java
index 9113e9b..c811cb5 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractInsertSqlQuerySelfTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractInsertSqlQuerySelfTest.java
@@ -242,11 +242,6 @@ public abstract class IgniteCacheAbstractInsertSqlQuerySelfTest extends GridComm
}
/** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- stopAllGrids();
- }
-
- /** {@inheritDoc} */
@Override protected void afterTest() throws Exception {
ignite(0).destroyCache("S2P");
ignite(0).destroyCache("I2P");
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractQuerySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractQuerySelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractQuerySelfTest.java
index ee1a652..cb038fa 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractQuerySelfTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractQuerySelfTest.java
@@ -273,10 +273,6 @@ public abstract class IgniteCacheAbstractQuerySelfTest extends GridCommonAbstrac
/** {@inheritDoc} */
@Override protected void afterTestsStopped() throws Exception {
- super.afterTestsStopped();
-
- stopAllGrids();
-
store.reset();
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractSqlDmlQuerySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractSqlDmlQuerySelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractSqlDmlQuerySelfTest.java
index b50198c..a57a867 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractSqlDmlQuerySelfTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractSqlDmlQuerySelfTest.java
@@ -155,11 +155,6 @@ public abstract class IgniteCacheAbstractSqlDmlQuerySelfTest extends GridCommonA
return ignite(0).cache("S2P-bin").withKeepBinary();
}
- /** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- stopAllGrids();
- }
-
/**
* @param name Cache name.
* @param partitioned Partition or replicated cache.
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheCollocatedQuerySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheCollocatedQuerySelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheCollocatedQuerySelfTest.java
index cd23611..2b3076c 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheCollocatedQuerySelfTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheCollocatedQuerySelfTest.java
@@ -97,11 +97,6 @@ public class IgniteCacheCollocatedQuerySelfTest extends GridCommonAbstractTest {
}
/** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- stopAllGrids();
- }
-
- /** {@inheritDoc} */
@Override protected void afterTest() throws Exception {
ignite(0).cache(DEFAULT_CACHE_NAME).removeAll();
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheCrossCacheJoinRandomTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheCrossCacheJoinRandomTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheCrossCacheJoinRandomTest.java
index 638ac62..3ebb3b4 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheCrossCacheJoinRandomTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheCrossCacheJoinRandomTest.java
@@ -143,8 +143,6 @@ public class IgniteCacheCrossCacheJoinRandomTest extends AbstractH2CompareQueryT
/** {@inheritDoc} */
@Override protected void afterTestsStopped() throws Exception {
- stopAllGrids();
-
cachesData = null;
super.afterTestsStopped();
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheDistributedJoinCollocatedAndNotTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheDistributedJoinCollocatedAndNotTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheDistributedJoinCollocatedAndNotTest.java
index c3214d3..f53f263 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheDistributedJoinCollocatedAndNotTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheDistributedJoinCollocatedAndNotTest.java
@@ -138,13 +138,6 @@ public class IgniteCacheDistributedJoinCollocatedAndNotTest extends GridCommonAb
startGrid(2);
}
- /** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- stopAllGrids();
-
- super.afterTestsStopped();
- }
-
/**
* @param name Cache name.
* @return Cache configuration.
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheDistributedJoinCustomAffinityMapper.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheDistributedJoinCustomAffinityMapper.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheDistributedJoinCustomAffinityMapper.java
index 7c40a83..b8aa4cb 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheDistributedJoinCustomAffinityMapper.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheDistributedJoinCustomAffinityMapper.java
@@ -153,13 +153,6 @@ public class IgniteCacheDistributedJoinCustomAffinityMapper extends GridCommonAb
startGridsMultiThreaded(3);
}
- /** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- stopAllGrids();
-
- super.afterTestsStopped();
- }
-
/**
* @throws Exception If failed.
*/
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheDistributedJoinNoIndexTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheDistributedJoinNoIndexTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheDistributedJoinNoIndexTest.java
index 7cd39b3..f8bc088 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheDistributedJoinNoIndexTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheDistributedJoinNoIndexTest.java
@@ -129,13 +129,6 @@ public class IgniteCacheDistributedJoinNoIndexTest extends GridCommonAbstractTes
startGrid(2);
}
- /** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- stopAllGrids();
-
- super.afterTestsStopped();
- }
-
/**
* @throws Exception If failed.
*/
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheDistributedJoinPartitionedAndReplicatedTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheDistributedJoinPartitionedAndReplicatedTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheDistributedJoinPartitionedAndReplicatedTest.java
index eb568df..462a008 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheDistributedJoinPartitionedAndReplicatedTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheDistributedJoinPartitionedAndReplicatedTest.java
@@ -176,13 +176,6 @@ public class IgniteCacheDistributedJoinPartitionedAndReplicatedTest extends Grid
startGrid(2);
}
- /** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- stopAllGrids();
-
- super.afterTestsStopped();
- }
-
/**
* @throws Exception If failed.
*/
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheDistributedJoinQueryConditionsTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheDistributedJoinQueryConditionsTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheDistributedJoinQueryConditionsTest.java
index c183608..6f20923 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheDistributedJoinQueryConditionsTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheDistributedJoinQueryConditionsTest.java
@@ -83,13 +83,6 @@ public class IgniteCacheDistributedJoinQueryConditionsTest extends GridCommonAbs
startGrid(2);
}
- /** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- stopAllGrids();
-
- super.afterTestsStopped();
- }
-
/**
* @throws Exception If failed.
*/
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheDistributedJoinTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheDistributedJoinTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheDistributedJoinTest.java
index e643170..dee8e64 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheDistributedJoinTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheDistributedJoinTest.java
@@ -226,7 +226,6 @@ public class IgniteCacheDistributedJoinTest extends GridCommonAbstractTest {
/** {@inheritDoc} */
@Override protected void afterTestsStopped() throws Exception {
U.closeQuiet(conn);
- stopAllGrids();
}
/**
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheDuplicateEntityConfigurationSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheDuplicateEntityConfigurationSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheDuplicateEntityConfigurationSelfTest.java
index 8448baf..d5c0f0a 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheDuplicateEntityConfigurationSelfTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheDuplicateEntityConfigurationSelfTest.java
@@ -52,11 +52,6 @@ public class IgniteCacheDuplicateEntityConfigurationSelfTest extends GridCommonA
startGrid(0);
}
- /** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- stopAllGrids();
- }
-
/**
* @throws Exception If failed.
*/
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheFieldsQueryNoDataSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheFieldsQueryNoDataSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheFieldsQueryNoDataSelfTest.java
index dbb54d3..75c0cd4 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheFieldsQueryNoDataSelfTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheFieldsQueryNoDataSelfTest.java
@@ -66,11 +66,6 @@ public class IgniteCacheFieldsQueryNoDataSelfTest extends GridCommonAbstractTest
startGrid();
}
- /** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- stopGrid();
- }
-
/**
* @throws Exception If failed.
*/
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheJoinPartitionedAndReplicatedCollocationTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheJoinPartitionedAndReplicatedCollocationTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheJoinPartitionedAndReplicatedCollocationTest.java
index e7bfff3..3d3f27b 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheJoinPartitionedAndReplicatedCollocationTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheJoinPartitionedAndReplicatedCollocationTest.java
@@ -153,13 +153,6 @@ public class IgniteCacheJoinPartitionedAndReplicatedCollocationTest extends Abst
}
/** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- stopAllGrids();
-
- super.afterTestsStopped();
- }
-
- /** {@inheritDoc} */
@Override protected Statement initializeH2Schema() throws SQLException {
Statement st = super.initializeH2Schema();
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheJoinPartitionedAndReplicatedTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheJoinPartitionedAndReplicatedTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheJoinPartitionedAndReplicatedTest.java
index 6c5bfa3..4f080e6 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheJoinPartitionedAndReplicatedTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheJoinPartitionedAndReplicatedTest.java
@@ -154,13 +154,6 @@ public class IgniteCacheJoinPartitionedAndReplicatedTest extends GridCommonAbstr
}
/** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- stopAllGrids();
-
- super.afterTestsStopped();
- }
-
- /** {@inheritDoc} */
@Override protected void beforeTest() throws Exception {
super.beforeTest();
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheJoinQueryWithAffinityKeyTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheJoinQueryWithAffinityKeyTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheJoinQueryWithAffinityKeyTest.java
index 4c7dbd0..be11153 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheJoinQueryWithAffinityKeyTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheJoinQueryWithAffinityKeyTest.java
@@ -92,13 +92,6 @@ public class IgniteCacheJoinQueryWithAffinityKeyTest extends GridCommonAbstractT
startGrid(NODES - 1);
}
- /** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- stopAllGrids();
-
- super.afterTestsStopped();
- }
-
/**
* @throws Exception If failed.
*/
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheLargeResultSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheLargeResultSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheLargeResultSelfTest.java
index a38f3fe..bac8d1d 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheLargeResultSelfTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheLargeResultSelfTest.java
@@ -69,11 +69,6 @@ public class IgniteCacheLargeResultSelfTest extends GridCommonAbstractTest {
startGridsMultiThreaded(3);
}
- /** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- stopAllGrids();
- }
-
/**
*/
public void testLargeResult() {
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheObjectKeyIndexingSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheObjectKeyIndexingSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheObjectKeyIndexingSelfTest.java
index 5caa625..2865767 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheObjectKeyIndexingSelfTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheObjectKeyIndexingSelfTest.java
@@ -42,8 +42,6 @@ public class IgniteCacheObjectKeyIndexingSelfTest extends GridCommonAbstractTest
/** {@inheritDoc} */
@Override protected void afterTestsStopped() throws Exception {
- super.afterTestsStopped();
-
Ignition.stopAll(true);
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheOffheapIndexScanTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheOffheapIndexScanTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheOffheapIndexScanTest.java
index 5ad8bfe..c0cc46d 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheOffheapIndexScanTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheOffheapIndexScanTest.java
@@ -72,11 +72,6 @@ public class IgniteCacheOffheapIndexScanTest extends GridCommonAbstractTest {
cache = grid(0).cache(DEFAULT_CACHE_NAME);
}
- /** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- stopAllGrids();
- }
-
/**
* @throws Exception If failed.
*/
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCachePartitionedQueryMultiThreadedSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCachePartitionedQueryMultiThreadedSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCachePartitionedQueryMultiThreadedSelfTest.java
index 83012c8..dc8f8d3 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCachePartitionedQueryMultiThreadedSelfTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCachePartitionedQueryMultiThreadedSelfTest.java
@@ -103,11 +103,6 @@ public class IgniteCachePartitionedQueryMultiThreadedSelfTest extends GridCommon
}
/** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- stopAllGrids();
- }
-
- /** {@inheritDoc} */
@Override protected void afterTest() throws Exception {
super.afterTest();
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCachePrimitiveFieldsQuerySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCachePrimitiveFieldsQuerySelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCachePrimitiveFieldsQuerySelfTest.java
index d43a10b..cf098b1 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCachePrimitiveFieldsQuerySelfTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCachePrimitiveFieldsQuerySelfTest.java
@@ -90,11 +90,6 @@ public class IgniteCachePrimitiveFieldsQuerySelfTest extends GridCommonAbstractT
startGrids(3);
}
- /** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- stopAllGrids();
- }
-
/**
* @throws Exception if failed.
*/
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheQueriesLoadTest1.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheQueriesLoadTest1.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheQueriesLoadTest1.java
index da773be..e5d0e2c 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheQueriesLoadTest1.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheQueriesLoadTest1.java
@@ -215,13 +215,6 @@ public class IgniteCacheQueriesLoadTest1 extends GridCommonAbstractTest {
preLoading();
}
- /** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- stopAllGrids();
-
- assert G.allGrids().isEmpty();
- }
-
/**
* @throws Exception If fail.
*/
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheQueryH2IndexingLeakTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheQueryH2IndexingLeakTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheQueryH2IndexingLeakTest.java
index a8f2636..7212bf8 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheQueryH2IndexingLeakTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheQueryH2IndexingLeakTest.java
@@ -106,8 +106,6 @@ public class IgniteCacheQueryH2IndexingLeakTest extends GridCommonAbstractTest {
/** {@inheritDoc} */
@Override protected void afterTestsStopped() throws Exception {
- stopAllGrids();
-
System.setProperty(IGNITE_H2_INDEXING_CACHE_CLEANUP_PERIOD,
origCacheCleanupPeriod != null ? origCacheCleanupPeriod : "");
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheQueryMultiThreadedSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheQueryMultiThreadedSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheQueryMultiThreadedSelfTest.java
index 4e5cf85..eb926a1 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheQueryMultiThreadedSelfTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheQueryMultiThreadedSelfTest.java
@@ -164,11 +164,6 @@ public class IgniteCacheQueryMultiThreadedSelfTest extends GridCommonAbstractTes
}
/** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- stopAllGrids();
- }
-
- /** {@inheritDoc} */
@Override protected void afterTest() throws Exception {
super.afterTest();
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheSqlQueryMultiThreadedSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheSqlQueryMultiThreadedSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheSqlQueryMultiThreadedSelfTest.java
index 6e6c49a..7241196 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheSqlQueryMultiThreadedSelfTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheSqlQueryMultiThreadedSelfTest.java
@@ -83,13 +83,6 @@ public class IgniteCacheSqlQueryMultiThreadedSelfTest extends GridCommonAbstract
awaitPartitionMapExchange();
}
- /** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- super.afterTestsStopped();
-
- stopAllGrids();
- }
-
/**
* @throws Exception If failed.
*/
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgnitePdsSingleNodeWithIndexingPutGetPersistenceTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgnitePdsSingleNodeWithIndexingPutGetPersistenceTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgnitePdsSingleNodeWithIndexingPutGetPersistenceTest.java
index 22c8851..635842d 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgnitePdsSingleNodeWithIndexingPutGetPersistenceTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgnitePdsSingleNodeWithIndexingPutGetPersistenceTest.java
@@ -47,8 +47,6 @@ public class IgnitePdsSingleNodeWithIndexingPutGetPersistenceTest extends Ignite
/** {@inheritDoc} */
@Override protected void afterTestsStopped() throws Exception {
- super.afterTestsStopped();
-
cleanPersistenceDir();
}
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/IgniteCacheDistributedPartitionQueryAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/IgniteCacheDistributedPartitionQueryAbstractSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/IgniteCacheDistributedPartitionQueryAbstractSelfTest.java
index 2a54821..ad07029 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/IgniteCacheDistributedPartitionQueryAbstractSelfTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/IgniteCacheDistributedPartitionQueryAbstractSelfTest.java
@@ -375,13 +375,6 @@ public abstract class IgniteCacheDistributedPartitionQueryAbstractSelfTest exten
}
}
- /** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- super.afterTestsStopped();
-
- stopAllGrids();
- }
-
/**
* @param orig Originator.
*/
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/IgniteCacheDistributedQueryStopOnCancelOrTimeoutSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/IgniteCacheDistributedQueryStopOnCancelOrTimeoutSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/IgniteCacheDistributedQueryStopOnCancelOrTimeoutSelfTest.java
index ee2787c..56fd7b8 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/IgniteCacheDistributedQueryStopOnCancelOrTimeoutSelfTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/IgniteCacheDistributedQueryStopOnCancelOrTimeoutSelfTest.java
@@ -98,13 +98,6 @@ public class IgniteCacheDistributedQueryStopOnCancelOrTimeoutSelfTest extends Gr
g.cache(DEFAULT_CACHE_NAME).removeAll();
}
- /** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- stopAllGrids();
-
- super.afterTestsStopped();
- }
-
/** */
public void testRemoteQueryExecutionTimeout() throws Exception {
testQueryCancel(CACHE_SIZE, VAL_SIZE, QRY_1, 500, TimeUnit.MILLISECONDS, true);
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/IgniteCacheQueryAbstractDistributedJoinSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/IgniteCacheQueryAbstractDistributedJoinSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/IgniteCacheQueryAbstractDistributedJoinSelfTest.java
index bd5adf1..7e23c88 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/IgniteCacheQueryAbstractDistributedJoinSelfTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/IgniteCacheQueryAbstractDistributedJoinSelfTest.java
@@ -192,11 +192,6 @@ public class IgniteCacheQueryAbstractDistributedJoinSelfTest extends GridCommonA
}
}
- /** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- stopAllGrids();
- }
-
/**
*
*/
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/IgniteCacheQueryNoRebalanceSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/IgniteCacheQueryNoRebalanceSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/IgniteCacheQueryNoRebalanceSelfTest.java
index d772aa1..7b4d400 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/IgniteCacheQueryNoRebalanceSelfTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/IgniteCacheQueryNoRebalanceSelfTest.java
@@ -59,13 +59,6 @@ public class IgniteCacheQueryNoRebalanceSelfTest extends GridCommonAbstractTest
return cfg;
}
- /** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- stopAllGrids();
-
- super.afterTestsStopped();
- }
-
/**
* Tests correct query execution with disabled re-balancing.
*/
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/IgniteCacheQueryNodeFailTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/IgniteCacheQueryNodeFailTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/IgniteCacheQueryNodeFailTest.java
index d76742b..6e47399 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/IgniteCacheQueryNodeFailTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/IgniteCacheQueryNodeFailTest.java
@@ -73,13 +73,6 @@ public class IgniteCacheQueryNodeFailTest extends GridCommonAbstractTest {
client = false;
}
- /** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- stopAllGrids();
-
- super.afterTestsStopped();
- }
-
/**
* @throws Exception If failed.
*/
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/IgniteCacheQueryNodeRestartSelfTest2.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/IgniteCacheQueryNodeRestartSelfTest2.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/IgniteCacheQueryNodeRestartSelfTest2.java
index bda503e..a8d1e34 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/IgniteCacheQueryNodeRestartSelfTest2.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/IgniteCacheQueryNodeRestartSelfTest2.java
@@ -401,11 +401,6 @@ public class IgniteCacheQueryNodeRestartSelfTest2 extends GridCommonAbstractTest
info("Queries stopped.");
}
- /** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- stopAllGrids();
- }
-
/**
* Run query closure.
*
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/DuplicateKeyValueClassesSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/DuplicateKeyValueClassesSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/DuplicateKeyValueClassesSelfTest.java
index 4ee884f..6eb1bb9 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/DuplicateKeyValueClassesSelfTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/DuplicateKeyValueClassesSelfTest.java
@@ -43,11 +43,6 @@ public class DuplicateKeyValueClassesSelfTest extends GridCommonAbstractTest {
grid(0).destroyCache(CACHE_NAME);
}
- /** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- stopAllGrids();
- }
-
/**
* Test duplicate key class.
*
[14/50] [abbrv] ignite git commit: IGNITE-6977 Fix of initial BitSet
size in GridPartitionStateMap - Fixes #3082.
Posted by dp...@apache.org.
IGNITE-6977 Fix of initial BitSet size in GridPartitionStateMap - Fixes #3082.
Signed-off-by: dpavlov <dp...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/4343b2f9
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/4343b2f9
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/4343b2f9
Branch: refs/heads/ignite-5789-1
Commit: 4343b2f9a6fe5c84d08cd7b31481836606d47a10
Parents: cb8fb73
Author: Alexander Belyak <al...@xored.com>
Authored: Mon May 21 16:26:04 2018 +0300
Committer: dpavlov <dp...@apache.org>
Committed: Mon May 21 16:26:04 2018 +0300
----------------------------------------------------------------------
.../org/apache/ignite/internal/util/GridPartitionStateMap.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/4343b2f9/modules/core/src/main/java/org/apache/ignite/internal/util/GridPartitionStateMap.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/GridPartitionStateMap.java b/modules/core/src/main/java/org/apache/ignite/internal/util/GridPartitionStateMap.java
index 07da672..5250e15 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/GridPartitionStateMap.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/GridPartitionStateMap.java
@@ -136,7 +136,7 @@ public class GridPartitionStateMap extends AbstractMap<Integer, GridDhtPartition
* @param parts Partitions to hold.
*/
public GridPartitionStateMap(int parts) {
- states = new BitSet(parts);
+ states = new BitSet(parts * BITS);
}
/**
[43/50] [abbrv] ignite git commit: IGNITE-5136 GridLogThrottle memory
leak
Posted by dp...@apache.org.
IGNITE-5136 GridLogThrottle memory leak
Signed-off-by: Anton Vinogradov <av...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/a3a619b6
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/a3a619b6
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/a3a619b6
Branch: refs/heads/ignite-5789-1
Commit: a3a619b6af66e21234e52a84ef0efecc4718cbe7
Parents: 21678bc
Author: Dmitrii Ryabov <So...@gmail.com>
Authored: Wed May 23 12:34:33 2018 +0300
Committer: Anton Vinogradov <av...@apache.org>
Committed: Wed May 23 12:34:33 2018 +0300
----------------------------------------------------------------------
.../apache/ignite/IgniteSystemProperties.java | 4 +
.../ignite/internal/util/GridLogThrottle.java | 28 +++-
.../apache/ignite/util/GridLogThrottleTest.java | 128 ++++++++++++-------
3 files changed, 108 insertions(+), 52 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/a3a619b6/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 727e809..b6f0286 100644
--- a/modules/core/src/main/java/org/apache/ignite/IgniteSystemProperties.java
+++ b/modules/core/src/main/java/org/apache/ignite/IgniteSystemProperties.java
@@ -29,6 +29,7 @@ import org.apache.ignite.configuration.CacheConfiguration;
import org.apache.ignite.configuration.DataStorageConfiguration;
import org.apache.ignite.internal.client.GridClient;
import org.apache.ignite.internal.marshaller.optimized.OptimizedMarshaller;
+import org.apache.ignite.internal.util.GridLogThrottle;
import org.apache.ignite.stream.StreamTransformer;
import org.jetbrains.annotations.Nullable;
@@ -756,6 +757,9 @@ public final class IgniteSystemProperties {
*/
public static final String IGNITE_WAL_LOG_TX_RECORDS = "IGNITE_WAL_LOG_TX_RECORDS";
+ /** Max amount of remembered errors for {@link GridLogThrottle}. */
+ public static final String IGNITE_LOG_THROTTLE_CAPACITY = "IGNITE_LOG_THROTTLE_CAPACITY";
+
/** If this property is set, {@link DataStorageConfiguration#writeThrottlingEnabled} will be overridden to true
* independent of initial value in configuration. */
public static final String IGNITE_OVERRIDE_WRITE_THROTTLING_ENABLED = "IGNITE_OVERRIDE_WRITE_THROTTLING_ENABLED";
http://git-wip-us.apache.org/repos/asf/ignite/blob/a3a619b6/modules/core/src/main/java/org/apache/ignite/internal/util/GridLogThrottle.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/GridLogThrottle.java b/modules/core/src/main/java/org/apache/ignite/internal/util/GridLogThrottle.java
index 59ddd1c..396cf37 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/GridLogThrottle.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/GridLogThrottle.java
@@ -17,19 +17,23 @@
package org.apache.ignite.internal.util;
-import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
import org.apache.ignite.IgniteLogger;
+import org.apache.ignite.IgniteSystemProperties;
import org.apache.ignite.internal.util.typedef.F;
import org.apache.ignite.internal.util.typedef.internal.U;
import org.apache.ignite.lang.IgniteBiTuple;
import org.jetbrains.annotations.Nullable;
+import org.jsr166.ConcurrentLinkedHashMap;
+
+import static org.apache.ignite.IgniteSystemProperties.IGNITE_LOG_THROTTLE_CAPACITY;
+import static org.jsr166.ConcurrentLinkedHashMap.DFLT_CONCUR_LVL;
/**
* Grid log throttle.
* <p>
* Errors are logged only if they were not logged for the last
- * {@link #throttleTimeout} number of minutes.
+ * {@link #throttleTimeout} milliseconds.
* Note that not only error messages are checked for duplicates, but also exception
* classes.
*/
@@ -37,12 +41,15 @@ public class GridLogThrottle {
/** Default throttle timeout in milliseconds (value is <tt>5 * 60 * 1000</tt>). */
public static final int DFLT_THROTTLE_TIMEOUT = 5 * 60 * 1000;
- /** Throttle timeout. */
- private static int throttleTimeout = DFLT_THROTTLE_TIMEOUT;
+ /** Throttle timeout in milliseconds. */
+ private static volatile int throttleTimeout = DFLT_THROTTLE_TIMEOUT;
+
+ /** Throttle capacity. */
+ private static final int throttleCap = IgniteSystemProperties.getInteger(IGNITE_LOG_THROTTLE_CAPACITY, 128);
/** Errors. */
private static final ConcurrentMap<IgniteBiTuple<Class<? extends Throwable>, String>, Long> errors =
- new ConcurrentHashMap<>();
+ new ConcurrentLinkedHashMap<>(throttleCap, 1f, DFLT_CONCUR_LVL, throttleCap);
/**
* Sets system-wide log throttle timeout.
@@ -58,11 +65,20 @@ public class GridLogThrottle {
*
* @return System-side log throttle timeout.
*/
- public static long throttleTimeout() {
+ public static int throttleTimeout() {
return throttleTimeout;
}
/**
+ * Gets system-wide log throttle capacity.
+ *
+ * @return System-side log throttle capacity.
+ */
+ public static int throttleCapacity() {
+ return throttleCap;
+ }
+
+ /**
* Logs error if needed.
*
* @param log Logger.
http://git-wip-us.apache.org/repos/asf/ignite/blob/a3a619b6/modules/core/src/test/java/org/apache/ignite/util/GridLogThrottleTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/util/GridLogThrottleTest.java b/modules/core/src/test/java/org/apache/ignite/util/GridLogThrottleTest.java
index 9eac0cc..37fa558 100644
--- a/modules/core/src/test/java/org/apache/ignite/util/GridLogThrottleTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/util/GridLogThrottleTest.java
@@ -18,6 +18,7 @@
package org.apache.ignite.util;
import org.apache.ignite.internal.util.typedef.internal.LT;
+import org.apache.ignite.testframework.GridStringLogger;
import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
import org.apache.ignite.testframework.junits.common.GridCommonTest;
@@ -28,6 +29,9 @@ import org.apache.ignite.testframework.junits.common.GridCommonTest;
*/
@GridCommonTest(group = "Utils")
public class GridLogThrottleTest extends GridCommonAbstractTest {
+ /** */
+ private final GridStringLogger log0 = new GridStringLogger(false, this.log);
+
/** Constructor. */
public GridLogThrottleTest() {
super(false);
@@ -41,75 +45,107 @@ public class GridLogThrottleTest extends GridCommonAbstractTest {
public void testThrottle() throws Exception {
LT.throttleTimeout(1000);
- // LOGGED.
- LT.error(log, new RuntimeException("Test exception 1."), "Test");
+ String sep = System.getProperty("line.separator");
- // OMITTED.
- LT.error(log, new RuntimeException("Test exception 1."), "Test");
+ checkError("Test exception 1.", "Test msg", true);
+ checkError("Test exception 1.", "Test msg", false);
- // OMITTED.
- LT.error(log, new RuntimeException("Test exception 1."), "Test1");
+ checkError("Test exception 2.", "Test msg", true);
- // LOGGED.
- LT.error(log, new RuntimeException("Test exception 2."), "Test");
+ checkErrorNoThrowable("Test - without throwable.", true);
+ checkErrorNoThrowable("Test - without throwable.", false);
+ checkWarn("Test - without throwable.", false);
- // LOGGED.
- LT.error(log, null, "Test - without throwable.");
+ checkWarn("Test - without throwable 1.", true);
+ checkWarn("Test - without throwable 1.", false);
- // OMITTED.
- LT.error(log, null, "Test - without throwable.");
+ Thread.sleep(LT.throttleTimeout() * 2);
+ info("Slept for throttle timeout: " + LT.throttleTimeout() * 2);
- // OMITTED.
- LT.warn(log, "Test - without throwable.");
+ checkError("Test exception 1.", "Test msg", true);
+ checkError("Test exception 1.", "Test msg", false);
+ checkError("Test exception 1.", "Test msg1", false);
- // LOGGED.
- LT.warn(log, "Test - without throwable1.");
+ checkError("Test exception 2.", "Test msg", true);
- // OMITTED.
- LT.warn(log, "Test - without throwable1.");
+ checkWarn("Test - without throwable.", true);
+ checkWarn("Test - without throwable.", false);
- Thread.sleep(LT.throttleTimeout());
+ LT.throttleTimeout(200);
- info("Slept for throttle timeout: " + LT.throttleTimeout());
+ Thread.sleep(LT.throttleTimeout() * 2);
+ info("Slept for throttle timeout: " + LT.throttleTimeout() * 2);
- // LOGGED.
- LT.error(log, new RuntimeException("Test exception 1."), "Test");
+ checkInfo("Test info message.", true);
+ checkInfo("Test info message.", false);
- // OMITTED.
- LT.error(log, new RuntimeException("Test exception 1."), "Test");
+ for (int i = 1; i <= LT.throttleCapacity(); i++)
+ checkInfo("Test info message " + i, true);
- // OMITTED.
- LT.error(log, new RuntimeException("Test exception 1."), "Test1");
+ checkInfo("Test info message.", true);
+ }
- // LOGGED.
- LT.error(log, new RuntimeException("Test exception 2."), "Test");
+ /**
+ * @param eMsg Exception message.
+ * @param msg Log message.
+ * @param isLogExpected Is log expected or not.
+ */
+ private void checkError(String eMsg, String msg, boolean isLogExpected) {
+ Exception e = eMsg != null ? new RuntimeException(eMsg) : null;
- // LOGGED.
- LT.warn(log, "Test - without throwable.");
+ LT.error(log0, e, msg);
- // OMITTED.
- LT.warn(log, "Test - without throwable.");
+ check(e, msg, isLogExpected);
+ }
- Thread.sleep(LT.throttleTimeout());
+ /**
+ * @param msg Log message.
+ * @param isLogExpected Is log expected or not.
+ */
+ private void checkErrorNoThrowable(String msg, boolean isLogExpected) {
+ LT.error(log0, null, msg);
- info("Slept for throttle timeout: " + LT.throttleTimeout());
+ check(null, msg, isLogExpected);
+ }
- //LOGGED.
- LT.info(log(), "Test info message.");
+ /**
+ * @param msg Log message.
+ * @param isLogExpected Is log expected or not.
+ */
+ private void checkWarn(String msg, boolean isLogExpected) {
+ LT.warn(log0, msg);
- //OMMITED.
- LT.info(log(), "Test info message.");
+ check(null, msg, isLogExpected);
+ }
+
+ /**
+ * @param msg Log message.
+ * @param isLogExpected Is log expected or not.
+ */
+ private void checkInfo(String msg, boolean isLogExpected) {
+ LT.info(log0, msg);
+
+ check(null, msg, isLogExpected);
+ }
+
+ /**
+ * @param e Exception.
+ * @param msg Log message.
+ * @param isLogExpected Is log expected or not.
+ */
+ private void check(Exception e, String msg, boolean isLogExpected) {
+ String sep = System.getProperty("line.separator");
- //OMMITED.
- LT.info(log(), "Test info message.");
+ if (isLogExpected) {
+ String s = msg;
- //OMMITED.
- LT.info(log(), "Test info message.");
+ if (e != null)
+ s += sep + "java.lang.RuntimeException: " + e.getMessage();
- //OMMITED.
- LT.info(log(), "Test info message.");
+ assertTrue(log0.toString().contains(s));
+ } else
+ assertEquals(log0.toString(), "");
- //OMMITED.
- LT.info(log(), "Test info message.");
+ log0.reset();
}
}
[17/50] [abbrv] ignite git commit: IGNITE-8266: stopAllGrids in
afterAllTests removed. - Fixes #3844.
Posted by dp...@apache.org.
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearMultiGetSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearMultiGetSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearMultiGetSelfTest.java
index 461a29e..e3a00c0 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearMultiGetSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearMultiGetSelfTest.java
@@ -101,11 +101,6 @@ public class GridCacheNearMultiGetSelfTest extends GridCommonAbstractTest {
}
/** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- stopAllGrids();
- }
-
- /** {@inheritDoc} */
@Override protected void afterTest() throws Exception {
for (int i = 0; i < GRID_CNT; i++) {
Ignite g = grid(i);
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearMultiNodeSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearMultiNodeSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearMultiNodeSelfTest.java
index 6f23865..ee82d5c 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearMultiNodeSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearMultiNodeSelfTest.java
@@ -152,13 +152,6 @@ public class GridCacheNearMultiNodeSelfTest extends GridCommonAbstractTest {
}
/** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- stopAllGrids();
-
- assert G.allGrids().isEmpty();
- }
-
- /** {@inheritDoc} */
@SuppressWarnings({"SizeReplaceableByIsEmpty"})
@Override protected void beforeTest() throws Exception {
for (int i = 0; i < GRID_CNT; i++) {
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearTxForceKeyTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearTxForceKeyTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearTxForceKeyTest.java
index 77aa75e..21b90e2 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearTxForceKeyTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearTxForceKeyTest.java
@@ -79,11 +79,4 @@ public class GridCacheNearTxForceKeyTest extends GridCommonAbstractTest {
assertTrue(ignite0.affinity(DEFAULT_CACHE_NAME).isPrimary(ignite1.cluster().localNode(), key));
}
-
- /** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- super.afterTestsStopped();
-
- stopAllGrids();
- }
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedAffinitySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedAffinitySelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedAffinitySelfTest.java
index b53177b..b212d63 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedAffinitySelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedAffinitySelfTest.java
@@ -94,11 +94,6 @@ public class GridCachePartitionedAffinitySelfTest extends GridCommonAbstractTest
startGrids(GRIDS);
}
- /** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- stopAllGrids();
- }
-
/**
* @param ignite Grid.
* @return Affinity.
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedBasicStoreMultiNodeSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedBasicStoreMultiNodeSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedBasicStoreMultiNodeSelfTest.java
index a7128e0..91c9b22 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedBasicStoreMultiNodeSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedBasicStoreMultiNodeSelfTest.java
@@ -81,8 +81,6 @@ public class GridCachePartitionedBasicStoreMultiNodeSelfTest extends GridCommonA
/** {@inheritDoc} */
@Override protected void afterTestsStopped() throws Exception {
- stopAllGrids();
-
stores = null;
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedMultiThreadedPutGetSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedMultiThreadedPutGetSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedMultiThreadedPutGetSelfTest.java
index 8fc41ce..c99d482 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedMultiThreadedPutGetSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedMultiThreadedPutGetSelfTest.java
@@ -103,11 +103,6 @@ public class GridCachePartitionedMultiThreadedPutGetSelfTest extends GridCommonA
}
/** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- stopAllGrids();
- }
-
- /** {@inheritDoc} */
@Override protected void afterTest() throws Exception {
super.afterTest();
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/NearCacheMultithreadedUpdateTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/NearCacheMultithreadedUpdateTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/NearCacheMultithreadedUpdateTest.java
index 4e4aa58..703da8a 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/NearCacheMultithreadedUpdateTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/NearCacheMultithreadedUpdateTest.java
@@ -74,13 +74,6 @@ public class NearCacheMultithreadedUpdateTest extends GridCommonAbstractTest {
client = false;
}
- /** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- super.afterTestsStopped();
-
- stopAllGrids();
- }
-
/**
* @throws Exception If failed.
*/
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/NoneRebalanceModeSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/NoneRebalanceModeSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/NoneRebalanceModeSelfTest.java
index f3fb814..f8fe993 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/NoneRebalanceModeSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/NoneRebalanceModeSelfTest.java
@@ -49,11 +49,6 @@ public class NoneRebalanceModeSelfTest extends GridCommonAbstractTest {
startGrid(0);
}
- /** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- stopAllGrids();
- }
-
/**
* @throws Exception If failed.
*/
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/rebalancing/CacheManualRebalancingTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/rebalancing/CacheManualRebalancingTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/rebalancing/CacheManualRebalancingTest.java
index 362cfa2..3a6ad48 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/rebalancing/CacheManualRebalancingTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/rebalancing/CacheManualRebalancingTest.java
@@ -84,11 +84,6 @@ public class CacheManualRebalancingTest extends GridCommonAbstractTest {
}
/** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- stopAllGrids();
- }
-
- /** {@inheritDoc} */
@Override protected long getTestTimeout() {
return 400_000;
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/rebalancing/GridCacheRebalancingOrderingTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/rebalancing/GridCacheRebalancingOrderingTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/rebalancing/GridCacheRebalancingOrderingTest.java
index d8a7605..54cadc5 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/rebalancing/GridCacheRebalancingOrderingTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/rebalancing/GridCacheRebalancingOrderingTest.java
@@ -174,13 +174,6 @@ public class GridCacheRebalancingOrderingTest extends GridCommonAbstractTest {
return 1000 * 60 * 5;
}
- /** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- stopAllGrids();
-
- super.afterTestsStopped();
- }
-
/**
* Convert the given key from binary form, if necessary.
*
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/rebalancing/GridCacheRebalancingSyncCheckDataTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/rebalancing/GridCacheRebalancingSyncCheckDataTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/rebalancing/GridCacheRebalancingSyncCheckDataTest.java
index d842e84..8a43b65 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/rebalancing/GridCacheRebalancingSyncCheckDataTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/rebalancing/GridCacheRebalancingSyncCheckDataTest.java
@@ -54,14 +54,6 @@ public class GridCacheRebalancingSyncCheckDataTest extends GridCommonAbstractTes
return cfg;
}
-
- /** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- super.afterTestsStopped();
-
- stopAllGrids();
- }
-
/**
* @throws Exception If failed.
*/
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/EvictionAbstractTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/EvictionAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/EvictionAbstractTest.java
index ba70232..a6c10ba 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/EvictionAbstractTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/EvictionAbstractTest.java
@@ -142,8 +142,6 @@ public abstract class EvictionAbstractTest<T extends EvictionPolicy<?, ?>>
/** {@inheritDoc} */
@Override protected void afterTestsStopped() throws Exception {
filter = null;
-
- super.afterTestsStopped();
}
/**
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/EvictionPolicyFactoryAbstractTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/EvictionPolicyFactoryAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/EvictionPolicyFactoryAbstractTest.java
index 0aa2d7f..0662d2d 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/EvictionPolicyFactoryAbstractTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/EvictionPolicyFactoryAbstractTest.java
@@ -156,8 +156,6 @@ public abstract class EvictionPolicyFactoryAbstractTest<T extends EvictionPolicy
/** {@inheritDoc} */
@Override protected void afterTestsStopped() throws Exception {
filter = null;
-
- super.afterTestsStopped();
}
/**
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/paged/PageEvictionMultinodeMixedRegionsTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/paged/PageEvictionMultinodeMixedRegionsTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/paged/PageEvictionMultinodeMixedRegionsTest.java
index ab47ac4..d9135c8 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/paged/PageEvictionMultinodeMixedRegionsTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/paged/PageEvictionMultinodeMixedRegionsTest.java
@@ -53,8 +53,6 @@ public class PageEvictionMultinodeMixedRegionsTest extends PageEvictionMultinode
/** {@inheritDoc} */
@Override protected void afterTestsStopped() throws Exception {
- super.afterTestsStopped();
-
cleanPersistenceDir();
}
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/paged/PageEvictionMultinodeTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/paged/PageEvictionMultinodeTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/paged/PageEvictionMultinodeTest.java
index e4587aa..cd27cf9 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/paged/PageEvictionMultinodeTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/paged/PageEvictionMultinodeTest.java
@@ -63,11 +63,6 @@ public abstract class PageEvictionMultinodeTest extends PageEvictionAbstractTest
}
/** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- stopAllGrids();
- }
-
- /** {@inheritDoc} */
@Override protected long getTestTimeout() {
return 10 * 60 * 1000;
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/sorted/SortedEvictionPolicyPerformanceTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/sorted/SortedEvictionPolicyPerformanceTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/sorted/SortedEvictionPolicyPerformanceTest.java
index c0a55fe..39b01ed 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/sorted/SortedEvictionPolicyPerformanceTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/sorted/SortedEvictionPolicyPerformanceTest.java
@@ -62,11 +62,6 @@ public class SortedEvictionPolicyPerformanceTest extends GridCommonAbstractTest
}
/** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- stopAllGrids();
- }
-
- /** {@inheritDoc} */
@Override protected IgniteConfiguration getConfiguration(String igniteInstanceName) throws Exception {
IgniteConfiguration cfg = super.getConfiguration(igniteInstanceName);
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalByteArrayValuesSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalByteArrayValuesSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalByteArrayValuesSelfTest.java
index c206c22..a6be82b 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalByteArrayValuesSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalByteArrayValuesSelfTest.java
@@ -74,8 +74,6 @@ public class GridCacheLocalByteArrayValuesSelfTest extends GridCacheAbstractByte
/** {@inheritDoc} */
@Override protected void afterTestsStopped() throws Exception {
- super.afterTestsStopped();
-
cache = null;
ignite = null;
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsCorruptedCacheDataTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsCorruptedCacheDataTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsCorruptedCacheDataTest.java
index 74613a8..6eff6f6 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsCorruptedCacheDataTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsCorruptedCacheDataTest.java
@@ -54,8 +54,6 @@ public class IgnitePdsCorruptedCacheDataTest extends GridCommonAbstractTest {
/** {@inheritDoc} */
@Override protected void afterTestsStopped() throws Exception {
- super.afterTestsStopped();
-
cleanPersistenceDir();
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/baseline/IgniteChangingBaselineDownCachePutAllFailoverTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/baseline/IgniteChangingBaselineDownCachePutAllFailoverTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/baseline/IgniteChangingBaselineDownCachePutAllFailoverTest.java
index 15384f1..d59375e 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/baseline/IgniteChangingBaselineDownCachePutAllFailoverTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/baseline/IgniteChangingBaselineDownCachePutAllFailoverTest.java
@@ -83,8 +83,6 @@ public class IgniteChangingBaselineDownCachePutAllFailoverTest extends CachePutA
/** {@inheritDoc} */
@Override protected void afterTestsStopped() throws Exception {
- stopAllGrids();
-
cleanPersistenceDir();
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/baseline/IgniteChangingBaselineDownCacheRemoveFailoverTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/baseline/IgniteChangingBaselineDownCacheRemoveFailoverTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/baseline/IgniteChangingBaselineDownCacheRemoveFailoverTest.java
index fa96e9c..e6e0cb9 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/baseline/IgniteChangingBaselineDownCacheRemoveFailoverTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/baseline/IgniteChangingBaselineDownCacheRemoveFailoverTest.java
@@ -100,8 +100,6 @@ public class IgniteChangingBaselineDownCacheRemoveFailoverTest extends GridCache
/** {@inheritDoc} */
@Override protected void afterTestsStopped() throws Exception {
- stopAllGrids();
-
cleanPersistenceDir();
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/baseline/IgniteChangingBaselineUpCachePutAllFailoverTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/baseline/IgniteChangingBaselineUpCachePutAllFailoverTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/baseline/IgniteChangingBaselineUpCachePutAllFailoverTest.java
index 219a221..f0a5603 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/baseline/IgniteChangingBaselineUpCachePutAllFailoverTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/baseline/IgniteChangingBaselineUpCachePutAllFailoverTest.java
@@ -82,8 +82,6 @@ public class IgniteChangingBaselineUpCachePutAllFailoverTest extends CachePutAll
/** {@inheritDoc} */
@Override protected void afterTestsStopped() throws Exception {
- stopAllGrids();
-
cleanPersistenceDir();
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/baseline/IgniteChangingBaselineUpCacheRemoveFailoverTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/baseline/IgniteChangingBaselineUpCacheRemoveFailoverTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/baseline/IgniteChangingBaselineUpCacheRemoveFailoverTest.java
index b2642e9..25b9744 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/baseline/IgniteChangingBaselineUpCacheRemoveFailoverTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/baseline/IgniteChangingBaselineUpCacheRemoveFailoverTest.java
@@ -97,8 +97,6 @@ public class IgniteChangingBaselineUpCacheRemoveFailoverTest extends GridCacheAb
/** {@inheritDoc} */
@Override protected void afterTestsStopped() throws Exception {
- stopAllGrids();
-
cleanPersistenceDir();
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/baseline/IgniteStableBaselineCachePutAllFailoverTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/baseline/IgniteStableBaselineCachePutAllFailoverTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/baseline/IgniteStableBaselineCachePutAllFailoverTest.java
index 80f3b16..f960306 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/baseline/IgniteStableBaselineCachePutAllFailoverTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/baseline/IgniteStableBaselineCachePutAllFailoverTest.java
@@ -98,8 +98,6 @@ public class IgniteStableBaselineCachePutAllFailoverTest extends CachePutAllFail
/** {@inheritDoc} */
@Override protected void afterTestsStopped() throws Exception {
- stopAllGrids();
-
cleanPersistenceDir();
}
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/baseline/IgniteStableBaselineCacheRemoveFailoverTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/baseline/IgniteStableBaselineCacheRemoveFailoverTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/baseline/IgniteStableBaselineCacheRemoveFailoverTest.java
index e71f33f..c4d4d68 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/baseline/IgniteStableBaselineCacheRemoveFailoverTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/baseline/IgniteStableBaselineCacheRemoveFailoverTest.java
@@ -94,8 +94,6 @@ public class IgniteStableBaselineCacheRemoveFailoverTest extends GridCacheAbstra
/** {@inheritDoc} */
@Override protected void afterTestsStopped() throws Exception {
- stopAllGrids();
-
cleanPersistenceDir();
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/file/IgnitePdsCacheDestroyDuringCheckpointTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/file/IgnitePdsCacheDestroyDuringCheckpointTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/file/IgnitePdsCacheDestroyDuringCheckpointTest.java
index fba62df..bb20304 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/file/IgnitePdsCacheDestroyDuringCheckpointTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/file/IgnitePdsCacheDestroyDuringCheckpointTest.java
@@ -85,10 +85,6 @@ public class IgnitePdsCacheDestroyDuringCheckpointTest extends GridCommonAbstrac
/** {@inheritDoc} */
@Override protected void afterTestsStopped() throws Exception {
- super.afterTestsStopped();
-
- stopAllGrids();
-
cleanPersistenceDir();
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/file/IgnitePdsPageReplacementTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/file/IgnitePdsPageReplacementTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/file/IgnitePdsPageReplacementTest.java
index b807aa7..f52b32e 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/file/IgnitePdsPageReplacementTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/file/IgnitePdsPageReplacementTest.java
@@ -105,10 +105,6 @@ public class IgnitePdsPageReplacementTest extends GridCommonAbstractTest {
/** {@inheritDoc} */
@Override protected void afterTestsStopped() throws Exception {
- super.afterTestsStopped();
-
- stopAllGrids();
-
cleanPersistenceDir();
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/file/IgnitePdsThreadInterruptionTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/file/IgnitePdsThreadInterruptionTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/file/IgnitePdsThreadInterruptionTest.java
index 22d5ad1..adaa764 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/file/IgnitePdsThreadInterruptionTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/file/IgnitePdsThreadInterruptionTest.java
@@ -96,8 +96,6 @@ public class IgnitePdsThreadInterruptionTest extends GridCommonAbstractTest {
/** {@inheritDoc} */
@Override protected void afterTest() throws Exception {
- super.afterTestsStopped();
-
stopAllGrids();
cleanPersistenceDir();
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/standbycluster/extended/GridActivateExtensionTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/standbycluster/extended/GridActivateExtensionTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/standbycluster/extended/GridActivateExtensionTest.java
index 2003155..2ebff5b 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/standbycluster/extended/GridActivateExtensionTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/standbycluster/extended/GridActivateExtensionTest.java
@@ -150,8 +150,6 @@ public class GridActivateExtensionTest extends GridCacheAbstractFullApiSelfTest
@Override protected void afterTestsStopped() throws Exception {
super.afterTestsStopped();
- stopAllGrids();
-
backUpCluster.clear();
condId = 0;
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryTransformerSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryTransformerSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryTransformerSelfTest.java
index 269ae71..53acd22 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryTransformerSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryTransformerSelfTest.java
@@ -77,11 +77,6 @@ public class GridCacheQueryTransformerSelfTest extends GridCommonAbstractTest {
}
}
- /** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- stopAllGrids();
- }
-
/**
* @throws Exception If failed.
*/
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/ScanQueryOffheapExpiryPolicySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/ScanQueryOffheapExpiryPolicySelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/ScanQueryOffheapExpiryPolicySelfTest.java
index 080558e..a3b1d41 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/ScanQueryOffheapExpiryPolicySelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/ScanQueryOffheapExpiryPolicySelfTest.java
@@ -71,13 +71,6 @@ public class ScanQueryOffheapExpiryPolicySelfTest extends GridCommonAbstractTest
startGridsMultiThreaded(NODES_CNT);
}
- /** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- super.afterTestsStopped();
-
- stopAllGrids();
- }
-
/**
* @throws Exception If failed.
*/
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousBatchAckTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousBatchAckTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousBatchAckTest.java
index d8f1c1a..3ee6a20 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousBatchAckTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousBatchAckTest.java
@@ -106,13 +106,6 @@ public class CacheContinuousBatchAckTest extends GridCommonAbstractTest implemen
}
/** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- super.afterTestsStopped();
-
- stopAllGrids();
- }
-
- /** {@inheritDoc} */
@Override protected void beforeTest() throws Exception {
super.beforeTest();
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryAsyncFilterListenerTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryAsyncFilterListenerTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryAsyncFilterListenerTest.java
index 8c76bbd..e66e7f1 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryAsyncFilterListenerTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryAsyncFilterListenerTest.java
@@ -106,13 +106,6 @@ public class CacheContinuousQueryAsyncFilterListenerTest extends GridCommonAbstr
startGrid(NODES - 1);
}
- /** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- stopAllGrids();
-
- super.afterTestsStopped();
- }
-
///
/// ASYNC FILTER AND LISTENER. TEST LISTENER.
///
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryCounterAbstractTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryCounterAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryCounterAbstractTest.java
index c68dafe..4ec8151 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryCounterAbstractTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryCounterAbstractTest.java
@@ -138,11 +138,6 @@ public abstract class CacheContinuousQueryCounterAbstractTest extends GridCommon
}
/** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- stopAllGrids();
- }
-
- /** {@inheritDoc} */
@Override protected void beforeTest() throws Exception {
GridTestUtils.waitForCondition(new PA() {
@Override public boolean apply() {
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryExecuteInPrimaryTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryExecuteInPrimaryTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryExecuteInPrimaryTest.java
index a0969d7..ffc7fd9 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryExecuteInPrimaryTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryExecuteInPrimaryTest.java
@@ -294,9 +294,4 @@ public class CacheContinuousQueryExecuteInPrimaryTest extends GridCommonAbstract
}
}
-
- /** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- stopAllGrids();
- }
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryOperationFromCallbackTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryOperationFromCallbackTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryOperationFromCallbackTest.java
index a880353..0540b43 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryOperationFromCallbackTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryOperationFromCallbackTest.java
@@ -127,13 +127,6 @@ public class CacheContinuousQueryOperationFromCallbackTest extends GridCommonAbs
}
/** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- stopAllGrids();
-
- super.afterTestsStopped();
- }
-
- /** {@inheritDoc} */
@Override protected void beforeTest() throws Exception {
super.beforeTest();
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryOperationP2PTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryOperationP2PTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryOperationP2PTest.java
index f099951..eb53fa3 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryOperationP2PTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryOperationP2PTest.java
@@ -72,13 +72,6 @@ public class CacheContinuousQueryOperationP2PTest extends GridCommonAbstractTest
}
/** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- stopAllGrids();
-
- super.afterTestsStopped();
- }
-
- /** {@inheritDoc} */
@Override protected void beforeTest() throws Exception {
super.beforeTest();
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryOrderingEventTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryOrderingEventTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryOrderingEventTest.java
index 70d834e..7442e24 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryOrderingEventTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryOrderingEventTest.java
@@ -121,13 +121,6 @@ public class CacheContinuousQueryOrderingEventTest extends GridCommonAbstractTes
}
/** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- stopAllGrids();
-
- super.afterTestsStopped();
- }
-
- /** {@inheritDoc} */
@Override protected void beforeTest() throws Exception {
super.beforeTest();
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryRandomOperationsTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryRandomOperationsTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryRandomOperationsTest.java
index 9a815de..1c6bd8c 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryRandomOperationsTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryRandomOperationsTest.java
@@ -138,13 +138,6 @@ public class CacheContinuousQueryRandomOperationsTest extends GridCommonAbstract
startGrid(getServerNodeCount());
}
- /** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- stopAllGrids();
-
- super.afterTestsStopped();
- }
-
/**
* @throws Exception If failed.
*/
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousWithTransformerReplicatedSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousWithTransformerReplicatedSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousWithTransformerReplicatedSelfTest.java
index 6035b93..7b53fb2 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousWithTransformerReplicatedSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousWithTransformerReplicatedSelfTest.java
@@ -122,8 +122,6 @@ public class CacheContinuousWithTransformerReplicatedSelfTest extends GridCommon
/** {@inheritDoc} */
@Override protected void afterTestsStopped() throws Exception {
stopAllGrids(true);
-
- super.afterTestsStopped();
}
/**
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheEntryProcessorExternalizableFailedTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheEntryProcessorExternalizableFailedTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheEntryProcessorExternalizableFailedTest.java
index 1c9e2fa..435ccc0 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheEntryProcessorExternalizableFailedTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheEntryProcessorExternalizableFailedTest.java
@@ -105,13 +105,6 @@ public class CacheEntryProcessorExternalizableFailedTest extends GridCommonAbstr
}
/** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- stopAllGrids();
-
- super.afterTestsStopped();
- }
-
- /** {@inheritDoc} */
@Override protected void beforeTest() throws Exception {
super.beforeTest();
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheEntryProcessorNonSerializableTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheEntryProcessorNonSerializableTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheEntryProcessorNonSerializableTest.java
index 72928b3..6936685 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheEntryProcessorNonSerializableTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheEntryProcessorNonSerializableTest.java
@@ -100,13 +100,6 @@ public class CacheEntryProcessorNonSerializableTest extends GridCommonAbstractTe
startGrid(getServerNodeCount());
}
- /** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- stopAllGrids();
-
- super.afterTestsStopped();
- }
-
/**
* @return Server nodes.
*/
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheKeepBinaryIterationTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheKeepBinaryIterationTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheKeepBinaryIterationTest.java
index b095b2d..ce45570 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheKeepBinaryIterationTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheKeepBinaryIterationTest.java
@@ -77,13 +77,6 @@ public class CacheKeepBinaryIterationTest extends GridCommonAbstractTest {
startGridsMultiThreaded(getServerNodeCount());
}
- /** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- stopAllGrids();
-
- super.afterTestsStopped();
- }
-
/**
* @throws Exception If failed.
*/
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryAbstractSelfTest.java
index 8287a9b..b673ee8 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryAbstractSelfTest.java
@@ -156,11 +156,6 @@ public abstract class GridCacheContinuousQueryAbstractSelfTest extends GridCommo
}
/** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- stopAllGrids();
- }
-
- /** {@inheritDoc} */
@Override protected void afterTest() throws Exception {
GridTestUtils.waitForCondition(new PA() {
@Override public boolean apply() {
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryConcurrentTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryConcurrentTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryConcurrentTest.java
index 7476b63..0241a69 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryConcurrentTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryConcurrentTest.java
@@ -83,13 +83,6 @@ public class GridCacheContinuousQueryConcurrentTest extends GridCommonAbstractTe
}
/** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- stopAllGrids();
-
- super.afterTestsStopped();
- }
-
- /** {@inheritDoc} */
@Override protected IgniteConfiguration getConfiguration(String igniteInstanceName) throws Exception {
IgniteConfiguration cfg = super.getConfiguration(igniteInstanceName);
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/store/GridCacheWriteBehindStoreAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/store/GridCacheWriteBehindStoreAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/store/GridCacheWriteBehindStoreAbstractSelfTest.java
index 3bac906..1ff0029 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/store/GridCacheWriteBehindStoreAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/store/GridCacheWriteBehindStoreAbstractSelfTest.java
@@ -54,8 +54,6 @@ public abstract class GridCacheWriteBehindStoreAbstractSelfTest extends GridComm
@Override protected void afterTestsStopped() throws Exception {
delegate = null;
store = null;
-
- super.afterTestsStopped();
}
/**
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/store/GridCacheWriteBehindStorePartitionedMultiNodeSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/store/GridCacheWriteBehindStorePartitionedMultiNodeSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/store/GridCacheWriteBehindStorePartitionedMultiNodeSelfTest.java
index 64d815c..de61058 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/store/GridCacheWriteBehindStorePartitionedMultiNodeSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/store/GridCacheWriteBehindStorePartitionedMultiNodeSelfTest.java
@@ -95,8 +95,6 @@ public class GridCacheWriteBehindStorePartitionedMultiNodeSelfTest extends GridC
/** {@inheritDoc} */
@Override protected void afterTestsStopped() throws Exception {
stores = null;
-
- super.afterTestsStopped();
}
/**
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/store/IgniteCacheWriteBehindNoUpdateSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/store/IgniteCacheWriteBehindNoUpdateSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/store/IgniteCacheWriteBehindNoUpdateSelfTest.java
index cd5e02e..ce26c2c 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/store/IgniteCacheWriteBehindNoUpdateSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/store/IgniteCacheWriteBehindNoUpdateSelfTest.java
@@ -55,11 +55,6 @@ public class IgniteCacheWriteBehindNoUpdateSelfTest extends GridCommonAbstractTe
}
/** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- stopAllGrids();
- }
-
- /** {@inheritDoc} */
@Override protected IgniteConfiguration getConfiguration(String igniteInstanceName) throws Exception {
IgniteConfiguration cfg = super.getConfiguration(igniteInstanceName);
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/transactions/TxDeadlockCauseTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/transactions/TxDeadlockCauseTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/transactions/TxDeadlockCauseTest.java
index 4e760bc..f7ba603 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/transactions/TxDeadlockCauseTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/transactions/TxDeadlockCauseTest.java
@@ -81,13 +81,6 @@ public class TxDeadlockCauseTest extends GridCommonAbstractTest {
stopAllGrids();
}
- /** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- super.afterTestsStopped();
-
- stopAllGrids();
- }
-
/**
* @throws Exception If failed.
*/
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/transactions/TxDeadlockDetectionNoHangsTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/transactions/TxDeadlockDetectionNoHangsTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/transactions/TxDeadlockDetectionNoHangsTest.java
index 87d572d..a181281 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/transactions/TxDeadlockDetectionNoHangsTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/transactions/TxDeadlockDetectionNoHangsTest.java
@@ -93,8 +93,6 @@ public class TxDeadlockDetectionNoHangsTest extends GridCommonAbstractTest {
/** {@inheritDoc} */
@Override protected void afterTestsStopped() throws Exception {
- super.afterTestsStopped();
-
GridTestUtils.setFieldValue(null, TxDeadlockDetection.class, "DEADLOCK_TIMEOUT",
getInteger(IGNITE_TX_DEADLOCK_DETECTION_TIMEOUT, 60000));
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/transactions/TxDeadlockDetectionTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/transactions/TxDeadlockDetectionTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/transactions/TxDeadlockDetectionTest.java
index 102a0a1..6cf65c8 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/transactions/TxDeadlockDetectionTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/transactions/TxDeadlockDetectionTest.java
@@ -99,13 +99,6 @@ public class TxDeadlockDetectionTest extends GridCommonAbstractTest {
startGridsMultiThreaded(NODES_CNT);
}
- /** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- super.afterTestsStopped();
-
- stopAllGrids();
- }
-
/**
* @throws Exception If failed.
*/
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/transactions/TxDeadlockDetectionUnmasrhalErrorsTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/transactions/TxDeadlockDetectionUnmasrhalErrorsTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/transactions/TxDeadlockDetectionUnmasrhalErrorsTest.java
index 598725e..0cadafe 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/transactions/TxDeadlockDetectionUnmasrhalErrorsTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/transactions/TxDeadlockDetectionUnmasrhalErrorsTest.java
@@ -83,13 +83,6 @@ public class TxDeadlockDetectionUnmasrhalErrorsTest extends GridCommonAbstractTe
startGrid(1);
}
- /** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- super.afterTestsStopped();
-
- stopAllGrids();
- }
-
/**
* @throws Exception If failed.
*/
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/transactions/TxMultiCacheAsyncOpsTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/transactions/TxMultiCacheAsyncOpsTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/transactions/TxMultiCacheAsyncOpsTest.java
index 261af70..89f20ec 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/transactions/TxMultiCacheAsyncOpsTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/transactions/TxMultiCacheAsyncOpsTest.java
@@ -74,13 +74,6 @@ public class TxMultiCacheAsyncOpsTest extends GridCommonAbstractTest {
startGridsMultiThreaded(GRID_COUNT);
}
- /** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- super.afterTestsStopped();
-
- stopAllGrids();
- }
-
/**
*
*/
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/transactions/TxOptimisticDeadlockDetectionTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/transactions/TxOptimisticDeadlockDetectionTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/transactions/TxOptimisticDeadlockDetectionTest.java
index 91a5742..1dae853 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/transactions/TxOptimisticDeadlockDetectionTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/transactions/TxOptimisticDeadlockDetectionTest.java
@@ -128,13 +128,6 @@ public class TxOptimisticDeadlockDetectionTest extends AbstractDeadlockDetection
startGrid(i + NODES_CNT);
}
- /** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- super.afterTestsStopped();
-
- stopAllGrids();
- }
-
/**
* @throws Exception If failed.
*/
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/transactions/TxOptimisticOnPartitionExchangeTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/transactions/TxOptimisticOnPartitionExchangeTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/transactions/TxOptimisticOnPartitionExchangeTest.java
index 03ea0f7..369e755 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/transactions/TxOptimisticOnPartitionExchangeTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/transactions/TxOptimisticOnPartitionExchangeTest.java
@@ -88,13 +88,6 @@ public class TxOptimisticOnPartitionExchangeTest extends GridCommonAbstractTest
}
/** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- super.afterTestsStopped();
-
- stopAllGrids();
- }
-
- /** {@inheritDoc} */
@Override protected IgniteConfiguration getConfiguration(String igniteInstanceName) throws Exception {
IgniteConfiguration cfg = super.getConfiguration(igniteInstanceName);
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/transactions/TxPessimisticDeadlockDetectionCrossCacheTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/transactions/TxPessimisticDeadlockDetectionCrossCacheTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/transactions/TxPessimisticDeadlockDetectionCrossCacheTest.java
index 612978f..b6bd7fb 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/transactions/TxPessimisticDeadlockDetectionCrossCacheTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/transactions/TxPessimisticDeadlockDetectionCrossCacheTest.java
@@ -72,13 +72,6 @@ public class TxPessimisticDeadlockDetectionCrossCacheTest extends GridCommonAbst
startGrids(NODES_CNT);
}
- /** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- super.afterTestsStopped();
-
- stopAllGrids();
- }
-
/**
* @throws Exception If failed.
*/
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/transactions/TxPessimisticDeadlockDetectionTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/transactions/TxPessimisticDeadlockDetectionTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/transactions/TxPessimisticDeadlockDetectionTest.java
index aab0b8e..32dbdc5 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/transactions/TxPessimisticDeadlockDetectionTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/transactions/TxPessimisticDeadlockDetectionTest.java
@@ -115,13 +115,6 @@ public class TxPessimisticDeadlockDetectionTest extends AbstractDeadlockDetectio
startGrid(i + NODES_CNT);
}
- /** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- super.afterTestsStopped();
-
- stopAllGrids();
- }
-
/**
* @throws Exception If failed.
*/
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/transactions/TxRollbackAsyncWithPersistenceTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/transactions/TxRollbackAsyncWithPersistenceTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/transactions/TxRollbackAsyncWithPersistenceTest.java
index f1f8d10..a11dca7 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/transactions/TxRollbackAsyncWithPersistenceTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/transactions/TxRollbackAsyncWithPersistenceTest.java
@@ -37,8 +37,6 @@ public class TxRollbackAsyncWithPersistenceTest extends TxRollbackAsyncTest {
/** {@inheritDoc} */
@Override protected void afterTestsStopped() throws Exception {
- super.afterTestsStopped();
-
System.clearProperty(IGNITE_WAL_LOG_TX_RECORDS);
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/transactions/TxRollbackOnTimeoutNoDeadlockDetectionTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/transactions/TxRollbackOnTimeoutNoDeadlockDetectionTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/transactions/TxRollbackOnTimeoutNoDeadlockDetectionTest.java
index d888970..11148aa 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/transactions/TxRollbackOnTimeoutNoDeadlockDetectionTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/transactions/TxRollbackOnTimeoutNoDeadlockDetectionTest.java
@@ -34,8 +34,6 @@ public class TxRollbackOnTimeoutNoDeadlockDetectionTest extends TxRollbackOnTime
/** {@inheritDoc} */
@Override protected void afterTestsStopped() throws Exception {
- super.afterTestsStopped();
-
System.clearProperty(IGNITE_TX_DEADLOCK_DETECTION_MAX_ITERS);
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/core/src/test/java/org/apache/ignite/internal/processors/closure/GridClosureProcessorRemoteTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/closure/GridClosureProcessorRemoteTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/closure/GridClosureProcessorRemoteTest.java
index 9c22817..5fd8416 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/closure/GridClosureProcessorRemoteTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/closure/GridClosureProcessorRemoteTest.java
@@ -56,11 +56,6 @@ public class GridClosureProcessorRemoteTest extends GridCommonAbstractTest {
}
/** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- stopAllGrids();
- }
-
- /** {@inheritDoc} */
@Override protected IgniteConfiguration getConfiguration() throws Exception {
IgniteConfiguration cfg = new IgniteConfiguration();
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/core/src/test/java/org/apache/ignite/internal/processors/closure/GridClosureProcessorSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/closure/GridClosureProcessorSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/closure/GridClosureProcessorSelfTest.java
index fec0637..fef74e8 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/closure/GridClosureProcessorSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/closure/GridClosureProcessorSelfTest.java
@@ -90,11 +90,6 @@ public class GridClosureProcessorSelfTest extends GridCommonAbstractTest {
}
/** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- stopAllGrids();
- }
-
- /** {@inheritDoc} */
@Override protected void beforeTest() throws Exception {
execCntr.set(0);
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/core/src/test/java/org/apache/ignite/internal/processors/closure/GridClosureSerializationTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/closure/GridClosureSerializationTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/closure/GridClosureSerializationTest.java
index 324a9e9..c6d14d8 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/closure/GridClosureSerializationTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/closure/GridClosureSerializationTest.java
@@ -53,13 +53,6 @@ public class GridClosureSerializationTest extends GridCommonAbstractTest {
startGrid(1);
}
- /** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- super.afterTestsStopped();
-
- stopAllGrids();
- }
-
/**
* @throws Exception If failed.
*/
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/core/src/test/java/org/apache/ignite/internal/processors/cluster/GridUpdateNotifierSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cluster/GridUpdateNotifierSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cluster/GridUpdateNotifierSelfTest.java
index f295b2b..58c41b5 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cluster/GridUpdateNotifierSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cluster/GridUpdateNotifierSelfTest.java
@@ -54,8 +54,6 @@ public class GridUpdateNotifierSelfTest extends GridCommonAbstractTest {
/** {@inheritDoc} */
@Override protected void afterTestsStopped() throws Exception {
- super.afterTestsStopped();
-
System.setProperty(IgniteSystemProperties.IGNITE_UPDATE_NOTIFIER, "false");
Properties props = U.field(IgniteProperties.class, "PROPS");
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/core/src/test/java/org/apache/ignite/internal/processors/compute/GridComputeJobExecutionErrorToLogManualTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/compute/GridComputeJobExecutionErrorToLogManualTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/compute/GridComputeJobExecutionErrorToLogManualTest.java
index 939101f..dc24156 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/compute/GridComputeJobExecutionErrorToLogManualTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/compute/GridComputeJobExecutionErrorToLogManualTest.java
@@ -55,11 +55,6 @@ public class GridComputeJobExecutionErrorToLogManualTest extends GridCommonAbstr
startGridsMultiThreaded(GRID_CNT, true);
}
- /** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- stopAllGrids();
- }
-
/**
* @throws Exception If fails.
*/
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/core/src/test/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerUpdateAfterLoadTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerUpdateAfterLoadTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerUpdateAfterLoadTest.java
index 6df4ec9..bdfc116 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerUpdateAfterLoadTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerUpdateAfterLoadTest.java
@@ -68,13 +68,6 @@ public class DataStreamerUpdateAfterLoadTest extends GridCommonAbstractTest {
startGrid(NODES - 1);
}
- /** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- stopAllGrids();
-
- super.afterTestsStopped();
- }
-
/**
* @throws Exception If failed.
*/
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsCacheSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsCacheSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsCacheSelfTest.java
index af9d285..f8f3a0c 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsCacheSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsCacheSelfTest.java
@@ -95,11 +95,6 @@ public class IgfsCacheSelfTest extends IgfsCommonAbstractTest {
startGrid();
}
- /** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- stopAllGrids();
- }
-
/**
* Test cache.
*
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsDataManagerSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsDataManagerSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsDataManagerSelfTest.java
index 18abc1c..c07f0ba 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsDataManagerSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsDataManagerSelfTest.java
@@ -145,11 +145,6 @@ public class IgfsDataManagerSelfTest extends IgfsCommonAbstractTest {
startGrids(NODES_CNT);
}
- /** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- stopAllGrids();
- }
-
/**
* Test file system structure in meta-cache.
*
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsMetaManagerSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsMetaManagerSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsMetaManagerSelfTest.java
index b018088..0059c27 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsMetaManagerSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsMetaManagerSelfTest.java
@@ -126,11 +126,6 @@ public class IgfsMetaManagerSelfTest extends IgfsCommonAbstractTest {
startGrids(NODES_CNT);
}
- /** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- stopAllGrids();
- }
-
/**
* Test properties management in meta-cache.
*
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsMetricsSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsMetricsSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsMetricsSelfTest.java
index 76398f5..9c664e8 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsMetricsSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsMetricsSelfTest.java
@@ -89,11 +89,6 @@ public class IgfsMetricsSelfTest extends IgfsCommonAbstractTest {
startPrimary();
}
- /** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- stopAllGrids(false);
- }
-
/**
* Start a grid with the primary file system.
*
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsProcessorSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsProcessorSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsProcessorSelfTest.java
index 6d69cbe..0ba3bcb 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsProcessorSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsProcessorSelfTest.java
@@ -111,11 +111,6 @@ public class IgfsProcessorSelfTest extends IgfsCommonAbstractTest {
}
/** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- stopAllGrids();
- }
-
- /** {@inheritDoc} */
@Override protected IgniteConfiguration getConfiguration(String igniteInstanceName) throws Exception {
IgniteConfiguration cfg = super.getConfiguration(igniteInstanceName);
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsStreamsSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsStreamsSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsStreamsSelfTest.java
index e811604..115cd2e 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsStreamsSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsStreamsSelfTest.java
@@ -96,11 +96,6 @@ public class IgfsStreamsSelfTest extends IgfsCommonAbstractTest {
}
/** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- stopAllGrids();
- }
-
- /** {@inheritDoc} */
@Override protected void beforeTest() throws Exception {
if (NODES_CNT <= 0)
return;
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsTaskSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsTaskSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsTaskSelfTest.java
index 13163d8..f959077 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsTaskSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsTaskSelfTest.java
@@ -94,11 +94,6 @@ public class IgfsTaskSelfTest extends IgfsCommonAbstractTest {
}
/** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- stopAllGrids(false);
- }
-
- /** {@inheritDoc} */
@Override protected void beforeTest() throws Exception {
igfs.clear();
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/split/IgfsAbstractRecordResolverSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/split/IgfsAbstractRecordResolverSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/split/IgfsAbstractRecordResolverSelfTest.java
index c929909..0395e21 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/split/IgfsAbstractRecordResolverSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/split/IgfsAbstractRecordResolverSelfTest.java
@@ -97,11 +97,6 @@ public class IgfsAbstractRecordResolverSelfTest extends GridCommonAbstractTest {
}
/** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- stopAllGrids(false);
- }
-
- /** {@inheritDoc} */
@Override protected void beforeTest() throws Exception {
igfs.clear();
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/core/src/test/java/org/apache/ignite/internal/processors/rest/handlers/log/GridLogCommandHandlerTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/rest/handlers/log/GridLogCommandHandlerTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/rest/handlers/log/GridLogCommandHandlerTest.java
index 1fb093a..7f0a6de 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/rest/handlers/log/GridLogCommandHandlerTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/rest/handlers/log/GridLogCommandHandlerTest.java
@@ -64,8 +64,6 @@ public class GridLogCommandHandlerTest extends GridCommonAbstractTest {
Files.delete(Paths.get(igniteHome + "/work/log/" + "test.log"));
Files.delete(Paths.get(igniteHome + "/work/log/" + "ignite.log"));
Files.delete(Paths.get(igniteHome + "/work/log/"));
-
- super.afterTestsStopped();
}
/**
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/core/src/test/java/org/apache/ignite/internal/processors/rest/handlers/query/GridQueryCommandHandlerTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/rest/handlers/query/GridQueryCommandHandlerTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/rest/handlers/query/GridQueryCommandHandlerTest.java
index cffc7b9..f0ff25a 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/rest/handlers/query/GridQueryCommandHandlerTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/rest/handlers/query/GridQueryCommandHandlerTest.java
@@ -48,13 +48,6 @@ public class GridQueryCommandHandlerTest extends GridCommonAbstractTest {
}
- /** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- super.afterTestsStopped();
-
- stopAllGrids();
- }
-
/**
* @throws Exception If failed.
*/
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/core/src/test/java/org/apache/ignite/internal/processors/service/ClosureServiceClientsNodesTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/service/ClosureServiceClientsNodesTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/service/ClosureServiceClientsNodesTest.java
index 8f03c4c..edb0182 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/service/ClosureServiceClientsNodesTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/service/ClosureServiceClientsNodesTest.java
@@ -80,11 +80,6 @@ public class ClosureServiceClientsNodesTest extends GridCommonAbstractTest {
startGrids(NODES_CNT);
}
- /** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- stopAllGrids();
- }
-
/**
* @throws Exception If failed.
*/
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/core/src/test/java/org/apache/ignite/internal/processors/service/GridServiceDeploymentCompoundFutureSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/service/GridServiceDeploymentCompoundFutureSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/service/GridServiceDeploymentCompoundFutureSelfTest.java
index bcc0504..ad93c6a 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/service/GridServiceDeploymentCompoundFutureSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/service/GridServiceDeploymentCompoundFutureSelfTest.java
@@ -31,11 +31,6 @@ import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
/** */
public class GridServiceDeploymentCompoundFutureSelfTest extends GridCommonAbstractTest {
- /** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- stopAllGrids();
- }
-
/**
* @throws Exception If failed.
*/
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/core/src/test/java/org/apache/ignite/internal/processors/service/GridServiceDeploymentExceptionPropagationTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/service/GridServiceDeploymentExceptionPropagationTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/service/GridServiceDeploymentExceptionPropagationTest.java
index 156a72e..d987ce6 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/service/GridServiceDeploymentExceptionPropagationTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/service/GridServiceDeploymentExceptionPropagationTest.java
@@ -26,13 +26,6 @@ import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
/** */
public class GridServiceDeploymentExceptionPropagationTest extends GridCommonAbstractTest {
- /** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- stopAllGrids();
-
- super.afterTestsStopped();
- }
-
/** */
@SuppressWarnings("unused")
public void testExceptionPropagation() throws Exception {
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/core/src/test/java/org/apache/ignite/internal/processors/service/GridServiceProcessorAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/service/GridServiceProcessorAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/service/GridServiceProcessorAbstractSelfTest.java
index 6d3b0d4..8e8a2fe 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/service/GridServiceProcessorAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/service/GridServiceProcessorAbstractSelfTest.java
@@ -114,11 +114,6 @@ public abstract class GridServiceProcessorAbstractSelfTest extends GridCommonAbs
}
/** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- stopAllGrids();
- }
-
- /** {@inheritDoc} */
@Override protected void beforeTest() throws Exception {
DummyService.reset();
}
[21/50] [abbrv] ignite git commit: IGNITE-8469 Fix for non-heap
memory leak for calling cluster activation multi times. - Fixes #3986.
Posted by dp...@apache.org.
IGNITE-8469 Fix for non-heap memory leak for calling cluster activation multi times. - Fixes #3986.
Signed-off-by: dpavlov <dp...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/9a4a145b
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/9a4a145b
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/9a4a145b
Branch: refs/heads/ignite-5789-1
Commit: 9a4a145be514e650258715a7e682d427d5812d16
Parents: eb8038f
Author: Maxim Muzafarov <ma...@gmail.com>
Authored: Mon May 21 17:28:22 2018 +0300
Committer: dpavlov <dp...@apache.org>
Committed: Mon May 21 17:28:22 2018 +0300
----------------------------------------------------------------------
.../mem/file/MappedFileMemoryProvider.java | 8 ++
.../mem/unsafe/UnsafeMemoryProvider.java | 8 ++
.../pagemem/impl/PageMemoryNoStoreImpl.java | 3 +-
.../apache/ignite/internal/util/GridDebug.java | 56 +++++++++----
.../pagemem/PageMemoryNoStoreLeakTest.java | 82 ++++++++++++++++++++
.../ignite/testsuites/IgnitePdsTestSuite.java | 2 +
6 files changed, 144 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/9a4a145b/modules/core/src/main/java/org/apache/ignite/internal/mem/file/MappedFileMemoryProvider.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/mem/file/MappedFileMemoryProvider.java b/modules/core/src/main/java/org/apache/ignite/internal/mem/file/MappedFileMemoryProvider.java
index 7186b27..54b4af4 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/mem/file/MappedFileMemoryProvider.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/mem/file/MappedFileMemoryProvider.java
@@ -55,6 +55,9 @@ public class MappedFileMemoryProvider implements DirectMemoryProvider {
/** */
private List<MappedFile> mappedFiles;
+ /** Flag shows if current memory provider have been already initialized. */
+ private boolean isInit;
+
/**
* @param allocationPath Allocation path.
*/
@@ -65,6 +68,9 @@ public class MappedFileMemoryProvider implements DirectMemoryProvider {
/** {@inheritDoc} */
@Override public void initialize(long[] sizes) {
+ if (isInit)
+ throw new IgniteException("Second initialization does not allowed for current provider");
+
this.sizes = sizes;
mappedFiles = new ArrayList<>(sizes.length);
@@ -90,6 +96,8 @@ public class MappedFileMemoryProvider implements DirectMemoryProvider {
"opened by another process and current user has enough rights): " + file);
}
}
+
+ isInit = true;
}
/** {@inheritDoc} */
http://git-wip-us.apache.org/repos/asf/ignite/blob/9a4a145b/modules/core/src/main/java/org/apache/ignite/internal/mem/unsafe/UnsafeMemoryProvider.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/mem/unsafe/UnsafeMemoryProvider.java b/modules/core/src/main/java/org/apache/ignite/internal/mem/unsafe/UnsafeMemoryProvider.java
index 276e10e..7eb58cb 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/mem/unsafe/UnsafeMemoryProvider.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/mem/unsafe/UnsafeMemoryProvider.java
@@ -41,6 +41,9 @@ public class UnsafeMemoryProvider implements DirectMemoryProvider {
/** */
private IgniteLogger log;
+ /** Flag shows if current memory provider have been already initialized. */
+ private boolean isInit;
+
/**
* @param log Ignite logger to use.
*/
@@ -50,9 +53,14 @@ public class UnsafeMemoryProvider implements DirectMemoryProvider {
/** {@inheritDoc} */
@Override public void initialize(long[] sizes) {
+ if (isInit)
+ throw new IgniteException("Second initialization does not allowed for current provider");
+
this.sizes = sizes;
regions = new ArrayList<>();
+
+ isInit = true;
}
/** {@inheritDoc} */
http://git-wip-us.apache.org/repos/asf/ignite/blob/9a4a145b/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 d4b22a6..54b647a 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
@@ -231,7 +231,8 @@ public class PageMemoryNoStoreImpl implements PageMemory {
if (lastIdx != SEG_CNT - 1)
chunks = Arrays.copyOf(chunks, lastIdx + 1);
- directMemoryProvider.initialize(chunks);
+ if (segments == null)
+ directMemoryProvider.initialize(chunks);
addSegment(null);
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/9a4a145b/modules/core/src/main/java/org/apache/ignite/internal/util/GridDebug.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/GridDebug.java b/modules/core/src/main/java/org/apache/ignite/internal/util/GridDebug.java
index 2fa148e..d26e060 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/GridDebug.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/GridDebug.java
@@ -18,6 +18,7 @@
package org.apache.ignite.internal.util;
import com.sun.management.HotSpotDiagnosticMXBean;
+import com.sun.management.OperatingSystemMXBean;
import java.io.File;
import java.io.FileNotFoundException;
import java.io.FileOutputStream;
@@ -34,6 +35,7 @@ import java.util.Date;
import java.util.concurrent.ConcurrentLinkedQueue;
import java.util.concurrent.atomic.AtomicReference;
import javax.management.MBeanServer;
+import org.apache.ignite.IgniteException;
import org.apache.ignite.internal.util.typedef.X;
import org.apache.ignite.internal.util.typedef.internal.U;
import org.apache.ignite.lang.IgnitePredicate;
@@ -75,6 +77,12 @@ public class GridDebug {
/** field to store the hotspot diagnostic MBean */
private static volatile HotSpotDiagnosticMXBean hotspotMBean;
+ /** Platform-specific management interface for the operating system. */
+ private static final String OS_BEAN_NAME = "java.lang:type=OperatingSystem";
+
+ /** Call to {@link #initOSMBean()} before accessing. */
+ private static volatile OperatingSystemMXBean osMBean;
+
/* */
static {
if (LOGS_PATH != null) {
@@ -339,33 +347,53 @@ public class GridDebug {
}
/**
- * Initialize the hotspot diagnostic MBean field
+ * @return Committed VM size in bits.
+ */
+ public static long getCommittedVirtualMemorySize() {
+ initOSMBean();
+
+ return osMBean.getCommittedVirtualMemorySize();
+ }
+
+ /**
+ * Initialize the hotspot diagnostic MBean field.
*/
private static void initHotspotMBean() {
if (hotspotMBean == null) {
synchronized (GridDebug.class) {
if (hotspotMBean == null)
- hotspotMBean = getHotspotMBean();
+ hotspotMBean = getMBean(HOTSPOT_BEAN_NAME, HotSpotDiagnosticMXBean.class);
}
}
}
/**
- * Gets the hotspot diagnostic MBean from the platform MBean server
- * @return Diagnostic bean.
+ * Initialize field to store OperatingSystem MXBean.
*/
- private static HotSpotDiagnosticMXBean getHotspotMBean() {
- try {
- MBeanServer server = ManagementFactory.getPlatformMBeanServer();
+ private static void initOSMBean() {
+ if (osMBean == null) {
+ synchronized (GridDebug.class) {
+ if (osMBean == null)
+ osMBean = getMBean(OS_BEAN_NAME, OperatingSystemMXBean.class);
+ }
+ }
+ }
- HotSpotDiagnosticMXBean bean = ManagementFactory.newPlatformMXBeanProxy(server,
- HOTSPOT_BEAN_NAME, HotSpotDiagnosticMXBean.class);
+ /**
+ * Get MXBean from the platform MBeanServer.
+ *
+ * @param mxbeanName The name for uniquely identifying the MXBean within an MBeanServer.
+ * @param mxbeanItf The MXBean interface.
+ * @return A proxy for a platform MXBean interface.
+ */
+ private static <T> T getMBean(String mxbeanName, Class<T> mxbeanItf) {
+ try {
+ MBeanServer srv = ManagementFactory.getPlatformMBeanServer();
- return bean;
- } catch (RuntimeException re) {
- throw re;
- } catch (Exception exp) {
- throw new RuntimeException(exp);
+ return ManagementFactory.newPlatformMXBeanProxy(srv, mxbeanName, mxbeanItf);
+ }
+ catch (IOException e) {
+ throw new IgniteException(e);
}
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/9a4a145b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/pagemem/PageMemoryNoStoreLeakTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/pagemem/PageMemoryNoStoreLeakTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/pagemem/PageMemoryNoStoreLeakTest.java
new file mode 100644
index 0000000..65e8c36
--- /dev/null
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/pagemem/PageMemoryNoStoreLeakTest.java
@@ -0,0 +1,82 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.internal.processors.cache.persistence.pagemem;
+
+import org.apache.ignite.configuration.DataRegionConfiguration;
+import org.apache.ignite.internal.mem.DirectMemoryProvider;
+import org.apache.ignite.internal.mem.unsafe.UnsafeMemoryProvider;
+import org.apache.ignite.internal.pagemem.PageMemory;
+import org.apache.ignite.internal.pagemem.impl.PageMemoryNoStoreImpl;
+import org.apache.ignite.internal.processors.cache.persistence.DataRegionMetricsImpl;
+import org.apache.ignite.internal.util.typedef.internal.D;
+import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
+
+/**
+ * Base scenario for memory leak:
+ * 1. Start topology with client nodes;
+ * 2. Call active(true) for cluster. This activation should fail by some circumstances (e.g. some locks exists);
+ * 3. IgniteCacheDatabaseSharedManager started and onActive called here. Memory allocated;
+ * 4. Call active(true) again. Activation successfull, non heap memory leak introduced;
+ */
+public class PageMemoryNoStoreLeakTest extends GridCommonAbstractTest {
+ /** */
+ private static final int PAGE_SIZE = 4 * 1024;
+
+ /** */
+ private static final int MAX_MEMORY_SIZE = 10 * 1024 * 1024;
+
+ /** Allow delta between GC executions. */
+ private static final int ALLOWED_DELTA = 10 * 1024 * 1024;
+
+ /**
+ * @throws Exception If failed.
+ */
+ public void testPageDoubleInitMemoryLeak() throws Exception {
+ long initVMsize = D.getCommittedVirtualMemorySize();
+
+ for (int i = 0; i < 1_000; i++) {
+ final DirectMemoryProvider provider = new UnsafeMemoryProvider(log());
+
+ final DataRegionConfiguration plcCfg = new DataRegionConfiguration()
+ .setMaxSize(MAX_MEMORY_SIZE).setInitialSize(MAX_MEMORY_SIZE);
+
+ PageMemory mem = new PageMemoryNoStoreImpl(
+ log(),
+ provider,
+ null,
+ PAGE_SIZE,
+ plcCfg,
+ new DataRegionMetricsImpl(plcCfg),
+ true);
+
+ try {
+ mem.start();
+
+ //Second initialization, introduces leak
+ mem.start();
+ }
+ finally {
+ mem.stop();
+ }
+
+ long committedVMSize = D.getCommittedVirtualMemorySize();
+
+ assertTrue(committedVMSize - initVMsize <= ALLOWED_DELTA);
+ }
+ }
+}
http://git-wip-us.apache.org/repos/asf/ignite/blob/9a4a145b/modules/core/src/test/java/org/apache/ignite/testsuites/IgnitePdsTestSuite.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgnitePdsTestSuite.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgnitePdsTestSuite.java
index ceb0f0d..7294a60 100644
--- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgnitePdsTestSuite.java
+++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgnitePdsTestSuite.java
@@ -37,6 +37,7 @@ import org.apache.ignite.internal.processors.cache.persistence.pagemem.FillFacto
import org.apache.ignite.internal.processors.cache.persistence.pagemem.IndexStoragePageMemoryImplTest;
import org.apache.ignite.internal.processors.cache.persistence.pagemem.PageMemoryImplNoLoadTest;
import org.apache.ignite.internal.processors.cache.persistence.pagemem.PageMemoryImplTest;
+import org.apache.ignite.internal.processors.cache.persistence.pagemem.PageMemoryNoStoreLeakTest;
import org.apache.ignite.internal.processors.cache.persistence.pagemem.PagesWriteThrottleSmokeTest;
import org.apache.ignite.internal.processors.cache.persistence.wal.SegmentedRingByteBufferTest;
import org.apache.ignite.internal.processors.database.IgniteDbDynamicCacheSelfTest;
@@ -61,6 +62,7 @@ public class IgnitePdsTestSuite extends TestSuite {
// Basic PageMemory tests.
suite.addTestSuite(PageMemoryImplNoLoadTest.class);
+ suite.addTestSuite(PageMemoryNoStoreLeakTest.class);
suite.addTestSuite(IndexStoragePageMemoryImplTest.class);
suite.addTestSuite(PageMemoryImplTest.class);
[38/50] [abbrv] ignite git commit: IGNITE-6075 Fix for
CacheLoadingConcurrentGridStartSelfTest sometimes fails - Fixes #3829.
Posted by dp...@apache.org.
IGNITE-6075 Fix for CacheLoadingConcurrentGridStartSelfTest sometimes fails - Fixes #3829.
Signed-off-by: dpavlov <dp...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/cc5484a9
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/cc5484a9
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/cc5484a9
Branch: refs/heads/ignite-5789-1
Commit: cc5484a998b696dceb6817263212f8a1da791ba3
Parents: d52bfdb
Author: Fedotov <va...@gmail.com>
Authored: Tue May 22 18:04:25 2018 +0300
Committer: dpavlov <dp...@apache.org>
Committed: Tue May 22 18:04:25 2018 +0300
----------------------------------------------------------------------
...CacheLoadingConcurrentGridStartSelfTest.java | 22 ++++++++++++--------
1 file changed, 13 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/cc5484a9/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheLoadingConcurrentGridStartSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheLoadingConcurrentGridStartSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheLoadingConcurrentGridStartSelfTest.java
index ebc804f..cbd0124 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheLoadingConcurrentGridStartSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheLoadingConcurrentGridStartSelfTest.java
@@ -38,6 +38,7 @@ import org.apache.ignite.configuration.CacheConfiguration;
import org.apache.ignite.configuration.IgniteConfiguration;
import org.apache.ignite.internal.IgniteEx;
import org.apache.ignite.internal.IgniteInternalFuture;
+import org.apache.ignite.internal.processors.datastreamer.DataStreamerImpl;
import org.apache.ignite.internal.util.lang.GridAbsPredicate;
import org.apache.ignite.internal.util.typedef.G;
import org.apache.ignite.internal.util.typedef.P1;
@@ -276,6 +277,8 @@ public class CacheLoadingConcurrentGridStartSelfTest extends GridCommonAbstractT
try (IgniteDataStreamer<Integer, String> dataStreamer = grid.dataStreamer(DEFAULT_CACHE_NAME)) {
dataStreamer.allowOverwrite(allowOverwrite);
+ ((DataStreamerImpl)dataStreamer).maxRemapCount(Integer.MAX_VALUE);
+
for (int i = 0; i < KEYS_CNT; i++) {
set.add(dataStreamer.addData(i, "Data"));
@@ -367,25 +370,26 @@ public class CacheLoadingConcurrentGridStartSelfTest extends GridCommonAbstractT
private void assertCacheSize() throws Exception {
final IgniteCache<Integer, String> cache = grid(0).cache(DEFAULT_CACHE_NAME);
- GridTestUtils.waitForCondition(new GridAbsPredicate() {
+ boolean consistentCache = GridTestUtils.waitForCondition(new GridAbsPredicate() {
@Override public boolean apply() {
int size = cache.size(CachePeekMode.PRIMARY);
if (size != KEYS_CNT)
log.info("Cache size: " + size);
- return size == KEYS_CNT;
- }
- }, 2 * 60_000);
+ int total = 0;
- assertEquals("Data lost.", KEYS_CNT, cache.size(CachePeekMode.PRIMARY));
+ for (int i = 0; i < GRIDS_CNT; i++)
+ total += grid(i).cache(DEFAULT_CACHE_NAME).localSize(CachePeekMode.PRIMARY);
- int total = 0;
+ if (total != KEYS_CNT)
+ log.info("Total size: " + size);
- for (int i = 0; i < GRIDS_CNT; i++)
- total += grid(i).cache(DEFAULT_CACHE_NAME).localSize(CachePeekMode.PRIMARY);
+ return size == KEYS_CNT && KEYS_CNT == total;
+ }
+ }, 2 * 60_000);
- assertEquals("Data lost.", KEYS_CNT, total);
+ assertTrue("Data lost. Actual cache size: " + cache.size(CachePeekMode.PRIMARY), consistentCache);
}
/**
[07/50] [abbrv] ignite git commit: IGNITE-8085 Fix of flaky failures
in Ignite Client Nodes test suite: Remote node could not start. - Fixes
#3767.
Posted by dp...@apache.org.
IGNITE-8085 Fix of flaky failures in Ignite Client Nodes test suite: Remote node could not start. - Fixes #3767.
Signed-off-by: dpavlov <dp...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/fe6e70e3
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/fe6e70e3
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/fe6e70e3
Branch: refs/heads/ignite-5789-1
Commit: fe6e70e3c8d6a6349ea00b7ec99b215945ffce6d
Parents: 5c8d9ff
Author: Fedotov <va...@gmail.com>
Authored: Fri May 18 19:38:34 2018 +0300
Committer: dpavlov <dp...@apache.org>
Committed: Fri May 18 19:38:34 2018 +0300
----------------------------------------------------------------------
.../ignite/internal/util/nodestart/StartNodeCallableImpl.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/fe6e70e3/modules/ssh/src/main/java/org/apache/ignite/internal/util/nodestart/StartNodeCallableImpl.java
----------------------------------------------------------------------
diff --git a/modules/ssh/src/main/java/org/apache/ignite/internal/util/nodestart/StartNodeCallableImpl.java b/modules/ssh/src/main/java/org/apache/ignite/internal/util/nodestart/StartNodeCallableImpl.java
index c9bc7ee..976bb07 100644
--- a/modules/ssh/src/main/java/org/apache/ignite/internal/util/nodestart/StartNodeCallableImpl.java
+++ b/modules/ssh/src/main/java/org/apache/ignite/internal/util/nodestart/StartNodeCallableImpl.java
@@ -82,7 +82,7 @@ public class StartNodeCallableImpl implements StartNodeCallable {
private static final long NODE_START_CHECK_PERIOD = 2000;
/** */
- private static final long NODE_START_CHECK_LIMIT = 5;
+ private static final long NODE_START_CHECK_LIMIT = 25;
/** Specification. */
private final IgniteRemoteStartSpecification spec;
[40/50] [abbrv] ignite git commit: IGNITE-8538 Web Console: Refactor
redirecting to default state.
Posted by dp...@apache.org.
IGNITE-8538 Web Console: Refactor redirecting to default state.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/cee9171f
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/cee9171f
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/cee9171f
Branch: refs/heads/ignite-5789-1
Commit: cee9171f1872ab5e8a589d5678b0d0b6c0a6e4dc
Parents: b4a95e7
Author: Alexey Kuznetsov <ak...@apache.org>
Authored: Wed May 23 10:37:41 2018 +0700
Committer: Alexey Kuznetsov <ak...@apache.org>
Committed: Wed May 23 10:37:41 2018 +0700
----------------------------------------------------------------------
.../page-queries/components/queries-notebook/template.tpl.pug | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/cee9171f/modules/web-console/frontend/app/components/page-queries/components/queries-notebook/template.tpl.pug
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/app/components/page-queries/components/queries-notebook/template.tpl.pug b/modules/web-console/frontend/app/components/page-queries/components/queries-notebook/template.tpl.pug
index 1fef75c..60e0335 100644
--- a/modules/web-console/frontend/app/components/page-queries/components/queries-notebook/template.tpl.pug
+++ b/modules/web-console/frontend/app/components/page-queries/components/queries-notebook/template.tpl.pug
@@ -78,8 +78,8 @@ mixin notebook-rename
mixin notebook-error
h2 Failed to load notebook
- label.col-sm-12 Notebook not accessible any more. Go back to configuration or open to another notebook.
- button.h3.btn.btn-primary(ui-sref='default-state') Back to configuration
+ label.col-sm-12 Notebook not accessible any more. Go back to notebooks list.
+ button.h3.btn.btn-primary(ui-sref='default-state') Leave Notebook
mixin paragraph-rename
.col-sm-6(ng-hide='paragraph.edit')
[46/50] [abbrv] ignite git commit: IGNITE-7809 fixed stable failures
of IgniteWalFlushDefaultSelfTest in Ignite PDS 2 & PDS 2 Direct IO,
new tests were added. - Fixes #3569.
Posted by dp...@apache.org.
IGNITE-7809 fixed stable failures of IgniteWalFlushDefaultSelfTest in Ignite PDS 2 & PDS 2 Direct IO, new tests were added. - Fixes #3569.
Signed-off-by: dpavlov <dp...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/fed2c022
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/fed2c022
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/fed2c022
Branch: refs/heads/ignite-5789-1
Commit: fed2c0226a3031b2ad9ff0816a5933c2eb87ad0f
Parents: b582171
Author: Ilya Lantukh <il...@gridgain.com>
Authored: Wed May 23 18:02:23 2018 +0300
Committer: dpavlov <dp...@apache.org>
Committed: Wed May 23 18:02:23 2018 +0300
----------------------------------------------------------------------
.../wal/FileWriteAheadLogManager.java | 6 ++-
.../wal/FsyncModeFileWriteAheadLogManager.java | 11 +++-
...alFlushBackgroundWithMmapBufferSelfTest.java | 28 ++++++++++
.../db/wal/IgniteWalFlushDefaultSelfTest.java | 35 ------------
.../db/wal/IgniteWalFlushFsyncSelfTest.java | 35 ++++++++++++
...alFlushFsyncWithDedicatedWorkerSelfTest.java | 39 ++++++++++++++
...niteWalFlushFsyncWithMmapBufferSelfTest.java | 28 ++++++++++
...teWalFlushLogOnlyWithMmapBufferSelfTest.java | 28 ++++++++++
...lFlushMultiNodeFailoverAbstractSelfTest.java | 56 +++++++++++++-------
.../ignite/testsuites/IgnitePdsTestSuite2.java | 16 +++++-
10 files changed, 223 insertions(+), 59 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/fed2c022/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/wal/FileWriteAheadLogManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/wal/FileWriteAheadLogManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/wal/FileWriteAheadLogManager.java
index e095f6a..ec9dae4 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/wal/FileWriteAheadLogManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/wal/FileWriteAheadLogManager.java
@@ -360,7 +360,11 @@ public class FileWriteAheadLogManager extends GridCacheSharedManagerAdapter impl
evt = ctx.event();
}
- /** For test purposes only. */
+ /**
+ * For test purposes only.
+ *
+ * @param ioFactory IO factory.
+ */
public void setFileIOFactory(FileIOFactory ioFactory) {
this.ioFactory = ioFactory;
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/fed2c022/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/wal/FsyncModeFileWriteAheadLogManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/wal/FsyncModeFileWriteAheadLogManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/wal/FsyncModeFileWriteAheadLogManager.java
index f582f19..3e906d5 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/wal/FsyncModeFileWriteAheadLogManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/wal/FsyncModeFileWriteAheadLogManager.java
@@ -228,7 +228,7 @@ public class FsyncModeFileWriteAheadLogManager extends GridCacheSharedManagerAda
private volatile long lastTruncatedArchiveIdx = -1L;
/** Factory to provide I/O interfaces for read/write operations with files */
- private final FileIOFactory ioFactory;
+ private FileIOFactory ioFactory;
/** Updater for {@link #currentHnd}, used for verify there are no concurrent update for current log segment handle */
private static final AtomicReferenceFieldUpdater<FsyncModeFileWriteAheadLogManager, FileWriteHandle> currentHndUpd =
@@ -318,6 +318,15 @@ public class FsyncModeFileWriteAheadLogManager extends GridCacheSharedManagerAda
assert mode == WALMode.FSYNC : dsCfg;
}
+ /**
+ * For test purposes only.
+ *
+ * @param ioFactory IO factory.
+ */
+ public void setFileIOFactory(FileIOFactory ioFactory) {
+ this.ioFactory = ioFactory;
+ }
+
/** {@inheritDoc} */
@Override public void start0() throws IgniteCheckedException {
if (!cctx.kernalContext().clientNode()) {
http://git-wip-us.apache.org/repos/asf/ignite/blob/fed2c022/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/IgniteWalFlushBackgroundWithMmapBufferSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/IgniteWalFlushBackgroundWithMmapBufferSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/IgniteWalFlushBackgroundWithMmapBufferSelfTest.java
new file mode 100644
index 0000000..4f021cb
--- /dev/null
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/IgniteWalFlushBackgroundWithMmapBufferSelfTest.java
@@ -0,0 +1,28 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.internal.processors.cache.persistence.db.wal;
+
+/**
+ *
+ */
+public class IgniteWalFlushBackgroundWithMmapBufferSelfTest extends IgniteWalFlushBackgroundSelfTest {
+ /** {@inheritDoc} */
+ @Override protected boolean mmap() {
+ return true;
+ }
+}
http://git-wip-us.apache.org/repos/asf/ignite/blob/fed2c022/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/IgniteWalFlushDefaultSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/IgniteWalFlushDefaultSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/IgniteWalFlushDefaultSelfTest.java
deleted file mode 100644
index 94e7e25..0000000
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/IgniteWalFlushDefaultSelfTest.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ignite.internal.processors.cache.persistence.db.wal;
-
-import org.apache.ignite.configuration.WALMode;
-
-/**
- *
- */
-public class IgniteWalFlushDefaultSelfTest extends IgniteWalFlushMultiNodeFailoverAbstractSelfTest {
- /** {@inheritDoc} */
- @Override protected int gridCount() {
- return 1;
- }
-
- /** {@inheritDoc} */
- @Override protected WALMode walMode() {
- return WALMode.FSYNC;
- }
-}
http://git-wip-us.apache.org/repos/asf/ignite/blob/fed2c022/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/IgniteWalFlushFsyncSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/IgniteWalFlushFsyncSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/IgniteWalFlushFsyncSelfTest.java
new file mode 100644
index 0000000..453064a
--- /dev/null
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/IgniteWalFlushFsyncSelfTest.java
@@ -0,0 +1,35 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.internal.processors.cache.persistence.db.wal;
+
+import org.apache.ignite.configuration.WALMode;
+
+/**
+ *
+ */
+public class IgniteWalFlushFsyncSelfTest extends IgniteWalFlushMultiNodeFailoverAbstractSelfTest {
+ /** {@inheritDoc} */
+ @Override protected int gridCount() {
+ return 1;
+ }
+
+ /** {@inheritDoc} */
+ @Override protected WALMode walMode() {
+ return WALMode.FSYNC;
+ }
+}
http://git-wip-us.apache.org/repos/asf/ignite/blob/fed2c022/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/IgniteWalFlushFsyncWithDedicatedWorkerSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/IgniteWalFlushFsyncWithDedicatedWorkerSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/IgniteWalFlushFsyncWithDedicatedWorkerSelfTest.java
new file mode 100644
index 0000000..4360fe5
--- /dev/null
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/IgniteWalFlushFsyncWithDedicatedWorkerSelfTest.java
@@ -0,0 +1,39 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.internal.processors.cache.persistence.db.wal;
+
+import org.apache.ignite.IgniteSystemProperties;
+
+/**
+ *
+ */
+public class IgniteWalFlushFsyncWithDedicatedWorkerSelfTest extends IgniteWalFlushFsyncSelfTest {
+ /** {@inheritDoc} */
+ @Override protected void beforeTest() throws Exception {
+ System.setProperty(IgniteSystemProperties.IGNITE_WAL_FSYNC_WITH_DEDICATED_WORKER, "true");
+
+ super.beforeTest();
+ }
+
+ /** {@inheritDoc} */
+ @Override protected void afterTest() throws Exception {
+ super.afterTest();
+
+ System.clearProperty(IgniteSystemProperties.IGNITE_WAL_FSYNC_WITH_DEDICATED_WORKER);
+ }
+}
http://git-wip-us.apache.org/repos/asf/ignite/blob/fed2c022/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/IgniteWalFlushFsyncWithMmapBufferSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/IgniteWalFlushFsyncWithMmapBufferSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/IgniteWalFlushFsyncWithMmapBufferSelfTest.java
new file mode 100644
index 0000000..63872ba
--- /dev/null
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/IgniteWalFlushFsyncWithMmapBufferSelfTest.java
@@ -0,0 +1,28 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.internal.processors.cache.persistence.db.wal;
+
+/**
+ *
+ */
+public class IgniteWalFlushFsyncWithMmapBufferSelfTest extends IgniteWalFlushFsyncSelfTest {
+ /** {@inheritDoc} */
+ @Override protected boolean mmap() {
+ return true;
+ }
+}
http://git-wip-us.apache.org/repos/asf/ignite/blob/fed2c022/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/IgniteWalFlushLogOnlyWithMmapBufferSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/IgniteWalFlushLogOnlyWithMmapBufferSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/IgniteWalFlushLogOnlyWithMmapBufferSelfTest.java
new file mode 100644
index 0000000..d1f5075
--- /dev/null
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/IgniteWalFlushLogOnlyWithMmapBufferSelfTest.java
@@ -0,0 +1,28 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.internal.processors.cache.persistence.db.wal;
+
+/**
+ *
+ */
+public class IgniteWalFlushLogOnlyWithMmapBufferSelfTest extends IgniteWalFlushLogOnlySelfTest {
+ /** {@inheritDoc} */
+ @Override protected boolean mmap() {
+ return true;
+ }
+}
http://git-wip-us.apache.org/repos/asf/ignite/blob/fed2c022/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/IgniteWalFlushMultiNodeFailoverAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/IgniteWalFlushMultiNodeFailoverAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/IgniteWalFlushMultiNodeFailoverAbstractSelfTest.java
index cc0986a..c47b046 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/IgniteWalFlushMultiNodeFailoverAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/IgniteWalFlushMultiNodeFailoverAbstractSelfTest.java
@@ -24,20 +24,20 @@ import java.nio.ByteBuffer;
import java.nio.MappedByteBuffer;
import org.apache.ignite.Ignite;
import org.apache.ignite.IgniteCache;
-import org.apache.ignite.IgniteCheckedException;
+import org.apache.ignite.IgniteSystemProperties;
import org.apache.ignite.cache.CacheAtomicityMode;
import org.apache.ignite.configuration.CacheConfiguration;
import org.apache.ignite.configuration.DataRegionConfiguration;
import org.apache.ignite.configuration.DataStorageConfiguration;
import org.apache.ignite.configuration.IgniteConfiguration;
import org.apache.ignite.configuration.WALMode;
-import org.apache.ignite.internal.IgniteKernal;
import org.apache.ignite.internal.pagemem.wal.IgniteWriteAheadLogManager;
import org.apache.ignite.internal.processors.cache.persistence.file.FileIO;
import org.apache.ignite.internal.processors.cache.persistence.file.FileIODecorator;
import org.apache.ignite.internal.processors.cache.persistence.file.FileIOFactory;
import org.apache.ignite.internal.processors.cache.persistence.file.RandomAccessFileIOFactory;
import org.apache.ignite.internal.processors.cache.persistence.wal.FileWriteAheadLogManager;
+import org.apache.ignite.internal.processors.cache.persistence.wal.FsyncModeFileWriteAheadLogManager;
import org.apache.ignite.internal.util.lang.GridAbsPredicate;
import org.apache.ignite.testframework.GridTestUtils;
import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
@@ -72,9 +72,13 @@ public abstract class IgniteWalFlushMultiNodeFailoverAbstractSelfTest extends Gr
/** {@inheritDoc} */
@Override protected void beforeTest() throws Exception {
+ super.beforeTest();
+
stopAllGrids();
cleanPersistenceDir();
+
+ System.setProperty(IgniteSystemProperties.IGNITE_WAL_MMAP, Boolean.toString(mmap()));
}
/** {@inheritDoc} */
@@ -82,6 +86,10 @@ public abstract class IgniteWalFlushMultiNodeFailoverAbstractSelfTest extends Gr
stopAllGrids();
cleanPersistenceDir();
+
+ System.clearProperty(IgniteSystemProperties.IGNITE_WAL_MMAP);
+
+ super.afterTest();
}
/** {@inheritDoc} */
@@ -89,9 +97,18 @@ public abstract class IgniteWalFlushMultiNodeFailoverAbstractSelfTest extends Gr
return 60_000;
}
- /** {@inheritDoc} */
+ /**
+ * @return WAL mode used in test.
+ */
protected abstract WALMode walMode();
+ /**
+ * @return {@code True} if test should use MMAP buffer mode.
+ */
+ protected boolean mmap() {
+ return false;
+ }
+
/** {@inheritDoc} */
@Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception {
IgniteConfiguration cfg = super.getConfiguration(gridName);
@@ -138,14 +155,7 @@ public abstract class IgniteWalFlushMultiNodeFailoverAbstractSelfTest extends Gr
public void failWhilePut(boolean failWhileStart) throws Exception {
final Ignite grid = startGridsMultiThreaded(gridCount());
- IgniteWriteAheadLogManager wal = ((IgniteKernal)grid).context().cache().context().wal();
-
- boolean mmap = GridTestUtils.getFieldValue(wal, "mmap");
-
- if (mmap)
- return;
-
- grid.active(true);
+ grid.cluster().active(true);
IgniteCache<Object, Object> cache = grid.cache(TEST_CACHE);
@@ -170,9 +180,7 @@ public abstract class IgniteWalFlushMultiNodeFailoverAbstractSelfTest extends Gr
startGrid(gridCount());
- FileWriteAheadLogManager wal0 = (FileWriteAheadLogManager)grid(gridCount()).context().cache().context().wal();
-
- wal0.setFileIOFactory(new FailingFileIOFactory(canFail));
+ setFileIOFactory(grid(gridCount()).context().cache().context().wal());
grid.cluster().setBaselineTopology(grid.cluster().topologyVersion());
@@ -186,7 +194,6 @@ public abstract class IgniteWalFlushMultiNodeFailoverAbstractSelfTest extends Gr
canFail.set(true);
}
-
// We should await successful stop of node.
GridTestUtils.waitForCondition(new GridAbsPredicate() {
@Override public boolean apply() {
@@ -200,11 +207,9 @@ public abstract class IgniteWalFlushMultiNodeFailoverAbstractSelfTest extends Gr
Ignite grid0 = startGrids(gridCount() + 1);
- FileWriteAheadLogManager wal0 = (FileWriteAheadLogManager)grid(gridCount()).context().cache().context().wal();
+ setFileIOFactory(grid(gridCount()).context().cache().context().wal());
- wal0.setFileIOFactory(new FailingFileIOFactory(canFail));
-
- grid0.active(true);
+ grid0.cluster().active(true);
cache = grid0.cache(TEST_CACHE);
@@ -212,6 +217,16 @@ public abstract class IgniteWalFlushMultiNodeFailoverAbstractSelfTest extends Gr
assertEquals(cache.get(i), "testValue" + i);
}
+ /** */
+ private void setFileIOFactory(IgniteWriteAheadLogManager wal) {
+ if (wal instanceof FileWriteAheadLogManager)
+ ((FileWriteAheadLogManager)wal).setFileIOFactory(new FailingFileIOFactory(canFail));
+ else if (wal instanceof FsyncModeFileWriteAheadLogManager)
+ ((FsyncModeFileWriteAheadLogManager)wal).setFileIOFactory(new FailingFileIOFactory(canFail));
+ else
+ fail(wal.getClass().toString());
+ }
+
/**
* Create File I/O which fails after second attempt to write to File
*/
@@ -220,7 +235,7 @@ public abstract class IgniteWalFlushMultiNodeFailoverAbstractSelfTest extends Gr
private static final long serialVersionUID = 0L;
/** */
- private AtomicBoolean fail;
+ private final AtomicBoolean fail;
/** */
private final FileIOFactory delegateFactory = new RandomAccessFileIOFactory();
@@ -242,6 +257,7 @@ public abstract class IgniteWalFlushMultiNodeFailoverAbstractSelfTest extends Gr
return new FileIODecorator(delegate) {
int writeAttempts = 2;
+ /** {@inheritDoc} */
@Override public int write(ByteBuffer srcBuf) throws IOException {
if (--writeAttempts <= 0 && fail != null && fail.get())
throw new IOException("No space left on device");
http://git-wip-us.apache.org/repos/asf/ignite/blob/fed2c022/modules/core/src/test/java/org/apache/ignite/testsuites/IgnitePdsTestSuite2.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgnitePdsTestSuite2.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgnitePdsTestSuite2.java
index 5a2abe8..95a9529 100644
--- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgnitePdsTestSuite2.java
+++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgnitePdsTestSuite2.java
@@ -41,9 +41,13 @@ import org.apache.ignite.internal.processors.cache.persistence.db.checkpoint.Ign
import org.apache.ignite.internal.processors.cache.persistence.db.IgnitePdsUnusedWalSegmentsTest;
import org.apache.ignite.internal.processors.cache.persistence.db.filename.IgniteUidAsConsistentIdMigrationTest;
import org.apache.ignite.internal.processors.cache.persistence.db.wal.IgniteWalFlushBackgroundSelfTest;
-import org.apache.ignite.internal.processors.cache.persistence.db.wal.IgniteWalFlushDefaultSelfTest;
+import org.apache.ignite.internal.processors.cache.persistence.db.wal.IgniteWalFlushBackgroundWithMmapBufferSelfTest;
+import org.apache.ignite.internal.processors.cache.persistence.db.wal.IgniteWalFlushFsyncSelfTest;
import org.apache.ignite.internal.processors.cache.persistence.db.wal.IgniteWalFlushFailoverTest;
+import org.apache.ignite.internal.processors.cache.persistence.db.wal.IgniteWalFlushFsyncWithDedicatedWorkerSelfTest;
+import org.apache.ignite.internal.processors.cache.persistence.db.wal.IgniteWalFlushFsyncWithMmapBufferSelfTest;
import org.apache.ignite.internal.processors.cache.persistence.db.wal.IgniteWalFlushLogOnlySelfTest;
+import org.apache.ignite.internal.processors.cache.persistence.db.wal.IgniteWalFlushLogOnlyWithMmapBufferSelfTest;
import org.apache.ignite.internal.processors.cache.persistence.db.wal.IgniteWalHistoryReservationsTest;
import org.apache.ignite.internal.processors.cache.persistence.db.wal.IgniteWalSerializerVersionTest;
import org.apache.ignite.internal.processors.cache.persistence.db.wal.WalCompactionTest;
@@ -125,12 +129,20 @@ public class IgnitePdsTestSuite2 extends TestSuite {
// Failover test
suite.addTestSuite(IgniteWalFlushFailoverTest.class);
- suite.addTestSuite(IgniteWalFlushDefaultSelfTest.class);
+ suite.addTestSuite(IgniteWalFlushFsyncSelfTest.class);
+
+ suite.addTestSuite(IgniteWalFlushFsyncWithDedicatedWorkerSelfTest.class);
+
+ suite.addTestSuite(IgniteWalFlushFsyncWithMmapBufferSelfTest.class);
suite.addTestSuite(IgniteWalFlushBackgroundSelfTest.class);
+ suite.addTestSuite(IgniteWalFlushBackgroundWithMmapBufferSelfTest.class);
+
suite.addTestSuite(IgniteWalFlushLogOnlySelfTest.class);
+ suite.addTestSuite(IgniteWalFlushLogOnlyWithMmapBufferSelfTest.class);
+
// Test suite uses Standalone WAL iterator to verify PDS content.
suite.addTestSuite(IgniteWalReaderTest.class);
[34/50] [abbrv] ignite git commit: IGNITE-7776 Change calculated
values in javadoc to avoid int overflow, this closes #3553
Posted by dp...@apache.org.
http://git-wip-us.apache.org/repos/asf/ignite/blob/ce8e31e2/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/IgniteWalHistoryReservationsTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/IgniteWalHistoryReservationsTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/IgniteWalHistoryReservationsTest.java
index e2c8bd1..e84563a 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/IgniteWalHistoryReservationsTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/IgniteWalHistoryReservationsTest.java
@@ -63,7 +63,7 @@ public class IgniteWalHistoryReservationsTest extends GridCommonAbstractTest {
DataStorageConfiguration memCfg = new DataStorageConfiguration()
.setDefaultDataRegionConfiguration(
new DataRegionConfiguration()
- .setMaxSize(200 * 1024 * 1024)
+ .setMaxSize(200L * 1024 * 1024)
.setPersistenceEnabled(true))
.setWalMode(WALMode.LOG_ONLY)
.setWalSegmentSize(512 * 1024);
http://git-wip-us.apache.org/repos/asf/ignite/blob/ce8e31e2/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/IgniteWalRecoveryPPCTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/IgniteWalRecoveryPPCTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/IgniteWalRecoveryPPCTest.java
index c67155b..d3e6278 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/IgniteWalRecoveryPPCTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/IgniteWalRecoveryPPCTest.java
@@ -85,16 +85,16 @@ public class IgniteWalRecoveryPPCTest extends GridCommonAbstractTest {
dbCfg.setPageSize(4 * 1024);
DataRegionConfiguration memPlcCfg = new DataRegionConfiguration();
- memPlcCfg.setInitialSize(1024 * 1024 * 1024);
- memPlcCfg.setMaxSize(1024 * 1024 * 1024);
+ memPlcCfg.setInitialSize(1024L * 1024 * 1024);
+ memPlcCfg.setMaxSize(1024L * 1024 * 1024);
memPlcCfg.setPersistenceEnabled(true);
dbCfg.setDefaultDataRegionConfiguration(memPlcCfg);
DataRegionConfiguration memPlcCfg2 = new DataRegionConfiguration();
memPlcCfg2.setName(MEM_PLC_NO_PDS);
- memPlcCfg2.setInitialSize(1024 * 1024 * 1024);
- memPlcCfg2.setMaxSize(1024 * 1024 * 1024);
+ memPlcCfg2.setInitialSize(1024L * 1024 * 1024);
+ memPlcCfg2.setMaxSize(1024L * 1024 * 1024);
memPlcCfg2.setPersistenceEnabled(false);
dbCfg.setDataRegionConfigurations(memPlcCfg2);
http://git-wip-us.apache.org/repos/asf/ignite/blob/ce8e31e2/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/IgniteWalRecoverySeveralRestartsTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/IgniteWalRecoverySeveralRestartsTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/IgniteWalRecoverySeveralRestartsTest.java
index 2086270..db20ace 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/IgniteWalRecoverySeveralRestartsTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/IgniteWalRecoverySeveralRestartsTest.java
@@ -79,7 +79,7 @@ public class IgniteWalRecoverySeveralRestartsTest extends GridCommonAbstractTest
DataStorageConfiguration memCfg = new DataStorageConfiguration()
.setDefaultDataRegionConfiguration(
- new DataRegionConfiguration().setMaxSize(500 * 1024 * 1024).setPersistenceEnabled(true))
+ new DataRegionConfiguration().setMaxSize(500L * 1024 * 1024).setPersistenceEnabled(true))
.setWalMode(WALMode.LOG_ONLY)
.setPageSize(PAGE_SIZE);
http://git-wip-us.apache.org/repos/asf/ignite/blob/ce8e31e2/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/IgniteWalRecoveryTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/IgniteWalRecoveryTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/IgniteWalRecoveryTest.java
index dbb91ee..116f174 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/IgniteWalRecoveryTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/IgniteWalRecoveryTest.java
@@ -143,8 +143,8 @@ public class IgniteWalRecoveryTest extends GridCommonAbstractTest {
DataRegionConfiguration memPlcCfg = new DataRegionConfiguration();
memPlcCfg.setName("dfltDataRegion");
- memPlcCfg.setInitialSize(1024 * 1024 * 1024);
- memPlcCfg.setMaxSize(1024 * 1024 * 1024);
+ memPlcCfg.setInitialSize(1024L * 1024 * 1024);
+ memPlcCfg.setMaxSize(1024L * 1024 * 1024);
memPlcCfg.setPersistenceEnabled(true);
dbCfg.setDefaultDataRegionConfiguration(memPlcCfg);
http://git-wip-us.apache.org/repos/asf/ignite/blob/ce8e31e2/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/IgniteWalSerializerVersionTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/IgniteWalSerializerVersionTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/IgniteWalSerializerVersionTest.java
index 7990d06..dcb8e7f 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/IgniteWalSerializerVersionTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/IgniteWalSerializerVersionTest.java
@@ -68,7 +68,7 @@ public class IgniteWalSerializerVersionTest extends GridCommonAbstractTest {
cfg.setDataStorageConfiguration(new DataStorageConfiguration()
.setDefaultDataRegionConfiguration(new DataRegionConfiguration()
.setPersistenceEnabled(true)
- .setMaxSize(100 * 1024 * 1024)));
+ .setMaxSize(100L * 1024 * 1024)));
return cfg;
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/ce8e31e2/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/WalCompactionTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/WalCompactionTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/WalCompactionTest.java
index 26c5ac5..2351178 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/WalCompactionTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/WalCompactionTest.java
@@ -73,7 +73,7 @@ public class WalCompactionTest extends GridCommonAbstractTest {
cfg.setDataStorageConfiguration(new DataStorageConfiguration()
.setDefaultDataRegionConfiguration(new DataRegionConfiguration()
.setPersistenceEnabled(true)
- .setMaxSize(200 * 1024 * 1024))
+ .setMaxSize(200L * 1024 * 1024))
.setWalMode(walMode)
.setWalSegmentSize(WAL_SEGMENT_SIZE)
.setWalHistorySize(500)
http://git-wip-us.apache.org/repos/asf/ignite/blob/ce8e31e2/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/WalRecoveryTxLogicalRecordsTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/WalRecoveryTxLogicalRecordsTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/WalRecoveryTxLogicalRecordsTest.java
index 7a50c0d..4493b4e 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/WalRecoveryTxLogicalRecordsTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/WalRecoveryTxLogicalRecordsTest.java
@@ -115,7 +115,7 @@ public class WalRecoveryTxLogicalRecordsTest extends GridCommonAbstractTest {
dbCfg.setWalHistorySize(WAL_HIST_SIZE);
dbCfg.setDefaultDataRegionConfiguration(new DataRegionConfiguration()
- .setMaxSize(100 * 1024 * 1024)
+ .setMaxSize(100L * 1024 * 1024)
.setPersistenceEnabled(true));
if (checkpointFreq != null)
http://git-wip-us.apache.org/repos/asf/ignite/blob/ce8e31e2/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/reader/IgniteWalReaderTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/reader/IgniteWalReaderTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/reader/IgniteWalReaderTest.java
index 28f049a..619cc00 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/reader/IgniteWalReaderTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/reader/IgniteWalReaderTest.java
@@ -140,7 +140,7 @@ public class IgniteWalReaderTest extends GridCommonAbstractTest {
DataStorageConfiguration dsCfg = new DataStorageConfiguration()
.setDefaultDataRegionConfiguration(
- new DataRegionConfiguration().setMaxSize(1024 * 1024 * 1024).setPersistenceEnabled(true))
+ new DataRegionConfiguration().setMaxSize(1024L * 1024 * 1024).setPersistenceEnabled(true))
.setPageSize(PAGE_SIZE)
.setWalHistorySize(1)
.setWalSegmentSize(1024 * 1024)
http://git-wip-us.apache.org/repos/asf/ignite/blob/ce8e31e2/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/pagemem/PagesWriteThrottleSmokeTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/pagemem/PagesWriteThrottleSmokeTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/pagemem/PagesWriteThrottleSmokeTest.java
index 249718b..f0937e8 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/pagemem/PagesWriteThrottleSmokeTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/pagemem/PagesWriteThrottleSmokeTest.java
@@ -76,8 +76,8 @@ public class PagesWriteThrottleSmokeTest extends GridCommonAbstractTest {
DataStorageConfiguration dbCfg = new DataStorageConfiguration()
.setDefaultDataRegionConfiguration(new DataRegionConfiguration()
- .setMaxSize(400 * 1024 * 1024)
- .setCheckpointPageBufferSize(200 * 1000 * 1000)
+ .setMaxSize(400L * 1024 * 1024)
+ .setCheckpointPageBufferSize(200L * 1000 * 1000)
.setName("dfltDataRegion")
.setMetricsEnabled(true)
.setPersistenceEnabled(true))
http://git-wip-us.apache.org/repos/asf/ignite/blob/ce8e31e2/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/standbycluster/IgniteChangeGlobalStateAbstractTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/standbycluster/IgniteChangeGlobalStateAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/standbycluster/IgniteChangeGlobalStateAbstractTest.java
index c30c8e9..016b6a4 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/standbycluster/IgniteChangeGlobalStateAbstractTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/standbycluster/IgniteChangeGlobalStateAbstractTest.java
@@ -353,7 +353,7 @@ public abstract class IgniteChangeGlobalStateAbstractTest extends GridCommonAbst
pCfg.setWalMode(WALMode.LOG_ONLY);
pCfg.setDefaultDataRegionConfiguration(
- new DataRegionConfiguration().setMaxSize(200 * 1024 * 1024).setPersistenceEnabled(true));
+ new DataRegionConfiguration().setMaxSize(200L * 1024 * 1024).setPersistenceEnabled(true));
cfg.setDataStorageConfiguration(pCfg);
http://git-wip-us.apache.org/repos/asf/ignite/blob/ce8e31e2/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/standbycluster/IgniteStandByClusterTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/standbycluster/IgniteStandByClusterTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/standbycluster/IgniteStandByClusterTest.java
index c62565f..1427e70 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/standbycluster/IgniteStandByClusterTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/standbycluster/IgniteStandByClusterTest.java
@@ -70,7 +70,7 @@ public class IgniteStandByClusterTest extends GridCommonAbstractTest {
cfg.setDataStorageConfiguration(new DataStorageConfiguration()
.setDefaultDataRegionConfiguration(new DataRegionConfiguration()
- .setMaxSize(100 * 1024 * 1024)
+ .setMaxSize(100L * 1024 * 1024)
.setPersistenceEnabled(true)));
cfg.setConsistentId(igniteInstanceName);
http://git-wip-us.apache.org/repos/asf/ignite/blob/ce8e31e2/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/standbycluster/extended/GridActivateExtensionTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/standbycluster/extended/GridActivateExtensionTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/standbycluster/extended/GridActivateExtensionTest.java
index 2ebff5b..1ca79fd 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/standbycluster/extended/GridActivateExtensionTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/standbycluster/extended/GridActivateExtensionTest.java
@@ -68,7 +68,7 @@ public class GridActivateExtensionTest extends GridCacheAbstractFullApiSelfTest
pCfg.setWalPath(testName + "/db/wal");
pCfg.setDefaultDataRegionConfiguration(
- new DataRegionConfiguration().setMaxSize(200 * 1024 * 1024).setPersistenceEnabled(true));
+ new DataRegionConfiguration().setMaxSize(200L * 1024 * 1024).setPersistenceEnabled(true));
pCfg.setWalMode(WALMode.LOG_ONLY);
http://git-wip-us.apache.org/repos/asf/ignite/blob/ce8e31e2/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/standbycluster/reconnect/IgniteAbstractStandByClientReconnectTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/standbycluster/reconnect/IgniteAbstractStandByClientReconnectTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/standbycluster/reconnect/IgniteAbstractStandByClientReconnectTest.java
index 954e0c6..9590112 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/standbycluster/reconnect/IgniteAbstractStandByClientReconnectTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/standbycluster/reconnect/IgniteAbstractStandByClientReconnectTest.java
@@ -144,7 +144,7 @@ public abstract class IgniteAbstractStandByClientReconnectTest extends GridCommo
cfg.setDataStorageConfiguration(new DataStorageConfiguration()
.setDefaultDataRegionConfiguration(new DataRegionConfiguration()
- .setMaxSize(100 * 1024 * 1024)
+ .setMaxSize(100L * 1024 * 1024)
.setPersistenceEnabled(true)));
cfg.setConsistentId(name);
http://git-wip-us.apache.org/repos/asf/ignite/blob/ce8e31e2/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/transactions/TxDeadlockCauseTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/transactions/TxDeadlockCauseTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/transactions/TxDeadlockCauseTest.java
index f7ba603..8f5ee30 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/transactions/TxDeadlockCauseTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/transactions/TxDeadlockCauseTest.java
@@ -62,7 +62,7 @@ public class TxDeadlockCauseTest extends GridCommonAbstractTest {
}
DataStorageConfiguration memCfg = new DataStorageConfiguration().setDefaultDataRegionConfiguration(
- new DataRegionConfiguration().setMaxSize(100 * 1024 * 1024));
+ new DataRegionConfiguration().setMaxSize(100L * 1024 * 1024));
cfg.setDataStorageConfiguration(memCfg);
http://git-wip-us.apache.org/repos/asf/ignite/blob/ce8e31e2/modules/core/src/test/java/org/apache/ignite/internal/processors/database/IgniteDbDynamicCacheSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/database/IgniteDbDynamicCacheSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/database/IgniteDbDynamicCacheSelfTest.java
index eecf23c..126ed5f 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/database/IgniteDbDynamicCacheSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/database/IgniteDbDynamicCacheSelfTest.java
@@ -40,7 +40,7 @@ public class IgniteDbDynamicCacheSelfTest extends GridCommonAbstractTest {
IgniteConfiguration cfg = super.getConfiguration(gridName);
DataStorageConfiguration memCfg = new DataStorageConfiguration().setDefaultDataRegionConfiguration(
- new DataRegionConfiguration().setMaxSize(200 * 1024 * 1024).setPersistenceEnabled(true));
+ new DataRegionConfiguration().setMaxSize(200L * 1024 * 1024).setPersistenceEnabled(true));
cfg.setDataStorageConfiguration(memCfg);
http://git-wip-us.apache.org/repos/asf/ignite/blob/ce8e31e2/modules/core/src/test/java/org/apache/ignite/internal/processors/database/IgniteDbPutGetWithCacheStoreTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/database/IgniteDbPutGetWithCacheStoreTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/database/IgniteDbPutGetWithCacheStoreTest.java
index 0fc311f..3238acf 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/database/IgniteDbPutGetWithCacheStoreTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/database/IgniteDbPutGetWithCacheStoreTest.java
@@ -59,7 +59,7 @@ public class IgniteDbPutGetWithCacheStoreTest extends GridCommonAbstractTest {
dbCfg
.setDefaultDataRegionConfiguration(
new DataRegionConfiguration()
- .setMaxSize(512 * 1024 * 1024)
+ .setMaxSize(512L * 1024 * 1024)
.setPersistenceEnabled(true))
.setWalMode(WALMode.LOG_ONLY);
http://git-wip-us.apache.org/repos/asf/ignite/blob/ce8e31e2/modules/core/src/test/java/org/apache/ignite/internal/processors/database/IndexStorageSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/database/IndexStorageSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/database/IndexStorageSelfTest.java
index 04bea54..b92534c 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/database/IndexStorageSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/database/IndexStorageSelfTest.java
@@ -157,7 +157,7 @@ public class IndexStorageSelfTest extends GridCommonAbstractTest {
DirectMemoryProvider provider = new MappedFileMemoryProvider(log(), allocationPath);
DataRegionConfiguration plcCfg = new DataRegionConfiguration()
- .setMaxSize(30 * 1024 * 1024).setInitialSize(30 * 1024 * 1024);
+ .setMaxSize(30L * 1024 * 1024).setInitialSize(30L * 1024 * 1024);
return new PageMemoryNoStoreImpl(
log,
http://git-wip-us.apache.org/repos/asf/ignite/blob/ce8e31e2/modules/core/src/test/java/org/apache/ignite/internal/processors/database/SwapPathConstructionSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/database/SwapPathConstructionSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/database/SwapPathConstructionSelfTest.java
index 177bcbe..5910a35 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/database/SwapPathConstructionSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/database/SwapPathConstructionSelfTest.java
@@ -138,7 +138,7 @@ public class SwapPathConstructionSelfTest extends GridCommonAbstractTest {
DataRegionConfiguration memPlcCfg = new DataRegionConfiguration();
memPlcCfg.setName("default");
- memPlcCfg.setMaxSize(20 * 1024 * 1024);
+ memPlcCfg.setMaxSize(20L * 1024 * 1024);
if (isRelativePath)
memPlcCfg.setSwapPath(RELATIVE_SWAP_PATH);
http://git-wip-us.apache.org/repos/asf/ignite/blob/ce8e31e2/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsAbstractBaseSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsAbstractBaseSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsAbstractBaseSelfTest.java
index acc6742..f4ac529 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsAbstractBaseSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsAbstractBaseSelfTest.java
@@ -75,7 +75,7 @@ public abstract class IgfsAbstractBaseSelfTest extends IgfsCommonAbstractTest {
protected static final int IGFS_BLOCK_SIZE = 512 * 1024;
/** Default block size (32Mb). */
- protected static final long BLOCK_SIZE = 32 * 1024 * 1024;
+ protected static final long BLOCK_SIZE = 32L * 1024 * 1024;
/** Default repeat count. */
protected static final int REPEAT_CNT = 5; // Diagnostic: up to 500; Regression: 5
http://git-wip-us.apache.org/repos/asf/ignite/blob/ce8e31e2/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsLocalSecondaryFileSystemProxySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsLocalSecondaryFileSystemProxySelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsLocalSecondaryFileSystemProxySelfTest.java
index 5b0a8df..ef3bf18 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsLocalSecondaryFileSystemProxySelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsLocalSecondaryFileSystemProxySelfTest.java
@@ -226,7 +226,7 @@ public class IgfsLocalSecondaryFileSystemProxySelfTest extends IgfsProxySelfTest
public void testAffinityMaxLen() throws Exception {
awaitPartitionMapExchange();
- long fileSize = 32 * 1024 * 1024;
+ long fileSize = 32L * 1024 * 1024;
IgfsPath filePath = new IgfsPath("/file");
http://git-wip-us.apache.org/repos/asf/ignite/blob/ce8e31e2/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsSizeSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsSizeSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsSizeSelfTest.java
index d891ee4..d37cd9c 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsSizeSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/igfs/IgfsSizeSelfTest.java
@@ -389,7 +389,7 @@ public class IgfsSizeSelfTest extends IgfsCommonAbstractTest {
* @throws Exception If failed.
*/
private void checkOversize() throws Exception {
- final long maxSize = 32 * 1024 * 1024;
+ final long maxSize = 32L * 1024 * 1024;
memIgfsdDataPlcSetter = new IgniteInClosure<IgniteConfiguration>() {
@Override public void apply(IgniteConfiguration cfg) {
http://git-wip-us.apache.org/repos/asf/ignite/blob/ce8e31e2/modules/core/src/test/java/org/apache/ignite/internal/util/offheap/GridOffHeapMapAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/util/offheap/GridOffHeapMapAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/util/offheap/GridOffHeapMapAbstractSelfTest.java
index a772cde..b0c6037 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/util/offheap/GridOffHeapMapAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/util/offheap/GridOffHeapMapAbstractSelfTest.java
@@ -60,7 +60,7 @@ public abstract class GridOffHeapMapAbstractSelfTest extends GridCommonAbstractT
protected GridOffHeapEvictListener evictLsnr;
/** */
- protected long mem = 20 * 1024 * 1024;
+ protected long mem = 20L * 1024 * 1024;
/** */
protected int loadCnt = 100000;
http://git-wip-us.apache.org/repos/asf/ignite/blob/ce8e31e2/modules/core/src/test/java/org/apache/ignite/internal/util/offheap/GridOffHeapPartitionedMapAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/util/offheap/GridOffHeapPartitionedMapAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/util/offheap/GridOffHeapPartitionedMapAbstractSelfTest.java
index 3b68d24..9447970 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/util/offheap/GridOffHeapPartitionedMapAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/util/offheap/GridOffHeapPartitionedMapAbstractSelfTest.java
@@ -60,7 +60,7 @@ public abstract class GridOffHeapPartitionedMapAbstractSelfTest extends GridComm
protected GridOffHeapEvictListener evictLsnr;
/** */
- protected long mem = 20 * 1024 * 1024;
+ protected long mem = 20L * 1024 * 1024;
/** */
protected int loadCnt = 100000;
http://git-wip-us.apache.org/repos/asf/ignite/blob/ce8e31e2/modules/core/src/test/java/org/apache/ignite/util/GridCommandHandlerTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/util/GridCommandHandlerTest.java b/modules/core/src/test/java/org/apache/ignite/util/GridCommandHandlerTest.java
index 80271c7..8b98ae6 100644
--- a/modules/core/src/test/java/org/apache/ignite/util/GridCommandHandlerTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/util/GridCommandHandlerTest.java
@@ -131,7 +131,7 @@ public class GridCommandHandlerTest extends GridCommonAbstractTest {
cfg.setConnectorConfiguration(new ConnectorConfiguration());
DataStorageConfiguration memCfg = new DataStorageConfiguration().setDefaultDataRegionConfiguration(
- new DataRegionConfiguration().setMaxSize(100 * 1024 * 1024));
+ new DataRegionConfiguration().setMaxSize(100L * 1024 * 1024));
cfg.setDataStorageConfiguration(memCfg);
http://git-wip-us.apache.org/repos/asf/ignite/blob/ce8e31e2/modules/core/src/test/java/org/apache/ignite/util/GridTopologyHeapSizeSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/util/GridTopologyHeapSizeSelfTest.java b/modules/core/src/test/java/org/apache/ignite/util/GridTopologyHeapSizeSelfTest.java
index 8279ee4..c8e4619 100644
--- a/modules/core/src/test/java/org/apache/ignite/util/GridTopologyHeapSizeSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/util/GridTopologyHeapSizeSelfTest.java
@@ -107,8 +107,8 @@ public class GridTopologyHeapSizeSelfTest extends GridCommonAbstractTest {
private GridTestNode getNode(String mac, int pid) {
ClusterMetricsSnapshot metrics = new ClusterMetricsSnapshot();
- metrics.setHeapMemoryMaximum(1024 * 1024 * 1024);
- metrics.setHeapMemoryInitialized(1024 * 1024 * 1024);
+ metrics.setHeapMemoryMaximum(1024L * 1024 * 1024);
+ metrics.setHeapMemoryInitialized(1024L * 1024 * 1024);
GridTestNode node = new GridTestNode(UUID.randomUUID(), metrics);
http://git-wip-us.apache.org/repos/asf/ignite/blob/ce8e31e2/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/HadoopPopularWordsTest.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/HadoopPopularWordsTest.java b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/HadoopPopularWordsTest.java
index 5a55430..8d46483 100644
--- a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/HadoopPopularWordsTest.java
+++ b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/HadoopPopularWordsTest.java
@@ -201,7 +201,7 @@ public class HadoopPopularWordsTest {
// replaces it with the calculated value based on input split size option.
if ("local".equals(cfg.get("mapred.job.tracker", "local"))) {
// Split job into tasks using 32MB split size.
- FileInputFormat.setMinInputSplitSize(jobCfg, 32 * 1024 * 1024);
+ FileInputFormat.setMinInputSplitSize(jobCfg, 32L * 1024 * 1024);
FileInputFormat.setMaxInputSplitSize(jobCfg, Long.MAX_VALUE);
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/ce8e31e2/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/Hadoop1OverIgfsProxyTest.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/Hadoop1OverIgfsProxyTest.java b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/Hadoop1OverIgfsProxyTest.java
index c7c792d..73dadcd 100644
--- a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/Hadoop1OverIgfsProxyTest.java
+++ b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/Hadoop1OverIgfsProxyTest.java
@@ -39,7 +39,7 @@ public class Hadoop1OverIgfsProxyTest extends Hadoop1DualAbstractTest {
* @throws Exception If failed.
*/
public void testAffinity() throws Exception {
- long fileSize = 32 * 1024 * 1024;
+ long fileSize = 32L * 1024 * 1024;
IgfsPath filePath = new IgfsPath("/file");
http://git-wip-us.apache.org/repos/asf/ignite/blob/ce8e31e2/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/IgfsNearOnlyMultiNodeSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/IgfsNearOnlyMultiNodeSelfTest.java b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/IgfsNearOnlyMultiNodeSelfTest.java
index 7a5690c..d3df289 100644
--- a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/IgfsNearOnlyMultiNodeSelfTest.java
+++ b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/impl/igfs/IgfsNearOnlyMultiNodeSelfTest.java
@@ -170,10 +170,10 @@ public class IgfsNearOnlyMultiNodeSelfTest extends GridCommonAbstractTest {
try (FileSystem fs = FileSystem.get(getFileSystemURI(0), getFileSystemConfig())) {
Collection<IgniteBiTuple<String, Long>> files = F.asList(
F.t("/dir1/dir2/file1", 1024L),
- F.t("/dir1/dir2/file2", 8 * 1024L),
- F.t("/dir1/file1", 1024 * 1024L),
- F.t("/dir1/file2", 5 * 1024 * 1024L),
- F.t("/file1", 64 * 1024L + 13),
+ F.t("/dir1/dir2/file2", 8L * 1024),
+ F.t("/dir1/file1", 1024L * 1024),
+ F.t("/dir1/file2", 5L * 1024 * 1024),
+ F.t("/file1", 64L * 1024 + 13),
F.t("/file2", 13L),
F.t("/file3", 123764L)
);
http://git-wip-us.apache.org/repos/asf/ignite/blob/ce8e31e2/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCheckClusterStateBeforeExecuteQueryTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCheckClusterStateBeforeExecuteQueryTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCheckClusterStateBeforeExecuteQueryTest.java
index 3a34fc7..7f155ed 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCheckClusterStateBeforeExecuteQueryTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCheckClusterStateBeforeExecuteQueryTest.java
@@ -49,7 +49,7 @@ public class IgniteCheckClusterStateBeforeExecuteQueryTest extends GridCommonAbs
pCfg.setDefaultDataRegionConfiguration(new DataRegionConfiguration()
.setPersistenceEnabled(true)
- .setMaxSize(100 * 1024 * 1024));
+ .setMaxSize(100L * 1024 * 1024));
cfg.setDataStorageConfiguration(pCfg);
http://git-wip-us.apache.org/repos/asf/ignite/blob/ce8e31e2/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteErrorOnRebalanceTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteErrorOnRebalanceTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteErrorOnRebalanceTest.java
index a9f927b..98aa4aa 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteErrorOnRebalanceTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteErrorOnRebalanceTest.java
@@ -64,7 +64,7 @@ public class IgniteErrorOnRebalanceTest extends GridCommonAbstractTest {
DataStorageConfiguration memCfg = new DataStorageConfiguration()
.setDefaultDataRegionConfiguration(
- new DataRegionConfiguration().setMaxSize(100 * 1024 * 1024).setPersistenceEnabled(true))
+ new DataRegionConfiguration().setMaxSize(100L * 1024 * 1024).setPersistenceEnabled(true))
.setPageSize(1024)
.setWalMode(WALMode.LOG_ONLY);
http://git-wip-us.apache.org/repos/asf/ignite/blob/ce8e31e2/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/IgniteCacheDistributedPartitionQueryAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/IgniteCacheDistributedPartitionQueryAbstractSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/IgniteCacheDistributedPartitionQueryAbstractSelfTest.java
index ad07029..b66f6c4 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/IgniteCacheDistributedPartitionQueryAbstractSelfTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/IgniteCacheDistributedPartitionQueryAbstractSelfTest.java
@@ -138,7 +138,7 @@ public abstract class IgniteCacheDistributedPartitionQueryAbstractSelfTest exten
IgniteConfiguration cfg = super.getConfiguration(gridName);
DataStorageConfiguration memCfg = new DataStorageConfiguration().setDefaultDataRegionConfiguration(
- new DataRegionConfiguration().setMaxSize(20 * 1024 * 1024));
+ new DataRegionConfiguration().setMaxSize(20L * 1024 * 1024));
cfg.setDataStorageConfiguration(memCfg);
http://git-wip-us.apache.org/repos/asf/ignite/blob/ce8e31e2/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/IgniteCacheQueryNodeRestartSelfTest2.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/IgniteCacheQueryNodeRestartSelfTest2.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/IgniteCacheQueryNodeRestartSelfTest2.java
index a8d1e34..834a732 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/IgniteCacheQueryNodeRestartSelfTest2.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/IgniteCacheQueryNodeRestartSelfTest2.java
@@ -97,7 +97,7 @@ public class IgniteCacheQueryNodeRestartSelfTest2 extends GridCommonAbstractTest
IgniteConfiguration c = super.getConfiguration(igniteInstanceName);
DataStorageConfiguration memCfg = new DataStorageConfiguration().setDefaultDataRegionConfiguration(
- new DataRegionConfiguration().setMaxSize(50 * 1024 * 1024));
+ new DataRegionConfiguration().setMaxSize(50L * 1024 * 1024));
c.setDataStorageConfiguration(memCfg);
http://git-wip-us.apache.org/repos/asf/ignite/blob/ce8e31e2/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/DynamicColumnsAbstractTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/DynamicColumnsAbstractTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/DynamicColumnsAbstractTest.java
index 2cbd3a5..5ddafa3 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/DynamicColumnsAbstractTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/DynamicColumnsAbstractTest.java
@@ -184,7 +184,7 @@ public abstract class DynamicColumnsAbstractTest extends GridCommonAbstractTest
cfg.setDiscoverySpi(new TcpDiscoverySpi().setIpFinder(IP_FINDER));
DataStorageConfiguration memCfg = new DataStorageConfiguration().setDefaultDataRegionConfiguration(
- new DataRegionConfiguration().setMaxSize(128 * 1024 * 1024));
+ new DataRegionConfiguration().setMaxSize(128L * 1024 * 1024));
cfg.setDataStorageConfiguration(memCfg);
http://git-wip-us.apache.org/repos/asf/ignite/blob/ce8e31e2/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/DynamicIndexAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/DynamicIndexAbstractSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/DynamicIndexAbstractSelfTest.java
index 2ee626f..2b5dcb7 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/DynamicIndexAbstractSelfTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/DynamicIndexAbstractSelfTest.java
@@ -136,7 +136,7 @@ public abstract class DynamicIndexAbstractSelfTest extends AbstractSchemaSelfTes
cfg.setMarshaller(new BinaryMarshaller());
DataStorageConfiguration memCfg = new DataStorageConfiguration().setDefaultDataRegionConfiguration(
- new DataRegionConfiguration().setMaxSize(128 * 1024 * 1024));
+ new DataRegionConfiguration().setMaxSize(128L * 1024 * 1024));
cfg.setDataStorageConfiguration(memCfg);
http://git-wip-us.apache.org/repos/asf/ignite/blob/ce8e31e2/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/OptimizedMarshallerIndexNameTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/OptimizedMarshallerIndexNameTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/OptimizedMarshallerIndexNameTest.java
index 1123d21..57a55f3 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/OptimizedMarshallerIndexNameTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/OptimizedMarshallerIndexNameTest.java
@@ -65,7 +65,7 @@ public class OptimizedMarshallerIndexNameTest extends GridCommonAbstractTest {
DataStorageConfiguration memCfg = new DataStorageConfiguration()
.setDefaultDataRegionConfiguration(
- new DataRegionConfiguration().setMaxSize(300 * 1024 * 1024).setPersistenceEnabled(true))
+ new DataRegionConfiguration().setMaxSize(300L * 1024 * 1024).setPersistenceEnabled(true))
.setStoragePath(workSubdir() + "/db")
.setWalArchivePath(workSubdir() + "/db/wal/archive")
.setWalPath(workSubdir() + "/db/wal")
http://git-wip-us.apache.org/repos/asf/ignite/blob/ce8e31e2/modules/indexing/src/test/java/org/apache/ignite/internal/processors/database/IgniteDbSingleNodeWithIndexingWalRestoreTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/database/IgniteDbSingleNodeWithIndexingWalRestoreTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/database/IgniteDbSingleNodeWithIndexingWalRestoreTest.java
index 2d104ae..6d80219 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/database/IgniteDbSingleNodeWithIndexingWalRestoreTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/database/IgniteDbSingleNodeWithIndexingWalRestoreTest.java
@@ -112,7 +112,7 @@ public class IgniteDbSingleNodeWithIndexingWalRestoreTest extends GridCommonAbst
DataStorageConfiguration memCfg = new DataStorageConfiguration()
.setDefaultDataRegionConfiguration(
- new DataRegionConfiguration().setMaxSize(100 * 1024 * 1024).setPersistenceEnabled(true))
+ new DataRegionConfiguration().setMaxSize(100L * 1024 * 1024).setPersistenceEnabled(true))
.setWalMode(WALMode.LOG_ONLY);
cfg.setDataStorageConfiguration(memCfg);
http://git-wip-us.apache.org/repos/asf/ignite/blob/ce8e31e2/modules/indexing/src/test/java/org/apache/ignite/internal/processors/database/IgnitePersistentStoreSchemaLoadTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/database/IgnitePersistentStoreSchemaLoadTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/database/IgnitePersistentStoreSchemaLoadTest.java
index 0817cae..a73fbde 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/database/IgnitePersistentStoreSchemaLoadTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/database/IgnitePersistentStoreSchemaLoadTest.java
@@ -74,7 +74,7 @@ public class IgnitePersistentStoreSchemaLoadTest extends GridCommonAbstractTest
pCfg.setDefaultDataRegionConfiguration(new DataRegionConfiguration()
.setPersistenceEnabled(true)
- .setMaxSize(100 * 1024 * 1024));
+ .setMaxSize(100L * 1024 * 1024));
pCfg.setCheckpointFrequency(1000);
http://git-wip-us.apache.org/repos/asf/ignite/blob/ce8e31e2/modules/indexing/src/test/java/org/apache/ignite/internal/processors/database/baseline/IgniteBaselineLockPartitionOnAffinityRunAtomicCacheTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/database/baseline/IgniteBaselineLockPartitionOnAffinityRunAtomicCacheTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/database/baseline/IgniteBaselineLockPartitionOnAffinityRunAtomicCacheTest.java
index 86d809d..680fbdf 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/database/baseline/IgniteBaselineLockPartitionOnAffinityRunAtomicCacheTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/database/baseline/IgniteBaselineLockPartitionOnAffinityRunAtomicCacheTest.java
@@ -35,8 +35,8 @@ public class IgniteBaselineLockPartitionOnAffinityRunAtomicCacheTest extends Ign
new DataStorageConfiguration()
.setDefaultDataRegionConfiguration(
new DataRegionConfiguration()
- .setInitialSize(200 * 1024 * 1024)
- .setMaxSize(200 * 1024 * 1024)
+ .setInitialSize(200L * 1024 * 1024)
+ .setMaxSize(200L * 1024 * 1024)
.setPersistenceEnabled(true)
)
);
http://git-wip-us.apache.org/repos/asf/ignite/blob/ce8e31e2/modules/indexing/src/test/java/org/apache/ignite/internal/processors/database/baseline/IgniteBaselineLockPartitionOnAffinityRunTxCacheTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/database/baseline/IgniteBaselineLockPartitionOnAffinityRunTxCacheTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/database/baseline/IgniteBaselineLockPartitionOnAffinityRunTxCacheTest.java
index caab3ac..d189e01 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/database/baseline/IgniteBaselineLockPartitionOnAffinityRunTxCacheTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/database/baseline/IgniteBaselineLockPartitionOnAffinityRunTxCacheTest.java
@@ -34,8 +34,8 @@ public class IgniteBaselineLockPartitionOnAffinityRunTxCacheTest extends IgniteC
new DataStorageConfiguration()
.setDefaultDataRegionConfiguration(
new DataRegionConfiguration()
- .setInitialSize(200 * 1024 * 1024)
- .setMaxSize(200 * 1024 * 1024)
+ .setInitialSize(200L * 1024 * 1024)
+ .setMaxSize(200L * 1024 * 1024)
.setPersistenceEnabled(true)
)
);
http://git-wip-us.apache.org/repos/asf/ignite/blob/ce8e31e2/modules/indexing/src/test/java/org/apache/ignite/internal/processors/database/baseline/IgniteChangingBaselineCacheQueryNodeRestartSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/database/baseline/IgniteChangingBaselineCacheQueryNodeRestartSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/database/baseline/IgniteChangingBaselineCacheQueryNodeRestartSelfTest.java
index a8f283c..b2a5758 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/database/baseline/IgniteChangingBaselineCacheQueryNodeRestartSelfTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/database/baseline/IgniteChangingBaselineCacheQueryNodeRestartSelfTest.java
@@ -42,7 +42,7 @@ public class IgniteChangingBaselineCacheQueryNodeRestartSelfTest extends IgniteC
new DataStorageConfiguration()
.setDefaultDataRegionConfiguration(
new DataRegionConfiguration()
- .setMaxSize(200 * 1024 * 1024)
+ .setMaxSize(200L * 1024 * 1024)
.setPersistenceEnabled(true)
)
);
http://git-wip-us.apache.org/repos/asf/ignite/blob/ce8e31e2/modules/indexing/src/test/java/org/apache/ignite/internal/processors/database/baseline/IgniteStableBaselineBinObjFieldsQuerySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/database/baseline/IgniteStableBaselineBinObjFieldsQuerySelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/database/baseline/IgniteStableBaselineBinObjFieldsQuerySelfTest.java
index 2ccfa1b..4b2d578 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/database/baseline/IgniteStableBaselineBinObjFieldsQuerySelfTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/database/baseline/IgniteStableBaselineBinObjFieldsQuerySelfTest.java
@@ -33,7 +33,7 @@ public class IgniteStableBaselineBinObjFieldsQuerySelfTest extends IgniteBinaryO
new DataStorageConfiguration()
.setDefaultDataRegionConfiguration(
new DataRegionConfiguration()
- .setMaxSize(200 * 1024 * 1024)
+ .setMaxSize(200L * 1024 * 1024)
.setPersistenceEnabled(true)
)
);
http://git-wip-us.apache.org/repos/asf/ignite/blob/ce8e31e2/modules/indexing/src/test/java/org/apache/ignite/internal/processors/database/baseline/IgniteStableBaselineCacheQueryNodeRestartsSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/database/baseline/IgniteStableBaselineCacheQueryNodeRestartsSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/database/baseline/IgniteStableBaselineCacheQueryNodeRestartsSelfTest.java
index 50c4cd9..d5a0408 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/database/baseline/IgniteStableBaselineCacheQueryNodeRestartsSelfTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/database/baseline/IgniteStableBaselineCacheQueryNodeRestartsSelfTest.java
@@ -34,7 +34,7 @@ public class IgniteStableBaselineCacheQueryNodeRestartsSelfTest extends IgniteCa
new DataStorageConfiguration()
.setDefaultDataRegionConfiguration(
new DataRegionConfiguration()
- .setMaxSize(200 * 1024 * 1024)
+ .setMaxSize(200L * 1024 * 1024)
.setPersistenceEnabled(true)
)
);
http://git-wip-us.apache.org/repos/asf/ignite/blob/ce8e31e2/modules/ml/src/test/java/org/apache/ignite/ml/dataset/impl/cache/CacheBasedDatasetTest.java
----------------------------------------------------------------------
diff --git a/modules/ml/src/test/java/org/apache/ignite/ml/dataset/impl/cache/CacheBasedDatasetTest.java b/modules/ml/src/test/java/org/apache/ignite/ml/dataset/impl/cache/CacheBasedDatasetTest.java
index 16ba044..2e39e65 100644
--- a/modules/ml/src/test/java/org/apache/ignite/ml/dataset/impl/cache/CacheBasedDatasetTest.java
+++ b/modules/ml/src/test/java/org/apache/ignite/ml/dataset/impl/cache/CacheBasedDatasetTest.java
@@ -206,7 +206,7 @@ public class CacheBasedDatasetTest extends GridCommonAbstractTest {
long checkingStartTs = System.currentTimeMillis();
while (!flag && (System.currentTimeMillis() - checkingStartTs) < 30_000) {
- LockSupport.parkNanos(200 * 1000 * 1000);
+ LockSupport.parkNanos(200L * 1000 * 1000);
flag = true;
for (String cacheName : cacheNames) {
[03/50] [abbrv] ignite git commit: IGNITE-8491 Add JMX flag: Is the
node in baseline or not - Fixes #4010.
Posted by dp...@apache.org.
IGNITE-8491 Add JMX flag: Is the node in baseline or not - Fixes #4010.
Signed-off-by: Ivan Rakov <ir...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/f8ae30d5
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/f8ae30d5
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/f8ae30d5
Branch: refs/heads/ignite-5789-1
Commit: f8ae30d5dd426d995d7bae98674712055895bcb5
Parents: 722bb1d
Author: vd-pyatkov <vp...@gridgain.com>
Authored: Fri May 18 16:59:14 2018 +0300
Committer: Ivan Rakov <ir...@apache.org>
Committed: Fri May 18 16:59:14 2018 +0300
----------------------------------------------------------------------
.../apache/ignite/internal/IgniteKernal.java | 13 +++
.../org/apache/ignite/mxbean/IgniteMXBean.java | 8 ++
.../util/mbeans/GridMBeanBaselineTest.java | 96 ++++++++++++++++++++
3 files changed, 117 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/f8ae30d5/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java b/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
index 6a40e38..c16af70 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
@@ -106,6 +106,7 @@ import org.apache.ignite.internal.binary.BinaryUtils;
import org.apache.ignite.internal.cluster.ClusterGroupAdapter;
import org.apache.ignite.internal.cluster.IgniteClusterEx;
import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion;
+import org.apache.ignite.internal.processors.cluster.DiscoveryDataClusterState;
import org.apache.ignite.internal.processors.failure.FailureProcessor;
import org.apache.ignite.internal.managers.GridManager;
import org.apache.ignite.internal.managers.checkpoint.GridCheckpointManager;
@@ -525,6 +526,18 @@ public class IgniteKernal implements IgniteEx, IgniteMXBean, Externalizable {
}
/** {@inheritDoc} */
+ @Override public boolean isNodeInBaseline() {
+ ClusterNode locNode = localNode();
+
+ if (locNode.isClient() || locNode.isDaemon())
+ return false;
+
+ DiscoveryDataClusterState clusterState = ctx.state().clusterState();
+
+ return clusterState.hasBaselineTopology() && CU.baselineNode(locNode, clusterState);
+ }
+
+ /** {@inheritDoc} */
@Override public String getCommunicationSpiFormatted() {
assert cfg != null;
http://git-wip-us.apache.org/repos/asf/ignite/blob/f8ae30d5/modules/core/src/main/java/org/apache/ignite/mxbean/IgniteMXBean.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/mxbean/IgniteMXBean.java b/modules/core/src/main/java/org/apache/ignite/mxbean/IgniteMXBean.java
index cc4bc5b..e0a5fb5 100644
--- a/modules/core/src/main/java/org/apache/ignite/mxbean/IgniteMXBean.java
+++ b/modules/core/src/main/java/org/apache/ignite/mxbean/IgniteMXBean.java
@@ -439,6 +439,14 @@ public interface IgniteMXBean {
public String getCurrentCoordinatorFormatted();
/**
+ * Gets a flag whether local node is in baseline. Returns false if baseline topology is not established.
+ *
+ * @return Return a baseline flag.
+ */
+ @MXBeanDescription("Baseline node flag.")
+ public boolean isNodeInBaseline();
+
+ /**
* Runs IO latency test against all remote server nodes in cluster.
*
* @param warmup Warmup duration in milliseconds.
http://git-wip-us.apache.org/repos/asf/ignite/blob/f8ae30d5/modules/core/src/test/java/org/apache/ignite/util/mbeans/GridMBeanBaselineTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/util/mbeans/GridMBeanBaselineTest.java b/modules/core/src/test/java/org/apache/ignite/util/mbeans/GridMBeanBaselineTest.java
new file mode 100644
index 0000000..00dce83
--- /dev/null
+++ b/modules/core/src/test/java/org/apache/ignite/util/mbeans/GridMBeanBaselineTest.java
@@ -0,0 +1,96 @@
+package org.apache.ignite.util.mbeans;
+
+import org.apache.ignite.Ignite;
+import org.apache.ignite.Ignition;
+import org.apache.ignite.cluster.BaselineNode;
+import org.apache.ignite.configuration.DataRegionConfiguration;
+import org.apache.ignite.configuration.DataStorageConfiguration;
+import org.apache.ignite.configuration.IgniteConfiguration;
+import org.apache.ignite.internal.IgniteEx;
+import org.apache.ignite.mxbean.IgniteMXBean;
+import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+/**
+ *
+ */
+public class GridMBeanBaselineTest extends GridCommonAbstractTest {
+ /** Client index. */
+ private static final int CLIENT_IDX = 33;
+
+ /** Nodes. */
+ public static final int NODES = 2;
+
+ /** {@inheritDoc} */
+ @Override protected IgniteConfiguration getConfiguration(String igniteInstanceName) throws Exception {
+ return super.getConfiguration(igniteInstanceName)
+ .setClientMode(igniteInstanceName.equals(getTestIgniteInstanceName(CLIENT_IDX)))
+ .setDataStorageConfiguration(new DataStorageConfiguration()
+ .setCheckpointFrequency(2_000)
+ .setDefaultDataRegionConfiguration(
+ new DataRegionConfiguration()
+ .setPersistenceEnabled(true)))
+ .setDataStorageConfiguration(
+ new DataStorageConfiguration()
+ .setDefaultDataRegionConfiguration(
+ new DataRegionConfiguration()
+ .setMaxSize(200L * 1024 * 1024)
+ .setPersistenceEnabled(true)));
+ }
+
+ /** {@inheritDoc} */
+ @Override protected void beforeTestsStarted() throws Exception {
+ cleanPersistenceDir();
+ }
+
+ /** {@inheritDoc} */
+ @Override protected void afterTestsStopped() throws Exception {
+ cleanPersistenceDir();
+ }
+
+ /**
+ * Test ignite kernal node in baseline test.
+ *
+ * @throws Exception Thrown if test fails.
+ */
+ public void testIgniteKernalNodeInBaselineTest() throws Exception {
+ try {
+ IgniteEx ignite0 = (IgniteEx)startGrids(NODES);
+
+ startGrid(CLIENT_IDX);
+
+ ignite0.cluster().active(true);
+
+ checkBaselineInFromMBean(ignite0);
+
+ startGrid(NODES);
+
+ checkBaselineInFromMBean(ignite0);
+
+ ignite0.cluster().setBaselineTopology(ignite0.cluster().topologyVersion());
+
+ checkBaselineInFromMBean(ignite0);
+ }
+ finally {
+ stopAllGrids();
+ }
+ }
+
+ /**
+ * @param ignite Ignite.
+ */
+ private void checkBaselineInFromMBean(IgniteEx ignite) {
+ Set<Object> cIds = ignite.cluster().currentBaselineTopology().stream()
+ .map(BaselineNode::consistentId)
+ .collect(Collectors.toSet());
+
+ for (Ignite ign : Ignition.allGrids()) {
+ IgniteMXBean igniteMXBean = (IgniteMXBean)ign;
+
+ assertEquals(cIds.contains(ign.cluster().localNode().consistentId()),
+ igniteMXBean.isNodeInBaseline());
+ }
+ }
+
+}
[37/50] [abbrv] ignite git commit: IGNITE-7116 Logging minor issue as
error instead of warning or info
Posted by dp...@apache.org.
IGNITE-7116 Logging minor issue as error instead of warning or info
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/d52bfdb1
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/d52bfdb1
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/d52bfdb1
Branch: refs/heads/ignite-5789-1
Commit: d52bfdb172ae447fd1e391e7e6dd62018fb9579f
Parents: 7c2fe64
Author: Kirill Danilov <do...@donz.ru>
Authored: Tue May 22 17:58:42 2018 +0300
Committer: dpavlov <dp...@apache.org>
Committed: Tue May 22 17:58:42 2018 +0300
----------------------------------------------------------------------
.../src/main/java/org/apache/ignite/logger/java/JavaLogger.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/d52bfdb1/modules/core/src/main/java/org/apache/ignite/logger/java/JavaLogger.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/logger/java/JavaLogger.java b/modules/core/src/main/java/org/apache/ignite/logger/java/JavaLogger.java
index a6c132d..cbbf849 100644
--- a/modules/core/src/main/java/org/apache/ignite/logger/java/JavaLogger.java
+++ b/modules/core/src/main/java/org/apache/ignite/logger/java/JavaLogger.java
@@ -151,7 +151,7 @@ public class JavaLogger implements IgniteLogger, LoggerNodeIdAware {
final URL cfgUrl = U.resolveIgniteUrl(DFLT_CONFIG_PATH);
if (cfgUrl == null) {
- error("Failed to resolve default logging config file: " + DFLT_CONFIG_PATH);
+ warning("Failed to resolve default logging config file: " + DFLT_CONFIG_PATH);
return;
}
[02/50] [abbrv] ignite git commit: IGNITE-8520
ignite-gce/ignite-shmem is redundant
Posted by dp...@apache.org.
IGNITE-8520 ignite-gce/ignite-shmem is redundant
Signed-off-by: Andrey Gura <ag...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/722bb1d2
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/722bb1d2
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/722bb1d2
Branch: refs/heads/ignite-5789-1
Commit: 722bb1d24faa322bb7118feb82c7c6e0698de665
Parents: 8f2eeee
Author: Ivanov Petr <pi...@gridgain.com>
Authored: Fri May 18 16:22:14 2018 +0300
Committer: Andrey Gura <ag...@apache.org>
Committed: Fri May 18 16:22:42 2018 +0300
----------------------------------------------------------------------
modules/gce/pom.xml | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/722bb1d2/modules/gce/pom.xml
----------------------------------------------------------------------
diff --git a/modules/gce/pom.xml b/modules/gce/pom.xml
index d81fea5..8f682c3 100644
--- a/modules/gce/pom.xml
+++ b/modules/gce/pom.xml
@@ -118,6 +118,7 @@
<outputDirectory>target/libs</outputDirectory>
<includeScope>runtime</includeScope>
<excludeTransitive>false</excludeTransitive>
+ <excludeArtifactIds>ignite-shmem</excludeArtifactIds>
</configuration>
</execution>
</executions>
[20/50] [abbrv] ignite git commit: IGNITE-8266: stopAllGrids in
afterAllTests removed. - Fixes #3844.
Posted by dp...@apache.org.
IGNITE-8266: stopAllGrids in afterAllTests removed. - Fixes #3844.
Signed-off-by: Nikolay Izhikov <ni...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/eb8038f6
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/eb8038f6
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/eb8038f6
Branch: refs/heads/ignite-5789-1
Commit: eb8038f65285559c5424eba2882b0de0583ea7af
Parents: 4343b2f
Author: Maxim Muzafarov <ma...@gmail.com>
Authored: Mon May 21 16:55:08 2018 +0300
Committer: Nikolay Izhikov <ni...@apache.org>
Committed: Mon May 21 16:55:08 2018 +0300
----------------------------------------------------------------------
.../optimized/OptimizedMarshallerAopTest.java | 7 -------
.../internal/TaskEventSubjectIdSelfTest.java | 2 --
.../ClientAbstractMultiThreadedSelfTest.java | 5 -----
.../client/ClientDefaultCacheSelfTest.java | 2 --
.../ClientAbstractMultiNodeSelfTest.java | 7 -------
.../client/integration/ClientAbstractSelfTest.java | 5 -----
.../integration/ClientPreferDirectSelfTest.java | 7 -------
.../client/router/TcpRouterAbstractSelfTest.java | 2 --
.../client/router/TcpRouterMultiNodeSelfTest.java | 2 --
.../jdbc2/JdbcAbstractDmlStatementSelfTest.java | 5 -----
.../internal/jdbc2/JdbcBulkLoadSelfTest.java | 5 -----
.../internal/jdbc2/JdbcComplexQuerySelfTest.java | 5 -----
.../internal/jdbc2/JdbcConnectionSelfTest.java | 5 -----
.../jdbc2/JdbcDistributedJoinsQueryTest.java | 5 -----
.../internal/jdbc2/JdbcEmptyCacheSelfTest.java | 5 -----
.../internal/jdbc2/JdbcLocalCachesSelfTest.java | 5 -----
.../internal/jdbc2/JdbcMetadataSelfTest.java | 5 -----
.../jdbc2/JdbcNoCacheStreamingSelfTest.java | 5 -----
.../internal/jdbc2/JdbcNoDefaultCacheTest.java | 5 -----
.../jdbc2/JdbcPreparedStatementSelfTest.java | 5 -----
.../internal/jdbc2/JdbcResultSetSelfTest.java | 5 -----
.../internal/jdbc2/JdbcStatementSelfTest.java | 5 -----
.../internal/jdbc2/JdbcStreamingSelfTest.java | 5 -----
.../jdbc2/JdbcStreamingToPublicCacheTest.java | 5 -----
.../rest/AbstractRestProcessorSelfTest.java | 5 -----
.../rest/ChangeStateCommandHandlerTest.java | 6 ------
.../rest/JettyRestProcessorAbstractSelfTest.java | 2 --
.../rest/RestBinaryProtocolSelfTest.java | 5 -----
.../rest/RestMemcacheProtocolSelfTest.java | 5 -----
.../rest/TaskCommandHandlerSelfTest.java | 2 --
.../tcp/redis/RedisCommonAbstractTest.java | 2 --
.../ignite/jdbc/AbstractJdbcPojoQuerySelfTest.java | 2 --
.../ignite/jdbc/JdbcComplexQuerySelfTest.java | 5 -----
.../apache/ignite/jdbc/JdbcConnectionSelfTest.java | 5 -----
.../apache/ignite/jdbc/JdbcEmptyCacheSelfTest.java | 5 -----
.../ignite/jdbc/JdbcErrorsAbstractSelfTest.java | 7 -------
.../ignite/jdbc/JdbcLocalCachesSelfTest.java | 5 -----
.../apache/ignite/jdbc/JdbcMetadataSelfTest.java | 5 -----
.../apache/ignite/jdbc/JdbcNoDefaultCacheTest.java | 5 -----
.../ignite/jdbc/JdbcPreparedStatementSelfTest.java | 5 -----
.../apache/ignite/jdbc/JdbcResultSetSelfTest.java | 5 -----
.../apache/ignite/jdbc/JdbcStatementSelfTest.java | 5 -----
.../thin/JdbcThinAbstractDmlStatementSelfTest.java | 5 -----
.../thin/JdbcThinAutoCloseServerCursorTest.java | 5 -----
.../jdbc/thin/JdbcThinComplexDmlDdlSelfTest.java | 5 -----
.../jdbc/thin/JdbcThinComplexQuerySelfTest.java | 5 -----
.../jdbc/thin/JdbcThinConnectionSelfTest.java | 5 -----
.../jdbc/thin/JdbcThinEmptyCacheSelfTest.java | 5 -----
.../ignite/jdbc/thin/JdbcThinMetadataSelfTest.java | 5 -----
.../thin/JdbcThinMissingLongArrayResultsTest.java | 6 +-----
.../jdbc/thin/JdbcThinNoDefaultSchemaTest.java | 5 -----
.../thin/JdbcThinPreparedStatementSelfTest.java | 5 -----
.../jdbc/thin/JdbcThinResultSetSelfTest.java | 5 -----
.../ignite/jdbc/thin/JdbcThinSchemaCaseTest.java | 5 -----
.../jdbc/thin/JdbcThinSelectAfterAlterTable.java | 5 -----
.../jdbc/thin/JdbcThinStatementSelfTest.java | 5 -----
.../ignite/cache/IgniteWarmupClosureSelfTest.java | 5 -----
.../cache/affinity/AffinityClientNodeSelfTest.java | 5 -----
.../affinity/AffinityDistributionLoggingTest.java | 2 --
.../affinity/local/LocalAffinityFunctionTest.java | 5 -----
.../RendezvousAffinityFunctionSelfTest.java | 5 -----
.../RendezvousAffinityFunctionSimpleBenchmark.java | 5 -----
.../CacheStoreSessionListenerAbstractSelfTest.java | 5 -----
.../failure/StopNodeOrHaltFailureHandlerTest.java | 5 -----
.../ignite/igfs/IgfsEventsAbstractSelfTest.java | 5 -----
.../igfs/IgfsFragmentizerAbstractSelfTest.java | 5 -----
.../ignite/internal/ClusterGroupSelfTest.java | 6 ------
.../ignite/internal/ClusterMetricsSelfTest.java | 5 -----
.../ignite/internal/GridAffinityMappedTest.java | 7 -------
.../internal/GridAffinityNoCacheSelfTest.java | 7 -------
...dCachePartitionExchangeManagerHistSizeTest.java | 2 --
.../internal/GridJobServicesAddNodeTest.java | 5 -----
.../GridKernalConcurrentAccessStopSelfTest.java | 6 ------
.../ignite/internal/GridListenActorSelfTest.java | 5 -----
.../ignite/internal/GridMultipleJobsSelfTest.java | 8 --------
.../ignite/internal/GridNodeFilterSelfTest.java | 10 ----------
.../internal/GridProjectionForCachesSelfTest.java | 5 -----
.../internal/GridRuntimeExceptionSelfTest.java | 5 -----
.../org/apache/ignite/internal/GridSelfTest.java | 5 -----
.../internal/GridTaskExecutionContextSelfTest.java | 5 -----
.../ignite/internal/GridTaskExecutionSelfTest.java | 5 -----
.../ignite/internal/GridTaskJobRejectSelfTest.java | 6 ------
.../IgniteClientReconnectAbstractTest.java | 4 ----
.../IgniteComputeEmptyClusterGroupTest.java | 5 -----
...niteConcurrentEntryProcessorAccessStopTest.java | 7 -------
.../IgniteSlowClientDetectionSelfTest.java | 7 -------
.../internal/MemoryLeaksOnRestartNodeTest.java | 4 ----
.../ignite/internal/TaskNodeRestartTest.java | 7 -------
.../BinaryArrayIdentityResolverSelfTest.java | 7 -------
.../BinaryObjectBuilderAdditionalSelfTest.java | 5 -----
.../BinaryObjectBuilderDefaultMappersSelfTest.java | 5 -----
.../BinarySerialiedFieldComparatorSelfTest.java | 7 -------
.../ignite/internal/binary/BinaryTreeSelfTest.java | 2 --
.../binary/GridBinaryAffinityKeySelfTest.java | 5 -----
.../managers/IgniteDiagnosticMessagesTest.java | 3 ---
.../communication/IgniteIoTestMessagesTest.java | 7 -------
.../IgniteVariousConnectionNumberTest.java | 7 -------
.../GridDeploymentMessageCountSelfTest.java | 7 -------
.../OptimizedMarshallerPooledSelfTest.java | 2 --
.../GridCacheTxLoadFromStoreOnLockSelfTest.java | 5 -----
.../GridAffinityProcessorAbstractSelfTest.java | 5 -----
.../cache/CacheAffinityCallSelfTest.java | 5 -----
.../cache/CacheConnectionLeakStoreTxTest.java | 5 -----
.../cache/CacheDeferredDeleteQueueTest.java | 4 ----
.../cache/CacheDeferredDeleteSanitySelfTest.java | 5 -----
.../CacheDhtLocalPartitionAfterRemoveSelfTest.java | 5 -----
.../cache/CacheEnumOperationsAbstractTest.java | 7 -------
.../CacheExchangeMessageDuplicatedStateTest.java | 7 -------
.../cache/CacheGroupMetricsMBeanTest.java | 5 -----
...InterceptorPartitionCounterLocalSanityTest.java | 7 -------
...ceptorPartitionCounterRandomOperationsTest.java | 7 -------
.../cache/CacheKeepBinaryTransactionTest.java | 7 -------
.../cache/CacheMetricsEntitiesCountTest.java | 5 -----
.../cache/CacheMetricsForClusterGroupSelfTest.java | 5 -----
.../cache/CacheOffheapMapEntrySelfTest.java | 5 -----
.../CacheOptimisticTransactionsWithFilterTest.java | 7 -------
.../cache/CachePutEventListenerErrorSelfTest.java | 5 -----
.../processors/cache/CachePutIfAbsentTest.java | 7 -------
.../cache/CacheSerializableTransactionsTest.java | 7 -------
...toreUsageMultinodeDynamicStartAbstractTest.java | 7 -------
.../cache/CacheTxNotAllowReadFromBackupTest.java | 7 -------
.../cache/CacheValidatorMetricsTest.java | 5 -----
.../processors/cache/CrossCacheLockTest.java | 7 -------
.../cache/CrossCacheTxRandomOperationsTest.java | 7 -------
.../EntryVersionConsistencyReadThroughTest.java | 7 -------
.../GridCacheAbstractByteArrayValuesSelfTest.java | 5 -----
.../cache/GridCacheAbstractLocalStoreSelfTest.java | 5 -----
.../cache/GridCacheAbstractRemoveFailureTest.java | 4 ----
.../cache/GridCacheAbstractSelfTest.java | 2 --
.../cache/GridCacheAffinityMapperSelfTest.java | 5 -----
.../cache/GridCacheAffinityRoutingSelfTest.java | 10 ----------
.../processors/cache/GridCacheClearSelfTest.java | 5 -----
.../GridCacheConfigurationValidationSelfTest.java | 7 -------
.../cache/GridCacheEntryMemorySizeSelfTest.java | 5 -----
.../GridCacheMarshallingNodeJoinSelfTest.java | 5 -----
.../cache/GridCacheNestedTxAbstractTest.java | 5 -----
.../cache/GridCachePartitionedGetSelfTest.java | 5 -----
.../cache/GridCachePutAllFailoverSelfTest.java | 2 --
...ridProjectionForCachesOnDaemonNodeSelfTest.java | 5 -----
.../processors/cache/IgniteCacheAbstractTest.java | 2 --
.../IgniteCacheBinaryEntryProcessorSelfTest.java | 7 -------
.../IgniteCacheBinaryObjectsScanSelfTest.java | 2 --
.../cache/IgniteCacheDynamicStopSelfTest.java | 7 -------
.../IgniteCacheEntryListenerExpiredEventsTest.java | 7 -------
.../cache/IgniteCacheEntryProcessorCallTest.java | 7 -------
.../IgniteCacheExpireAndUpdateConsistencyTest.java | 7 -------
.../cache/IgniteCacheIncrementTxTest.java | 7 -------
.../IgniteCacheInvokeReadThroughAbstractTest.java | 7 -------
.../cache/IgniteCacheNearLockValueSelfTest.java | 7 -------
.../cache/IgniteCacheNoSyncForGetTest.java | 7 -------
.../cache/IgniteCacheObjectPutSelfTest.java | 5 -----
.../cache/IgniteCachePutAllRestartTest.java | 2 --
.../cache/IgniteCachePutStackOverflowSelfTest.java | 5 -----
.../cache/IgniteCacheSerializationSelfTest.java | 7 -------
.../cache/IgniteCacheStartStopLoadTest.java | 5 -----
.../cache/IgniteCacheStoreCollectionTest.java | 7 -------
.../IgniteClientCacheInitializationFailTest.java | 5 -----
.../cache/IgniteDynamicCacheMultinodeTest.java | 7 -------
.../cache/IgniteDynamicCacheStartSelfTest.java | 7 -------
.../IgniteDynamicCacheStartStopConcurrentTest.java | 7 -------
.../cache/IgniteInternalCacheTypesTest.java | 7 -------
.../cache/IgniteOutOfMemoryPropagationTest.java | 7 -------
.../IgniteStartCacheInTransactionSelfTest.java | 5 -----
.../cache/IgniteSystemCacheOnClientTest.java | 7 -------
.../processors/cache/IgniteTxAbstractTest.java | 7 -------
.../cache/IgniteTxConfigCacheSelfTest.java | 5 -----
...OffheapCacheMetricsForClusterGroupSelfTest.java | 5 -----
.../cache/WalModeChangeAbstractSelfTest.java | 7 -------
.../binary/CacheKeepBinaryWithInterceptorTest.java | 7 -------
...eBinaryObjectsAbstractDataStreamerSelfTest.java | 5 -----
...BinaryObjectsAbstractMultiThreadedSelfTest.java | 5 -----
.../GridCacheBinaryObjectsAbstractSelfTest.java | 5 -----
.../GridCacheBinaryStoreAbstractSelfTest.java | 5 -----
.../GridCacheSequenceApiSelfAbstractTest.java | 17 ++++++-----------
.../datastructures/IgniteAtomicsAbstractTest.java | 4 ----
.../IgniteClientDataStructuresAbstractTest.java | 5 -----
.../IgniteCollectionAbstractTest.java | 5 -----
.../IgniteDataStructureWithJobTest.java | 7 -------
.../distributed/CacheAsyncOperationsTest.java | 7 -------
.../cache/distributed/CacheExchangeMergeTest.java | 2 --
.../distributed/CacheGetFutureHangsSelfTest.java | 7 -------
.../CacheGetInsideLockChangingTopologyTest.java | 4 ----
.../CacheLateAffinityAssignmentTest.java | 7 -------
.../cache/distributed/CacheStartOnJoinTest.java | 2 --
.../distributed/CacheTryLockMultithreadedTest.java | 7 -------
...AbstractDistributedByteArrayValuesSelfTest.java | 2 --
.../GridCacheAbstractJobExecutionTest.java | 5 -----
.../GridCacheAbstractNodeRestartSelfTest.java | 2 --
.../GridCacheAbstractPrimarySyncSelfTest.java | 5 -----
.../distributed/GridCacheBasicOpAbstractTest.java | 2 --
.../distributed/GridCacheLockAbstractTest.java | 5 -----
.../distributed/GridCacheMixedModeSelfTest.java | 5 -----
.../GridCacheMultiNodeAbstractTest.java | 2 --
.../GridCacheMultiNodeLockAbstractTest.java | 2 --
.../GridCacheNodeFailureAbstractTest.java | 2 --
...dCachePartitionedReloadAllAbstractSelfTest.java | 4 ----
.../GridCachePreloadRestartAbstractSelfTest.java | 5 -----
...naryMetadataUpdateChangingTopologySelfTest.java | 5 -----
.../IgniteBinaryMetadataUpdateNodeRestartTest.java | 4 ----
.../IgniteCacheClientReconnectTest.java | 7 -------
.../IgniteCacheConnectionRecoveryTest.java | 7 -------
.../distributed/IgniteCacheGetRestartTest.java | 4 ----
.../distributed/IgniteCacheManyClientsTest.java | 7 -------
.../IgniteCacheMessageRecoveryAbstractTest.java | 5 -----
...niteCacheMessageRecoveryIdleConnectionTest.java | 7 -------
.../IgniteCacheNearRestartRollbackSelfTest.java | 2 --
.../distributed/IgniteCachePrimarySyncTest.java | 7 -------
.../distributed/IgniteCacheReadFromBackupTest.java | 7 -------
.../IgniteCacheSingleGetMessageTest.java | 7 -------
.../IgniteCrossCacheTxStoreSelfTest.java | 2 --
.../IgniteOptimisticTxSuspendResumeTest.java | 2 --
.../distributed/IgniteTxCachePrimarySyncTest.java | 7 -------
...WriteSynchronizationModesMultithreadedTest.java | 4 ----
.../distributed/IgniteTxTimeoutAbstractTest.java | 2 --
...CacheAbstractTransformWriteThroughSelfTest.java | 2 --
.../distributed/dht/GridCacheDhtEntrySelfTest.java | 5 -----
.../GridCacheDhtEvictionNearReadersSelfTest.java | 7 -------
.../dht/GridCacheDhtMappingSelfTest.java | 7 -------
.../dht/IgniteCacheCommitDelayTxRecoveryTest.java | 7 -------
.../dht/IgniteCacheCrossCacheTxFailoverTest.java | 7 -------
.../dht/IgniteCacheMultiTxLockSelfTest.java | 7 -------
.../dht/IgniteCachePutRetryAbstractSelfTest.java | 4 ----
.../dht/IgniteCrossCacheTxSelfTest.java | 5 -----
.../near/GridCacheNearMultiGetSelfTest.java | 5 -----
.../near/GridCacheNearMultiNodeSelfTest.java | 7 -------
.../near/GridCacheNearTxForceKeyTest.java | 7 -------
.../near/GridCachePartitionedAffinitySelfTest.java | 5 -----
...achePartitionedBasicStoreMultiNodeSelfTest.java | 2 --
...achePartitionedMultiThreadedPutGetSelfTest.java | 5 -----
.../near/NearCacheMultithreadedUpdateTest.java | 7 -------
.../near/NoneRebalanceModeSelfTest.java | 5 -----
.../rebalancing/CacheManualRebalancingTest.java | 5 -----
.../GridCacheRebalancingOrderingTest.java | 7 -------
.../GridCacheRebalancingSyncCheckDataTest.java | 8 --------
.../cache/eviction/EvictionAbstractTest.java | 2 --
.../EvictionPolicyFactoryAbstractTest.java | 2 --
.../PageEvictionMultinodeMixedRegionsTest.java | 2 --
.../eviction/paged/PageEvictionMultinodeTest.java | 5 -----
.../SortedEvictionPolicyPerformanceTest.java | 5 -----
.../GridCacheLocalByteArrayValuesSelfTest.java | 2 --
.../IgnitePdsCorruptedCacheDataTest.java | 2 --
...hangingBaselineDownCachePutAllFailoverTest.java | 2 --
...hangingBaselineDownCacheRemoveFailoverTest.java | 2 --
...eChangingBaselineUpCachePutAllFailoverTest.java | 2 --
...eChangingBaselineUpCacheRemoveFailoverTest.java | 2 --
...gniteStableBaselineCachePutAllFailoverTest.java | 2 --
...gniteStableBaselineCacheRemoveFailoverTest.java | 2 --
.../IgnitePdsCacheDestroyDuringCheckpointTest.java | 4 ----
.../db/file/IgnitePdsPageReplacementTest.java | 4 ----
.../db/file/IgnitePdsThreadInterruptionTest.java | 2 --
.../extended/GridActivateExtensionTest.java | 2 --
.../query/GridCacheQueryTransformerSelfTest.java | 5 -----
.../ScanQueryOffheapExpiryPolicySelfTest.java | 7 -------
.../continuous/CacheContinuousBatchAckTest.java | 7 -------
...acheContinuousQueryAsyncFilterListenerTest.java | 7 -------
.../CacheContinuousQueryCounterAbstractTest.java | 5 -----
.../CacheContinuousQueryExecuteInPrimaryTest.java | 5 -----
...heContinuousQueryOperationFromCallbackTest.java | 7 -------
.../CacheContinuousQueryOperationP2PTest.java | 7 -------
.../CacheContinuousQueryOrderingEventTest.java | 7 -------
.../CacheContinuousQueryRandomOperationsTest.java | 7 -------
...ontinuousWithTransformerReplicatedSelfTest.java | 2 --
...acheEntryProcessorExternalizableFailedTest.java | 7 -------
.../CacheEntryProcessorNonSerializableTest.java | 7 -------
.../continuous/CacheKeepBinaryIterationTest.java | 7 -------
.../GridCacheContinuousQueryAbstractSelfTest.java | 5 -----
.../GridCacheContinuousQueryConcurrentTest.java | 7 -------
.../GridCacheWriteBehindStoreAbstractSelfTest.java | 2 --
...iteBehindStorePartitionedMultiNodeSelfTest.java | 2 --
.../IgniteCacheWriteBehindNoUpdateSelfTest.java | 5 -----
.../cache/transactions/TxDeadlockCauseTest.java | 7 -------
.../TxDeadlockDetectionNoHangsTest.java | 2 --
.../transactions/TxDeadlockDetectionTest.java | 7 -------
.../TxDeadlockDetectionUnmasrhalErrorsTest.java | 7 -------
.../transactions/TxMultiCacheAsyncOpsTest.java | 7 -------
.../TxOptimisticDeadlockDetectionTest.java | 7 -------
.../TxOptimisticOnPartitionExchangeTest.java | 7 -------
...PessimisticDeadlockDetectionCrossCacheTest.java | 7 -------
.../TxPessimisticDeadlockDetectionTest.java | 7 -------
.../TxRollbackAsyncWithPersistenceTest.java | 2 --
...TxRollbackOnTimeoutNoDeadlockDetectionTest.java | 2 --
.../closure/GridClosureProcessorRemoteTest.java | 5 -----
.../closure/GridClosureProcessorSelfTest.java | 5 -----
.../closure/GridClosureSerializationTest.java | 7 -------
.../cluster/GridUpdateNotifierSelfTest.java | 2 --
...ridComputeJobExecutionErrorToLogManualTest.java | 5 -----
.../DataStreamerUpdateAfterLoadTest.java | 7 -------
.../processors/igfs/IgfsCacheSelfTest.java | 5 -----
.../processors/igfs/IgfsDataManagerSelfTest.java | 5 -----
.../processors/igfs/IgfsMetaManagerSelfTest.java | 5 -----
.../processors/igfs/IgfsMetricsSelfTest.java | 5 -----
.../processors/igfs/IgfsProcessorSelfTest.java | 5 -----
.../processors/igfs/IgfsStreamsSelfTest.java | 5 -----
.../internal/processors/igfs/IgfsTaskSelfTest.java | 5 -----
.../split/IgfsAbstractRecordResolverSelfTest.java | 5 -----
.../handlers/log/GridLogCommandHandlerTest.java | 2 --
.../query/GridQueryCommandHandlerTest.java | 7 -------
.../service/ClosureServiceClientsNodesTest.java | 5 -----
...ridServiceDeploymentCompoundFutureSelfTest.java | 5 -----
...dServiceDeploymentExceptionPropagationTest.java | 7 -------
.../GridServiceProcessorAbstractSelfTest.java | 5 -----
.../IgniteServiceDynamicCachesSelfTest.java | 5 -----
.../service/ServicePredicateAccessCacheTest.java | 7 -------
.../loadtests/GridCacheMultiNodeLoadTest.java | 2 --
.../communication/GridIoManagerBenchmark0.java | 5 -----
.../direct/stealing/GridStealingLoadTest.java | 5 -----
.../p2p/GridP2PContinuousDeploymentSelfTest.java | 5 -----
.../session/GridSessionWaitAttributeSelfTest.java | 6 ------
...SharedFsCheckpointSpiMultiThreadedSelfTest.java | 2 --
.../tcp/TcpCommunicationSpiDropNodesTest.java | 2 --
.../tcp/TcpCommunicationSpiFaultyClientTest.java | 2 --
.../spi/discovery/AuthenticationRestartTest.java | 2 --
.../tcp/TcpDiscoveryConcurrentStartTest.java | 5 -----
.../stream/socket/SocketStreamerSelfTest.java | 5 -----
.../common/GridRollingRestartAbstractTest.java | 4 ----
.../util/mbeans/GridMBeanDisableSelfTest.java | 2 --
.../apache/ignite/stream/flume/IgniteSinkTest.java | 5 -----
.../TcpDiscoveryGoogleStorageIpFinderSelfTest.java | 2 --
.../hadoop/impl/HadoopAbstractSelfTest.java | 2 --
.../hadoop/impl/HadoopCommandLineTest.java | 2 --
.../hadoop/impl/HadoopJobTrackerSelfTest.java | 7 -------
.../hadoop/impl/HadoopTaskExecutionSelfTest.java | 7 -------
.../impl/client/HadoopClientProtocolSelfTest.java | 7 -------
.../hadoop/impl/igfs/IgfsEventsTestSuite.java | 2 --
.../IgniteHadoopFileSystemClientBasedOpenTest.java | 7 -------
.../HibernateL2CacheConfigurationSelfTest.java | 5 -----
.../hibernate/HibernateL2CacheMultiJvmTest.java | 7 -------
.../cache/hibernate/HibernateL2CacheSelfTest.java | 5 -----
.../HibernateL2CacheStrategySelfTest.java | 5 -----
.../HibernateL2CacheTransactionalSelfTest.java | 2 --
.../HibernateL2CacheConfigurationSelfTest.java | 5 -----
.../hibernate/HibernateL2CacheMultiJvmTest.java | 7 -------
.../cache/hibernate/HibernateL2CacheSelfTest.java | 5 -----
.../HibernateL2CacheStrategySelfTest.java | 5 -----
.../HibernateL2CacheTransactionalSelfTest.java | 2 --
.../cache/CacheBinaryKeyConcurrentQueryTest.java | 7 -------
.../cache/CacheIteratorScanQueryTest.java | 5 -----
.../cache/CacheOffheapBatchIndexingBaseTest.java | 5 -----
.../cache/CacheOperationsWithExpirationTest.java | 7 -------
.../processors/cache/CacheQueryBuildValueTest.java | 7 -------
.../CacheRandomOperationsMultithreadedTest.java | 7 -------
.../cache/CacheSqlQueryValueCopySelfTest.java | 7 -------
.../cache/GridCacheFullTextQuerySelfTest.java | 5 -----
.../processors/cache/GridCacheOffHeapSelfTest.java | 2 --
.../cache/GridCacheOffheapIndexEntryEvictTest.java | 5 -----
.../cache/GridCacheOffheapIndexGetSelfTest.java | 5 -----
.../IgniteBinaryObjectFieldsQuerySelfTest.java | 2 --
.../IgniteBinaryObjectQueryArgumentsTest.java | 7 -------
.../IgniteCacheAbstractFieldsQuerySelfTest.java | 2 --
.../IgniteCacheAbstractInsertSqlQuerySelfTest.java | 5 -----
.../cache/IgniteCacheAbstractQuerySelfTest.java | 4 ----
.../IgniteCacheAbstractSqlDmlQuerySelfTest.java | 5 -----
.../cache/IgniteCacheCollocatedQuerySelfTest.java | 5 -----
.../cache/IgniteCacheCrossCacheJoinRandomTest.java | 2 --
...teCacheDistributedJoinCollocatedAndNotTest.java | 7 -------
...teCacheDistributedJoinCustomAffinityMapper.java | 7 -------
.../IgniteCacheDistributedJoinNoIndexTest.java | 7 -------
...istributedJoinPartitionedAndReplicatedTest.java | 7 -------
...iteCacheDistributedJoinQueryConditionsTest.java | 7 -------
.../cache/IgniteCacheDistributedJoinTest.java | 1 -
...eCacheDuplicateEntityConfigurationSelfTest.java | 5 -----
.../IgniteCacheFieldsQueryNoDataSelfTest.java | 5 -----
...oinPartitionedAndReplicatedCollocationTest.java | 7 -------
...gniteCacheJoinPartitionedAndReplicatedTest.java | 7 -------
.../IgniteCacheJoinQueryWithAffinityKeyTest.java | 7 -------
.../cache/IgniteCacheLargeResultSelfTest.java | 5 -----
.../IgniteCacheObjectKeyIndexingSelfTest.java | 2 --
.../cache/IgniteCacheOffheapIndexScanTest.java | 5 -----
...CachePartitionedQueryMultiThreadedSelfTest.java | 5 -----
.../IgniteCachePrimitiveFieldsQuerySelfTest.java | 5 -----
.../cache/IgniteCacheQueriesLoadTest1.java | 7 -------
.../cache/IgniteCacheQueryH2IndexingLeakTest.java | 2 --
.../IgniteCacheQueryMultiThreadedSelfTest.java | 5 -----
.../IgniteCacheSqlQueryMultiThreadedSelfTest.java | 7 -------
...ingleNodeWithIndexingPutGetPersistenceTest.java | 2 --
...eDistributedPartitionQueryAbstractSelfTest.java | 7 -------
...tributedQueryStopOnCancelOrTimeoutSelfTest.java | 7 -------
...eCacheQueryAbstractDistributedJoinSelfTest.java | 5 -----
.../near/IgniteCacheQueryNoRebalanceSelfTest.java | 7 -------
.../near/IgniteCacheQueryNodeFailTest.java | 7 -------
.../near/IgniteCacheQueryNodeRestartSelfTest2.java | 5 -----
.../index/DuplicateKeyValueClassesSelfTest.java | 5 -----
.../cache/index/DynamicIndexAbstractSelfTest.java | 7 -------
.../cache/index/H2ConnectionLeaksSelfTest.java | 5 -----
.../H2DynamicColumnsAbstractBasicSelfTest.java | 7 -------
.../index/H2DynamicIndexAbstractSelfTest.java | 7 -------
.../cache/index/H2DynamicIndexingComplexTest.java | 7 -------
.../cache/index/H2DynamicTableSelfTest.java | 7 -------
.../index/OptimizedMarshallerIndexNameTest.java | 7 -------
.../cache/index/QueryEntityValidationSelfTest.java | 5 -----
...niteCacheLocalQueryCancelOrTimeoutSelfTest.java | 7 -------
...eLockPartitionOnAffinityRunAtomicCacheTest.java | 2 --
...elineLockPartitionOnAffinityRunTxCacheTest.java | 2 --
...ngingBaselineCacheQueryNodeRestartSelfTest.java | 2 --
...ableBaselineCacheQueryNodeRestartsSelfTest.java | 2 --
.../query/IgniteSqlDefaultValueTest.java | 7 -------
.../query/IgniteSqlDistributedJoinSelfTest.java | 5 -----
.../query/IgniteSqlNotNullConstraintTest.java | 7 -------
.../processors/query/IgniteSqlRoutingTest.java | 7 -------
.../query/IgniteSqlSegmentedIndexSelfTest.java | 5 -----
...gniteSqlSkipReducerOnUpdateDmlFlagSelfTest.java | 8 --------
.../IgniteSqlSkipReducerOnUpdateDmlSelfTest.java | 4 ----
.../query/IgniteSqlSplitterSelfTest.java | 5 -----
.../query/h2/IgniteSqlBigIntegerKeyTest.java | 5 -----
.../query/h2/sql/AbstractH2CompareQueryTest.java | 4 ----
.../query/h2/sql/GridQueryParsingTest.java | 4 ----
.../cache/CacheJndiTmFactorySelfTest.java | 2 --
.../cache/GridJtaTransactionManagerSelfTest.java | 4 ----
.../kafka/connect/IgniteSinkConnectorTest.java | 5 -----
.../kafka/connect/IgniteSourceConnectorTest.java | 5 -----
.../processors/schedule/GridScheduleSelfTest.java | 7 -------
.../spark/JavaStandaloneIgniteRDDSelfTest.java | 6 ------
.../springdata/IgniteSpringDataCrudSelfTest.java | 2 --
.../IgniteSpringDataQueriesSelfTest.java | 2 --
.../springdata/IgniteSpringDataCrudSelfTest.java | 2 --
.../IgniteSpringDataQueriesSelfTest.java | 3 +--
.../GridSpringCacheManagerMultiJvmSelfTest.java | 5 -----
.../spring/GridSpringCacheManagerSelfTest.java | 5 -----
.../ignite/cache/spring/SpringCacheTest.java | 2 --
.../resource/GridLoggerInjectionSelfTest.java | 7 -------
.../resource/GridServiceInjectionSelfTest.java | 7 -------
.../GridSpringResourceInjectionSelfTest.java | 5 -----
.../GridSpringTransactionManagerSelfTest.java | 5 -----
.../stream/zeromq/IgniteZeroMqStreamerTest.java | 5 -----
.../zk/internal/ZookeeperDiscoverySpiTest.java | 2 --
425 files changed, 8 insertions(+), 2151 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/aop/src/test/java/org/apache/ignite/internal/marshaller/optimized/OptimizedMarshallerAopTest.java
----------------------------------------------------------------------
diff --git a/modules/aop/src/test/java/org/apache/ignite/internal/marshaller/optimized/OptimizedMarshallerAopTest.java b/modules/aop/src/test/java/org/apache/ignite/internal/marshaller/optimized/OptimizedMarshallerAopTest.java
index a1c52ab..8236f43 100644
--- a/modules/aop/src/test/java/org/apache/ignite/internal/marshaller/optimized/OptimizedMarshallerAopTest.java
+++ b/modules/aop/src/test/java/org/apache/ignite/internal/marshaller/optimized/OptimizedMarshallerAopTest.java
@@ -66,13 +66,6 @@ public class OptimizedMarshallerAopTest extends GridCommonAbstractTest {
assert G.allGrids().size() == 1;
}
- /** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- stopAllGrids();
-
- assert G.allGrids().isEmpty();
- }
-
/**
* JUnit.
*
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/clients/src/test/java/org/apache/ignite/internal/TaskEventSubjectIdSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/TaskEventSubjectIdSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/TaskEventSubjectIdSelfTest.java
index 102db57..93b720f 100644
--- a/modules/clients/src/test/java/org/apache/ignite/internal/TaskEventSubjectIdSelfTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/internal/TaskEventSubjectIdSelfTest.java
@@ -107,8 +107,6 @@ public class TaskEventSubjectIdSelfTest extends GridCommonAbstractTest {
/** {@inheritDoc} */
@Override protected void afterTestsStopped() throws Exception {
GridClientFactory.stop(client.id());
-
- stopGrid();
}
/** {@inheritDoc} */
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientAbstractMultiThreadedSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientAbstractMultiThreadedSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientAbstractMultiThreadedSelfTest.java
index ecdbd4a..fb46bb2 100644
--- a/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientAbstractMultiThreadedSelfTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientAbstractMultiThreadedSelfTest.java
@@ -232,11 +232,6 @@ public abstract class ClientAbstractMultiThreadedSelfTest extends GridCommonAbst
}
/** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- stopAllGrids();
- }
-
- /** {@inheritDoc} */
@Override protected void beforeTest() throws Exception {
client = GridClientFactory.start(clientConfiguration());
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientDefaultCacheSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientDefaultCacheSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientDefaultCacheSelfTest.java
index 2fe6084..c62cf8a 100644
--- a/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientDefaultCacheSelfTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/internal/client/ClientDefaultCacheSelfTest.java
@@ -84,8 +84,6 @@ public class ClientDefaultCacheSelfTest extends GridCommonAbstractTest {
/** {@inheritDoc} */
@Override protected void afterTestsStopped() throws Exception {
- stopGrid();
-
System.clearProperty(IGNITE_JETTY_PORT);
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientAbstractMultiNodeSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientAbstractMultiNodeSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientAbstractMultiNodeSelfTest.java
index 6023ab0..3481f34 100644
--- a/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientAbstractMultiNodeSelfTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientAbstractMultiNodeSelfTest.java
@@ -239,13 +239,6 @@ public abstract class ClientAbstractMultiNodeSelfTest extends GridCommonAbstract
}
/** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- info("Stopping grids.");
-
- stopAllGrids();
- }
-
- /** {@inheritDoc} */
@Override protected void beforeTest() throws Exception {
client = GridClientFactory.start(clientConfiguration());
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientAbstractSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientAbstractSelfTest.java
index 89eebdf..5971218 100644
--- a/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientAbstractSelfTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientAbstractSelfTest.java
@@ -136,11 +136,6 @@ public abstract class ClientAbstractSelfTest extends GridCommonAbstractTest {
}
/** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- stopGrid();
- }
-
- /** {@inheritDoc} */
@Override protected void beforeTest() throws Exception {
exec = Executors.newCachedThreadPool();
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientPreferDirectSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientPreferDirectSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientPreferDirectSelfTest.java
index f8bcd8a..b012d3b 100644
--- a/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientPreferDirectSelfTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/internal/client/integration/ClientPreferDirectSelfTest.java
@@ -61,13 +61,6 @@ public class ClientPreferDirectSelfTest extends GridCommonAbstractTest {
}
/** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- info("Stopping grids.");
-
- stopAllGrids();
- }
-
- /** {@inheritDoc} */
@Override protected IgniteConfiguration getConfiguration(String igniteInstanceName) throws Exception {
IgniteConfiguration c = super.getConfiguration(igniteInstanceName);
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/clients/src/test/java/org/apache/ignite/internal/client/router/TcpRouterAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/client/router/TcpRouterAbstractSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/client/router/TcpRouterAbstractSelfTest.java
index f0ce7fb..628006e 100644
--- a/modules/clients/src/test/java/org/apache/ignite/internal/client/router/TcpRouterAbstractSelfTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/internal/client/router/TcpRouterAbstractSelfTest.java
@@ -86,8 +86,6 @@ public abstract class TcpRouterAbstractSelfTest extends ClientAbstractSelfTest {
/** {@inheritDoc} */
@Override protected void afterTestsStopped() throws Exception {
router.stop();
-
- super.afterTestsStopped();
}
/** {@inheritDoc} */
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/clients/src/test/java/org/apache/ignite/internal/client/router/TcpRouterMultiNodeSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/client/router/TcpRouterMultiNodeSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/client/router/TcpRouterMultiNodeSelfTest.java
index ea73819..070a43c 100644
--- a/modules/clients/src/test/java/org/apache/ignite/internal/client/router/TcpRouterMultiNodeSelfTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/internal/client/router/TcpRouterMultiNodeSelfTest.java
@@ -64,8 +64,6 @@ public class TcpRouterMultiNodeSelfTest extends ClientAbstractMultiNodeSelfTest
info("Routers stopped.");
routers.clear();
-
- super.afterTestsStopped();
}
/** {@inheritDoc} */
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcAbstractDmlStatementSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcAbstractDmlStatementSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcAbstractDmlStatementSelfTest.java
index 0a055a9..1cc5740 100644
--- a/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcAbstractDmlStatementSelfTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcAbstractDmlStatementSelfTest.java
@@ -64,11 +64,6 @@ public abstract class JdbcAbstractDmlStatementSelfTest extends GridCommonAbstrac
}
/** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- stopAllGrids();
- }
-
- /** {@inheritDoc} */
@Override protected void beforeTest() throws Exception {
((IgniteEx)ignite(0)).context().cache().dynamicStartSqlCache(cacheConfig());
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcBulkLoadSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcBulkLoadSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcBulkLoadSelfTest.java
index d9506cf..e91585f 100644
--- a/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcBulkLoadSelfTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcBulkLoadSelfTest.java
@@ -98,11 +98,6 @@ public class JdbcBulkLoadSelfTest extends GridCommonAbstractTest {
startGrids(2);
}
- /** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- stopAllGrids();
- }
-
/**
* Establishes the JDBC connection.
*
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcComplexQuerySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcComplexQuerySelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcComplexQuerySelfTest.java
index 1163723..8b1390e 100644
--- a/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcComplexQuerySelfTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcComplexQuerySelfTest.java
@@ -111,11 +111,6 @@ public class JdbcComplexQuerySelfTest extends GridCommonAbstractTest {
}
/** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- stopAllGrids();
- }
-
- /** {@inheritDoc} */
@Override protected void beforeTest() throws Exception {
stmt = DriverManager.getConnection(BASE_URL).createStatement();
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcConnectionSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcConnectionSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcConnectionSelfTest.java
index 35d0fba..d560d74 100644
--- a/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcConnectionSelfTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcConnectionSelfTest.java
@@ -97,11 +97,6 @@ public class JdbcConnectionSelfTest extends GridCommonAbstractTest {
startGridsMultiThreaded(GRID_CNT);
}
- /** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- stopAllGrids();
- }
-
/**
* @throws Exception If failed.
*/
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcDistributedJoinsQueryTest.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcDistributedJoinsQueryTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcDistributedJoinsQueryTest.java
index 63f5a5c..2a58e02 100644
--- a/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcDistributedJoinsQueryTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcDistributedJoinsQueryTest.java
@@ -96,11 +96,6 @@ public class JdbcDistributedJoinsQueryTest extends GridCommonAbstractTest {
}
/** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- stopAllGrids();
- }
-
- /** {@inheritDoc} */
@Override protected void beforeTest() throws Exception {
stmt = DriverManager.getConnection(BASE_URL).createStatement();
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcEmptyCacheSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcEmptyCacheSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcEmptyCacheSelfTest.java
index 615658a..25b97ea 100644
--- a/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcEmptyCacheSelfTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcEmptyCacheSelfTest.java
@@ -79,11 +79,6 @@ public class JdbcEmptyCacheSelfTest extends GridCommonAbstractTest {
}
/** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- stopAllGrids();
- }
-
- /** {@inheritDoc} */
@Override protected void beforeTest() throws Exception {
stmt = DriverManager.getConnection(BASE_URL).createStatement();
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcLocalCachesSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcLocalCachesSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcLocalCachesSelfTest.java
index 09ccbc9..46379cb 100644
--- a/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcLocalCachesSelfTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcLocalCachesSelfTest.java
@@ -95,11 +95,6 @@ public class JdbcLocalCachesSelfTest extends GridCommonAbstractTest {
cache2.put("key2", 4);
}
- /** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- stopAllGrids();
- }
-
/**
* @throws Exception If failed.
*/
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcMetadataSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcMetadataSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcMetadataSelfTest.java
index 1e5db0a..c3d0824 100755
--- a/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcMetadataSelfTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcMetadataSelfTest.java
@@ -134,11 +134,6 @@ public class JdbcMetadataSelfTest extends GridCommonAbstractTest {
personCache.put(new AffinityKey<>("p3", "o2"), new Person("Mike Green", 40, 2));
}
- /** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- stopAllGrids();
- }
-
/**
* @throws Exception If failed.
*/
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcNoCacheStreamingSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcNoCacheStreamingSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcNoCacheStreamingSelfTest.java
index 74c2820..e32e070 100644
--- a/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcNoCacheStreamingSelfTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcNoCacheStreamingSelfTest.java
@@ -94,11 +94,6 @@ public class JdbcNoCacheStreamingSelfTest extends GridCommonAbstractTest {
startGrids(2);
}
- /** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- stopAllGrids();
- }
-
/**
* @param allowOverwrite Allow overwriting of existing keys.
* @return Connection to use for the test.
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcNoDefaultCacheTest.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcNoDefaultCacheTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcNoDefaultCacheTest.java
index e851319..5c549a8 100644
--- a/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcNoDefaultCacheTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcNoDefaultCacheTest.java
@@ -99,11 +99,6 @@ public class JdbcNoDefaultCacheTest extends GridCommonAbstractTest {
}
}
- /** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- stopAllGrids();
- }
-
/**
* @throws Exception If failed.
*/
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcPreparedStatementSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcPreparedStatementSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcPreparedStatementSelfTest.java
index 7df0e02..0a48961 100644
--- a/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcPreparedStatementSelfTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcPreparedStatementSelfTest.java
@@ -129,11 +129,6 @@ public class JdbcPreparedStatementSelfTest extends GridCommonAbstractTest {
}
/** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- stopAllGrids();
- }
-
- /** {@inheritDoc} */
@Override protected void beforeTest() throws Exception {
conn = DriverManager.getConnection(BASE_URL);
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcResultSetSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcResultSetSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcResultSetSelfTest.java
index 42134e7..9e60c25 100644
--- a/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcResultSetSelfTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcResultSetSelfTest.java
@@ -114,11 +114,6 @@ public class JdbcResultSetSelfTest extends GridCommonAbstractTest {
}
/** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- stopAllGrids();
- }
-
- /** {@inheritDoc} */
@Override protected void beforeTest() throws Exception {
stmt = DriverManager.getConnection(BASE_URL).createStatement();
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcStatementSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcStatementSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcStatementSelfTest.java
index d3f77e0..f778fde 100644
--- a/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcStatementSelfTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcStatementSelfTest.java
@@ -97,11 +97,6 @@ public class JdbcStatementSelfTest extends GridCommonAbstractTest {
}
/** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- stopAllGrids();
- }
-
- /** {@inheritDoc} */
@Override protected void beforeTest() throws Exception {
conn = DriverManager.getConnection(BASE_URL);
stmt = conn.createStatement();
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcStreamingSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcStreamingSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcStreamingSelfTest.java
index e302529..9e11efc 100644
--- a/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcStreamingSelfTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcStreamingSelfTest.java
@@ -111,11 +111,6 @@ public class JdbcStreamingSelfTest extends GridCommonAbstractTest {
U.sleep(1000);
}
- /** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- stopAllGrids();
- }
-
/**
* @return Connection without streaming initially turned on.
* @throws SQLException if failed.
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcStreamingToPublicCacheTest.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcStreamingToPublicCacheTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcStreamingToPublicCacheTest.java
index b973f10..20fd0fb 100644
--- a/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcStreamingToPublicCacheTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/internal/jdbc2/JdbcStreamingToPublicCacheTest.java
@@ -78,11 +78,6 @@ public class JdbcStreamingToPublicCacheTest extends GridCommonAbstractTest {
startGrids(2);
}
- /** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- stopAllGrids();
- }
-
/**
* @param cacheName Cache name.
* @param streaming Streaming mode flag.
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/AbstractRestProcessorSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/AbstractRestProcessorSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/AbstractRestProcessorSelfTest.java
index 712b71a..c67d735 100644
--- a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/AbstractRestProcessorSelfTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/AbstractRestProcessorSelfTest.java
@@ -47,11 +47,6 @@ abstract class AbstractRestProcessorSelfTest extends GridCommonAbstractTest {
}
/** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- stopAllGrids();
- }
-
- /** {@inheritDoc} */
@Override protected void beforeTest() throws Exception {
assert grid(0).cluster().nodes().size() == gridCount();
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/ChangeStateCommandHandlerTest.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/ChangeStateCommandHandlerTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/ChangeStateCommandHandlerTest.java
index 8f794c4..cb882e7 100644
--- a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/ChangeStateCommandHandlerTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/ChangeStateCommandHandlerTest.java
@@ -78,12 +78,6 @@ public class ChangeStateCommandHandlerTest extends GridCommonAbstractTest {
}
/** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- stopAllGrids();
- }
-
-
- /** {@inheritDoc} */
@Override protected void beforeTest() throws Exception {
GridClientConfiguration cfg = new GridClientConfiguration();
cfg.setProtocol(TCP);
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/JettyRestProcessorAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/JettyRestProcessorAbstractSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/JettyRestProcessorAbstractSelfTest.java
index 96391e9..f52bfcb 100644
--- a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/JettyRestProcessorAbstractSelfTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/JettyRestProcessorAbstractSelfTest.java
@@ -184,8 +184,6 @@ public abstract class JettyRestProcessorAbstractSelfTest extends AbstractRestPro
/** {@inheritDoc} */
@Override protected void afterTestsStopped() throws Exception {
- super.afterTestsStopped();
-
System.clearProperty(IGNITE_JETTY_PORT);
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/RestBinaryProtocolSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/RestBinaryProtocolSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/RestBinaryProtocolSelfTest.java
index 284cffc..fb56b77 100644
--- a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/RestBinaryProtocolSelfTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/RestBinaryProtocolSelfTest.java
@@ -76,11 +76,6 @@ public class RestBinaryProtocolSelfTest extends GridCommonAbstractTest {
}
/** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- stopAllGrids();
- }
-
- /** {@inheritDoc} */
@Override protected void beforeTest() throws Exception {
client = client();
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/RestMemcacheProtocolSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/RestMemcacheProtocolSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/RestMemcacheProtocolSelfTest.java
index 02b7584..9ac6270 100644
--- a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/RestMemcacheProtocolSelfTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/RestMemcacheProtocolSelfTest.java
@@ -59,11 +59,6 @@ public class RestMemcacheProtocolSelfTest extends GridCommonAbstractTest {
}
/** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- stopAllGrids();
- }
-
- /** {@inheritDoc} */
@Override protected void beforeTest() throws Exception {
client = client();
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/TaskCommandHandlerSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/TaskCommandHandlerSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/TaskCommandHandlerSelfTest.java
index f6acd56..60e620b 100644
--- a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/TaskCommandHandlerSelfTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/TaskCommandHandlerSelfTest.java
@@ -86,8 +86,6 @@ public class TaskCommandHandlerSelfTest extends GridCommonAbstractTest {
/** {@inheritDoc} */
@Override protected void afterTestsStopped() throws Exception {
- stopAllGrids();
-
System.clearProperty(IgniteSystemProperties.IGNITE_REST_MAX_TASK_RESULTS);
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/protocols/tcp/redis/RedisCommonAbstractTest.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/protocols/tcp/redis/RedisCommonAbstractTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/protocols/tcp/redis/RedisCommonAbstractTest.java
index 78bff43..3db7706 100644
--- a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/protocols/tcp/redis/RedisCommonAbstractTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/protocols/tcp/redis/RedisCommonAbstractTest.java
@@ -70,8 +70,6 @@ public class RedisCommonAbstractTest extends GridCommonAbstractTest {
/** {@inheritDoc} */
@Override protected void afterTestsStopped() throws Exception {
- stopAllGrids();
-
pool.destroy();
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/clients/src/test/java/org/apache/ignite/jdbc/AbstractJdbcPojoQuerySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/apache/ignite/jdbc/AbstractJdbcPojoQuerySelfTest.java b/modules/clients/src/test/java/org/apache/ignite/jdbc/AbstractJdbcPojoQuerySelfTest.java
index 892812f..cc8d72e 100644
--- a/modules/clients/src/test/java/org/apache/ignite/jdbc/AbstractJdbcPojoQuerySelfTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/jdbc/AbstractJdbcPojoQuerySelfTest.java
@@ -115,8 +115,6 @@ public abstract class AbstractJdbcPojoQuerySelfTest extends GridCommonAbstractTe
/** {@inheritDoc} */
@Override protected void afterTestsStopped() throws Exception {
- stopAllGrids();
-
GridTestProperties.setProperty(GridTestProperties.MARSH_CLASS_NAME, marshallerBackup);
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcComplexQuerySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcComplexQuerySelfTest.java b/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcComplexQuerySelfTest.java
index 99bc361..3c00288 100644
--- a/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcComplexQuerySelfTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcComplexQuerySelfTest.java
@@ -106,11 +106,6 @@ public class JdbcComplexQuerySelfTest extends GridCommonAbstractTest {
}
/** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- stopAllGrids();
- }
-
- /** {@inheritDoc} */
@Override protected void beforeTest() throws Exception {
stmt = DriverManager.getConnection(URL).createStatement();
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcConnectionSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcConnectionSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcConnectionSelfTest.java
index 466bf5d..14d2146 100644
--- a/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcConnectionSelfTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcConnectionSelfTest.java
@@ -93,11 +93,6 @@ public class JdbcConnectionSelfTest extends GridCommonAbstractTest {
startGridsMultiThreaded(2);
}
- /** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- stopAllGrids();
- }
-
/**
* @throws Exception If failed.
*/
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcEmptyCacheSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcEmptyCacheSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcEmptyCacheSelfTest.java
index c883aa0..897f71e 100644
--- a/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcEmptyCacheSelfTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcEmptyCacheSelfTest.java
@@ -80,11 +80,6 @@ public class JdbcEmptyCacheSelfTest extends GridCommonAbstractTest {
}
/** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- stopAllGrids();
- }
-
- /** {@inheritDoc} */
@Override protected void beforeTest() throws Exception {
stmt = DriverManager.getConnection(URL).createStatement();
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcErrorsAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcErrorsAbstractSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcErrorsAbstractSelfTest.java
index 2059408..59535f8 100644
--- a/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcErrorsAbstractSelfTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcErrorsAbstractSelfTest.java
@@ -69,13 +69,6 @@ public abstract class JdbcErrorsAbstractSelfTest extends GridCommonAbstractTest
.setInterceptor(new TestCacheInterceptor()));
}
- /** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- stopAllGrids();
-
- super.afterTestsStopped();
- }
-
/**
* Test that H2 specific error codes get propagated to Ignite SQL exceptions.
* @throws SQLException if failed.
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcLocalCachesSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcLocalCachesSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcLocalCachesSelfTest.java
index ad65434..9350e0d 100644
--- a/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcLocalCachesSelfTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcLocalCachesSelfTest.java
@@ -92,11 +92,6 @@ public class JdbcLocalCachesSelfTest extends GridCommonAbstractTest {
cache2.put("key2", 4);
}
- /** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- stopAllGrids();
- }
-
/**
* @throws Exception If failed.
*/
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcMetadataSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcMetadataSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcMetadataSelfTest.java
index 2d1443b..f270910 100644
--- a/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcMetadataSelfTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcMetadataSelfTest.java
@@ -105,11 +105,6 @@ public class JdbcMetadataSelfTest extends GridCommonAbstractTest {
personCache.put(new AffinityKey<>("p3", "o2"), new Person("Mike Green", 40, 2));
}
- /** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- stopAllGrids();
- }
-
/**
* @throws Exception If failed.
*/
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcNoDefaultCacheTest.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcNoDefaultCacheTest.java b/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcNoDefaultCacheTest.java
index a37c167..adb5c30 100644
--- a/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcNoDefaultCacheTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcNoDefaultCacheTest.java
@@ -99,11 +99,6 @@ public class JdbcNoDefaultCacheTest extends GridCommonAbstractTest {
}
}
- /** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- stopAllGrids();
- }
-
/**
* @return Connection URL.
*/
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcPreparedStatementSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcPreparedStatementSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcPreparedStatementSelfTest.java
index 384036a..9bdb7d8 100644
--- a/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcPreparedStatementSelfTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcPreparedStatementSelfTest.java
@@ -126,11 +126,6 @@ public class JdbcPreparedStatementSelfTest extends GridCommonAbstractTest {
}
/** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- stopAllGrids();
- }
-
- /** {@inheritDoc} */
@Override protected void beforeTest() throws Exception {
conn = DriverManager.getConnection(URL);
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcResultSetSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcResultSetSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcResultSetSelfTest.java
index b407f3e..0fe55f2 100644
--- a/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcResultSetSelfTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcResultSetSelfTest.java
@@ -109,11 +109,6 @@ public class JdbcResultSetSelfTest extends GridCommonAbstractTest {
}
/** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- stopAllGrids();
- }
-
- /** {@inheritDoc} */
@Override protected void beforeTest() throws Exception {
stmt = DriverManager.getConnection(URL).createStatement();
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcStatementSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcStatementSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcStatementSelfTest.java
index be685cc..4d72b8e 100644
--- a/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcStatementSelfTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcStatementSelfTest.java
@@ -95,11 +95,6 @@ public class JdbcStatementSelfTest extends GridCommonAbstractTest {
}
/** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- stopAllGrids();
- }
-
- /** {@inheritDoc} */
@Override protected void beforeTest() throws Exception {
conn = DriverManager.getConnection(URL);
stmt = conn.createStatement();
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinAbstractDmlStatementSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinAbstractDmlStatementSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinAbstractDmlStatementSelfTest.java
index 69435da..9363467 100644
--- a/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinAbstractDmlStatementSelfTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinAbstractDmlStatementSelfTest.java
@@ -57,11 +57,6 @@ public abstract class JdbcThinAbstractDmlStatementSelfTest extends JdbcThinAbstr
}
/** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- stopAllGrids();
- }
-
- /** {@inheritDoc} */
@Override protected void beforeTest() throws Exception {
ignite(0).getOrCreateCache(cacheConfig());
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinAutoCloseServerCursorTest.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinAutoCloseServerCursorTest.java b/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinAutoCloseServerCursorTest.java
index 943ca0e..bb2696f 100644
--- a/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinAutoCloseServerCursorTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinAutoCloseServerCursorTest.java
@@ -84,11 +84,6 @@ public class JdbcThinAutoCloseServerCursorTest extends JdbcThinAbstractSelfTest
}
/** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- stopAllGrids();
- }
-
- /** {@inheritDoc} */
@Override protected void afterTest() throws Exception {
IgniteCache<Integer, Person> cache = grid(0).cache(CACHE_NAME);
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinComplexDmlDdlSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinComplexDmlDdlSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinComplexDmlDdlSelfTest.java
index 7941abe..9c40948 100644
--- a/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinComplexDmlDdlSelfTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinComplexDmlDdlSelfTest.java
@@ -108,11 +108,6 @@ public class JdbcThinComplexDmlDdlSelfTest extends GridCommonAbstractTest {
}
/** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- stopAllGrids();
- }
-
- /** {@inheritDoc} */
@Override protected void beforeTest() throws Exception {
super.beforeTest();
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinComplexQuerySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinComplexQuerySelfTest.java b/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinComplexQuerySelfTest.java
index ad1e312..692de7c 100644
--- a/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinComplexQuerySelfTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinComplexQuerySelfTest.java
@@ -105,11 +105,6 @@ public class JdbcThinComplexQuerySelfTest extends JdbcThinAbstractSelfTest {
}
/** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- stopAllGrids();
- }
-
- /** {@inheritDoc} */
@Override protected void beforeTest() throws Exception {
Connection conn = DriverManager.getConnection(URL);
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinConnectionSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinConnectionSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinConnectionSelfTest.java
index b462e46..d907c2b 100644
--- a/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinConnectionSelfTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinConnectionSelfTest.java
@@ -116,11 +116,6 @@ public class JdbcThinConnectionSelfTest extends JdbcThinAbstractSelfTest {
startGridsMultiThreaded(2);
}
- /** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- stopAllGrids();
- }
-
/**
* @throws Exception If failed.
*/
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinEmptyCacheSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinEmptyCacheSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinEmptyCacheSelfTest.java
index 41b4338..87c1428 100644
--- a/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinEmptyCacheSelfTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinEmptyCacheSelfTest.java
@@ -79,11 +79,6 @@ public class JdbcThinEmptyCacheSelfTest extends JdbcThinAbstractSelfTest {
}
/** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- stopAllGrids();
- }
-
- /** {@inheritDoc} */
@Override protected void beforeTest() throws Exception {
Connection conn = DriverManager.getConnection(URL);
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinMetadataSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinMetadataSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinMetadataSelfTest.java
index cc6790a..8e35a86 100644
--- a/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinMetadataSelfTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinMetadataSelfTest.java
@@ -148,11 +148,6 @@ public class JdbcThinMetadataSelfTest extends JdbcThinAbstractSelfTest {
}
}
- /** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- stopAllGrids();
- }
-
/**
* @throws Exception If failed.
*/
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinMissingLongArrayResultsTest.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinMissingLongArrayResultsTest.java b/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinMissingLongArrayResultsTest.java
index 1f6e2c0..633c74b 100644
--- a/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinMissingLongArrayResultsTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinMissingLongArrayResultsTest.java
@@ -158,11 +158,7 @@ public class JdbcThinMissingLongArrayResultsTest extends JdbcThinAbstractSelfTes
}
streamer.flush();
}
- ignite.active(true); }
-
- /** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- stopAllGrids();
+ ignite.active(true);
}
/**
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinNoDefaultSchemaTest.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinNoDefaultSchemaTest.java b/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinNoDefaultSchemaTest.java
index 11aef9f..53425c8 100644
--- a/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinNoDefaultSchemaTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinNoDefaultSchemaTest.java
@@ -100,11 +100,6 @@ public class JdbcThinNoDefaultSchemaTest extends JdbcThinAbstractSelfTest {
}
}
- /** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- stopAllGrids();
- }
-
/**
* @throws Exception If failed.
*/
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinPreparedStatementSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinPreparedStatementSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinPreparedStatementSelfTest.java
index c577853..85efb4d 100644
--- a/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinPreparedStatementSelfTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinPreparedStatementSelfTest.java
@@ -140,11 +140,6 @@ public class JdbcThinPreparedStatementSelfTest extends JdbcThinAbstractSelfTest
}
/** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- stopAllGrids();
- }
-
- /** {@inheritDoc} */
@Override protected void beforeTest() throws Exception {
conn = DriverManager.getConnection(URL);
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinResultSetSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinResultSetSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinResultSetSelfTest.java
index fd46cda..6b7cdf4 100644
--- a/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinResultSetSelfTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinResultSetSelfTest.java
@@ -112,11 +112,6 @@ public class JdbcThinResultSetSelfTest extends JdbcThinAbstractSelfTest {
}
/** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- stopAllGrids();
- }
-
- /** {@inheritDoc} */
@Override protected void beforeTest() throws Exception {
Connection conn = DriverManager.getConnection(URL);
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinSchemaCaseTest.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinSchemaCaseTest.java b/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinSchemaCaseTest.java
index 11416e5..8f11087 100644
--- a/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinSchemaCaseTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinSchemaCaseTest.java
@@ -87,11 +87,6 @@ public class JdbcThinSchemaCaseTest extends JdbcThinAbstractSelfTest {
startGridsMultiThreaded(GRID_CNT);
}
- /** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- stopAllGrids();
- }
-
/**
* @throws Exception If failed.
*/
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinSelectAfterAlterTable.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinSelectAfterAlterTable.java b/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinSelectAfterAlterTable.java
index 13b8f3e..ef711dc 100644
--- a/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinSelectAfterAlterTable.java
+++ b/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinSelectAfterAlterTable.java
@@ -87,11 +87,6 @@ public class JdbcThinSelectAfterAlterTable extends GridCommonAbstractTest {
}
/** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- stopAllGrids();
- }
-
- /** {@inheritDoc} */
@Override protected void beforeTest() throws Exception {
super.beforeTest();
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinStatementSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinStatementSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinStatementSelfTest.java
index 82c0512..6d6e72d 100644
--- a/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinStatementSelfTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinStatementSelfTest.java
@@ -96,11 +96,6 @@ public class JdbcThinStatementSelfTest extends JdbcThinAbstractSelfTest {
}
/** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- stopAllGrids();
- }
-
- /** {@inheritDoc} */
@Override protected void beforeTest() throws Exception {
conn = DriverManager.getConnection(URL);
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/core/src/test/java/org/apache/ignite/cache/IgniteWarmupClosureSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/cache/IgniteWarmupClosureSelfTest.java b/modules/core/src/test/java/org/apache/ignite/cache/IgniteWarmupClosureSelfTest.java
index 30e6072..1fccb90 100644
--- a/modules/core/src/test/java/org/apache/ignite/cache/IgniteWarmupClosureSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/cache/IgniteWarmupClosureSelfTest.java
@@ -69,11 +69,6 @@ public class IgniteWarmupClosureSelfTest extends GridCommonAbstractTest {
return cfg;
}
- /** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- stopAllGrids();
- }
-
/**
* @throws Exception If failed.
*/
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/core/src/test/java/org/apache/ignite/cache/affinity/AffinityClientNodeSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/cache/affinity/AffinityClientNodeSelfTest.java b/modules/core/src/test/java/org/apache/ignite/cache/affinity/AffinityClientNodeSelfTest.java
index 73302d9..6d1c020 100644
--- a/modules/core/src/test/java/org/apache/ignite/cache/affinity/AffinityClientNodeSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/cache/affinity/AffinityClientNodeSelfTest.java
@@ -106,11 +106,6 @@ public class AffinityClientNodeSelfTest extends GridCommonAbstractTest {
startGrid(NODE_CNT - 1); // Start client after servers.
}
- /** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- stopAllGrids();
- }
-
/**
* @throws Exception If failed.
*/
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/core/src/test/java/org/apache/ignite/cache/affinity/AffinityDistributionLoggingTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/cache/affinity/AffinityDistributionLoggingTest.java b/modules/core/src/test/java/org/apache/ignite/cache/affinity/AffinityDistributionLoggingTest.java
index 7ea1a1a..0168c7c 100644
--- a/modules/core/src/test/java/org/apache/ignite/cache/affinity/AffinityDistributionLoggingTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/cache/affinity/AffinityDistributionLoggingTest.java
@@ -71,8 +71,6 @@ public class AffinityDistributionLoggingTest extends GridCommonAbstractTest {
/** {@inheritDoc} */
@Override protected void afterTestsStopped() throws Exception {
- super.afterTestsStopped();
-
if (tempProp != null)
System.setProperty(IGNITE_PART_DISTRIBUTION_WARN_THRESHOLD, tempProp);
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/core/src/test/java/org/apache/ignite/cache/affinity/local/LocalAffinityFunctionTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/cache/affinity/local/LocalAffinityFunctionTest.java b/modules/core/src/test/java/org/apache/ignite/cache/affinity/local/LocalAffinityFunctionTest.java
index b447b78..e08d212 100755
--- a/modules/core/src/test/java/org/apache/ignite/cache/affinity/local/LocalAffinityFunctionTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/cache/affinity/local/LocalAffinityFunctionTest.java
@@ -61,11 +61,6 @@ public class LocalAffinityFunctionTest extends GridCommonAbstractTest {
startGrids(NODE_CNT);
}
- @Override protected void afterTestsStopped() throws Exception {
- super.afterTestsStopped();
- stopAllGrids();
- }
-
public void testWronglySetAffinityFunctionForLocalCache() {
Ignite node = ignite(NODE_CNT - 1);
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/core/src/test/java/org/apache/ignite/cache/affinity/rendezvous/RendezvousAffinityFunctionSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/cache/affinity/rendezvous/RendezvousAffinityFunctionSelfTest.java b/modules/core/src/test/java/org/apache/ignite/cache/affinity/rendezvous/RendezvousAffinityFunctionSelfTest.java
index d895315..7fa2dc7 100644
--- a/modules/core/src/test/java/org/apache/ignite/cache/affinity/rendezvous/RendezvousAffinityFunctionSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/cache/affinity/rendezvous/RendezvousAffinityFunctionSelfTest.java
@@ -35,11 +35,6 @@ public class RendezvousAffinityFunctionSelfTest extends AbstractAffinityFunction
}
/** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- stopAllGrids();
- }
-
- /** {@inheritDoc} */
@Override protected AffinityFunction affinityFunction() {
AffinityFunction aff = new RendezvousAffinityFunction();
[15/50] [abbrv] ignite git commit: IGNITE-8266: stopAllGrids in
afterAllTests removed. - Fixes #3844.
Posted by dp...@apache.org.
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/DynamicIndexAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/DynamicIndexAbstractSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/DynamicIndexAbstractSelfTest.java
index 452ac96..2ee626f 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/DynamicIndexAbstractSelfTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/DynamicIndexAbstractSelfTest.java
@@ -82,13 +82,6 @@ public abstract class DynamicIndexAbstractSelfTest extends AbstractSchemaSelfTes
/** Argument for simple SQL (2). */
protected static final int SQL_ARG_2 = 80;
- /** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- stopAllGrids();
-
- super.afterTestsStopped();
- }
-
/**
* Create server configuration.
*
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/H2ConnectionLeaksSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/H2ConnectionLeaksSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/H2ConnectionLeaksSelfTest.java
index 417c1f3..240b526 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/H2ConnectionLeaksSelfTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/H2ConnectionLeaksSelfTest.java
@@ -57,11 +57,6 @@ public class H2ConnectionLeaksSelfTest extends GridCommonAbstractTest {
}
/** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- stopAllGrids();
- }
-
- /** {@inheritDoc} */
@Override protected IgniteConfiguration getConfiguration(String igniteInstanceName) throws Exception {
CacheConfiguration<Long, String> ccfg = new CacheConfiguration<Long, String>().setName(CACHE_NAME)
.setIndexedTypes(Long.class, String.class);
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/H2DynamicColumnsAbstractBasicSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/H2DynamicColumnsAbstractBasicSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/H2DynamicColumnsAbstractBasicSelfTest.java
index 70f2d85..650da7d 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/H2DynamicColumnsAbstractBasicSelfTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/H2DynamicColumnsAbstractBasicSelfTest.java
@@ -74,13 +74,6 @@ public abstract class H2DynamicColumnsAbstractBasicSelfTest extends DynamicColum
}
/** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- stopAllGrids();
-
- super.afterTestsStopped();
- }
-
- /** {@inheritDoc} */
@Override protected void beforeTest() throws Exception {
super.beforeTest();
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/H2DynamicIndexAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/H2DynamicIndexAbstractSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/H2DynamicIndexAbstractSelfTest.java
index ba848fb..cf47774 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/H2DynamicIndexAbstractSelfTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/H2DynamicIndexAbstractSelfTest.java
@@ -54,13 +54,6 @@ public abstract class H2DynamicIndexAbstractSelfTest extends AbstractSchemaSelfT
}
/** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- stopAllGrids();
-
- super.afterTestsStopped();
- }
-
- /** {@inheritDoc} */
@Override protected void beforeTest() throws Exception {
super.beforeTest();
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/H2DynamicIndexingComplexTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/H2DynamicIndexingComplexTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/H2DynamicIndexingComplexTest.java
index d7a351b..2095294 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/H2DynamicIndexingComplexTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/H2DynamicIndexingComplexTest.java
@@ -87,13 +87,6 @@ public abstract class H2DynamicIndexingComplexTest extends DynamicIndexAbstractS
Ignition.start(serverConfiguration(3));
}
- /** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- stopAllGrids();
-
- super.afterTestsStopped();
- }
-
/** Do test. */
@SuppressWarnings("ThrowableResultOfMethodCallIgnored")
public void testOperations() {
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/H2DynamicTableSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/H2DynamicTableSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/H2DynamicTableSelfTest.java
index cd41419..d132ebb 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/H2DynamicTableSelfTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/H2DynamicTableSelfTest.java
@@ -111,13 +111,6 @@ public class H2DynamicTableSelfTest extends AbstractSchemaSelfTest {
}
/** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- stopAllGrids();
-
- super.afterTestsStopped();
- }
-
- /** {@inheritDoc} */
@SuppressWarnings("unchecked")
@Override protected void beforeTest() throws Exception {
super.beforeTest();
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/OptimizedMarshallerIndexNameTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/OptimizedMarshallerIndexNameTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/OptimizedMarshallerIndexNameTest.java
index a288acc..1123d21 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/OptimizedMarshallerIndexNameTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/OptimizedMarshallerIndexNameTest.java
@@ -107,13 +107,6 @@ public class OptimizedMarshallerIndexNameTest extends GridCommonAbstractTest {
grid().active(true);
}
- /** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- stopAllGrids();
-
- super.afterTestsStopped();
- }
-
/**
* Verifies that BPlusTree are not erroneously shared between tables in the same cache
* due to IGNITE-6915 bug.
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/QueryEntityValidationSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/QueryEntityValidationSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/QueryEntityValidationSelfTest.java
index 97c9aa1..c8f6706 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/QueryEntityValidationSelfTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/QueryEntityValidationSelfTest.java
@@ -43,11 +43,6 @@ public class QueryEntityValidationSelfTest extends GridCommonAbstractTest {
startGrid(0);
}
- /** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- stopAllGrids();
- }
-
/**
* Test null value type.
*
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/local/IgniteCacheLocalQueryCancelOrTimeoutSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/local/IgniteCacheLocalQueryCancelOrTimeoutSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/local/IgniteCacheLocalQueryCancelOrTimeoutSelfTest.java
index 103d8b4..fc681a4 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/local/IgniteCacheLocalQueryCancelOrTimeoutSelfTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/local/IgniteCacheLocalQueryCancelOrTimeoutSelfTest.java
@@ -70,13 +70,6 @@ public class IgniteCacheLocalQueryCancelOrTimeoutSelfTest extends GridCommonAbst
g.cache(DEFAULT_CACHE_NAME).removeAll();
}
- /** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- super.afterTestsStopped();
-
- stopAllGrids();
- }
-
/**
* @param cache Cache.
*/
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/indexing/src/test/java/org/apache/ignite/internal/processors/database/baseline/IgniteBaselineLockPartitionOnAffinityRunAtomicCacheTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/database/baseline/IgniteBaselineLockPartitionOnAffinityRunAtomicCacheTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/database/baseline/IgniteBaselineLockPartitionOnAffinityRunAtomicCacheTest.java
index 8b5f90f..86d809d 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/database/baseline/IgniteBaselineLockPartitionOnAffinityRunAtomicCacheTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/database/baseline/IgniteBaselineLockPartitionOnAffinityRunAtomicCacheTest.java
@@ -89,8 +89,6 @@ public class IgniteBaselineLockPartitionOnAffinityRunAtomicCacheTest extends Ign
/** {@inheritDoc} */
@Override protected void afterTestsStopped() throws Exception {
- stopAllGrids();
-
cleanPersistenceDir();
}
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/indexing/src/test/java/org/apache/ignite/internal/processors/database/baseline/IgniteBaselineLockPartitionOnAffinityRunTxCacheTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/database/baseline/IgniteBaselineLockPartitionOnAffinityRunTxCacheTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/database/baseline/IgniteBaselineLockPartitionOnAffinityRunTxCacheTest.java
index b10ffb2..caab3ac 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/database/baseline/IgniteBaselineLockPartitionOnAffinityRunTxCacheTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/database/baseline/IgniteBaselineLockPartitionOnAffinityRunTxCacheTest.java
@@ -80,8 +80,6 @@ public class IgniteBaselineLockPartitionOnAffinityRunTxCacheTest extends IgniteC
/** {@inheritDoc} */
@Override protected void afterTestsStopped() throws Exception {
- stopAllGrids();
-
cleanPersistenceDir();
}
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/indexing/src/test/java/org/apache/ignite/internal/processors/database/baseline/IgniteChangingBaselineCacheQueryNodeRestartSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/database/baseline/IgniteChangingBaselineCacheQueryNodeRestartSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/database/baseline/IgniteChangingBaselineCacheQueryNodeRestartSelfTest.java
index 3ee19d5..a8f283c 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/database/baseline/IgniteChangingBaselineCacheQueryNodeRestartSelfTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/database/baseline/IgniteChangingBaselineCacheQueryNodeRestartSelfTest.java
@@ -65,8 +65,6 @@ public class IgniteChangingBaselineCacheQueryNodeRestartSelfTest extends IgniteC
/** {@inheritDoc} */
@Override protected void afterTestsStopped() throws Exception {
- stopAllGrids();
-
cleanPersistenceDir();
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/indexing/src/test/java/org/apache/ignite/internal/processors/database/baseline/IgniteStableBaselineCacheQueryNodeRestartsSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/database/baseline/IgniteStableBaselineCacheQueryNodeRestartsSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/database/baseline/IgniteStableBaselineCacheQueryNodeRestartsSelfTest.java
index 3248906..50c4cd9 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/database/baseline/IgniteStableBaselineCacheQueryNodeRestartsSelfTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/database/baseline/IgniteStableBaselineCacheQueryNodeRestartsSelfTest.java
@@ -61,8 +61,6 @@ public class IgniteStableBaselineCacheQueryNodeRestartsSelfTest extends IgniteCa
/** {@inheritDoc} */
@Override protected void afterTestsStopped() throws Exception {
- stopAllGrids();
-
cleanPersistenceDir();
}
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/IgniteSqlDefaultValueTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/IgniteSqlDefaultValueTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/IgniteSqlDefaultValueTest.java
index 2edc93b..f4c0539 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/IgniteSqlDefaultValueTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/IgniteSqlDefaultValueTest.java
@@ -72,13 +72,6 @@ public class IgniteSqlDefaultValueTest extends GridCommonAbstractTest {
}
/** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- stopAllGrids();
-
- super.afterTestsStopped();
- }
-
- /** {@inheritDoc} */
@Override protected void afterTest() throws Exception {
Collection<String> tblNames = new ArrayList<>();
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/IgniteSqlDistributedJoinSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/IgniteSqlDistributedJoinSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/IgniteSqlDistributedJoinSelfTest.java
index 93fcdb3..4b993ec 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/IgniteSqlDistributedJoinSelfTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/IgniteSqlDistributedJoinSelfTest.java
@@ -66,11 +66,6 @@ public class IgniteSqlDistributedJoinSelfTest extends GridCommonAbstractTest {
startGridsMultiThreaded(NODES_COUNT, false);
}
- /** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- stopAllGrids();
- }
-
/**
* @param name Cache name.
* @param partitioned Partition or replicated cache.
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/IgniteSqlNotNullConstraintTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/IgniteSqlNotNullConstraintTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/IgniteSqlNotNullConstraintTest.java
index 183138b..7a62931 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/IgniteSqlNotNullConstraintTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/IgniteSqlNotNullConstraintTest.java
@@ -243,13 +243,6 @@ public class IgniteSqlNotNullConstraintTest extends GridCommonAbstractTest {
}
/** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- super.afterTestsStopped();
-
- stopAllGrids();
- }
-
- /** {@inheritDoc} */
@Override protected void afterTest() throws Exception {
super.afterTest();
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/IgniteSqlRoutingTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/IgniteSqlRoutingTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/IgniteSqlRoutingTest.java
index 323eb7a..4976ee8 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/IgniteSqlRoutingTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/IgniteSqlRoutingTest.java
@@ -120,13 +120,6 @@ public class IgniteSqlRoutingTest extends GridCommonAbstractTest {
fillCaches();
}
- /** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- super.afterTestsStopped();
-
- stopAllGrids();
- }
-
/** */
private CacheConfiguration buildCacheConfiguration(String name) {
if (name.equals(CACHE_PERSON)) {
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/IgniteSqlSegmentedIndexSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/IgniteSqlSegmentedIndexSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/IgniteSqlSegmentedIndexSelfTest.java
index dd03274..389a1ab 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/IgniteSqlSegmentedIndexSelfTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/IgniteSqlSegmentedIndexSelfTest.java
@@ -94,11 +94,6 @@ public class IgniteSqlSegmentedIndexSelfTest extends GridCommonAbstractTest {
}
/** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- stopAllGrids();
- }
-
- /** {@inheritDoc} */
@Override protected void afterTest() throws Exception {
super.afterTest();
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/IgniteSqlSkipReducerOnUpdateDmlFlagSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/IgniteSqlSkipReducerOnUpdateDmlFlagSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/IgniteSqlSkipReducerOnUpdateDmlFlagSelfTest.java
index f31cb24..6d1b32b 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/IgniteSqlSkipReducerOnUpdateDmlFlagSelfTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/IgniteSqlSkipReducerOnUpdateDmlFlagSelfTest.java
@@ -173,14 +173,6 @@ public class IgniteSqlSkipReducerOnUpdateDmlFlagSelfTest extends GridCommonAbstr
}
/** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
-
- super.afterTestsStopped();
-
- stopAllGrids();
- }
-
- /** {@inheritDoc} */
@Override protected void afterTest() throws Exception {
super.afterTest();
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/IgniteSqlSkipReducerOnUpdateDmlSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/IgniteSqlSkipReducerOnUpdateDmlSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/IgniteSqlSkipReducerOnUpdateDmlSelfTest.java
index 25a3dfb..12def67 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/IgniteSqlSkipReducerOnUpdateDmlSelfTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/IgniteSqlSkipReducerOnUpdateDmlSelfTest.java
@@ -181,10 +181,6 @@ public class IgniteSqlSkipReducerOnUpdateDmlSelfTest extends GridCommonAbstractT
/** {@inheritDoc} */
@Override protected void afterTestsStopped() throws Exception {
checkNoLeaks();
-
- super.afterTestsStopped();
-
- stopAllGrids();
}
/** {@inheritDoc} */
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/IgniteSqlSplitterSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/IgniteSqlSplitterSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/IgniteSqlSplitterSelfTest.java
index a38a61f..df226b2 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/IgniteSqlSplitterSelfTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/IgniteSqlSplitterSelfTest.java
@@ -101,11 +101,6 @@ public class IgniteSqlSplitterSelfTest extends GridCommonAbstractTest {
}
}
- /** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- stopAllGrids();
- }
-
/**
* @param name Cache name.
* @param partitioned Partition or replicated cache.
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/IgniteSqlBigIntegerKeyTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/IgniteSqlBigIntegerKeyTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/IgniteSqlBigIntegerKeyTest.java
index 196f0e7..366c61a 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/IgniteSqlBigIntegerKeyTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/IgniteSqlBigIntegerKeyTest.java
@@ -59,11 +59,6 @@ public class IgniteSqlBigIntegerKeyTest extends GridCommonAbstractTest {
}
- /** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- stopAllGrids();
- }
-
/** */
private IgniteCache<Object, Object> getCache() {
return grid("client").cache(CACHE_NAME);
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/sql/AbstractH2CompareQueryTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/sql/AbstractH2CompareQueryTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/sql/AbstractH2CompareQueryTest.java
index 1ddd252..b1d5842 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/sql/AbstractH2CompareQueryTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/sql/AbstractH2CompareQueryTest.java
@@ -127,16 +127,12 @@ public abstract class AbstractH2CompareQueryTest extends GridCommonAbstractTest
/** {@inheritDoc} */
@Override protected void afterTestsStopped() throws Exception {
- super.afterTestsStopped();
-
Statement st = conn.createStatement();
st.execute("DROP ALL OBJECTS");
conn.close();
- stopAllGrids();
-
ignite = null;
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/sql/GridQueryParsingTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/sql/GridQueryParsingTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/sql/GridQueryParsingTest.java
index 6efb99f..a362586 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/sql/GridQueryParsingTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/sql/GridQueryParsingTest.java
@@ -129,11 +129,7 @@ public class GridQueryParsingTest extends GridCommonAbstractTest {
/** {@inheritDoc} */
@Override protected void afterTestsStopped() throws Exception {
- stopAllGrids();
-
ignite = null;
-
- super.afterTestsStopped();
}
/**
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/jta/src/test/java/org/apache/ignite/internal/processors/cache/CacheJndiTmFactorySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/jta/src/test/java/org/apache/ignite/internal/processors/cache/CacheJndiTmFactorySelfTest.java b/modules/jta/src/test/java/org/apache/ignite/internal/processors/cache/CacheJndiTmFactorySelfTest.java
index 0dee4be..494c5b7 100644
--- a/modules/jta/src/test/java/org/apache/ignite/internal/processors/cache/CacheJndiTmFactorySelfTest.java
+++ b/modules/jta/src/test/java/org/apache/ignite/internal/processors/cache/CacheJndiTmFactorySelfTest.java
@@ -82,8 +82,6 @@ public class CacheJndiTmFactorySelfTest extends GridCommonAbstractTest {
if (urlPkgPrefixesBackup != null)
System.setProperty(Context.URL_PKG_PREFIXES, urlPkgPrefixesBackup);
-
- super.afterTestsStopped();
}
/**
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/jta/src/test/java/org/apache/ignite/internal/processors/cache/GridJtaTransactionManagerSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/jta/src/test/java/org/apache/ignite/internal/processors/cache/GridJtaTransactionManagerSelfTest.java b/modules/jta/src/test/java/org/apache/ignite/internal/processors/cache/GridJtaTransactionManagerSelfTest.java
index 5cad167..e2ffa34 100644
--- a/modules/jta/src/test/java/org/apache/ignite/internal/processors/cache/GridJtaTransactionManagerSelfTest.java
+++ b/modules/jta/src/test/java/org/apache/ignite/internal/processors/cache/GridJtaTransactionManagerSelfTest.java
@@ -62,10 +62,6 @@ public class GridJtaTransactionManagerSelfTest extends GridCommonAbstractTest {
/** {@inheritDoc} */
@Override protected void afterTestsStopped() throws Exception {
- super.afterTestsStopped();
-
- stopAllGrids();
-
jotm.stop();
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/kafka/src/test/java/org/apache/ignite/stream/kafka/connect/IgniteSinkConnectorTest.java
----------------------------------------------------------------------
diff --git a/modules/kafka/src/test/java/org/apache/ignite/stream/kafka/connect/IgniteSinkConnectorTest.java b/modules/kafka/src/test/java/org/apache/ignite/stream/kafka/connect/IgniteSinkConnectorTest.java
index 912ea87..90306a7 100644
--- a/modules/kafka/src/test/java/org/apache/ignite/stream/kafka/connect/IgniteSinkConnectorTest.java
+++ b/modules/kafka/src/test/java/org/apache/ignite/stream/kafka/connect/IgniteSinkConnectorTest.java
@@ -134,11 +134,6 @@ public class IgniteSinkConnectorTest extends GridCommonAbstractTest {
grid = startGrid("igniteServerNode", cfg);
}
- /** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- stopAllGrids();
- }
-
public void testSinkPutsWithoutTransformation() throws Exception {
Map<String, String> sinkProps = makeSinkProps(Utils.join(TOPICS, ","));
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/kafka/src/test/java/org/apache/ignite/stream/kafka/connect/IgniteSourceConnectorTest.java
----------------------------------------------------------------------
diff --git a/modules/kafka/src/test/java/org/apache/ignite/stream/kafka/connect/IgniteSourceConnectorTest.java b/modules/kafka/src/test/java/org/apache/ignite/stream/kafka/connect/IgniteSourceConnectorTest.java
index 1609e9c..cc487aa 100644
--- a/modules/kafka/src/test/java/org/apache/ignite/stream/kafka/connect/IgniteSourceConnectorTest.java
+++ b/modules/kafka/src/test/java/org/apache/ignite/stream/kafka/connect/IgniteSourceConnectorTest.java
@@ -95,11 +95,6 @@ public class IgniteSourceConnectorTest extends GridCommonAbstractTest {
}
/** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- stopAllGrids();
- }
-
- /** {@inheritDoc} */
@Override protected void beforeTest() throws Exception {
kafkaBroker = new TestKafkaBroker();
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/schedule/src/test/java/org/apache/ignite/internal/processors/schedule/GridScheduleSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/schedule/src/test/java/org/apache/ignite/internal/processors/schedule/GridScheduleSelfTest.java b/modules/schedule/src/test/java/org/apache/ignite/internal/processors/schedule/GridScheduleSelfTest.java
index 122d98d..992deb5 100644
--- a/modules/schedule/src/test/java/org/apache/ignite/internal/processors/schedule/GridScheduleSelfTest.java
+++ b/modules/schedule/src/test/java/org/apache/ignite/internal/processors/schedule/GridScheduleSelfTest.java
@@ -66,13 +66,6 @@ public class GridScheduleSelfTest extends GridCommonAbstractTest {
}
/** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- stopAllGrids();
-
- super.afterTestsStopped();
- }
-
- /** {@inheritDoc} */
@Override protected void beforeTest() throws Exception {
execCntr.set(0);
exec = Executors.newSingleThreadExecutor(new ThreadFactory() {
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/spark/src/test/java/org/apache/ignite/spark/JavaStandaloneIgniteRDDSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/spark/src/test/java/org/apache/ignite/spark/JavaStandaloneIgniteRDDSelfTest.java b/modules/spark/src/test/java/org/apache/ignite/spark/JavaStandaloneIgniteRDDSelfTest.java
index 87da627..29ada3f 100644
--- a/modules/spark/src/test/java/org/apache/ignite/spark/JavaStandaloneIgniteRDDSelfTest.java
+++ b/modules/spark/src/test/java/org/apache/ignite/spark/JavaStandaloneIgniteRDDSelfTest.java
@@ -117,12 +117,6 @@ public class JavaStandaloneIgniteRDDSelfTest extends GridCommonAbstractTest {
Ignition.start(getConfiguration("grid-" + i, false));
}
- /** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- for (int i = 0; i < GRID_CNT; i++)
- Ignition.stop("grid-" + i, false);
- }
-
/**
* @throws Exception If failed.
*/
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/spring-data-2.0/src/test/java/org/apache/ignite/springdata/IgniteSpringDataCrudSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/spring-data-2.0/src/test/java/org/apache/ignite/springdata/IgniteSpringDataCrudSelfTest.java b/modules/spring-data-2.0/src/test/java/org/apache/ignite/springdata/IgniteSpringDataCrudSelfTest.java
index 38929b2..766b2a8 100644
--- a/modules/spring-data-2.0/src/test/java/org/apache/ignite/springdata/IgniteSpringDataCrudSelfTest.java
+++ b/modules/spring-data-2.0/src/test/java/org/apache/ignite/springdata/IgniteSpringDataCrudSelfTest.java
@@ -74,8 +74,6 @@ public class IgniteSpringDataCrudSelfTest extends GridCommonAbstractTest {
/** {@inheritDoc} */
@Override protected void afterTestsStopped() throws Exception {
- super.afterTestsStopped();
-
ctx.destroy();
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/spring-data-2.0/src/test/java/org/apache/ignite/springdata/IgniteSpringDataQueriesSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/spring-data-2.0/src/test/java/org/apache/ignite/springdata/IgniteSpringDataQueriesSelfTest.java b/modules/spring-data-2.0/src/test/java/org/apache/ignite/springdata/IgniteSpringDataQueriesSelfTest.java
index 6b289f1..c03c9c8 100644
--- a/modules/spring-data-2.0/src/test/java/org/apache/ignite/springdata/IgniteSpringDataQueriesSelfTest.java
+++ b/modules/spring-data-2.0/src/test/java/org/apache/ignite/springdata/IgniteSpringDataQueriesSelfTest.java
@@ -73,8 +73,6 @@ public class IgniteSpringDataQueriesSelfTest extends GridCommonAbstractTest {
*/
@Override protected void afterTestsStopped() throws Exception {
ctx.destroy();
-
- super.afterTestsStopped();
}
/** */
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/spring-data/src/test/java/org/apache/ignite/springdata/IgniteSpringDataCrudSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/spring-data/src/test/java/org/apache/ignite/springdata/IgniteSpringDataCrudSelfTest.java b/modules/spring-data/src/test/java/org/apache/ignite/springdata/IgniteSpringDataCrudSelfTest.java
index 0199f6b..f9011fa 100644
--- a/modules/spring-data/src/test/java/org/apache/ignite/springdata/IgniteSpringDataCrudSelfTest.java
+++ b/modules/spring-data/src/test/java/org/apache/ignite/springdata/IgniteSpringDataCrudSelfTest.java
@@ -73,8 +73,6 @@ public class IgniteSpringDataCrudSelfTest extends GridCommonAbstractTest {
/** {@inheritDoc} */
@Override protected void afterTestsStopped() throws Exception {
- super.afterTestsStopped();
-
ctx.destroy();
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/spring-data/src/test/java/org/apache/ignite/springdata/IgniteSpringDataQueriesSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/spring-data/src/test/java/org/apache/ignite/springdata/IgniteSpringDataQueriesSelfTest.java b/modules/spring-data/src/test/java/org/apache/ignite/springdata/IgniteSpringDataQueriesSelfTest.java
index 74e8ea4..2d7dcc0 100644
--- a/modules/spring-data/src/test/java/org/apache/ignite/springdata/IgniteSpringDataQueriesSelfTest.java
+++ b/modules/spring-data/src/test/java/org/apache/ignite/springdata/IgniteSpringDataQueriesSelfTest.java
@@ -64,10 +64,9 @@ public class IgniteSpringDataQueriesSelfTest extends GridCommonAbstractTest {
"lastName" + Integer.toHexString((i + 16) % 256)));
}
+ /** {@inheritDoc} */
@Override protected void afterTestsStopped() throws Exception {
ctx.destroy();
-
- super.afterTestsStopped();
}
/** */
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/spring/src/test/java/org/apache/ignite/cache/spring/GridSpringCacheManagerMultiJvmSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/spring/src/test/java/org/apache/ignite/cache/spring/GridSpringCacheManagerMultiJvmSelfTest.java b/modules/spring/src/test/java/org/apache/ignite/cache/spring/GridSpringCacheManagerMultiJvmSelfTest.java
index 39483fc..a392bc9 100644
--- a/modules/spring/src/test/java/org/apache/ignite/cache/spring/GridSpringCacheManagerMultiJvmSelfTest.java
+++ b/modules/spring/src/test/java/org/apache/ignite/cache/spring/GridSpringCacheManagerMultiJvmSelfTest.java
@@ -37,11 +37,6 @@ import org.springframework.context.support.ClassPathXmlApplicationContext;
*/
public class GridSpringCacheManagerMultiJvmSelfTest extends GridCommonAbstractTest {
/** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- stopAllGrids();
- }
-
- /** {@inheritDoc} */
@Override protected boolean isMultiJvm() {
return true;
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/spring/src/test/java/org/apache/ignite/cache/spring/GridSpringCacheManagerSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/spring/src/test/java/org/apache/ignite/cache/spring/GridSpringCacheManagerSelfTest.java b/modules/spring/src/test/java/org/apache/ignite/cache/spring/GridSpringCacheManagerSelfTest.java
index 5a0e759..e73ea89 100644
--- a/modules/spring/src/test/java/org/apache/ignite/cache/spring/GridSpringCacheManagerSelfTest.java
+++ b/modules/spring/src/test/java/org/apache/ignite/cache/spring/GridSpringCacheManagerSelfTest.java
@@ -92,11 +92,6 @@ public class GridSpringCacheManagerSelfTest extends GridCommonAbstractTest {
}
/** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- stopAllGrids();
- }
-
- /** {@inheritDoc} */
@Override protected void beforeTest() throws Exception {
BeanFactory factory = new ClassPathXmlApplicationContext("org/apache/ignite/cache/spring/spring-caching.xml");
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/spring/src/test/java/org/apache/ignite/cache/spring/SpringCacheTest.java
----------------------------------------------------------------------
diff --git a/modules/spring/src/test/java/org/apache/ignite/cache/spring/SpringCacheTest.java b/modules/spring/src/test/java/org/apache/ignite/cache/spring/SpringCacheTest.java
index 06dc263..53c52f8 100644
--- a/modules/spring/src/test/java/org/apache/ignite/cache/spring/SpringCacheTest.java
+++ b/modules/spring/src/test/java/org/apache/ignite/cache/spring/SpringCacheTest.java
@@ -47,8 +47,6 @@ public class SpringCacheTest extends GridCommonAbstractTest {
/** {@inheritDoc} */
@Override protected void afterTestsStopped() throws Exception {
- super.afterTestsStopped();
-
G.stop(true);
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/spring/src/test/java/org/apache/ignite/internal/processors/resource/GridLoggerInjectionSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/spring/src/test/java/org/apache/ignite/internal/processors/resource/GridLoggerInjectionSelfTest.java b/modules/spring/src/test/java/org/apache/ignite/internal/processors/resource/GridLoggerInjectionSelfTest.java
index 2b01057..3fc64b5 100644
--- a/modules/spring/src/test/java/org/apache/ignite/internal/processors/resource/GridLoggerInjectionSelfTest.java
+++ b/modules/spring/src/test/java/org/apache/ignite/internal/processors/resource/GridLoggerInjectionSelfTest.java
@@ -40,13 +40,6 @@ public class GridLoggerInjectionSelfTest extends GridCommonAbstractTest implemen
startGrids(2);
}
- /** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- stopAllGrids();
-
- super.afterTestsStopped();
- }
-
/**
* Test that closure gets right log category injected on all nodes using field injection.
*
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/spring/src/test/java/org/apache/ignite/internal/processors/resource/GridServiceInjectionSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/spring/src/test/java/org/apache/ignite/internal/processors/resource/GridServiceInjectionSelfTest.java b/modules/spring/src/test/java/org/apache/ignite/internal/processors/resource/GridServiceInjectionSelfTest.java
index 52581b6..a8cd89c 100644
--- a/modules/spring/src/test/java/org/apache/ignite/internal/processors/resource/GridServiceInjectionSelfTest.java
+++ b/modules/spring/src/test/java/org/apache/ignite/internal/processors/resource/GridServiceInjectionSelfTest.java
@@ -54,13 +54,6 @@ public class GridServiceInjectionSelfTest extends GridCommonAbstractTest impleme
assertEquals(2, grid(1).cluster().nodes().size());
}
- /** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- stopAllGrids();
-
- super.afterTestsStopped();
- }
-
/**
* @throws Exception If failed.
*/
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/spring/src/test/java/org/apache/ignite/internal/processors/resource/GridSpringResourceInjectionSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/spring/src/test/java/org/apache/ignite/internal/processors/resource/GridSpringResourceInjectionSelfTest.java b/modules/spring/src/test/java/org/apache/ignite/internal/processors/resource/GridSpringResourceInjectionSelfTest.java
index 08fe69d..7f89b32 100644
--- a/modules/spring/src/test/java/org/apache/ignite/internal/processors/resource/GridSpringResourceInjectionSelfTest.java
+++ b/modules/spring/src/test/java/org/apache/ignite/internal/processors/resource/GridSpringResourceInjectionSelfTest.java
@@ -48,11 +48,6 @@ public class GridSpringResourceInjectionSelfTest extends GridCommonAbstractTest
"/org/apache/ignite/internal/processors/resource/spring-resource.xml"));
}
- /** {@inheritDoc} */
- @Override public void afterTestsStopped() throws Exception {
- stopAllGrids();
- }
-
/**
* @throws Exception If failed.
*/
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/spring/src/test/java/org/apache/ignite/transactions/spring/GridSpringTransactionManagerSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/spring/src/test/java/org/apache/ignite/transactions/spring/GridSpringTransactionManagerSelfTest.java b/modules/spring/src/test/java/org/apache/ignite/transactions/spring/GridSpringTransactionManagerSelfTest.java
index e68ddb4..9fc9599 100644
--- a/modules/spring/src/test/java/org/apache/ignite/transactions/spring/GridSpringTransactionManagerSelfTest.java
+++ b/modules/spring/src/test/java/org/apache/ignite/transactions/spring/GridSpringTransactionManagerSelfTest.java
@@ -78,11 +78,6 @@ public class GridSpringTransactionManagerSelfTest extends GridCommonAbstractTest
}
/** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- stopAllGrids();
- }
-
- /** {@inheritDoc} */
@Override protected void beforeTest() throws Exception {
ApplicationContext applicationContext = new GenericXmlApplicationContext("config/spring-transactions.xml");
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/zeromq/src/test/java/org/apache/ignite/stream/zeromq/IgniteZeroMqStreamerTest.java
----------------------------------------------------------------------
diff --git a/modules/zeromq/src/test/java/org/apache/ignite/stream/zeromq/IgniteZeroMqStreamerTest.java b/modules/zeromq/src/test/java/org/apache/ignite/stream/zeromq/IgniteZeroMqStreamerTest.java
index 763212d..5d2d0c2 100644
--- a/modules/zeromq/src/test/java/org/apache/ignite/stream/zeromq/IgniteZeroMqStreamerTest.java
+++ b/modules/zeromq/src/test/java/org/apache/ignite/stream/zeromq/IgniteZeroMqStreamerTest.java
@@ -59,11 +59,6 @@ public class IgniteZeroMqStreamerTest extends GridCommonAbstractTest {
grid().getOrCreateCache(defaultCacheConfiguration());
}
- /** {@inheritDoc} */
- @Override public void afterTestsStopped() throws Exception {
- stopAllGrids();
- }
-
/**
* @throws Exception Test exception.
*/
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/zookeeper/src/test/java/org/apache/ignite/spi/discovery/zk/internal/ZookeeperDiscoverySpiTest.java
----------------------------------------------------------------------
diff --git a/modules/zookeeper/src/test/java/org/apache/ignite/spi/discovery/zk/internal/ZookeeperDiscoverySpiTest.java b/modules/zookeeper/src/test/java/org/apache/ignite/spi/discovery/zk/internal/ZookeeperDiscoverySpiTest.java
index 1585870..a647ecf 100644
--- a/modules/zookeeper/src/test/java/org/apache/ignite/spi/discovery/zk/internal/ZookeeperDiscoverySpiTest.java
+++ b/modules/zookeeper/src/test/java/org/apache/ignite/spi/discovery/zk/internal/ZookeeperDiscoverySpiTest.java
@@ -383,8 +383,6 @@ public class ZookeeperDiscoverySpiTest extends GridCommonAbstractTest {
stopZkCluster();
System.clearProperty(ZookeeperDiscoveryImpl.IGNITE_ZOOKEEPER_DISCOVERY_SPI_ACK_TIMEOUT);
-
- super.afterTestsStopped();
}
/**
[29/50] [abbrv] ignite git commit: IGNITE-8298 Web Console: Fixed
tables UI issues.
Posted by dp...@apache.org.
IGNITE-8298 Web Console: Fixed tables UI issues.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/7c118e40
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/7c118e40
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/7c118e40
Branch: refs/heads/ignite-5789-1
Commit: 7c118e40965d9a88aceb542ff23036593683708c
Parents: 556f460
Author: Dmitriy Shabalin <dm...@gmail.com>
Authored: Tue May 22 16:49:48 2018 +0700
Committer: Alexey Kuznetsov <ak...@apache.org>
Committed: Tue May 22 16:49:48 2018 +0700
----------------------------------------------------------------------
.../frontend/app/primitives/ui-grid-header/index.scss | 4 ++++
modules/web-console/frontend/app/primitives/ui-grid/index.scss | 4 ++++
2 files changed, 8 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/7c118e40/modules/web-console/frontend/app/primitives/ui-grid-header/index.scss
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/app/primitives/ui-grid-header/index.scss b/modules/web-console/frontend/app/primitives/ui-grid-header/index.scss
index 4d5d455..7c2efc3 100644
--- a/modules/web-console/frontend/app/primitives/ui-grid-header/index.scss
+++ b/modules/web-console/frontend/app/primitives/ui-grid-header/index.scss
@@ -20,6 +20,10 @@
.ui-grid-header--subcategories {
border-color: $table-border-color;
+ .ui-grid-header-canvas {
+ background-color: #f5f5f5;
+ }
+
.ui-grid-row:nth-child(even) .ui-grid-cell.cell-total {
background-color: rgba(102,175,233,.6);
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/7c118e40/modules/web-console/frontend/app/primitives/ui-grid/index.scss
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/app/primitives/ui-grid/index.scss b/modules/web-console/frontend/app/primitives/ui-grid/index.scss
index 2a5c587..a450090 100644
--- a/modules/web-console/frontend/app/primitives/ui-grid/index.scss
+++ b/modules/web-console/frontend/app/primitives/ui-grid/index.scss
@@ -147,6 +147,10 @@
}
.ui-grid-header--subcategories {
+ .ui-grid-header-canvas {
+ background-color: white;
+ }
+
.ui-grid-header-span.ui-grid-header-cell {
background: initial;
[05/50] [abbrv] ignite git commit: IGNITE-605: remove todo as no
needs - Fixes #4027.
Posted by dp...@apache.org.
IGNITE-605: remove todo as no needs - Fixes #4027.
Signed-off-by: dpavlov <dp...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/c2285c73
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/c2285c73
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/c2285c73
Branch: refs/heads/ignite-5789-1
Commit: c2285c73c8ad0aad154f06e4b0adaf05685d37b1
Parents: e078245
Author: Maxim Muzafarov <ma...@gmail.com>
Authored: Fri May 18 18:43:09 2018 +0300
Committer: dpavlov <dp...@apache.org>
Committed: Fri May 18 18:43:09 2018 +0300
----------------------------------------------------------------------
.../org/apache/ignite/testframework/junits/GridAbstractTest.java | 1 -
1 file changed, 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/c2285c73/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java
index cc54d23..86f7866 100755
--- a/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java
@@ -1033,7 +1033,6 @@ public abstract class GridAbstractTest extends TestCase {
* @throws IgniteCheckedException On error.
*/
protected IgniteConfiguration optimize(IgniteConfiguration cfg) throws IgniteCheckedException {
- // TODO: IGNITE-605: propose another way to avoid network overhead in tests.
if (cfg.getLocalHost() == null) {
if (cfg.getDiscoverySpi() instanceof TcpDiscoverySpi) {
cfg.setLocalHost("127.0.0.1");
[35/50] [abbrv] ignite git commit: IGNITE-7776 Change calculated
values in javadoc to avoid int overflow, this closes #3553
Posted by dp...@apache.org.
IGNITE-7776 Change calculated values in javadoc to avoid int overflow, this closes #3553
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/ce8e31e2
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/ce8e31e2
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/ce8e31e2
Branch: refs/heads/ignite-5789-1
Commit: ce8e31e28e16c7c22fe88ab6b1a1304b14f6881d
Parents: 409a552
Author: Alexander Belyak <al...@xored.com>
Authored: Tue May 22 16:09:08 2018 +0300
Committer: dpavlov <dp...@apache.org>
Committed: Tue May 22 16:09:09 2018 +0300
----------------------------------------------------------------------
.../JettyRestProcessorAbstractSelfTest.java | 2 +-
.../FoldersReuseCompatibilityTest.java | 2 +-
.../configuration/DataRegionConfiguration.java | 10 +++---
.../configuration/DataStorageConfiguration.java | 32 +++++++++++---------
.../configuration/FileSystemConfiguration.java | 2 +-
.../configuration/MemoryConfiguration.java | 10 +++---
.../MemoryPolicyConfiguration.java | 8 ++---
.../apache/ignite/internal/GridDiagnostic.java | 2 +-
.../pagemem/impl/PageMemoryNoStoreImpl.java | 2 +-
.../IgniteCacheDatabaseSharedManager.java | 2 +-
.../cache/CacheDataRegionConfigurationTest.java | 4 +--
.../IgniteClusterActivateDeactivateTest.java | 4 +--
.../cache/IgniteOutOfMemoryPropagationTest.java | 2 +-
.../cache/MemoryPolicyConfigValidationTest.java | 20 ++++++------
...AffinityCoordinatorDynamicStartStopTest.java | 2 +-
.../distributed/CacheBaselineTopologyTest.java | 8 ++---
.../CacheLateAffinityAssignmentTest.java | 2 +-
.../cache/distributed/CacheStartOnJoinTest.java | 4 +--
.../PageEvictionMultinodeMixedRegionsTest.java | 2 +-
...eBaselineAffinityTopologyActivationTest.java | 2 +-
.../IgniteDataStorageMetricsSelfTest.java | 4 +--
...tePdsBinaryMetadataOnClusterRestartTest.java | 2 +-
...gnitePdsCacheAssignmentNodeRestartsTest.java | 4 +--
.../IgnitePdsCacheRebalancingAbstractTest.java | 4 +--
.../IgnitePdsContinuousRestartTest.java | 2 +-
.../persistence/IgnitePdsDynamicCacheTest.java | 2 +-
.../IgnitePdsExchangeDuringCheckpointTest.java | 4 +--
.../IgnitePdsMultiNodePutGetRestartTest.java | 2 +-
.../persistence/IgnitePdsPageSizesTest.java | 2 +-
...gnitePdsRecoveryAfterFileCorruptionTest.java | 2 +-
.../IgnitePdsRemoveDuringRebalancingTest.java | 2 +-
.../IgnitePersistentStoreCacheGroupsTest.java | 2 +-
.../MemoryPolicyInitializationTest.java | 4 +--
.../IgniteBaselineAbstractFullApiSelfTest.java | 2 +-
...gingBaselineDownCachePutAllFailoverTest.java | 6 ++--
...gingBaselineDownCacheRemoveFailoverTest.java | 6 ++--
...angingBaselineUpCachePutAllFailoverTest.java | 6 ++--
...angingBaselineUpCacheRemoveFailoverTest.java | 6 ++--
...teStableBaselineCachePutAllFailoverTest.java | 6 ++--
...teStableBaselineCacheRemoveFailoverTest.java | 6 ++--
.../db/IgnitePdsCacheRestoreTest.java | 4 +--
.../db/IgnitePdsMultiNodePutGetRestartTest.java | 2 +-
...PdsPageEvictionDuringPartitionClearTest.java | 2 +-
.../db/IgnitePdsPageEvictionTest.java | 2 +-
...tePdsRebalancingOnNotStableTopologyTest.java | 2 +-
.../db/IgnitePdsTransactionsHangTest.java | 10 +++---
.../db/IgnitePdsWholeClusterRestartTest.java | 2 +-
...faultPageSizeBackwardsCompatibilityTest.java | 2 +-
.../db/file/IgnitePdsCacheIntegrationTest.java | 2 +-
.../file/IgnitePdsDiskErrorsRecoveringTest.java | 2 +-
.../file/IgnitePdsNoActualWalHistoryTest.java | 2 +-
.../IgniteUidAsConsistentIdMigrationTest.java | 2 +-
.../wal/IgniteWalHistoryReservationsTest.java | 2 +-
.../db/wal/IgniteWalRecoveryPPCTest.java | 8 ++---
.../IgniteWalRecoverySeveralRestartsTest.java | 2 +-
.../db/wal/IgniteWalRecoveryTest.java | 4 +--
.../db/wal/IgniteWalSerializerVersionTest.java | 2 +-
.../persistence/db/wal/WalCompactionTest.java | 2 +-
.../db/wal/WalRecoveryTxLogicalRecordsTest.java | 2 +-
.../db/wal/reader/IgniteWalReaderTest.java | 2 +-
.../pagemem/PagesWriteThrottleSmokeTest.java | 4 +--
.../IgniteChangeGlobalStateAbstractTest.java | 2 +-
.../IgniteStandByClusterTest.java | 2 +-
.../extended/GridActivateExtensionTest.java | 2 +-
...gniteAbstractStandByClientReconnectTest.java | 2 +-
.../cache/transactions/TxDeadlockCauseTest.java | 2 +-
.../database/IgniteDbDynamicCacheSelfTest.java | 2 +-
.../IgniteDbPutGetWithCacheStoreTest.java | 2 +-
.../database/IndexStorageSelfTest.java | 2 +-
.../database/SwapPathConstructionSelfTest.java | 2 +-
.../igfs/IgfsAbstractBaseSelfTest.java | 2 +-
...fsLocalSecondaryFileSystemProxySelfTest.java | 2 +-
.../processors/igfs/IgfsSizeSelfTest.java | 2 +-
.../offheap/GridOffHeapMapAbstractSelfTest.java | 2 +-
...idOffHeapPartitionedMapAbstractSelfTest.java | 2 +-
.../ignite/util/GridCommandHandlerTest.java | 2 +-
.../util/GridTopologyHeapSizeSelfTest.java | 4 +--
.../hadoop/impl/HadoopPopularWordsTest.java | 2 +-
.../impl/igfs/Hadoop1OverIgfsProxyTest.java | 2 +-
.../igfs/IgfsNearOnlyMultiNodeSelfTest.java | 8 ++---
...CheckClusterStateBeforeExecuteQueryTest.java | 2 +-
.../cache/IgniteErrorOnRebalanceTest.java | 2 +-
...stributedPartitionQueryAbstractSelfTest.java | 2 +-
.../IgniteCacheQueryNodeRestartSelfTest2.java | 2 +-
.../cache/index/DynamicColumnsAbstractTest.java | 2 +-
.../index/DynamicIndexAbstractSelfTest.java | 2 +-
.../index/OptimizedMarshallerIndexNameTest.java | 2 +-
...eDbSingleNodeWithIndexingWalRestoreTest.java | 2 +-
.../IgnitePersistentStoreSchemaLoadTest.java | 2 +-
...ckPartitionOnAffinityRunAtomicCacheTest.java | 4 +--
...neLockPartitionOnAffinityRunTxCacheTest.java | 4 +--
...ngBaselineCacheQueryNodeRestartSelfTest.java | 2 +-
...StableBaselineBinObjFieldsQuerySelfTest.java | 2 +-
...eBaselineCacheQueryNodeRestartsSelfTest.java | 2 +-
.../impl/cache/CacheBasedDatasetTest.java | 2 +-
95 files changed, 170 insertions(+), 168 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/ce8e31e2/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/JettyRestProcessorAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/JettyRestProcessorAbstractSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/JettyRestProcessorAbstractSelfTest.java
index f52bfcb..426d391 100644
--- a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/JettyRestProcessorAbstractSelfTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/JettyRestProcessorAbstractSelfTest.java
@@ -3060,7 +3060,7 @@ public abstract class JettyRestProcessorAbstractSelfTest extends AbstractRestPro
DataRegionConfiguration drCfg = new DataRegionConfiguration();
drCfg.setName("testDataRegion");
- drCfg.setMaxSize(100 * 1024 * 1024);
+ drCfg.setMaxSize(100L * 1024 * 1024);
dsCfg.setDefaultDataRegionConfiguration(drCfg);
http://git-wip-us.apache.org/repos/asf/ignite/blob/ce8e31e2/modules/compatibility/src/test/java/org/apache/ignite/compatibility/persistence/FoldersReuseCompatibilityTest.java
----------------------------------------------------------------------
diff --git a/modules/compatibility/src/test/java/org/apache/ignite/compatibility/persistence/FoldersReuseCompatibilityTest.java b/modules/compatibility/src/test/java/org/apache/ignite/compatibility/persistence/FoldersReuseCompatibilityTest.java
index 69eecb1..e04f39f 100644
--- a/modules/compatibility/src/test/java/org/apache/ignite/compatibility/persistence/FoldersReuseCompatibilityTest.java
+++ b/modules/compatibility/src/test/java/org/apache/ignite/compatibility/persistence/FoldersReuseCompatibilityTest.java
@@ -175,7 +175,7 @@ public class FoldersReuseCompatibilityTest extends IgnitePersistenceCompatibilit
final MemoryConfiguration memCfg = new MemoryConfiguration();
final MemoryPolicyConfiguration memPolCfg = new MemoryPolicyConfiguration();
- memPolCfg.setMaxSize(32 * 1024 * 1024); // we don't need much memory for this test
+ memPolCfg.setMaxSize(32L * 1024 * 1024); // we don't need much memory for this test
memCfg.setMemoryPolicies(memPolCfg);
cfg.setMemoryConfiguration(memCfg);
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/ce8e31e2/modules/core/src/main/java/org/apache/ignite/configuration/DataRegionConfiguration.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/configuration/DataRegionConfiguration.java b/modules/core/src/main/java/org/apache/ignite/configuration/DataRegionConfiguration.java
index 52cb764..474334c 100644
--- a/modules/core/src/main/java/org/apache/ignite/configuration/DataRegionConfiguration.java
+++ b/modules/core/src/main/java/org/apache/ignite/configuration/DataRegionConfiguration.java
@@ -39,8 +39,8 @@ import static org.apache.ignite.configuration.DataStorageConfiguration.DFLT_DATA
* <property name="defaultRegionConfiguration">
* <bean class="org.apache.ignite.configuration.DataRegionConfiguration">
* <property name="name" value="Default_Region"/>
- * <property name="initialSize" value="#{100 * 1024 * 1024}"/>
- * <property name="maxSize" value="#{5 * 1024 * 102 * 1024}"/>
+ * <property name="initialSize" value="#{100L * 1024 * 1024}"/>
+ * <property name="maxSize" value="#{5L * 1024 * 1024 * 1024}"/>
* </bean>
* </property>
*
@@ -50,14 +50,14 @@ import static org.apache.ignite.configuration.DataStorageConfiguration.DFLT_DATA
* <list>
* <bean class="org.apache.ignite.configuration.DataRegionConfiguration">
* <property name="name" value="20MB_Region_Eviction"/>
- * <property name="initialSize" value="#{20 * 1024 * 1024}"/>
+ * <property name="initialSize" value="#{20L * 1024 * 1024}"/>
* <property name="pageEvictionMode" value="RANDOM_2_LRU"/>
* </bean>
*
* <bean class="org.apache.ignite.configuration.DataRegionConfiguration">
* <property name="name" value="25MB_Region_Swapping"/>
- * <property name="initialSize" value="#{25 * 1024 * 1024}"/>
- * <property name="maxSize" value="#{100 * 1024 * 1024}"/>
+ * <property name="initialSize" value="#{25L * 1024 * 1024}"/>
+ * <property name="maxSize" value="#{100L * 1024 * 1024}"/>
* <property name="swapPath" value="db/swap"/>
* </bean>
* </list>
http://git-wip-us.apache.org/repos/asf/ignite/blob/ce8e31e2/modules/core/src/main/java/org/apache/ignite/configuration/DataStorageConfiguration.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/configuration/DataStorageConfiguration.java b/modules/core/src/main/java/org/apache/ignite/configuration/DataStorageConfiguration.java
index 747efd8..ccabf3f 100644
--- a/modules/core/src/main/java/org/apache/ignite/configuration/DataStorageConfiguration.java
+++ b/modules/core/src/main/java/org/apache/ignite/configuration/DataStorageConfiguration.java
@@ -48,12 +48,12 @@ import org.apache.ignite.internal.util.typedef.internal.U;
*
* <property name="dataStorageConfiguration">
* <bean class="org.apache.ignite.configuration.DataStorageConfiguration">
- * <property name="systemCacheInitialSize" value="#{100 * 1024 * 1024}"/>
+ * <property name="systemCacheInitialSize" value="#{100L * 1024 * 1024}"/>
*
* <property name="defaultDataRegionConfiguration">
* <bean class="org.apache.ignite.configuration.DataRegionConfiguration">
* <property name="name" value="default_data_region"/>
- * <property name="initialSize" value="#{5 * 1024 * 1024 * 1024}"/>
+ * <property name="initialSize" value="#{5L * 1024 * 1024 * 1024}"/>
* </bean>
* </property>
* </bean>
@@ -78,10 +78,10 @@ public class DataStorageConfiguration implements Serializable {
DFLT_DATA_REGION_INITIAL_SIZE);
/** Default initial size of a memory chunk for the system cache (40 MB). */
- private static final long DFLT_SYS_CACHE_INIT_SIZE = 40 * 1024 * 1024;
+ private static final long DFLT_SYS_REG_INIT_SIZE = 40L * 1024 * 1024;
/** Default max size of a memory chunk for the system cache (100 MB). */
- private static final long DFLT_SYS_CACHE_MAX_SIZE = 100 * 1024 * 1024;
+ private static final long DFLT_SYS_REG_MAX_SIZE = 100L * 1024 * 1024;
/** Default memory page size. */
public static final int DFLT_PAGE_SIZE = 4 * 1024;
@@ -152,11 +152,11 @@ public class DataStorageConfiguration implements Serializable {
/** Default wal compaction enabled. */
public static final boolean DFLT_WAL_COMPACTION_ENABLED = false;
- /** Size of a memory chunk reserved for system cache initially. */
- private long sysRegionInitSize = DFLT_SYS_CACHE_INIT_SIZE;
+ /** Initial size of a memory chunk reserved for system cache. */
+ private long sysRegionInitSize = DFLT_SYS_REG_INIT_SIZE;
- /** Maximum size of system cache. */
- private long sysCacheMaxSize = DFLT_SYS_CACHE_MAX_SIZE;
+ /** Maximum size of a memory chunk reserved for system cache. */
+ private long sysRegionMaxSize = DFLT_SYS_REG_MAX_SIZE;
/** Memory page size. */
private int pageSize;
@@ -270,14 +270,14 @@ public class DataStorageConfiguration implements Serializable {
/**
* Sets initial size of a data region reserved for system cache.
*
- * Default value is {@link #DFLT_SYS_CACHE_INIT_SIZE}
+ * Default value is {@link #DFLT_SYS_REG_INIT_SIZE}
*
* @param sysRegionInitSize Size in bytes.
*
* @return {@code this} for chaining.
*/
public DataStorageConfiguration setSystemRegionInitialSize(long sysRegionInitSize) {
- A.ensure(sysCacheMaxSize > 0, "System region initial size can not be less zero.");
+ A.ensure(sysRegionInitSize > 0, "System region initial size can not be less zero.");
this.sysRegionInitSize = sysRegionInitSize;
@@ -290,21 +290,23 @@ public class DataStorageConfiguration implements Serializable {
* @return Size in bytes.
*/
public long getSystemRegionMaxSize() {
- return sysCacheMaxSize;
+ return sysRegionMaxSize;
}
/**
* Sets maximum data region size reserved for system cache. The total size should not be less than 10 MB
* due to internal data structures overhead.
*
- * @param sysCacheMaxSize Maximum size in bytes for system cache data region.
+ * Default value is {@link #DFLT_SYS_REG_MAX_SIZE}.
+ *
+ * @param sysRegionMaxSize Maximum size in bytes for system cache data region.
*
* @return {@code this} for chaining.
*/
- public DataStorageConfiguration setSystemRegionMaxSize(long sysCacheMaxSize) {
- A.ensure(sysCacheMaxSize > 0, "System cache max size can not be less zero.");
+ public DataStorageConfiguration setSystemRegionMaxSize(long sysRegionMaxSize) {
+ A.ensure(sysRegionMaxSize > 0, "System region max size can not be less zero.");
- this.sysCacheMaxSize = sysCacheMaxSize;
+ this.sysRegionMaxSize = sysRegionMaxSize;
return this;
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/ce8e31e2/modules/core/src/main/java/org/apache/ignite/configuration/FileSystemConfiguration.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/configuration/FileSystemConfiguration.java b/modules/core/src/main/java/org/apache/ignite/configuration/FileSystemConfiguration.java
index e36f857..65e915b 100644
--- a/modules/core/src/main/java/org/apache/ignite/configuration/FileSystemConfiguration.java
+++ b/modules/core/src/main/java/org/apache/ignite/configuration/FileSystemConfiguration.java
@@ -38,7 +38,7 @@ public class FileSystemConfiguration {
public static final String DFLT_USER_NAME = System.getProperty("user.name", "anonymous");
/** Default fragmentizer throttling block length. */
- public static final long DFLT_FRAGMENTIZER_THROTTLING_BLOCK_LENGTH = 16 * 1024 * 1024;
+ public static final long DFLT_FRAGMENTIZER_THROTTLING_BLOCK_LENGTH = 16L * 1024 * 1024;
/** Default fragmentizer throttling delay. */
public static final long DFLT_FRAGMENTIZER_THROTTLING_DELAY = 200;
http://git-wip-us.apache.org/repos/asf/ignite/blob/ce8e31e2/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 f6f4e55..75fe11b 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
@@ -42,14 +42,14 @@ import org.apache.ignite.internal.util.typedef.internal.U;
* {@code
* <property name="memoryConfiguration">
* <bean class="org.apache.ignite.configuration.MemoryConfiguration">
- * <property name="systemCacheInitialSize" value="#{100 * 1024 * 1024}"/>
+ * <property name="systemCacheInitialSize" value="#{100L * 1024 * 1024}"/>
* <property name="defaultMemoryPolicyName" value="default_mem_plc"/>
*
* <property name="memoryPolicies">
* <list>
* <bean class="org.apache.ignite.configuration.MemoryPolicyConfiguration">
* <property name="name" value="default_mem_plc"/>
- * <property name="initialSize" value="#{5 * 1024 * 1024 * 1024}"/>
+ * <property name="initialSize" value="#{5L * 1024 * 1024 * 1024}"/>
* </bean>
* </list>
* </property>
@@ -78,10 +78,10 @@ public class MemoryConfiguration implements Serializable {
DFLT_MEMORY_POLICY_INITIAL_SIZE);
/** Default initial size of a memory chunk for the system cache (40 MB). */
- private static final long DFLT_SYS_CACHE_INIT_SIZE = 40 * 1024 * 1024;
+ private static final long DFLT_SYS_CACHE_INIT_SIZE = 40L * 1024 * 1024;
/** Default max size of a memory chunk for the system cache (100 MB). */
- private static final long DFLT_SYS_CACHE_MAX_SIZE = 100 * 1024 * 1024;
+ private static final long DFLT_SYS_CACHE_MAX_SIZE = 100L * 1024 * 1024;
/** Default memory page size. */
public static final int DFLT_PAGE_SIZE = 4 * 1024;
@@ -129,7 +129,7 @@ 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.");
+ A.ensure(sysCacheInitSize > 0, "System cache initial size can not be less zero.");
this.sysCacheInitSize = sysCacheInitSize;
http://git-wip-us.apache.org/repos/asf/ignite/blob/ce8e31e2/modules/core/src/main/java/org/apache/ignite/configuration/MemoryPolicyConfiguration.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/configuration/MemoryPolicyConfiguration.java b/modules/core/src/main/java/org/apache/ignite/configuration/MemoryPolicyConfiguration.java
index a1a822f..a144050 100644
--- a/modules/core/src/main/java/org/apache/ignite/configuration/MemoryPolicyConfiguration.java
+++ b/modules/core/src/main/java/org/apache/ignite/configuration/MemoryPolicyConfiguration.java
@@ -41,19 +41,19 @@ import static org.apache.ignite.configuration.MemoryConfiguration.DFLT_MEM_PLC_D
* <list>
* <bean class="org.apache.ignite.configuration.MemoryPolicyConfiguration">
* <property name="name" value="Default_Region"/>
- * <property name="initialSize" value="#{100 * 1024 * 1024}"/>
+ * <property name="initialSize" value="#{100L * 1024 * 1024}"/>
* </bean>
*
* <bean class="org.apache.ignite.configuration.MemoryPolicyConfiguration">
* <property name="name" value="20MB_Region_Eviction"/>
- * <property name="initialSize" value="#{20 * 1024 * 1024}"/>
+ * <property name="initialSize" value="#{20L * 1024 * 1024}"/>
* <property name="pageEvictionMode" value="RANDOM_2_LRU"/>
* </bean>
*
* <bean class="org.apache.ignite.configuration.MemoryPolicyConfiguration">
* <property name="name" value="25MB_Region_Swapping"/>
- * <property name="initialSize" value="#{25 * 1024 * 1024}"/>
- * <property name="initialSize" value="#{100 * 1024 * 1024}"/>
+ * <property name="initialSize" value="#{25L * 1024 * 1024}"/>
+ * <property name="maxSize" value="#{100L * 1024 * 1024}"/>
* <property name="swapFilePath" value="memoryPolicyExampleSwap"/>
* </bean>
* </list>
http://git-wip-us.apache.org/repos/asf/ignite/blob/ce8e31e2/modules/core/src/main/java/org/apache/ignite/internal/GridDiagnostic.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/GridDiagnostic.java b/modules/core/src/main/java/org/apache/ignite/internal/GridDiagnostic.java
index 4a33b9d..ced4f84 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/GridDiagnostic.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/GridDiagnostic.java
@@ -136,7 +136,7 @@ final class GridDiagnostic {
}
});
- final long HALF_GB = 512/*MB*/ * 1024 * 1024;
+ final long HALF_GB = 512L/*MB*/ * 1024 * 1024;
exec.execute(new GridWorker(igniteInstanceName, "grid-diagnostic-7", log) {
@Override public void body() {
http://git-wip-us.apache.org/repos/asf/ignite/blob/ce8e31e2/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 54b647a..4982fa3 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
@@ -211,7 +211,7 @@ public class PageMemoryNoStoreImpl implements PageMemory {
long total = startSize;
- long allocChunkSize = Math.max((maxSize - startSize) / (SEG_CNT - 1), 256 * 1024 * 1024);
+ long allocChunkSize = Math.max((maxSize - startSize) / (SEG_CNT - 1), 256L * 1024 * 1024);
int lastIdx = 0;
http://git-wip-us.apache.org/repos/asf/ignite/blob/ce8e31e2/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/IgniteCacheDatabaseSharedManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/IgniteCacheDatabaseSharedManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/IgniteCacheDatabaseSharedManager.java
index 566ae6d..6f151b5 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/IgniteCacheDatabaseSharedManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/IgniteCacheDatabaseSharedManager.java
@@ -79,7 +79,7 @@ public class IgniteCacheDatabaseSharedManager extends GridCacheSharedManagerAdap
static final String SYSTEM_DATA_REGION_NAME = "sysMemPlc";
/** Minimum size of memory chunk */
- private static final long MIN_PAGE_MEMORY_SIZE = 10 * 1024 * 1024;
+ private static final long MIN_PAGE_MEMORY_SIZE = 10L * 1024 * 1024;
/** Maximum initial size on 32-bit JVM */
private static final long MAX_PAGE_MEMORY_INIT_SIZE_32_BIT = 2L * 1024 * 1024 * 1024;
http://git-wip-us.apache.org/repos/asf/ignite/blob/ce8e31e2/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheDataRegionConfigurationTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheDataRegionConfigurationTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheDataRegionConfigurationTest.java
index 1e9c4ed..614c900 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheDataRegionConfigurationTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheDataRegionConfigurationTest.java
@@ -41,10 +41,10 @@ public class CacheDataRegionConfigurationTest extends GridCommonAbstractTest {
private volatile DataStorageConfiguration memCfg;
/** */
- private static final long DFLT_MEM_PLC_SIZE = 10 * 1024 * 1024;
+ private static final long DFLT_MEM_PLC_SIZE = 10L * 1024 * 1024;
/** */
- private static final long BIG_MEM_PLC_SIZE = 1024 * 1024 * 1024;
+ private static final long BIG_MEM_PLC_SIZE = 1024L * 1024 * 1024;
/** {@inheritDoc} */
@Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception {
http://git-wip-us.apache.org/repos/asf/ignite/blob/ce8e31e2/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteClusterActivateDeactivateTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteClusterActivateDeactivateTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteClusterActivateDeactivateTest.java
index 838e56d..cb2d13b 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteClusterActivateDeactivateTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteClusterActivateDeactivateTest.java
@@ -118,11 +118,11 @@ public class IgniteClusterActivateDeactivateTest extends GridCommonAbstractTest
DataStorageConfiguration memCfg = new DataStorageConfiguration();
memCfg.setPageSize(4 * 1024);
memCfg.setDefaultDataRegionConfiguration(new DataRegionConfiguration()
- .setMaxSize(300 * 1024 * 1024)
+ .setMaxSize(300L * 1024 * 1024)
.setPersistenceEnabled(persistenceEnabled()));
memCfg.setDataRegionConfigurations(new DataRegionConfiguration()
- .setMaxSize(300 * 1024 * 1024)
+ .setMaxSize(300L * 1024 * 1024)
.setName(NO_PERSISTENCE_REGION)
.setPersistenceEnabled(false));
http://git-wip-us.apache.org/repos/asf/ignite/blob/ce8e31e2/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteOutOfMemoryPropagationTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteOutOfMemoryPropagationTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteOutOfMemoryPropagationTest.java
index 39c6d4a..34fb749 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteOutOfMemoryPropagationTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteOutOfMemoryPropagationTest.java
@@ -229,7 +229,7 @@ public class IgniteOutOfMemoryPropagationTest extends GridCommonAbstractTest {
DataStorageConfiguration memCfg = new DataStorageConfiguration();
memCfg.setDefaultDataRegionConfiguration(new DataRegionConfiguration()
- .setMaxSize(10 * 1024 * 1024 + 1));
+ .setMaxSize(10L * 1024 * 1024 + 1));
cfg.setDataStorageConfiguration(memCfg);
http://git-wip-us.apache.org/repos/asf/ignite/blob/ce8e31e2/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/MemoryPolicyConfigValidationTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/MemoryPolicyConfigValidationTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/MemoryPolicyConfigValidationTest.java
index d0130cf..6dec847 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/MemoryPolicyConfigValidationTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/MemoryPolicyConfigValidationTest.java
@@ -83,7 +83,7 @@ public class MemoryPolicyConfigValidationTest extends GridCommonAbstractTest {
plcs = createValidUserDefault();
memCfg.setDefaultMemoryPolicyName(VALID_DEFAULT_MEM_PLC_NAME);
- memCfg.setDefaultMemoryPolicySize(10 * 1014 * 1024);
+ memCfg.setDefaultMemoryPolicySize(10L * 1014 * 1024);
break;
@@ -119,7 +119,7 @@ public class MemoryPolicyConfigValidationTest extends GridCommonAbstractTest {
private MemoryPolicyConfiguration[] createSubIntervalsIsNegative() {
MemoryPolicyConfiguration[] res = new MemoryPolicyConfiguration[1];
- res[0] = createMemoryPolicy(VALID_DEFAULT_MEM_PLC_NAME, 100 * 1024 * 1024, 100 * 1024 * 1024);
+ res[0] = createMemoryPolicy(VALID_DEFAULT_MEM_PLC_NAME, 100L * 1024 * 1024, 100L * 1024 * 1024);
res[0].setSubIntervals(-10);
return res;
@@ -131,7 +131,7 @@ public class MemoryPolicyConfigValidationTest extends GridCommonAbstractTest {
private MemoryPolicyConfiguration[] createRateTimeIntervalIsNegative() {
MemoryPolicyConfiguration[] res = new MemoryPolicyConfiguration[1];
- res[0] = createMemoryPolicy(VALID_DEFAULT_MEM_PLC_NAME, 100 * 1024 * 1024, 100 * 1024 * 1024);
+ res[0] = createMemoryPolicy(VALID_DEFAULT_MEM_PLC_NAME, 100L * 1024 * 1024, 100L * 1024 * 1024);
res[0].setRateTimeInterval(-10);
return res;
@@ -143,7 +143,7 @@ public class MemoryPolicyConfigValidationTest extends GridCommonAbstractTest {
private MemoryPolicyConfiguration[] createValidUserDefault() {
MemoryPolicyConfiguration[] res = new MemoryPolicyConfiguration[1];
- res[0] = createMemoryPolicy(VALID_DEFAULT_MEM_PLC_NAME, 100 * 1024 * 1024, 100 * 1024 * 1024);
+ res[0] = createMemoryPolicy(VALID_DEFAULT_MEM_PLC_NAME, 100L * 1024 * 1024, 100L * 1024 * 1024);
return res;
}
@@ -154,7 +154,7 @@ public class MemoryPolicyConfigValidationTest extends GridCommonAbstractTest {
private MemoryPolicyConfiguration[] createMissingUserDefinedDefault() {
MemoryPolicyConfiguration[] res = new MemoryPolicyConfiguration[1];
- res[0] = createMemoryPolicy(VALID_USER_MEM_PLC_NAME, 10 * 1024 * 1024, 10 * 1024 * 1024);
+ res[0] = createMemoryPolicy(VALID_USER_MEM_PLC_NAME, 10L * 1024 * 1024, 10L * 1024 * 1024);
return res;
}
@@ -165,7 +165,7 @@ public class MemoryPolicyConfigValidationTest extends GridCommonAbstractTest {
private MemoryPolicyConfiguration[] createPlcWithNullName() {
MemoryPolicyConfiguration[] res = new MemoryPolicyConfiguration[1];
- res[0] = createMemoryPolicy(null, 10 * 1024 * 1024, 10 * 1024 * 1024);
+ res[0] = createMemoryPolicy(null, 10L * 1024 * 1024, 10L * 1024 * 1024);
return res;
}
@@ -187,7 +187,7 @@ public class MemoryPolicyConfigValidationTest extends GridCommonAbstractTest {
private MemoryPolicyConfiguration[] createPlcWithReservedNameMisuseCfg() {
MemoryPolicyConfiguration[] res = new MemoryPolicyConfiguration[1];
- res[0] = createMemoryPolicy("sysMemPlc", 10 * 1024 * 1024, 10 * 1024 * 1024);
+ res[0] = createMemoryPolicy("sysMemPlc", 10L * 1024 * 1024, 10L * 1024 * 1024);
return res;
}
@@ -198,8 +198,8 @@ public class MemoryPolicyConfigValidationTest extends GridCommonAbstractTest {
private MemoryPolicyConfiguration[] createPlcsWithNamesConflictCfg() {
MemoryPolicyConfiguration[] res = new MemoryPolicyConfiguration[2];
- res[0] = createMemoryPolicy("cflt0", 10 * 1024 * 1024, 10 * 1024 * 1024);
- res[1] = createMemoryPolicy("cflt0", 10 * 1024 * 1024, 10 * 1024 * 1024);
+ res[0] = createMemoryPolicy("cflt0", 10L * 1024 * 1024, 10L * 1024 * 1024);
+ res[1] = createMemoryPolicy("cflt0", 10L * 1024 * 1024, 10L * 1024 * 1024);
return res;
}
@@ -210,7 +210,7 @@ public class MemoryPolicyConfigValidationTest extends GridCommonAbstractTest {
private MemoryPolicyConfiguration[] createMaxSizeSmallerThanInitialSize() {
MemoryPolicyConfiguration[] res = new MemoryPolicyConfiguration[1];
- res[0] = createMemoryPolicy("invalidSize", 100 * 1024 * 1024, 10 * 1024 * 1024);
+ res[0] = createMemoryPolicy("invalidSize", 100L * 1024 * 1024, 10L * 1024 * 1024);
return res;
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/ce8e31e2/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/NonAffinityCoordinatorDynamicStartStopTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/NonAffinityCoordinatorDynamicStartStopTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/NonAffinityCoordinatorDynamicStartStopTest.java
index 0f50efc..f88f5b9 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/NonAffinityCoordinatorDynamicStartStopTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/NonAffinityCoordinatorDynamicStartStopTest.java
@@ -60,7 +60,7 @@ public class NonAffinityCoordinatorDynamicStartStopTest extends GridCommonAbstra
discoverySpi.setIpFinder(ipFinder);
DataStorageConfiguration memCfg = new DataStorageConfiguration().setDefaultDataRegionConfiguration(
- new DataRegionConfiguration().setMaxSize(200 * 1024 * 1024));
+ new DataRegionConfiguration().setMaxSize(200L * 1024 * 1024));
cfg.setDataStorageConfiguration(memCfg);
http://git-wip-us.apache.org/repos/asf/ignite/blob/ce8e31e2/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheBaselineTopologyTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheBaselineTopologyTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheBaselineTopologyTest.java
index e543919..7334336 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheBaselineTopologyTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheBaselineTopologyTest.java
@@ -124,15 +124,15 @@ public class CacheBaselineTopologyTest extends GridCommonAbstractTest {
new DataStorageConfiguration().setDefaultDataRegionConfiguration(
new DataRegionConfiguration()
.setPersistenceEnabled(true)
- .setMaxSize(100 * 1024 * 1024)
- .setInitialSize(100 * 1024 * 1024)
+ .setMaxSize(100L * 1024 * 1024)
+ .setInitialSize(100L * 1024 * 1024)
)
.setDataRegionConfigurations(
new DataRegionConfiguration()
.setName("memory")
.setPersistenceEnabled(false)
- .setMaxSize(100 * 1024 * 1024)
- .setInitialSize(100 * 1024 * 1024)
+ .setMaxSize(100L * 1024 * 1024)
+ .setInitialSize(100L * 1024 * 1024)
)
.setWalMode(WALMode.LOG_ONLY)
);
http://git-wip-us.apache.org/repos/asf/ignite/blob/ce8e31e2/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheLateAffinityAssignmentTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheLateAffinityAssignmentTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheLateAffinityAssignmentTest.java
index 9c61ccb..d40f4ca 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheLateAffinityAssignmentTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheLateAffinityAssignmentTest.java
@@ -186,7 +186,7 @@ public class CacheLateAffinityAssignmentTest extends GridCommonAbstractTest {
DataStorageConfiguration cfg1 = new DataStorageConfiguration();
- cfg1.setDefaultDataRegionConfiguration(new DataRegionConfiguration().setMaxSize(512 * 1024 * 1024L));
+ cfg1.setDefaultDataRegionConfiguration(new DataRegionConfiguration().setMaxSize(512L * 1024 * 1024));
cfg.setDataStorageConfiguration(cfg1);
http://git-wip-us.apache.org/repos/asf/ignite/blob/ce8e31e2/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheStartOnJoinTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheStartOnJoinTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheStartOnJoinTest.java
index 9d4083f..d59f470 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheStartOnJoinTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheStartOnJoinTest.java
@@ -99,7 +99,7 @@ public class CacheStartOnJoinTest extends GridCommonAbstractTest {
DataStorageConfiguration memCfg = new DataStorageConfiguration();
memCfg.setPageSize(1024);
- memCfg.setDefaultDataRegionConfiguration(new DataRegionConfiguration().setMaxSize(50 * 1024 * 1024));
+ memCfg.setDefaultDataRegionConfiguration(new DataRegionConfiguration().setMaxSize(50L * 1024 * 1024));
cfg.setDataStorageConfiguration(memCfg);
@@ -110,7 +110,7 @@ public class CacheStartOnJoinTest extends GridCommonAbstractTest {
/** {@inheritDoc} */
@Override protected long getTestTimeout() {
- return 10 * 60 * 1000L;
+ return 10L * 60 * 1000;
}
/** {@inheritDoc} */
http://git-wip-us.apache.org/repos/asf/ignite/blob/ce8e31e2/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/paged/PageEvictionMultinodeMixedRegionsTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/paged/PageEvictionMultinodeMixedRegionsTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/paged/PageEvictionMultinodeMixedRegionsTest.java
index d9135c8..3da47e7 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/paged/PageEvictionMultinodeMixedRegionsTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/paged/PageEvictionMultinodeMixedRegionsTest.java
@@ -35,7 +35,7 @@ public class PageEvictionMultinodeMixedRegionsTest extends PageEvictionMultinode
DataRegionConfiguration persReg = new DataRegionConfiguration()
.setName("persisted")
.setPersistenceEnabled(true)
- .setMaxSize(128 * 1024 * 1024); // limit memory to save space on agents
+ .setMaxSize(128L * 1024 * 1024); // limit memory to save space on agents
cfg.getDataStorageConfiguration().setDataRegionConfigurations(persReg);
http://git-wip-us.apache.org/repos/asf/ignite/blob/ce8e31e2/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgniteBaselineAffinityTopologyActivationTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgniteBaselineAffinityTopologyActivationTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgniteBaselineAffinityTopologyActivationTest.java
index 6b6d666..ce287d1 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgniteBaselineAffinityTopologyActivationTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgniteBaselineAffinityTopologyActivationTest.java
@@ -68,7 +68,7 @@ public class IgniteBaselineAffinityTopologyActivationTest extends GridCommonAbst
cfg.setDataStorageConfiguration(
new DataStorageConfiguration().setDefaultDataRegionConfiguration(
new DataRegionConfiguration()
- .setPersistenceEnabled(true).setMaxSize(10 * 1024 * 1024)
+ .setPersistenceEnabled(true).setMaxSize(10L * 1024 * 1024)
).setWalMode(WALMode.LOG_ONLY)
);
http://git-wip-us.apache.org/repos/asf/ignite/blob/ce8e31e2/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgniteDataStorageMetricsSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgniteDataStorageMetricsSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgniteDataStorageMetricsSelfTest.java
index a752605..4db1de9 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgniteDataStorageMetricsSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgniteDataStorageMetricsSelfTest.java
@@ -75,12 +75,12 @@ public class IgniteDataStorageMetricsSelfTest extends GridCommonAbstractTest {
DataStorageConfiguration memCfg = new DataStorageConfiguration()
.setDefaultDataRegionConfiguration(new DataRegionConfiguration()
- .setMaxSize(10 * 1024 * 1024)
+ .setMaxSize(10L * 1024 * 1024)
.setPersistenceEnabled(true)
.setMetricsEnabled(true)
.setName("dflt-plc"))
.setDataRegionConfigurations(new DataRegionConfiguration()
- .setMaxSize(10 * 1024 * 1024)
+ .setMaxSize(10L * 1024 * 1024)
.setPersistenceEnabled(false)
.setMetricsEnabled(true)
.setName("no-persistence"))
http://git-wip-us.apache.org/repos/asf/ignite/blob/ce8e31e2/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsBinaryMetadataOnClusterRestartTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsBinaryMetadataOnClusterRestartTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsBinaryMetadataOnClusterRestartTest.java
index 989626f..28c1e9b 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsBinaryMetadataOnClusterRestartTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsBinaryMetadataOnClusterRestartTest.java
@@ -84,7 +84,7 @@ public class IgnitePdsBinaryMetadataOnClusterRestartTest extends GridCommonAbstr
.setWalMode(WALMode.LOG_ONLY)
.setDefaultDataRegionConfiguration(new DataRegionConfiguration()
.setPersistenceEnabled(true)
- .setMaxSize(100 * 1024 * 1024))
+ .setMaxSize(100L * 1024 * 1024))
);
BinaryConfiguration bCfg = new BinaryConfiguration();
http://git-wip-us.apache.org/repos/asf/ignite/blob/ce8e31e2/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsCacheAssignmentNodeRestartsTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsCacheAssignmentNodeRestartsTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsCacheAssignmentNodeRestartsTest.java
index c57165c..032b422 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsCacheAssignmentNodeRestartsTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsCacheAssignmentNodeRestartsTest.java
@@ -69,8 +69,8 @@ public class IgnitePdsCacheAssignmentNodeRestartsTest extends GridCommonAbstract
.setPageSize(1024)
.setDefaultDataRegionConfiguration(new DataRegionConfiguration()
.setPersistenceEnabled(true)
- .setInitialSize(50 * 1024 * 1024L)
- .setMaxSize(50 * 1024 * 1024L)
+ .setInitialSize(50L * 1024 * 1024)
+ .setMaxSize(50L * 1024 * 1024)
)
.setWalMode(WALMode.LOG_ONLY)
);
http://git-wip-us.apache.org/repos/asf/ignite/blob/ce8e31e2/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsCacheRebalancingAbstractTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsCacheRebalancingAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsCacheRebalancingAbstractTest.java
index c0c2be9..31980ef 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsCacheRebalancingAbstractTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsCacheRebalancingAbstractTest.java
@@ -131,8 +131,8 @@ public abstract class IgnitePdsCacheRebalancingAbstractTest extends GridCommonAb
DataRegionConfiguration memPlcCfg = new DataRegionConfiguration();
memPlcCfg.setName("dfltDataRegion");
- memPlcCfg.setMaxSize(150 * 1024 * 1024);
- memPlcCfg.setInitialSize(100 * 1024 * 1024);
+ memPlcCfg.setMaxSize(150L * 1024 * 1024);
+ memPlcCfg.setInitialSize(100L * 1024 * 1024);
memPlcCfg.setPersistenceEnabled(true);
memCfg.setDefaultDataRegionConfiguration(memPlcCfg);
http://git-wip-us.apache.org/repos/asf/ignite/blob/ce8e31e2/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsContinuousRestartTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsContinuousRestartTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsContinuousRestartTest.java
index a02ed11..9317707 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsContinuousRestartTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsContinuousRestartTest.java
@@ -83,7 +83,7 @@ public class IgnitePdsContinuousRestartTest extends GridCommonAbstractTest {
DataStorageConfiguration memCfg = new DataStorageConfiguration()
.setDefaultDataRegionConfiguration(
new DataRegionConfiguration()
- .setMaxSize(400 * 1024 * 1024)
+ .setMaxSize(400L * 1024 * 1024)
.setPersistenceEnabled(true))
.setWalMode(WALMode.LOG_ONLY)
.setCheckpointFrequency(checkpointDelay);
http://git-wip-us.apache.org/repos/asf/ignite/blob/ce8e31e2/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsDynamicCacheTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsDynamicCacheTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsDynamicCacheTest.java
index 871cba3..42dc563 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsDynamicCacheTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsDynamicCacheTest.java
@@ -45,7 +45,7 @@ public class IgnitePdsDynamicCacheTest extends IgniteDbDynamicCacheSelfTest {
DataStorageConfiguration memCfg = new DataStorageConfiguration()
.setDefaultDataRegionConfiguration(
- new DataRegionConfiguration().setMaxSize(200 * 1024 * 1024).setPersistenceEnabled(true))
+ new DataRegionConfiguration().setMaxSize(200L * 1024 * 1024).setPersistenceEnabled(true))
.setWalMode(WALMode.LOG_ONLY)
.setPageSize(4 * 1024);
http://git-wip-us.apache.org/repos/asf/ignite/blob/ce8e31e2/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsExchangeDuringCheckpointTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsExchangeDuringCheckpointTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsExchangeDuringCheckpointTest.java
index 37d55ec..f160972 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsExchangeDuringCheckpointTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsExchangeDuringCheckpointTest.java
@@ -90,13 +90,13 @@ public class IgnitePdsExchangeDuringCheckpointTest extends GridCommonAbstractTes
DataStorageConfiguration memCfg = new DataStorageConfiguration()
.setDefaultDataRegionConfiguration(
- new DataRegionConfiguration().setMaxSize(800 * 1024 * 1024).setPersistenceEnabled(true))
+ new DataRegionConfiguration().setMaxSize(800L * 1024 * 1024).setPersistenceEnabled(true))
.setWalMode(WALMode.LOG_ONLY)
.setCheckpointThreads(1)
.setCheckpointFrequency(1);
memCfg.setDataRegionConfigurations(new DataRegionConfiguration()
- .setMaxSize(200 * 1024 * 1024)
+ .setMaxSize(200L * 1024 * 1024)
.setName(NO_PERSISTENCE_REGION)
.setPersistenceEnabled(false));
http://git-wip-us.apache.org/repos/asf/ignite/blob/ce8e31e2/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsMultiNodePutGetRestartTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsMultiNodePutGetRestartTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsMultiNodePutGetRestartTest.java
index 3eb17c1..08a2597 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsMultiNodePutGetRestartTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsMultiNodePutGetRestartTest.java
@@ -72,7 +72,7 @@ public class IgnitePdsMultiNodePutGetRestartTest extends GridCommonAbstractTest
DataStorageConfiguration memCfg = new DataStorageConfiguration()
.setDefaultDataRegionConfiguration(
- new DataRegionConfiguration().setMaxSize(100 * 1024 * 1024).setPersistenceEnabled(true))
+ new DataRegionConfiguration().setMaxSize(100L * 1024 * 1024).setPersistenceEnabled(true))
.setWalMode(WALMode.LOG_ONLY);
cfg.setDataStorageConfiguration(memCfg);
http://git-wip-us.apache.org/repos/asf/ignite/blob/ce8e31e2/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsPageSizesTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsPageSizesTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsPageSizesTest.java
index 556f376..daa2aeb 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsPageSizesTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsPageSizesTest.java
@@ -47,7 +47,7 @@ public class IgnitePdsPageSizesTest extends GridCommonAbstractTest {
DataStorageConfiguration memCfg = new DataStorageConfiguration()
.setDefaultDataRegionConfiguration(
- new DataRegionConfiguration().setMaxSize(100 * 1024 * 1024).setPersistenceEnabled(true))
+ new DataRegionConfiguration().setMaxSize(100L * 1024 * 1024).setPersistenceEnabled(true))
.setWalMode(WALMode.LOG_ONLY)
.setPageSize(pageSize);
http://git-wip-us.apache.org/repos/asf/ignite/blob/ce8e31e2/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsRecoveryAfterFileCorruptionTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsRecoveryAfterFileCorruptionTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsRecoveryAfterFileCorruptionTest.java
index e03cf52..20f2345 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsRecoveryAfterFileCorruptionTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsRecoveryAfterFileCorruptionTest.java
@@ -83,7 +83,7 @@ public class IgnitePdsRecoveryAfterFileCorruptionTest extends GridCommonAbstract
DataStorageConfiguration memCfg = new DataStorageConfiguration()
.setDefaultDataRegionConfiguration(
new DataRegionConfiguration()
- .setMaxSize(1024 * 1024 * 1024)
+ .setMaxSize(1024L * 1024 * 1024)
.setPersistenceEnabled(true)
.setName(policyName))
.setWalMode(WALMode.LOG_ONLY)
http://git-wip-us.apache.org/repos/asf/ignite/blob/ce8e31e2/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsRemoveDuringRebalancingTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsRemoveDuringRebalancingTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsRemoveDuringRebalancingTest.java
index 94b818d..e51901d 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsRemoveDuringRebalancingTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsRemoveDuringRebalancingTest.java
@@ -63,7 +63,7 @@ public class IgnitePdsRemoveDuringRebalancingTest extends GridCommonAbstractTest
DataStorageConfiguration memCfg = new DataStorageConfiguration()
.setDefaultDataRegionConfiguration(
new DataRegionConfiguration()
- .setMaxSize(100 * 1024 * 1024)
+ .setMaxSize(100L * 1024 * 1024)
.setPersistenceEnabled(true))
.setWalMode(WALMode.LOG_ONLY)
.setPageSize(1024)
http://git-wip-us.apache.org/repos/asf/ignite/blob/ce8e31e2/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePersistentStoreCacheGroupsTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePersistentStoreCacheGroupsTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePersistentStoreCacheGroupsTest.java
index ef21bd6..9685413 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePersistentStoreCacheGroupsTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePersistentStoreCacheGroupsTest.java
@@ -87,7 +87,7 @@ public class IgnitePersistentStoreCacheGroupsTest extends GridCommonAbstractTest
DataStorageConfiguration memCfg = new DataStorageConfiguration()
.setDefaultDataRegionConfiguration(
- new DataRegionConfiguration().setMaxSize(100 * 1024 * 1024).setPersistenceEnabled(true))
+ new DataRegionConfiguration().setMaxSize(100L * 1024 * 1024).setPersistenceEnabled(true))
.setPageSize(1024)
.setWalMode(WALMode.LOG_ONLY);
http://git-wip-us.apache.org/repos/asf/ignite/blob/ce8e31e2/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/MemoryPolicyInitializationTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/MemoryPolicyInitializationTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/MemoryPolicyInitializationTest.java
index fb1574d..774fcc6 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/MemoryPolicyInitializationTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/MemoryPolicyInitializationTest.java
@@ -38,10 +38,10 @@ public class MemoryPolicyInitializationTest extends GridCommonAbstractTest {
private static final String CUSTOM_NON_DEFAULT_MEM_PLC_NAME = "custom_mem_plc";
/** */
- private static final long USER_CUSTOM_MEM_PLC_SIZE = 89 * 1024 * 1024;
+ private static final long USER_CUSTOM_MEM_PLC_SIZE = 89L * 1024 * 1024;
/** */
- private static final long USER_DEFAULT_MEM_PLC_SIZE = 99 * 1024 * 1024;
+ private static final long USER_DEFAULT_MEM_PLC_SIZE = 99L * 1024 * 1024;
/** */
private MemoryConfiguration memCfg;
http://git-wip-us.apache.org/repos/asf/ignite/blob/ce8e31e2/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/baseline/IgniteBaselineAbstractFullApiSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/baseline/IgniteBaselineAbstractFullApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/baseline/IgniteBaselineAbstractFullApiSelfTest.java
index 03dc445..67d13d6 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/baseline/IgniteBaselineAbstractFullApiSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/baseline/IgniteBaselineAbstractFullApiSelfTest.java
@@ -33,7 +33,7 @@ public abstract class IgniteBaselineAbstractFullApiSelfTest extends GridCacheAbs
cfg.setDataStorageConfiguration(new DataStorageConfiguration()
.setDefaultDataRegionConfiguration(
new DataRegionConfiguration()
- .setMaxSize(256 * 1024 * 1024)
+ .setMaxSize(256L * 1024 * 1024)
.setPersistenceEnabled(true))
.setWalMode(WALMode.LOG_ONLY));
http://git-wip-us.apache.org/repos/asf/ignite/blob/ce8e31e2/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/baseline/IgniteChangingBaselineDownCachePutAllFailoverTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/baseline/IgniteChangingBaselineDownCachePutAllFailoverTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/baseline/IgniteChangingBaselineDownCachePutAllFailoverTest.java
index d59375e..c64284b 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/baseline/IgniteChangingBaselineDownCachePutAllFailoverTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/baseline/IgniteChangingBaselineDownCachePutAllFailoverTest.java
@@ -49,9 +49,9 @@ public class IgniteChangingBaselineDownCachePutAllFailoverTest extends CachePutA
.setDefaultDataRegionConfiguration(
new DataRegionConfiguration()
.setPersistenceEnabled(true)
- .setInitialSize(200 * 1024 * 1024)
- .setMaxSize(200 * 1024 * 1024)
- .setCheckpointPageBufferSize(200 * 1024 * 1024)
+ .setInitialSize(200L * 1024 * 1024)
+ .setMaxSize(200L * 1024 * 1024)
+ .setCheckpointPageBufferSize(200L * 1024 * 1024)
)
);
http://git-wip-us.apache.org/repos/asf/ignite/blob/ce8e31e2/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/baseline/IgniteChangingBaselineDownCacheRemoveFailoverTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/baseline/IgniteChangingBaselineDownCacheRemoveFailoverTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/baseline/IgniteChangingBaselineDownCacheRemoveFailoverTest.java
index e6e0cb9..dfe1b1e 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/baseline/IgniteChangingBaselineDownCacheRemoveFailoverTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/baseline/IgniteChangingBaselineDownCacheRemoveFailoverTest.java
@@ -71,9 +71,9 @@ public class IgniteChangingBaselineDownCacheRemoveFailoverTest extends GridCache
new DataStorageConfiguration()
.setDefaultDataRegionConfiguration(new DataRegionConfiguration()
.setPersistenceEnabled(true)
- .setInitialSize(200 * 1024 * 1024)
- .setMaxSize(200 * 1024 * 1024)
- .setCheckpointPageBufferSize(200 * 1024 * 1024)
+ .setInitialSize(200L * 1024 * 1024)
+ .setMaxSize(200L * 1024 * 1024)
+ .setCheckpointPageBufferSize(200L * 1024 * 1024)
)
);
http://git-wip-us.apache.org/repos/asf/ignite/blob/ce8e31e2/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/baseline/IgniteChangingBaselineUpCachePutAllFailoverTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/baseline/IgniteChangingBaselineUpCachePutAllFailoverTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/baseline/IgniteChangingBaselineUpCachePutAllFailoverTest.java
index f0a5603..2e78464 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/baseline/IgniteChangingBaselineUpCachePutAllFailoverTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/baseline/IgniteChangingBaselineUpCachePutAllFailoverTest.java
@@ -48,9 +48,9 @@ public class IgniteChangingBaselineUpCachePutAllFailoverTest extends CachePutAll
.setDefaultDataRegionConfiguration(
new DataRegionConfiguration()
.setPersistenceEnabled(true)
- .setInitialSize(200 * 1024 * 1024)
- .setMaxSize(200 * 1024 * 1024)
- .setCheckpointPageBufferSize(200 * 1024 * 1024)
+ .setInitialSize(200L * 1024 * 1024)
+ .setMaxSize(200L * 1024 * 1024)
+ .setCheckpointPageBufferSize(200L * 1024 * 1024)
)
);
http://git-wip-us.apache.org/repos/asf/ignite/blob/ce8e31e2/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/baseline/IgniteChangingBaselineUpCacheRemoveFailoverTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/baseline/IgniteChangingBaselineUpCacheRemoveFailoverTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/baseline/IgniteChangingBaselineUpCacheRemoveFailoverTest.java
index 25b9744..8f15d77 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/baseline/IgniteChangingBaselineUpCacheRemoveFailoverTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/baseline/IgniteChangingBaselineUpCacheRemoveFailoverTest.java
@@ -70,9 +70,9 @@ public class IgniteChangingBaselineUpCacheRemoveFailoverTest extends GridCacheAb
new DataStorageConfiguration()
.setDefaultDataRegionConfiguration(new DataRegionConfiguration()
.setPersistenceEnabled(true)
- .setInitialSize(200 * 1024 * 1024)
- .setMaxSize(200 * 1024 * 1024)
- .setCheckpointPageBufferSize(200 * 1024 * 1024)
+ .setInitialSize(200L * 1024 * 1024)
+ .setMaxSize(200L * 1024 * 1024)
+ .setCheckpointPageBufferSize(200L * 1024 * 1024)
)
);
http://git-wip-us.apache.org/repos/asf/ignite/blob/ce8e31e2/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/baseline/IgniteStableBaselineCachePutAllFailoverTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/baseline/IgniteStableBaselineCachePutAllFailoverTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/baseline/IgniteStableBaselineCachePutAllFailoverTest.java
index f960306..f6ba354 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/baseline/IgniteStableBaselineCachePutAllFailoverTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/baseline/IgniteStableBaselineCachePutAllFailoverTest.java
@@ -47,9 +47,9 @@ public class IgniteStableBaselineCachePutAllFailoverTest extends CachePutAllFail
.setDefaultDataRegionConfiguration(
new DataRegionConfiguration()
.setPersistenceEnabled(true)
- .setInitialSize(200 * 1024 * 1024)
- .setMaxSize(200 * 1024 * 1024)
- .setCheckpointPageBufferSize(200 * 1024 * 1024)
+ .setInitialSize(200L * 1024 * 1024)
+ .setMaxSize(200L * 1024 * 1024)
+ .setCheckpointPageBufferSize(200L * 1024 * 1024)
)
);
http://git-wip-us.apache.org/repos/asf/ignite/blob/ce8e31e2/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/baseline/IgniteStableBaselineCacheRemoveFailoverTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/baseline/IgniteStableBaselineCacheRemoveFailoverTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/baseline/IgniteStableBaselineCacheRemoveFailoverTest.java
index c4d4d68..eda485d 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/baseline/IgniteStableBaselineCacheRemoveFailoverTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/baseline/IgniteStableBaselineCacheRemoveFailoverTest.java
@@ -70,9 +70,9 @@ public class IgniteStableBaselineCacheRemoveFailoverTest extends GridCacheAbstra
new DataStorageConfiguration()
.setDefaultDataRegionConfiguration(new DataRegionConfiguration()
.setPersistenceEnabled(true)
- .setInitialSize(512 * 1024 * 1024)
- .setMaxSize(512 * 1024 * 1024)
- .setCheckpointPageBufferSize(512 * 1024 * 1024)
+ .setInitialSize(512L * 1024 * 1024)
+ .setMaxSize(512L * 1024 * 1024)
+ .setCheckpointPageBufferSize(512L * 1024 * 1024)
)
);
http://git-wip-us.apache.org/repos/asf/ignite/blob/ce8e31e2/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/IgnitePdsCacheRestoreTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/IgnitePdsCacheRestoreTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/IgnitePdsCacheRestoreTest.java
index 525f36a..2db3ca2 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/IgnitePdsCacheRestoreTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/IgnitePdsCacheRestoreTest.java
@@ -60,12 +60,12 @@ public class IgnitePdsCacheRestoreTest extends GridCommonAbstractTest {
DataStorageConfiguration memCfg = new DataStorageConfiguration()
.setDefaultDataRegionConfiguration(
- new DataRegionConfiguration().setMaxSize(10 * 1024 * 1024).setPersistenceEnabled(true))
+ new DataRegionConfiguration().setMaxSize(10L * 1024 * 1024).setPersistenceEnabled(true))
.setPageSize(4 * 1024)
.setWalMode(WALMode.LOG_ONLY);
memCfg.setDataRegionConfigurations(new DataRegionConfiguration()
- .setMaxSize(10 * 1024 * 1024)
+ .setMaxSize(10L * 1024 * 1024)
.setName(NO_PERSISTENCE_REGION)
.setPersistenceEnabled(false));
http://git-wip-us.apache.org/repos/asf/ignite/blob/ce8e31e2/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/IgnitePdsMultiNodePutGetRestartTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/IgnitePdsMultiNodePutGetRestartTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/IgnitePdsMultiNodePutGetRestartTest.java
index 690c9a6..d386c17 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/IgnitePdsMultiNodePutGetRestartTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/IgnitePdsMultiNodePutGetRestartTest.java
@@ -61,7 +61,7 @@ public class IgnitePdsMultiNodePutGetRestartTest extends GridCommonAbstractTest
DataStorageConfiguration memCfg = new DataStorageConfiguration()
.setDefaultDataRegionConfiguration(
- new DataRegionConfiguration().setMaxSize(100 * 1024 * 1024).setPersistenceEnabled(true))
+ new DataRegionConfiguration().setMaxSize(100L * 1024 * 1024).setPersistenceEnabled(true))
.setWalMode(WALMode.LOG_ONLY);
cfg.setDataStorageConfiguration(memCfg);
http://git-wip-us.apache.org/repos/asf/ignite/blob/ce8e31e2/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/IgnitePdsPageEvictionDuringPartitionClearTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/IgnitePdsPageEvictionDuringPartitionClearTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/IgnitePdsPageEvictionDuringPartitionClearTest.java
index 8858206..720b604 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/IgnitePdsPageEvictionDuringPartitionClearTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/IgnitePdsPageEvictionDuringPartitionClearTest.java
@@ -59,7 +59,7 @@ public class IgnitePdsPageEvictionDuringPartitionClearTest extends GridCommonAbs
// Intentionally set small page cache size.
DataStorageConfiguration memCfg = new DataStorageConfiguration()
.setDefaultDataRegionConfiguration(
- new DataRegionConfiguration().setMaxSize(70 * 1024 * 1024).setPersistenceEnabled(true))
+ new DataRegionConfiguration().setMaxSize(70L * 1024 * 1024).setPersistenceEnabled(true))
.setWalMode(WALMode.LOG_ONLY);
cfg.setDataStorageConfiguration(memCfg);
http://git-wip-us.apache.org/repos/asf/ignite/blob/ce8e31e2/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/IgnitePdsPageEvictionTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/IgnitePdsPageEvictionTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/IgnitePdsPageEvictionTest.java
index 931e0d6..3c07a16 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/IgnitePdsPageEvictionTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/IgnitePdsPageEvictionTest.java
@@ -57,7 +57,7 @@ public class IgnitePdsPageEvictionTest extends GridCommonAbstractTest {
DataStorageConfiguration memCfg = new DataStorageConfiguration()
.setDefaultDataRegionConfiguration(
- new DataRegionConfiguration().setMaxSize(50 * 1024 * 1024).setPersistenceEnabled(true))
+ new DataRegionConfiguration().setMaxSize(50L * 1024 * 1024).setPersistenceEnabled(true))
.setWalMode(WALMode.LOG_ONLY)
.setPageSize(1024)
.setConcurrencyLevel(Runtime.getRuntime().availableProcessors() * 4);
http://git-wip-us.apache.org/repos/asf/ignite/blob/ce8e31e2/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/IgnitePdsRebalancingOnNotStableTopologyTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/IgnitePdsRebalancingOnNotStableTopologyTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/IgnitePdsRebalancingOnNotStableTopologyTest.java
index 9690174..8b3c875 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/IgnitePdsRebalancingOnNotStableTopologyTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/IgnitePdsRebalancingOnNotStableTopologyTest.java
@@ -167,7 +167,7 @@ public class IgnitePdsRebalancingOnNotStableTopologyTest extends GridCommonAbstr
DataStorageConfiguration memCfg = new DataStorageConfiguration()
.setDefaultDataRegionConfiguration(
- new DataRegionConfiguration().setMaxSize(200 * 1024 * 1024).setPersistenceEnabled(true))
+ new DataRegionConfiguration().setMaxSize(200L * 1024 * 1024).setPersistenceEnabled(true))
.setWalMode(WALMode.LOG_ONLY)
.setCheckpointFrequency(CHECKPOINT_FREQUENCY);
http://git-wip-us.apache.org/repos/asf/ignite/blob/ce8e31e2/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/IgnitePdsTransactionsHangTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/IgnitePdsTransactionsHangTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/IgnitePdsTransactionsHangTest.java
index de0b3bf..36afe32 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/IgnitePdsTransactionsHangTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/IgnitePdsTransactionsHangTest.java
@@ -58,10 +58,10 @@ public class IgnitePdsTransactionsHangTest extends GridCommonAbstractTest {
private static final TcpDiscoveryIpFinder IP_FINDER = new TcpDiscoveryVmIpFinder(true);
/** Page cache size. */
- private static final int PAGE_CACHE_SIZE = 512;
+ private static final long PAGE_CACHE_SIZE = 512L * 1024 * 1024;
/** Page size. */
- private static final Integer PAGE_SIZE = 16;
+ private static final int PAGE_SIZE = 16 * 1024;
/** Cache name. */
private static final String CACHE_NAME = "IgnitePdsTransactionsHangTest";
@@ -124,8 +124,8 @@ public class IgnitePdsTransactionsHangTest extends GridCommonAbstractTest {
DataRegionConfiguration memPlcCfg = new DataRegionConfiguration();
memPlcCfg.setName("dfltDataRegion");
- memPlcCfg.setInitialSize(PAGE_CACHE_SIZE * 1024 * 1024);
- memPlcCfg.setMaxSize(PAGE_CACHE_SIZE * 1024 * 1024);
+ memPlcCfg.setInitialSize(PAGE_CACHE_SIZE);
+ memPlcCfg.setMaxSize(PAGE_CACHE_SIZE);
memPlcCfg.setPersistenceEnabled(true);
DataStorageConfiguration memCfg = new DataStorageConfiguration();
@@ -133,7 +133,7 @@ public class IgnitePdsTransactionsHangTest extends GridCommonAbstractTest {
memCfg.setDefaultDataRegionConfiguration(memPlcCfg);
memCfg.setWalHistorySize(1);
memCfg.setCheckpointFrequency(CHECKPOINT_FREQUENCY);
- memCfg.setPageSize(PAGE_SIZE * 1024);
+ memCfg.setPageSize(PAGE_SIZE);
cfg.setDataStorageConfiguration(memCfg);
http://git-wip-us.apache.org/repos/asf/ignite/blob/ce8e31e2/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/IgnitePdsWholeClusterRestartTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/IgnitePdsWholeClusterRestartTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/IgnitePdsWholeClusterRestartTest.java
index dc6f0ec..7db84a3 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/IgnitePdsWholeClusterRestartTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/IgnitePdsWholeClusterRestartTest.java
@@ -54,7 +54,7 @@ public class IgnitePdsWholeClusterRestartTest extends GridCommonAbstractTest {
DataStorageConfiguration memCfg = new DataStorageConfiguration()
.setDefaultDataRegionConfiguration(
- new DataRegionConfiguration().setMaxSize(100 * 1024 * 1024).setPersistenceEnabled(true))
+ new DataRegionConfiguration().setMaxSize(100L * 1024 * 1024).setPersistenceEnabled(true))
.setWalMode(WALMode.LOG_ONLY);
cfg.setDataStorageConfiguration(memCfg);
http://git-wip-us.apache.org/repos/asf/ignite/blob/ce8e31e2/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/file/DefaultPageSizeBackwardsCompatibilityTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/file/DefaultPageSizeBackwardsCompatibilityTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/file/DefaultPageSizeBackwardsCompatibilityTest.java
index e0e277c..739beb4 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/file/DefaultPageSizeBackwardsCompatibilityTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/file/DefaultPageSizeBackwardsCompatibilityTest.java
@@ -60,7 +60,7 @@ public class DefaultPageSizeBackwardsCompatibilityTest extends GridCommonAbstrac
memCfg.setPageSize(2048);
DataRegionConfiguration memPlcCfg = new DataRegionConfiguration();
- memPlcCfg.setMaxSize(100 * 1000 * 1000);
+ memPlcCfg.setMaxSize(100L * 1000 * 1000);
memPlcCfg.setName("dfltDataRegion");
memPlcCfg.setPersistenceEnabled(true);
http://git-wip-us.apache.org/repos/asf/ignite/blob/ce8e31e2/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/file/IgnitePdsCacheIntegrationTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/file/IgnitePdsCacheIntegrationTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/file/IgnitePdsCacheIntegrationTest.java
index 1ba723d..ba9a000 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/file/IgnitePdsCacheIntegrationTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/file/IgnitePdsCacheIntegrationTest.java
@@ -63,7 +63,7 @@ public class IgnitePdsCacheIntegrationTest extends GridCommonAbstractTest {
DataStorageConfiguration memCfg = new DataStorageConfiguration()
.setDefaultDataRegionConfiguration(
- new DataRegionConfiguration().setMaxSize(100 * 1024 * 1024).setPersistenceEnabled(true))
+ new DataRegionConfiguration().setMaxSize(100L * 1024 * 1024).setPersistenceEnabled(true))
.setWalMode(WALMode.LOG_ONLY)
.setConcurrencyLevel(Runtime.getRuntime().availableProcessors() * 4);
http://git-wip-us.apache.org/repos/asf/ignite/blob/ce8e31e2/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/file/IgnitePdsDiskErrorsRecoveringTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/file/IgnitePdsDiskErrorsRecoveringTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/file/IgnitePdsDiskErrorsRecoveringTest.java
index c902879..67a2eca 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/file/IgnitePdsDiskErrorsRecoveringTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/file/IgnitePdsDiskErrorsRecoveringTest.java
@@ -98,7 +98,7 @@ public class IgnitePdsDiskErrorsRecoveringTest extends GridCommonAbstractTest {
DataStorageConfiguration dsCfg = new DataStorageConfiguration()
.setDefaultDataRegionConfiguration(
- new DataRegionConfiguration().setMaxSize(100 * 1024 * 1024).setPersistenceEnabled(true))
+ new DataRegionConfiguration().setMaxSize(100L * 1024 * 1024).setPersistenceEnabled(true))
.setWalMode(WALMode.LOG_ONLY)
.setWalCompactionEnabled(false)
.setWalSegmentSize(WAL_SEGMENT_SIZE)
http://git-wip-us.apache.org/repos/asf/ignite/blob/ce8e31e2/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/file/IgnitePdsNoActualWalHistoryTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/file/IgnitePdsNoActualWalHistoryTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/file/IgnitePdsNoActualWalHistoryTest.java
index 48372ef..c2967fe 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/file/IgnitePdsNoActualWalHistoryTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/file/IgnitePdsNoActualWalHistoryTest.java
@@ -67,7 +67,7 @@ public class IgnitePdsNoActualWalHistoryTest extends GridCommonAbstractTest {
.setWalSegments(10)
.setWalMode(WALMode.LOG_ONLY)
.setDefaultDataRegionConfiguration(new DataRegionConfiguration()
- .setMaxSize(100 * 1024 * 1024)
+ .setMaxSize(100L * 1024 * 1024)
.setPersistenceEnabled(true));
cfg.setMarshaller(null);
http://git-wip-us.apache.org/repos/asf/ignite/blob/ce8e31e2/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/filename/IgniteUidAsConsistentIdMigrationTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/filename/IgniteUidAsConsistentIdMigrationTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/filename/IgniteUidAsConsistentIdMigrationTest.java
index 419ad63..6e8ef65 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/filename/IgniteUidAsConsistentIdMigrationTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/filename/IgniteUidAsConsistentIdMigrationTest.java
@@ -144,7 +144,7 @@ public class IgniteUidAsConsistentIdMigrationTest extends GridCommonAbstractTest
}
dsCfg.setDefaultDataRegionConfiguration(new DataRegionConfiguration()
- .setMaxSize(32 * 1024 * 1024)
+ .setMaxSize(32L * 1024 * 1024)
.setPersistenceEnabled(true));
cfg.setDataStorageConfiguration(dsCfg);
[19/50] [abbrv] ignite git commit: IGNITE-8266: stopAllGrids in
afterAllTests removed. - Fixes #3844.
Posted by dp...@apache.org.
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/core/src/test/java/org/apache/ignite/cache/affinity/rendezvous/RendezvousAffinityFunctionSimpleBenchmark.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/cache/affinity/rendezvous/RendezvousAffinityFunctionSimpleBenchmark.java b/modules/core/src/test/java/org/apache/ignite/cache/affinity/rendezvous/RendezvousAffinityFunctionSimpleBenchmark.java
index 0d47676..c680a68 100644
--- a/modules/core/src/test/java/org/apache/ignite/cache/affinity/rendezvous/RendezvousAffinityFunctionSimpleBenchmark.java
+++ b/modules/core/src/test/java/org/apache/ignite/cache/affinity/rendezvous/RendezvousAffinityFunctionSimpleBenchmark.java
@@ -93,11 +93,6 @@ public class RendezvousAffinityFunctionSimpleBenchmark extends GridCommonAbstrac
ignite = startGrid();
}
- /** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- stopAllGrids();
- }
-
/**
* @param nodesCnt Count of nodes to generate.
* @return Nodes list.
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/core/src/test/java/org/apache/ignite/cache/store/CacheStoreSessionListenerAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/cache/store/CacheStoreSessionListenerAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/cache/store/CacheStoreSessionListenerAbstractSelfTest.java
index 56e7dca..412a879 100644
--- a/modules/core/src/test/java/org/apache/ignite/cache/store/CacheStoreSessionListenerAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/cache/store/CacheStoreSessionListenerAbstractSelfTest.java
@@ -87,11 +87,6 @@ public abstract class CacheStoreSessionListenerAbstractSelfTest extends GridComm
}
/** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- stopAllGrids();
- }
-
- /** {@inheritDoc} */
@Override protected void beforeTest() throws Exception {
try (Connection conn = DriverManager.getConnection(URL)) {
conn.createStatement().executeUpdate("DROP TABLE IF EXISTS Table1");
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/core/src/test/java/org/apache/ignite/failure/StopNodeOrHaltFailureHandlerTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/failure/StopNodeOrHaltFailureHandlerTest.java b/modules/core/src/test/java/org/apache/ignite/failure/StopNodeOrHaltFailureHandlerTest.java
index da13b06..05e3e6e 100644
--- a/modules/core/src/test/java/org/apache/ignite/failure/StopNodeOrHaltFailureHandlerTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/failure/StopNodeOrHaltFailureHandlerTest.java
@@ -47,11 +47,6 @@ public class StopNodeOrHaltFailureHandlerTest extends GridCommonAbstractTest {
}
/** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- stopAllGrids();
- }
-
- /** {@inheritDoc} */
@Override protected FailureHandler getFailureHandler(String igniteInstanceName) {
return igniteInstanceName.endsWith("2") ?
new StopNodeOrHaltFailureHandler(false, 0) :
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/core/src/test/java/org/apache/ignite/igfs/IgfsEventsAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/igfs/IgfsEventsAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/igfs/IgfsEventsAbstractSelfTest.java
index 5593493..bb84ae3 100644
--- a/modules/core/src/test/java/org/apache/ignite/igfs/IgfsEventsAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/igfs/IgfsEventsAbstractSelfTest.java
@@ -179,11 +179,6 @@ public abstract class IgfsEventsAbstractSelfTest extends GridCommonAbstractTest
igfs.clear();
}
- /** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- stopGrid(1);
- }
-
/**
* Checks events on CRUD operations on a single file in nested directories.
*
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/core/src/test/java/org/apache/ignite/igfs/IgfsFragmentizerAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/igfs/IgfsFragmentizerAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/igfs/IgfsFragmentizerAbstractSelfTest.java
index a409ece..0b14b1d 100644
--- a/modules/core/src/test/java/org/apache/ignite/igfs/IgfsFragmentizerAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/igfs/IgfsFragmentizerAbstractSelfTest.java
@@ -150,11 +150,6 @@ public class IgfsFragmentizerAbstractSelfTest extends IgfsCommonAbstractTest {
}
/** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- stopAllGrids();
- }
-
- /** {@inheritDoc} */
@Override protected void afterTest() throws Exception {
grid(0).fileSystem("igfs").clear();
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/core/src/test/java/org/apache/ignite/internal/ClusterGroupSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/ClusterGroupSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/ClusterGroupSelfTest.java
index 99006d1..0c4812f 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/ClusterGroupSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/ClusterGroupSelfTest.java
@@ -77,12 +77,6 @@ public class ClusterGroupSelfTest extends ClusterGroupAbstractTest {
}
/** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- for (int i = 0; i < NODES_CNT; i++)
- stopGrid(i);
- }
-
- /** {@inheritDoc} */
@Override protected ClusterGroup projection() {
return grid(0).cluster().forPredicate(F.nodeForNodeIds(ids));
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/core/src/test/java/org/apache/ignite/internal/ClusterMetricsSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/ClusterMetricsSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/ClusterMetricsSelfTest.java
index d379400..addecea 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/ClusterMetricsSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/ClusterMetricsSelfTest.java
@@ -56,11 +56,6 @@ public class ClusterMetricsSelfTest extends GridCommonAbstractTest {
}
/** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- stopAllGrids();
- }
-
- /** {@inheritDoc} */
@Override protected IgniteConfiguration getConfiguration(String igniteInstanceName) throws Exception {
IgniteConfiguration cfg = super.getConfiguration(igniteInstanceName);
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/core/src/test/java/org/apache/ignite/internal/GridAffinityMappedTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridAffinityMappedTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridAffinityMappedTest.java
index 68e2bb9..0622453 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/GridAffinityMappedTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/GridAffinityMappedTest.java
@@ -87,13 +87,6 @@ public class GridAffinityMappedTest extends GridCommonAbstractTest {
startGrid(3);
}
- /** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- stopGrid(1);
- stopGrid(2);
- stopGrid(3);
- }
-
/**
* @throws IgniteCheckedException If failed.
*/
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/core/src/test/java/org/apache/ignite/internal/GridAffinityNoCacheSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridAffinityNoCacheSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridAffinityNoCacheSelfTest.java
index a974cdb..bdd1ce6 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/GridAffinityNoCacheSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/GridAffinityNoCacheSelfTest.java
@@ -49,13 +49,6 @@ public class GridAffinityNoCacheSelfTest extends GridCommonAbstractTest {
startGrids(2);
}
- /** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- stopAllGrids();
-
- super.afterTestsStopped();
- }
-
/**
* @throws Exception If failed.
*/
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/core/src/test/java/org/apache/ignite/internal/GridCachePartitionExchangeManagerHistSizeTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridCachePartitionExchangeManagerHistSizeTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridCachePartitionExchangeManagerHistSizeTest.java
index 5f1c3a8..69d7368 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/GridCachePartitionExchangeManagerHistSizeTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/GridCachePartitionExchangeManagerHistSizeTest.java
@@ -56,8 +56,6 @@ public class GridCachePartitionExchangeManagerHistSizeTest extends GridCommonAbs
/** {@inheritDoc} */
@Override protected void afterTestsStopped() throws Exception {
- stopAllGrids();
-
if (oldHistVal != null)
System.setProperty(IGNITE_EXCHANGE_HISTORY_SIZE, oldHistVal);
else
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/core/src/test/java/org/apache/ignite/internal/GridJobServicesAddNodeTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridJobServicesAddNodeTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridJobServicesAddNodeTest.java
index 4b8b494..aab33db 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/GridJobServicesAddNodeTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/GridJobServicesAddNodeTest.java
@@ -62,11 +62,6 @@ public class GridJobServicesAddNodeTest extends GridCommonAbstractTest {
}
/** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- stopAllGrids();
- }
-
- /** {@inheritDoc} */
@Override protected IgniteConfiguration getConfiguration(String igniteInstanceName) throws Exception {
IgniteConfiguration c = super.getConfiguration(igniteInstanceName);
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/core/src/test/java/org/apache/ignite/internal/GridKernalConcurrentAccessStopSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridKernalConcurrentAccessStopSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridKernalConcurrentAccessStopSelfTest.java
index 954834d..2db34e0 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/GridKernalConcurrentAccessStopSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/GridKernalConcurrentAccessStopSelfTest.java
@@ -38,12 +38,6 @@ public class GridKernalConcurrentAccessStopSelfTest extends GridCommonAbstractT
startGrid(i);
}
- /** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- for (int i = GRIDS; i-- >= 0;)
- stopGrid(i);
- }
-
/**
*
*/
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/core/src/test/java/org/apache/ignite/internal/GridListenActorSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridListenActorSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridListenActorSelfTest.java
index 4b488be..ae2a505 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/GridListenActorSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/GridListenActorSelfTest.java
@@ -43,11 +43,6 @@ public class GridListenActorSelfTest extends GridCommonAbstractTest {
}
/** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- stopGrid();
- }
-
- /** {@inheritDoc} */
@SuppressWarnings("deprecation")
@Override protected void afterTest() throws Exception {
((IgniteKernal)grid()).context().io().
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/core/src/test/java/org/apache/ignite/internal/GridMultipleJobsSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridMultipleJobsSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridMultipleJobsSelfTest.java
index bc6eca2..b9b0925 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/GridMultipleJobsSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/GridMultipleJobsSelfTest.java
@@ -63,14 +63,6 @@ public class GridMultipleJobsSelfTest extends GridCommonAbstractTest {
}
/** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- stopGrid(1);
- stopGrid(2);
-
- assertEquals(0, G.allGrids().size());
- }
-
- /** {@inheritDoc} */
@Override protected long getTestTimeout() {
return TEST_TIMEOUT;
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/core/src/test/java/org/apache/ignite/internal/GridNodeFilterSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridNodeFilterSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridNodeFilterSelfTest.java
index 59d3156..7a07def 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/GridNodeFilterSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/GridNodeFilterSelfTest.java
@@ -48,16 +48,6 @@ public class GridNodeFilterSelfTest extends GridCommonAbstractTest {
startGrid(3);
}
- /** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- stopGrid(1);
- stopGrid(2);
- stopGrid(3);
-
- ignite = null;
- rmtIgnite = null;
- }
-
/**
* @throws Exception If failed.
*/
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/core/src/test/java/org/apache/ignite/internal/GridProjectionForCachesSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridProjectionForCachesSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridProjectionForCachesSelfTest.java
index 222e58c..3548234 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/GridProjectionForCachesSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/GridProjectionForCachesSelfTest.java
@@ -119,11 +119,6 @@ public class GridProjectionForCachesSelfTest extends GridCommonAbstractTest {
}
/** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- stopAllGrids();
- }
-
- /** {@inheritDoc} */
@Override protected void beforeTest() throws Exception {
ignite = grid(0);
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/core/src/test/java/org/apache/ignite/internal/GridRuntimeExceptionSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridRuntimeExceptionSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridRuntimeExceptionSelfTest.java
index d3408da..a1f946b 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/GridRuntimeExceptionSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/GridRuntimeExceptionSelfTest.java
@@ -74,11 +74,6 @@ public class GridRuntimeExceptionSelfTest extends GridCommonAbstractTest {
startGrid();
}
- /** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- stopGrid();
- }
-
/**
* @throws Exception If failed.
*/
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/core/src/test/java/org/apache/ignite/internal/GridSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridSelfTest.java
index f71ffb0..08b5402 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/GridSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/GridSelfTest.java
@@ -50,11 +50,6 @@ public class GridSelfTest extends ClusterGroupAbstractTest {
}
/** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- stopAllGrids();
- }
-
- /** {@inheritDoc} */
@Override protected ClusterGroup projection() {
return grid(0).cluster();
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/core/src/test/java/org/apache/ignite/internal/GridTaskExecutionContextSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridTaskExecutionContextSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridTaskExecutionContextSelfTest.java
index 418a01e..c31c805 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/GridTaskExecutionContextSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/GridTaskExecutionContextSelfTest.java
@@ -49,11 +49,6 @@ public class GridTaskExecutionContextSelfTest extends GridCommonAbstractTest {
}
/** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- stopAllGrids();
- }
-
- /** {@inheritDoc} */
@Override protected void beforeTest() throws Exception {
CNT.set(0);
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/core/src/test/java/org/apache/ignite/internal/GridTaskExecutionSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridTaskExecutionSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridTaskExecutionSelfTest.java
index 84e37ca..e197908 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/GridTaskExecutionSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/GridTaskExecutionSelfTest.java
@@ -68,11 +68,6 @@ public class GridTaskExecutionSelfTest extends GridCommonAbstractTest {
startGrid(3);
}
- /** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- stopAllGrids();
- }
-
/**
* {@inheritDoc}
*/
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/core/src/test/java/org/apache/ignite/internal/GridTaskJobRejectSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridTaskJobRejectSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridTaskJobRejectSelfTest.java
index 68abc95..a6678da 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/GridTaskJobRejectSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/GridTaskJobRejectSelfTest.java
@@ -55,12 +55,6 @@ public class GridTaskJobRejectSelfTest extends GridCommonAbstractTest {
}
/** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- stopGrid(1);
- stopGrid(2);
- }
-
- /** {@inheritDoc} */
@Override protected IgniteConfiguration getConfiguration(String igniteInstanceName) throws Exception {
IgniteConfiguration cfg = super.getConfiguration(igniteInstanceName);
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectAbstractTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectAbstractTest.java
index e68ea13..76a0d52 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectAbstractTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectAbstractTest.java
@@ -183,11 +183,7 @@ public abstract class IgniteClientReconnectAbstractTest extends GridCommonAbstra
/** {@inheritDoc} */
@Override protected void afterTestsStopped() throws Exception {
- super.afterTestsStopped();
-
System.clearProperty(IgniteSystemProperties.IGNITE_ENABLE_FORCIBLE_NODE_KILL);
-
- stopAllGrids();
}
/**
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/core/src/test/java/org/apache/ignite/internal/IgniteComputeEmptyClusterGroupTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/IgniteComputeEmptyClusterGroupTest.java b/modules/core/src/test/java/org/apache/ignite/internal/IgniteComputeEmptyClusterGroupTest.java
index 8069e37..f346b8e 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/IgniteComputeEmptyClusterGroupTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/IgniteComputeEmptyClusterGroupTest.java
@@ -67,11 +67,6 @@ public class IgniteComputeEmptyClusterGroupTest extends GridCommonAbstractTest {
startGrids(2);
}
- /** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- stopAllGrids();
- }
-
/**
* @throws Exception If failed.
*/
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/core/src/test/java/org/apache/ignite/internal/IgniteConcurrentEntryProcessorAccessStopTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/IgniteConcurrentEntryProcessorAccessStopTest.java b/modules/core/src/test/java/org/apache/ignite/internal/IgniteConcurrentEntryProcessorAccessStopTest.java
index 743bb98..af65ffb 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/IgniteConcurrentEntryProcessorAccessStopTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/IgniteConcurrentEntryProcessorAccessStopTest.java
@@ -33,13 +33,6 @@ public class IgniteConcurrentEntryProcessorAccessStopTest extends GridCommonAbst
startGrid();
}
- /** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- stopAllGrids();
-
- super.afterTestsStopped();
- }
-
/**
* Tests concurrent instance shutdown.
*
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/core/src/test/java/org/apache/ignite/internal/IgniteSlowClientDetectionSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/IgniteSlowClientDetectionSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/IgniteSlowClientDetectionSelfTest.java
index 9a923f3..d738784 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/IgniteSlowClientDetectionSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/IgniteSlowClientDetectionSelfTest.java
@@ -96,13 +96,6 @@ public class IgniteSlowClientDetectionSelfTest extends GridCommonAbstractTest {
startGrids(nodeCount());
}
- /** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- super.afterTestsStopped();
-
- stopAllGrids();
- }
-
/**
* @throws Exception If failed.
*/
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/core/src/test/java/org/apache/ignite/internal/MemoryLeaksOnRestartNodeTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/MemoryLeaksOnRestartNodeTest.java b/modules/core/src/test/java/org/apache/ignite/internal/MemoryLeaksOnRestartNodeTest.java
index df055fe..bf0c911 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/MemoryLeaksOnRestartNodeTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/MemoryLeaksOnRestartNodeTest.java
@@ -64,11 +64,7 @@ public class MemoryLeaksOnRestartNodeTest extends GridCommonAbstractTest {
/** {@inheritDoc} */
@Override protected void afterTestsStopped() throws Exception {
- stopAllGrids();
-
cleanPersistenceDir();
-
- super.afterTestsStopped();
}
/**
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/core/src/test/java/org/apache/ignite/internal/TaskNodeRestartTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/TaskNodeRestartTest.java b/modules/core/src/test/java/org/apache/ignite/internal/TaskNodeRestartTest.java
index 50fa494..573804e 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/TaskNodeRestartTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/TaskNodeRestartTest.java
@@ -72,13 +72,6 @@ public class TaskNodeRestartTest extends GridCommonAbstractTest {
startGridsMultiThreaded(NODES);
}
- /** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- stopAllGrids();
-
- super.afterTestsStopped();
- }
-
/**
* @throws Exception If failed.
*/
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryArrayIdentityResolverSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryArrayIdentityResolverSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryArrayIdentityResolverSelfTest.java
index 7344cfa..27c39c3 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryArrayIdentityResolverSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryArrayIdentityResolverSelfTest.java
@@ -52,13 +52,6 @@ public class BinaryArrayIdentityResolverSelfTest extends GridCommonAbstractTest
}
/** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- stopAllGrids();
-
- super.afterTestsStopped();
- }
-
- /** {@inheritDoc} */
@Override protected void afterTest() throws Exception {
for (Long ptr : ptrs)
GridUnsafe.freeMemory(ptr);
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryObjectBuilderAdditionalSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryObjectBuilderAdditionalSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryObjectBuilderAdditionalSelfTest.java
index dd748a8..2366bac 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryObjectBuilderAdditionalSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryObjectBuilderAdditionalSelfTest.java
@@ -107,11 +107,6 @@ public class BinaryObjectBuilderAdditionalSelfTest extends GridCommonAbstractTes
}
/** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- stopAllGrids();
- }
-
- /** {@inheritDoc} */
@Override protected void afterTest() throws Exception {
jcache(0).clear();
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryObjectBuilderDefaultMappersSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryObjectBuilderDefaultMappersSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryObjectBuilderDefaultMappersSelfTest.java
index ff6a3b1..1c5fbd7 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryObjectBuilderDefaultMappersSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryObjectBuilderDefaultMappersSelfTest.java
@@ -101,11 +101,6 @@ public class BinaryObjectBuilderDefaultMappersSelfTest extends GridCommonAbstrac
startGrids(1);
}
- /** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- stopAllGrids();
- }
-
/**
* @return Whether to use compact footer.
*/
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/core/src/test/java/org/apache/ignite/internal/binary/BinarySerialiedFieldComparatorSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/binary/BinarySerialiedFieldComparatorSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/binary/BinarySerialiedFieldComparatorSelfTest.java
index e957b61..4278ef4 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/binary/BinarySerialiedFieldComparatorSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/binary/BinarySerialiedFieldComparatorSelfTest.java
@@ -52,13 +52,6 @@ public class BinarySerialiedFieldComparatorSelfTest extends GridCommonAbstractTe
}
/** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- stopAllGrids();
-
- super.afterTestsStopped();
- }
-
- /** {@inheritDoc} */
@Override protected void beforeTest() throws Exception {
super.beforeTest();
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryTreeSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryTreeSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryTreeSelfTest.java
index 819e766..8d84f54 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryTreeSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryTreeSelfTest.java
@@ -60,8 +60,6 @@ public class BinaryTreeSelfTest extends GridCommonAbstractTest {
/** {@inheritDoc} */
@Override protected void afterTestsStopped() throws Exception {
- super.afterTestsStopped();
-
G.stop(NODE_CLI, true);
G.stop(NODE_SRV, true);
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/core/src/test/java/org/apache/ignite/internal/binary/GridBinaryAffinityKeySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/binary/GridBinaryAffinityKeySelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/binary/GridBinaryAffinityKeySelfTest.java
index bdcb106..8d3f34b 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/binary/GridBinaryAffinityKeySelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/binary/GridBinaryAffinityKeySelfTest.java
@@ -95,11 +95,6 @@ public class GridBinaryAffinityKeySelfTest extends GridCommonAbstractTest {
startGridsMultiThreaded(GRID_CNT);
}
- /** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- stopAllGrids();
- }
-
/**
* @throws Exception If failed.
*/
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/core/src/test/java/org/apache/ignite/internal/managers/IgniteDiagnosticMessagesTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/managers/IgniteDiagnosticMessagesTest.java b/modules/core/src/test/java/org/apache/ignite/internal/managers/IgniteDiagnosticMessagesTest.java
index 572f356..5bc4363 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/managers/IgniteDiagnosticMessagesTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/managers/IgniteDiagnosticMessagesTest.java
@@ -104,11 +104,8 @@ public class IgniteDiagnosticMessagesTest extends GridCommonAbstractTest {
/** {@inheritDoc} */
@Override protected void afterTest() throws Exception {
stopAllGrids();
-
- super.afterTestsStopped();
}
-
/**
* @throws Exception If failed.
*/
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/core/src/test/java/org/apache/ignite/internal/managers/communication/IgniteIoTestMessagesTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/managers/communication/IgniteIoTestMessagesTest.java b/modules/core/src/test/java/org/apache/ignite/internal/managers/communication/IgniteIoTestMessagesTest.java
index f84fa77..65231e7 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/managers/communication/IgniteIoTestMessagesTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/managers/communication/IgniteIoTestMessagesTest.java
@@ -63,13 +63,6 @@ public class IgniteIoTestMessagesTest extends GridCommonAbstractTest {
startGrid(4);
}
- /** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- stopAllGrids();
-
- super.afterTestsStopped();
- }
-
/**
* @throws Exception If failed.
*/
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/core/src/test/java/org/apache/ignite/internal/managers/communication/IgniteVariousConnectionNumberTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/managers/communication/IgniteVariousConnectionNumberTest.java b/modules/core/src/test/java/org/apache/ignite/internal/managers/communication/IgniteVariousConnectionNumberTest.java
index 9cc46d9..2ea1f90 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/managers/communication/IgniteVariousConnectionNumberTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/managers/communication/IgniteVariousConnectionNumberTest.java
@@ -83,13 +83,6 @@ public class IgniteVariousConnectionNumberTest extends GridCommonAbstractTest {
log.info("Random seed: " + seed);
}
- /** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- stopAllGrids();
-
- super.afterTestsStopped();
- }
-
/**
* @throws Exception If failed.
*/
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/core/src/test/java/org/apache/ignite/internal/managers/deployment/GridDeploymentMessageCountSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/managers/deployment/GridDeploymentMessageCountSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/managers/deployment/GridDeploymentMessageCountSelfTest.java
index 9ef688a..6b9a681 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/managers/deployment/GridDeploymentMessageCountSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/managers/deployment/GridDeploymentMessageCountSelfTest.java
@@ -58,13 +58,6 @@ public class GridDeploymentMessageCountSelfTest extends GridCommonAbstractTest {
private Map<String, MessageCountingCommunicationSpi> commSpis = new ConcurrentHashMap<>();
/** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- stopAllGrids();
-
- assert G.allGrids().isEmpty();
- }
-
- /** {@inheritDoc} */
@Override protected IgniteConfiguration getConfiguration(String igniteInstanceName) throws Exception {
IgniteConfiguration cfg = super.getConfiguration(igniteInstanceName);
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/core/src/test/java/org/apache/ignite/internal/marshaller/optimized/OptimizedMarshallerPooledSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/marshaller/optimized/OptimizedMarshallerPooledSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/marshaller/optimized/OptimizedMarshallerPooledSelfTest.java
index 02954f9..d33e831 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/marshaller/optimized/OptimizedMarshallerPooledSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/marshaller/optimized/OptimizedMarshallerPooledSelfTest.java
@@ -38,8 +38,6 @@ public class OptimizedMarshallerPooledSelfTest extends OptimizedMarshallerSelfTe
/** {@inheritDoc} */
@Override protected void afterTestsStopped() throws Exception {
- super.afterTestsStopped();
-
// Reset static registry.
new OptimizedMarshaller().setPoolSize(0);
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/core/src/test/java/org/apache/ignite/internal/processors/GridCacheTxLoadFromStoreOnLockSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/GridCacheTxLoadFromStoreOnLockSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/GridCacheTxLoadFromStoreOnLockSelfTest.java
index 8da7355..6293723 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/GridCacheTxLoadFromStoreOnLockSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/GridCacheTxLoadFromStoreOnLockSelfTest.java
@@ -65,11 +65,6 @@ public class GridCacheTxLoadFromStoreOnLockSelfTest extends GridCommonAbstractTe
startGridsMultiThreaded(4);
}
- /** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- stopAllGrids();
- }
-
/**
* @throws Exception If failed.
*/
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/core/src/test/java/org/apache/ignite/internal/processors/affinity/GridAffinityProcessorAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/affinity/GridAffinityProcessorAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/affinity/GridAffinityProcessorAbstractSelfTest.java
index aa2abae..74c8ef2 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/affinity/GridAffinityProcessorAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/affinity/GridAffinityProcessorAbstractSelfTest.java
@@ -102,11 +102,6 @@ public abstract class GridAffinityProcessorAbstractSelfTest extends GridCommonAb
startGrid(i);
}
- /** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- stopAllGrids();
- }
-
/**
* Test affinity functions caching and clean up.
*
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheAffinityCallSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheAffinityCallSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheAffinityCallSelfTest.java
index c601ff1..503da88 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheAffinityCallSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheAffinityCallSelfTest.java
@@ -86,11 +86,6 @@ public class CacheAffinityCallSelfTest extends GridCommonAbstractTest {
return cfg;
}
- /** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- stopAllGrids();
- }
-
/**
* @throws Exception If failed.
*/
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheConnectionLeakStoreTxTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheConnectionLeakStoreTxTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheConnectionLeakStoreTxTest.java
index 611f2cd..27dbe62 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheConnectionLeakStoreTxTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheConnectionLeakStoreTxTest.java
@@ -98,11 +98,6 @@ public class CacheConnectionLeakStoreTxTest extends GridCommonAbstractTest {
TestStore.sessions.clear();
}
- /** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- stopAllGrids();
- }
-
/**
* @throws Exception If failed.
*/
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheDeferredDeleteQueueTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheDeferredDeleteQueueTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheDeferredDeleteQueueTest.java
index 18a35c6..014da07 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheDeferredDeleteQueueTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheDeferredDeleteQueueTest.java
@@ -60,10 +60,6 @@ public class CacheDeferredDeleteQueueTest extends GridCommonAbstractTest {
System.setProperty(IGNITE_CACHE_REMOVED_ENTRIES_TTL, ttlProp);
else
System.clearProperty(IGNITE_CACHE_REMOVED_ENTRIES_TTL);
-
- stopAllGrids();
-
- super.afterTestsStopped();
}
/**
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheDeferredDeleteSanitySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheDeferredDeleteSanitySelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheDeferredDeleteSanitySelfTest.java
index 177c990..dd75799 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheDeferredDeleteSanitySelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheDeferredDeleteSanitySelfTest.java
@@ -39,11 +39,6 @@ public class CacheDeferredDeleteSanitySelfTest extends GridCommonAbstractTest {
startGrid(0);
}
- /** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- stopAllGrids();
- }
-
/**
* @throws Exception If fails.
*/
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheDhtLocalPartitionAfterRemoveSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheDhtLocalPartitionAfterRemoveSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheDhtLocalPartitionAfterRemoveSelfTest.java
index 702b188..164d7f9 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheDhtLocalPartitionAfterRemoveSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheDhtLocalPartitionAfterRemoveSelfTest.java
@@ -51,11 +51,6 @@ public class CacheDhtLocalPartitionAfterRemoveSelfTest extends GridCommonAbstrac
startGrids(GRID_CNT);
}
- /** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- stopAllGrids();
- }
-
/**
* @throws Exception If failed.
*/
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheEnumOperationsAbstractTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheEnumOperationsAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheEnumOperationsAbstractTest.java
index 9b4aa46..148b60e 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheEnumOperationsAbstractTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheEnumOperationsAbstractTest.java
@@ -79,13 +79,6 @@ public abstract class CacheEnumOperationsAbstractTest extends GridCommonAbstract
startGrid(0);
}
- /** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- stopAllGrids();
-
- super.afterTestsStopped();
- }
-
/**
* @throws Exception If failed.
*/
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/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 3341095..cdd0002 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
@@ -143,13 +143,6 @@ public class CacheExchangeMessageDuplicatedStateTest extends GridCommonAbstractT
startGrid(0);
}
- /** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- stopAllGrids();
-
- super.afterTestsStopped();
- }
-
/**
* @throws Exception If failed.
*/
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheGroupMetricsMBeanTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheGroupMetricsMBeanTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheGroupMetricsMBeanTest.java
index 6e39ff0..26a504b 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheGroupMetricsMBeanTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheGroupMetricsMBeanTest.java
@@ -140,11 +140,6 @@ public class CacheGroupMetricsMBeanTest extends GridCommonAbstractTest implement
return cfg;
}
- /** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- stopAllGrids();
- }
-
/**
* Gets CacheGroupMetricsMXBean for given node and group name.
*
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheInterceptorPartitionCounterLocalSanityTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheInterceptorPartitionCounterLocalSanityTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheInterceptorPartitionCounterLocalSanityTest.java
index 2874111..acb929b 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheInterceptorPartitionCounterLocalSanityTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheInterceptorPartitionCounterLocalSanityTest.java
@@ -96,13 +96,6 @@ public class CacheInterceptorPartitionCounterLocalSanityTest extends GridCommonA
}
/** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- stopAllGrids();
-
- super.afterTestsStopped();
- }
-
- /** {@inheritDoc} */
@Override protected void beforeTest() throws Exception {
afterPutEvts = new BlockingArrayQueue<>();
afterRmvEvts = new BlockingArrayQueue<>();
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheInterceptorPartitionCounterRandomOperationsTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheInterceptorPartitionCounterRandomOperationsTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheInterceptorPartitionCounterRandomOperationsTest.java
index e23c783..f21608c 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheInterceptorPartitionCounterRandomOperationsTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheInterceptorPartitionCounterRandomOperationsTest.java
@@ -122,13 +122,6 @@ public class CacheInterceptorPartitionCounterRandomOperationsTest extends GridCo
}
/** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- stopAllGrids();
-
- super.afterTestsStopped();
- }
-
- /** {@inheritDoc} */
@Override protected void beforeTest() throws Exception {
afterPutEvts.clear();
afterRmvEvts.clear();
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheKeepBinaryTransactionTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheKeepBinaryTransactionTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheKeepBinaryTransactionTest.java
index 9965737..841e49c 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheKeepBinaryTransactionTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheKeepBinaryTransactionTest.java
@@ -62,13 +62,6 @@ public class CacheKeepBinaryTransactionTest extends GridCommonAbstractTest {
startGrid(0);
}
- /** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- super.afterTestsStopped();
-
- stopAllGrids();
- }
-
/**
* @throws Exception If failed.
*/
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheMetricsEntitiesCountTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheMetricsEntitiesCountTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheMetricsEntitiesCountTest.java
index d3490f4..1ab7c40 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheMetricsEntitiesCountTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheMetricsEntitiesCountTest.java
@@ -86,11 +86,6 @@ public class CacheMetricsEntitiesCountTest extends GridCommonAbstractTest {
startGrids(GRID_CNT);
}
- /** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- stopAllGrids();
- }
-
/**
* Test entities count, calculated by different implementations.
*/
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheMetricsForClusterGroupSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheMetricsForClusterGroupSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheMetricsForClusterGroupSelfTest.java
index b8f9d70..3f196a5 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheMetricsForClusterGroupSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheMetricsForClusterGroupSelfTest.java
@@ -80,11 +80,6 @@ public class CacheMetricsForClusterGroupSelfTest extends GridCommonAbstractTest
startGrid(GRID_CNT);
}
- /** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- stopAllGrids();
- }
-
/**
* Test cluster group metrics in case of statistics enabled.
*/
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheOffheapMapEntrySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheOffheapMapEntrySelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheOffheapMapEntrySelfTest.java
index bdc5507..e520d45 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheOffheapMapEntrySelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheOffheapMapEntrySelfTest.java
@@ -47,11 +47,6 @@ public class CacheOffheapMapEntrySelfTest extends GridCacheAbstractSelfTest {
}
/** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- stopAllGrids();
- }
-
- /** {@inheritDoc} */
@Override protected void beforeTest() throws Exception {
startGrids(1);
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheOptimisticTransactionsWithFilterTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheOptimisticTransactionsWithFilterTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheOptimisticTransactionsWithFilterTest.java
index 84035f6..d953e04 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheOptimisticTransactionsWithFilterTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheOptimisticTransactionsWithFilterTest.java
@@ -82,13 +82,6 @@ public class CacheOptimisticTransactionsWithFilterTest extends GridCommonAbstrac
client = false;
}
- /** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- stopAllGrids();
-
- super.afterTestsStopped();
- }
-
/**
* @return Number of server nodes. In addition 2 clients are started.
*/
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CachePutEventListenerErrorSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CachePutEventListenerErrorSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CachePutEventListenerErrorSelfTest.java
index f609af3..8891f64 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CachePutEventListenerErrorSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CachePutEventListenerErrorSelfTest.java
@@ -86,11 +86,6 @@ public class CachePutEventListenerErrorSelfTest extends GridCommonAbstractTest {
}
}
- /** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- stopAllGrids();
- }
-
/**
* @throws Exception If failed.
*/
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CachePutIfAbsentTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CachePutIfAbsentTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CachePutIfAbsentTest.java
index 1fdb8a6..00ba25f 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CachePutIfAbsentTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CachePutIfAbsentTest.java
@@ -67,13 +67,6 @@ public class CachePutIfAbsentTest extends GridCommonAbstractTest {
}
/** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- super.afterTestsStopped();
-
- stopAllGrids();
- }
-
- /** {@inheritDoc} */
@Override protected long getTestTimeout() {
return 5 * 60_000;
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheSerializableTransactionsTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheSerializableTransactionsTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheSerializableTransactionsTest.java
index 9ca73d9..c5fb571 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheSerializableTransactionsTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheSerializableTransactionsTest.java
@@ -140,13 +140,6 @@ public class CacheSerializableTransactionsTest extends GridCommonAbstractTest {
}
/** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- super.afterTestsStopped();
-
- stopAllGrids();
- }
-
- /** {@inheritDoc} */
@Override protected long getTestTimeout() {
return 5 * 60_000;
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheStoreUsageMultinodeDynamicStartAbstractTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheStoreUsageMultinodeDynamicStartAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheStoreUsageMultinodeDynamicStartAbstractTest.java
index 9171db8..745e97b 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheStoreUsageMultinodeDynamicStartAbstractTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheStoreUsageMultinodeDynamicStartAbstractTest.java
@@ -37,13 +37,6 @@ public abstract class CacheStoreUsageMultinodeDynamicStartAbstractTest extends C
startGrid(3);
}
- /** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- super.afterTestsStopped();
-
- stopAllGrids();
- }
-
/**
* @throws Exception If failed.
*/
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheTxNotAllowReadFromBackupTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheTxNotAllowReadFromBackupTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheTxNotAllowReadFromBackupTest.java
index 79b0638..f0ec084 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheTxNotAllowReadFromBackupTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheTxNotAllowReadFromBackupTest.java
@@ -74,13 +74,6 @@ public class CacheTxNotAllowReadFromBackupTest extends GridCommonAbstractTest {
startGridsMultiThreaded(NODES);
}
- /** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- stopAllGrids();
-
- super.afterTestsStopped();
- }
-
/**
* @throws Exception If failed.
*/
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheValidatorMetricsTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheValidatorMetricsTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheValidatorMetricsTest.java
index 5c601a1..ba3ad5a 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheValidatorMetricsTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheValidatorMetricsTest.java
@@ -64,11 +64,6 @@ public class CacheValidatorMetricsTest extends GridCommonAbstractTest implements
return cfg;
}
- /** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- stopAllGrids();
- }
-
/**
* Asserts that the cache has appropriate status (indicated by the cache metrics).
*
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CrossCacheLockTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CrossCacheLockTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CrossCacheLockTest.java
index b64cf85..8f0e20f 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CrossCacheLockTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CrossCacheLockTest.java
@@ -77,13 +77,6 @@ public class CrossCacheLockTest extends GridCommonAbstractTest {
startGrid(GRID_CNT - 1);
}
- /** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- super.afterTestsStopped();
-
- stopAllGrids();
- }
-
/**
* @throws Exception If failed.
*/
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CrossCacheTxRandomOperationsTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CrossCacheTxRandomOperationsTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CrossCacheTxRandomOperationsTest.java
index 6c22b05..cc9823b 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CrossCacheTxRandomOperationsTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CrossCacheTxRandomOperationsTest.java
@@ -99,13 +99,6 @@ public class CrossCacheTxRandomOperationsTest extends GridCommonAbstractTest {
startGrid(GRID_CNT - 1);
}
- /** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- super.afterTestsStopped();
-
- stopAllGrids();
- }
-
/**
* @return Test near cache flag.
*/
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/EntryVersionConsistencyReadThroughTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/EntryVersionConsistencyReadThroughTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/EntryVersionConsistencyReadThroughTest.java
index a6ab938..ebf253d 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/EntryVersionConsistencyReadThroughTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/EntryVersionConsistencyReadThroughTest.java
@@ -99,13 +99,6 @@ public class EntryVersionConsistencyReadThroughTest extends GridCommonAbstractTe
startGrid(NODES_CNT - 1);
}
- /** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- stopAllGrids();
-
- super.afterTestsStopped();
- }
-
/**
* @throws Exception If failed.
*/
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractByteArrayValuesSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractByteArrayValuesSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractByteArrayValuesSelfTest.java
index fb8cc22..cabe41f 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractByteArrayValuesSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractByteArrayValuesSelfTest.java
@@ -55,11 +55,6 @@ public abstract class GridCacheAbstractByteArrayValuesSelfTest extends GridCommo
return c;
}
- /** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- stopAllGrids();
- }
-
/**
* Wrap provided values into byte array.
*
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractLocalStoreSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractLocalStoreSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractLocalStoreSelfTest.java
index ac3bddb..9fe714f 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractLocalStoreSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractLocalStoreSelfTest.java
@@ -201,11 +201,6 @@ public abstract class GridCacheAbstractLocalStoreSelfTest extends GridCommonAbst
*/
protected abstract CacheMode getCacheMode();
- /** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- stopAllGrids();
- }
-
/**
* @throws Exception If failed.
*/
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractRemoveFailureTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractRemoveFailureTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractRemoveFailureTest.java
index 7f373b4..036153d 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractRemoveFailureTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractRemoveFailureTest.java
@@ -118,11 +118,7 @@ public abstract class GridCacheAbstractRemoveFailureTest extends GridCommonAbstr
/** {@inheritDoc} */
@Override protected void afterTestsStopped() throws Exception {
- super.afterTestsStopped();
-
System.setProperty(IGNITE_ATOMIC_CACHE_DELETE_HISTORY_SIZE, sizePropVal != null ? sizePropVal : "");
-
- stopAllGrids();
}
/** {@inheritDoc} */
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractSelfTest.java
index 299dbf4..7a35999 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractSelfTest.java
@@ -101,8 +101,6 @@ public abstract class GridCacheAbstractSelfTest extends GridCommonAbstractTest {
/** {@inheritDoc} */
@Override protected void afterTestsStopped() throws Exception {
- stopAllGrids();
-
if (storeStgy != null)
storeStgy.resetStore();
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAffinityMapperSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAffinityMapperSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAffinityMapperSelfTest.java
index 4bb6ce9..09fc296 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAffinityMapperSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAffinityMapperSelfTest.java
@@ -34,11 +34,6 @@ public class GridCacheAffinityMapperSelfTest extends GridCommonAbstractTest {
startGrid();
}
- /** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- stopAllGrids();
- }
-
/**
*
*/
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAffinityRoutingSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAffinityRoutingSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAffinityRoutingSelfTest.java
index 0df4887..ddb38e0 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAffinityRoutingSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAffinityRoutingSelfTest.java
@@ -124,16 +124,6 @@ public class GridCacheAffinityRoutingSelfTest extends GridCommonAbstractTest {
}
}
- /** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- super.afterTestsStopped();
-
- for (int i = 0; i < GRID_CNT; i++)
- stopGrid(i);
-
- assert G.allGrids().isEmpty();
- }
-
/**
* JUnit.
*
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheClearSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheClearSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheClearSelfTest.java
index 9b3777d..81c4413 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheClearSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheClearSelfTest.java
@@ -71,11 +71,6 @@ public class GridCacheClearSelfTest extends GridCommonAbstractTest {
}
}
- /** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- stopAllGrids();
- }
-
/**
* @throws Exception If failed.
*/
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConfigurationValidationSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConfigurationValidationSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConfigurationValidationSelfTest.java
index b0dcac1..7b793b7 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConfigurationValidationSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConfigurationValidationSelfTest.java
@@ -133,13 +133,6 @@ public class GridCacheConfigurationValidationSelfTest extends GridCommonAbstract
return cfg;
}
- /** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- super.afterTestsStopped();
-
- stopAllGrids();
- }
-
/**
* This test method does not require remote nodes.
*
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheEntryMemorySizeSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheEntryMemorySizeSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheEntryMemorySizeSelfTest.java
index 8092d9f..016f3a0 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheEntryMemorySizeSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheEntryMemorySizeSelfTest.java
@@ -115,11 +115,6 @@ public class GridCacheEntryMemorySizeSelfTest extends GridCommonAbstractTest {
startGrids(2);
}
- /** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- stopAllGrids();
- }
-
/**
* @param nearEnabled {@code True} if near cache should be enabled.
* @param mode Cache mode.
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMarshallingNodeJoinSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMarshallingNodeJoinSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMarshallingNodeJoinSelfTest.java
index 392f8e5..df3430f 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMarshallingNodeJoinSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheMarshallingNodeJoinSelfTest.java
@@ -80,11 +80,6 @@ public class GridCacheMarshallingNodeJoinSelfTest extends GridCommonAbstractTest
startGridsMultiThreaded(2);
}
- /** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- stopAllGrids();
- }
-
/**
* @throws Exception If failed.
*/
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheNestedTxAbstractTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheNestedTxAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheNestedTxAbstractTest.java
index e93fd1e..762cc4d 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheNestedTxAbstractTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheNestedTxAbstractTest.java
@@ -82,11 +82,6 @@ public class GridCacheNestedTxAbstractTest extends GridCommonAbstractTest {
}
/** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- stopAllGrids();
- }
-
- /** {@inheritDoc} */
@Override protected void afterTest() throws Exception {
super.afterTest();
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCachePartitionedGetSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCachePartitionedGetSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCachePartitionedGetSelfTest.java
index d5988f1..f5cc65b 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCachePartitionedGetSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCachePartitionedGetSelfTest.java
@@ -106,11 +106,6 @@ public class GridCachePartitionedGetSelfTest extends GridCommonAbstractTest {
received.set(false);
}
- /** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- stopAllGrids();
- }
-
/**
* @throws Exception If failed.
*/
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCachePutAllFailoverSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCachePutAllFailoverSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCachePutAllFailoverSelfTest.java
index 19bef92..1d9a4ec 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCachePutAllFailoverSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCachePutAllFailoverSelfTest.java
@@ -129,8 +129,6 @@ public class GridCachePutAllFailoverSelfTest extends GridCommonAbstractTest {
/** {@inheritDoc} */
@Override protected void afterTestsStopped() throws Exception {
- super.afterTestsStopped();
-
System.clearProperty(IgniteSystemProperties.IGNITE_ENABLE_FORCIBLE_NODE_KILL);
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridProjectionForCachesOnDaemonNodeSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridProjectionForCachesOnDaemonNodeSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridProjectionForCachesOnDaemonNodeSelfTest.java
index 1e26fd2..e32668b 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridProjectionForCachesOnDaemonNodeSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridProjectionForCachesOnDaemonNodeSelfTest.java
@@ -77,11 +77,6 @@ public class GridProjectionForCachesOnDaemonNodeSelfTest extends GridCommonAbstr
}
/** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- stopAllGrids();
- }
-
- /** {@inheritDoc} */
protected void beforeTest() throws Exception {
ignite.getOrCreateCache(DEFAULT_CACHE_NAME);
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractTest.java
index 409c0af..54b561b 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractTest.java
@@ -78,8 +78,6 @@ public abstract class IgniteCacheAbstractTest extends GridCommonAbstractTest {
/** {@inheritDoc} */
@Override protected void afterTestsStopped() throws Exception {
- stopAllGrids();
-
storeMap.clear();
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheBinaryEntryProcessorSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheBinaryEntryProcessorSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheBinaryEntryProcessorSelfTest.java
index 5aef9a8..963fe88 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheBinaryEntryProcessorSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheBinaryEntryProcessorSelfTest.java
@@ -63,13 +63,6 @@ public class IgniteCacheBinaryEntryProcessorSelfTest extends GridCommonAbstractT
}
/** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- stopAllGrids();
-
- super.afterTestsStopped();
- }
-
- /** {@inheritDoc} */
@Override protected void beforeTestsStarted() throws Exception {
super.beforeTestsStarted();
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheBinaryObjectsScanSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheBinaryObjectsScanSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheBinaryObjectsScanSelfTest.java
index f18aebe..64c2bbc 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheBinaryObjectsScanSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheBinaryObjectsScanSelfTest.java
@@ -62,8 +62,6 @@ public class IgniteCacheBinaryObjectsScanSelfTest extends GridCommonAbstractTest
/** {@inheritDoc} */
@Override protected void afterTestsStopped() throws Exception {
ldr = null;
-
- stopAllGrids();
}
/** {@inheritDoc} */
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheDynamicStopSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheDynamicStopSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheDynamicStopSelfTest.java
index 44cd475..b1047ba 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheDynamicStopSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheDynamicStopSelfTest.java
@@ -41,13 +41,6 @@ public class IgniteCacheDynamicStopSelfTest extends GridCommonAbstractTest {
startGrids(4);
}
- /** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- super.afterTestsStopped();
-
- stopAllGrids();
- }
-
/**
* @throws Exception If failed.
*/
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheEntryListenerExpiredEventsTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheEntryListenerExpiredEventsTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheEntryListenerExpiredEventsTest.java
index c767188..524d0fb 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheEntryListenerExpiredEventsTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheEntryListenerExpiredEventsTest.java
@@ -71,13 +71,6 @@ public class IgniteCacheEntryListenerExpiredEventsTest extends GridCommonAbstrac
startGrid(0);
}
- /** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- stopAllGrids();
-
- super.afterTestsStopped();
- }
-
/**
* @throws Exception If failed.
*/
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb8038f6/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheEntryProcessorCallTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheEntryProcessorCallTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheEntryProcessorCallTest.java
index cd4a78f..2f80462 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheEntryProcessorCallTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheEntryProcessorCallTest.java
@@ -84,13 +84,6 @@ public class IgniteCacheEntryProcessorCallTest extends GridCommonAbstractTest {
}
/** {@inheritDoc} */
- @Override protected void afterTestsStopped() throws Exception {
- stopAllGrids();
-
- super.afterTestsStopped();
- }
-
- /** {@inheritDoc} */
@Override protected void beforeTestsStarted() throws Exception {
super.beforeTestsStarted();
[41/50] [abbrv] ignite git commit: IGNITE-8525: Support for
IgniteZeroMqStreamer non-multi-part pub-sub. - Fixes #4020.
Posted by dp...@apache.org.
IGNITE-8525: Support for IgniteZeroMqStreamer non-multi-part pub-sub. - Fixes #4020.
Signed-off-by: shroman <rs...@yahoo.com>
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/2cad0ab3
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/2cad0ab3
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/2cad0ab3
Branch: refs/heads/ignite-5789-1
Commit: 2cad0ab39665b1d2cc1d4d3edf45e74699070411
Parents: cee9171
Author: shroman <rs...@yahoo.com>
Authored: Wed May 23 13:50:00 2018 +0900
Committer: shroman <rs...@yahoo.com>
Committed: Wed May 23 13:50:00 2018 +0900
----------------------------------------------------------------------
.../stream/zeromq/IgniteZeroMqStreamer.java | 43 +++++++++++---------
.../stream/zeromq/IgniteZeroMqStreamerTest.java | 24 ++++++++++-
2 files changed, 46 insertions(+), 21 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/2cad0ab3/modules/zeromq/src/main/java/org/apache/ignite/stream/zeromq/IgniteZeroMqStreamer.java
----------------------------------------------------------------------
diff --git a/modules/zeromq/src/main/java/org/apache/ignite/stream/zeromq/IgniteZeroMqStreamer.java b/modules/zeromq/src/main/java/org/apache/ignite/stream/zeromq/IgniteZeroMqStreamer.java
index 18cb387..1a8e15b 100644
--- a/modules/zeromq/src/main/java/org/apache/ignite/stream/zeromq/IgniteZeroMqStreamer.java
+++ b/modules/zeromq/src/main/java/org/apache/ignite/stream/zeromq/IgniteZeroMqStreamer.java
@@ -95,29 +95,34 @@ public class IgniteZeroMqStreamer<K, V> extends StreamAdapter<byte[], K, V> impl
ctx = ZMQ.context(ioThreads);
- zeroMqExSrv.execute(new Runnable() {
- @Override public void run() {
- ZMQ.Socket socket = ctx.socket(socketType);
- socket.connect(addr);
-
- if (ZeroMqTypeSocket.SUB.getType() == socketType)
- socket.subscribe(topic);
-
- while (isStarted) {
- try {
- if (ZeroMqTypeSocket.SUB.getType() == socketType)
- socket.recv(0);
- addMessage(socket.recv(0));
- }
- catch (ZMQException e) {
- if (e.getErrorCode() == ZMQ.Error.ETERM.getCode()) {
- break;
+ zeroMqExSrv.execute(() -> {
+ ZMQ.Socket socket = ctx.socket(socketType);
+ socket.connect(addr);
+
+ if (ZeroMqTypeSocket.SUB.getType() == socketType)
+ socket.subscribe(topic);
+
+ while (isStarted) {
+ try {
+ byte[] msg = socket.recv(0);
+
+ if (ZeroMqTypeSocket.SUB.getType() == socketType) {
+ if (socket.hasReceiveMore()) {
+ addMessage(socket.recv(0));
+ continue;
}
}
- }
- socket.close();
+ addMessage(msg);
+ }
+ catch (ZMQException e) {
+ if (e.getErrorCode() == ZMQ.Error.ETERM.getCode()) {
+ break;
+ }
+ }
}
+
+ socket.close();
});
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/2cad0ab3/modules/zeromq/src/test/java/org/apache/ignite/stream/zeromq/IgniteZeroMqStreamerTest.java
----------------------------------------------------------------------
diff --git a/modules/zeromq/src/test/java/org/apache/ignite/stream/zeromq/IgniteZeroMqStreamerTest.java b/modules/zeromq/src/test/java/org/apache/ignite/stream/zeromq/IgniteZeroMqStreamerTest.java
index 5d2d0c2..0992126 100644
--- a/modules/zeromq/src/test/java/org/apache/ignite/stream/zeromq/IgniteZeroMqStreamerTest.java
+++ b/modules/zeromq/src/test/java/org/apache/ignite/stream/zeromq/IgniteZeroMqStreamerTest.java
@@ -44,6 +44,9 @@ public class IgniteZeroMqStreamerTest extends GridCommonAbstractTest {
/** Topic name for PUB-SUB. */
private final byte[] TOPIC = "0mq".getBytes();
+ /** If pub-sub envelopes are used. */
+ private static boolean multipart_pubsub;
+
/** Constructor. */
public IgniteZeroMqStreamerTest() {
super(true);
@@ -74,6 +77,19 @@ public class IgniteZeroMqStreamerTest extends GridCommonAbstractTest {
/**
* @throws Exception Test exception.
*/
+ public void testZeroMqSubSocketMultipart() throws Exception {
+ try (IgniteDataStreamer<Integer, String> dataStreamer = grid().dataStreamer(DEFAULT_CACHE_NAME)) {
+ try (IgniteZeroMqStreamer streamer = newStreamerInstance(
+ dataStreamer, 3, ZeroMqTypeSocket.SUB, ADDR, TOPIC);) {
+ multipart_pubsub = true;
+ executeStreamer(streamer, ZMQ.PUB, TOPIC);
+ }
+ }
+ }
+
+ /**
+ * @throws Exception Test exception.
+ */
public void testZeroMqSubSocket() throws Exception {
try (IgniteDataStreamer<Integer, String> dataStreamer = grid().dataStreamer(DEFAULT_CACHE_NAME)) {
try (IgniteZeroMqStreamer streamer = newStreamerInstance(
@@ -130,7 +146,7 @@ public class IgniteZeroMqStreamerTest extends GridCommonAbstractTest {
String cachedValue = cache.get(testId);
// ZeroMQ message successfully put to cache.
- assertTrue(cachedValue != null && cachedValue.equals(String.valueOf(testId)));
+ assertTrue(cachedValue != null && cachedValue.endsWith(String.valueOf(testId)));
assertTrue(cache.size() == CACHE_ENTRY_COUNT);
@@ -173,7 +189,11 @@ public class IgniteZeroMqStreamerTest extends GridCommonAbstractTest {
for (int i = 0; i < CACHE_ENTRY_COUNT; i++) {
if (ZMQ.PUB == clientSocket)
socket.sendMore(topic);
- socket.send(String.valueOf(i).getBytes("UTF-8"));
+
+ if (ZMQ.PUB == clientSocket && multipart_pubsub)
+ socket.send((topic + " " + String.valueOf(i)).getBytes("UTF-8"));
+ else
+ socket.send(String.valueOf(i).getBytes("UTF-8"));
}
}
}
[10/50] [abbrv] ignite git commit: IGNITE-8488 Web Console: Fixed
scrolling issues in bs-select-menu.
Posted by dp...@apache.org.
IGNITE-8488 Web Console: Fixed scrolling issues in bs-select-menu.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/381448ea
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/381448ea
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/381448ea
Branch: refs/heads/ignite-5789-1
Commit: 381448ea74dc64bf5ebcf5201ed75def058ffae9
Parents: fe6e70e
Author: Ilya Borisov <kl...@gmail.com>
Authored: Mon May 21 16:24:50 2018 +0700
Committer: Alexey Kuznetsov <ak...@apache.org>
Committed: Mon May 21 16:24:50 2018 +0700
----------------------------------------------------------------------
.../app/components/bs-select-menu/controller.js | 5 +-
.../app/components/bs-select-menu/index.js | 2 +
.../app/components/bs-select-menu/index.spec.js | 67 +
.../app/components/bs-select-menu/style.scss | 18 +-
.../app/components/bs-select-menu/template.pug | 3 +-
.../transcludeToBody.directive.js | 50 +
.../components/cluster-selector/template.pug | 4 +-
modules/web-console/frontend/package-lock.json | 8166 ++++++++++--------
modules/web-console/frontend/package.json | 2 +-
9 files changed, 4937 insertions(+), 3380 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/381448ea/modules/web-console/frontend/app/components/bs-select-menu/controller.js
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/app/components/bs-select-menu/controller.js b/modules/web-console/frontend/app/components/bs-select-menu/controller.js
index f8c0171..70346ed 100644
--- a/modules/web-console/frontend/app/components/bs-select-menu/controller.js
+++ b/modules/web-console/frontend/app/components/bs-select-menu/controller.js
@@ -18,8 +18,11 @@
export default class {
static $inject = ['$scope'];
+ /**
+ * @param {ng.IScope} $scope
+ */
constructor($scope) {
- Object.assign(this, {$scope});
+ this.$scope = $scope;
}
areAllSelected() {
http://git-wip-us.apache.org/repos/asf/ignite/blob/381448ea/modules/web-console/frontend/app/components/bs-select-menu/index.js
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/app/components/bs-select-menu/index.js b/modules/web-console/frontend/app/components/bs-select-menu/index.js
index e64e1fa..a9bafb2 100644
--- a/modules/web-console/frontend/app/components/bs-select-menu/index.js
+++ b/modules/web-console/frontend/app/components/bs-select-menu/index.js
@@ -18,7 +18,9 @@
import angular from 'angular';
import directive from './directive';
+import {directive as transcludeToBody} from './transcludeToBody.directive';
export default angular
.module('ignite-console.bs-select-menu', [])
+ .directive('bssmTranscludeToBody', transcludeToBody)
.directive('bsSelectMenu', directive);
http://git-wip-us.apache.org/repos/asf/ignite/blob/381448ea/modules/web-console/frontend/app/components/bs-select-menu/index.spec.js
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/app/components/bs-select-menu/index.spec.js b/modules/web-console/frontend/app/components/bs-select-menu/index.spec.js
new file mode 100644
index 0000000..9b9fa39
--- /dev/null
+++ b/modules/web-console/frontend/app/components/bs-select-menu/index.spec.js
@@ -0,0 +1,67 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import 'mocha';
+import {assert} from 'chai';
+import angular from 'angular';
+import componentModule from './index.js';
+
+suite('bs-select-menu', () => {
+ /** @type {ng.IScope} */
+ let $scope;
+ /** @type {ng.ICompileService} */
+ let $compile;
+
+ setup(() => {
+ angular.module('test', [componentModule.name]);
+ angular.mock.module('test');
+ angular.mock.inject((_$rootScope_, _$compile_) => {
+ $compile = _$compile_;
+ $scope = _$rootScope_.$new();
+ });
+ });
+
+ test('Create/destroy', () => {
+ $scope.$matches = [];
+ $scope.show = false;
+ const el = angular.element(`
+ <div ng-if='show'>
+ <bs-select-menu></bs-select-menu>
+ </div>
+ `);
+
+ const overlay = () => document.body.querySelector('.bssm-click-overlay');
+
+ $compile(el)($scope);
+ $scope.$digest();
+ assert.notOk(overlay(), 'No overlay on init');
+
+ $scope.show = true;
+ $scope.$isShown = true;
+ $scope.$digest();
+ assert.ok(overlay(), 'Adds overlay to body on show');
+
+ $scope.show = false;
+ $scope.$digest();
+ assert.notOk(overlay(), 'Removes overlay when element is removed from DOM');
+
+ $scope.show = true;
+ $scope.$isShown = false;
+ $scope.$digest();
+ assert.notOk(overlay(), 'Removes overlay menu is closed');
+ });
+});
http://git-wip-us.apache.org/repos/asf/ignite/blob/381448ea/modules/web-console/frontend/app/components/bs-select-menu/style.scss
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/app/components/bs-select-menu/style.scss b/modules/web-console/frontend/app/components/bs-select-menu/style.scss
index 4c071f6..02f9b5c 100644
--- a/modules/web-console/frontend/app/components/bs-select-menu/style.scss
+++ b/modules/web-console/frontend/app/components/bs-select-menu/style.scss
@@ -75,15 +75,6 @@
}
}
- .bssm-click-overlay {
- position: fixed;
- top: 0;
- right: 0;
- bottom: 0;
- left: 0;
- z-index: -1;
- }
-
[class*='bssm-multiple'] {
.bssm-active-indicator {
display: initial;
@@ -100,3 +91,12 @@
}
}
}
+
+.bssm-click-overlay {
+ position: fixed;
+ top: 0;
+ right: 0;
+ bottom: 0;
+ left: 0;
+ z-index: 1999;
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ignite/blob/381448ea/modules/web-console/frontend/app/components/bs-select-menu/template.pug
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/app/components/bs-select-menu/template.pug b/modules/web-console/frontend/app/components/bs-select-menu/template.pug
index c8c6eaa..d878063 100644
--- a/modules/web-console/frontend/app/components/bs-select-menu/template.pug
+++ b/modules/web-console/frontend/app/components/bs-select-menu/template.pug
@@ -43,4 +43,5 @@ ul.bs-select-menu(
ng-src='{{ $isActive($index) ? "/images/checkbox-active.svg" : "/images/checkbox.svg" }}'
)
span.bssm-item-text(ng-bind-html='match.label')
- .bssm-click-overlay(ng-click='$hide()')
+ bssm-transclude-to-body(ng-if='$isShown')
+ .bssm-click-overlay(ng-click='$hide()')
http://git-wip-us.apache.org/repos/asf/ignite/blob/381448ea/modules/web-console/frontend/app/components/bs-select-menu/transcludeToBody.directive.js
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/app/components/bs-select-menu/transcludeToBody.directive.js b/modules/web-console/frontend/app/components/bs-select-menu/transcludeToBody.directive.js
new file mode 100644
index 0000000..b415719
--- /dev/null
+++ b/modules/web-console/frontend/app/components/bs-select-menu/transcludeToBody.directive.js
@@ -0,0 +1,50 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+class Controller {
+ static $inject = ['$transclude', '$document'];
+
+ /**
+ * @param {ng.ITranscludeFunction} $transclude
+ * @param {JQLite} $document
+ */
+ constructor($transclude, $document) {
+ this.$transclude = $transclude;
+ this.$document = $document;
+ }
+
+ $postLink() {
+ this.$transclude((clone) => {
+ this.clone = clone;
+ this.$document.find('body').append(clone);
+ });
+ }
+
+ $onDestroy() {
+ this.clone.remove();
+ this.clone = this.$document = null;
+ }
+}
+
+export function directive() {
+ return {
+ restrict: 'E',
+ transclude: true,
+ controller: Controller,
+ scope: {}
+ };
+}
http://git-wip-us.apache.org/repos/asf/ignite/blob/381448ea/modules/web-console/frontend/app/components/cluster-selector/template.pug
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/app/components/cluster-selector/template.pug b/modules/web-console/frontend/app/components/cluster-selector/template.pug
index c97a698..15a4228 100644
--- a/modules/web-console/frontend/app/components/cluster-selector/template.pug
+++ b/modules/web-console/frontend/app/components/cluster-selector/template.pug
@@ -38,8 +38,8 @@ div.btn-ignite.btn-ignite--primary(
bs-select=''
bs-options='item as item.name for item in $ctrl.clusters'
- data-trigger='hover focus'
- data-container='self'
+ data-trigger='click'
+ data-container='body'
data-ng-change='$ctrl.change()'
[28/50] [abbrv] ignite git commit: IGNITE-8553 Web Console: Fixed
column resize on double click.
Posted by dp...@apache.org.
IGNITE-8553 Web Console: Fixed column resize on double click.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/556f460a
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/556f460a
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/556f460a
Branch: refs/heads/ignite-5789-1
Commit: 556f460a21442503d66a1275656714a2a49d482c
Parents: a44c54c
Author: Dmitriy Shabalin <dm...@gmail.com>
Authored: Tue May 22 16:27:28 2018 +0700
Committer: Alexey Kuznetsov <ak...@apache.org>
Committed: Tue May 22 16:27:28 2018 +0700
----------------------------------------------------------------------
modules/web-console/frontend/app/app.js | 2 ++
.../ui-grid-column-resizer/directive.js | 29 ++++++++++++++++++++
.../components/ui-grid-column-resizer/index.js | 24 ++++++++++++++++
3 files changed, 55 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/556f460a/modules/web-console/frontend/app/app.js
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/app/app.js b/modules/web-console/frontend/app/app.js
index 60b4ebc..38872c7 100644
--- a/modules/web-console/frontend/app/app.js
+++ b/modules/web-console/frontend/app/app.js
@@ -128,6 +128,7 @@ import bsSelectMenu from './components/bs-select-menu';
import protectFromBsSelectRender from './components/protect-from-bs-select-render';
import uiGridHovering from './components/ui-grid-hovering';
import uiGridFilters from './components/ui-grid-filters';
+import uiGridColumnResizer from './components/ui-grid-column-resizer';
import listEditable from './components/list-editable';
import breadcrumbs from './components/breadcrumbs';
import panelCollapsible from './components/panel-collapsible';
@@ -222,6 +223,7 @@ angular.module('ignite-console', [
bsSelectMenu.name,
uiGridHovering.name,
uiGridFilters.name,
+ uiGridColumnResizer.name,
protectFromBsSelectRender.name,
AngularStrapTooltip.name,
AngularStrapSelect.name,
http://git-wip-us.apache.org/repos/asf/ignite/blob/556f460a/modules/web-console/frontend/app/components/ui-grid-column-resizer/directive.js
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/app/components/ui-grid-column-resizer/directive.js b/modules/web-console/frontend/app/components/ui-grid-column-resizer/directive.js
new file mode 100644
index 0000000..6ba2a78
--- /dev/null
+++ b/modules/web-console/frontend/app/components/ui-grid-column-resizer/directive.js
@@ -0,0 +1,29 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+export default function() {
+ return {
+ priority: -200,
+ restrict: 'A',
+ require: '?^uiGrid',
+ link($scope, $element) {
+ $element.on('dblclick', function($event) {
+ $event.stopImmediatePropagation();
+ });
+ }
+ };
+}
http://git-wip-us.apache.org/repos/asf/ignite/blob/556f460a/modules/web-console/frontend/app/components/ui-grid-column-resizer/index.js
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/app/components/ui-grid-column-resizer/index.js b/modules/web-console/frontend/app/components/ui-grid-column-resizer/index.js
new file mode 100644
index 0000000..9edf1ef
--- /dev/null
+++ b/modules/web-console/frontend/app/components/ui-grid-column-resizer/index.js
@@ -0,0 +1,24 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import angular from 'angular';
+
+import uiGridColumnResizer from './directive';
+
+export default angular
+ .module('ignite-console.ui-grid-column-resizer', [])
+ .directive('uiGridColumnResizer', uiGridColumnResizer);
[39/50] [abbrv] ignite git commit: IGNITE-8538 Web Console: Refactor
redirecting to default state.
Posted by dp...@apache.org.
IGNITE-8538 Web Console: Refactor redirecting to default state.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/b4a95e7b
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/b4a95e7b
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/b4a95e7b
Branch: refs/heads/ignite-5789-1
Commit: b4a95e7b1574404333912e9cf5564d336fb39130
Parents: cc5484a
Author: Alexey Kuznetsov <ak...@apache.org>
Authored: Tue May 22 23:16:39 2018 +0700
Committer: Alexey Kuznetsov <ak...@apache.org>
Committed: Tue May 22 23:16:39 2018 +0700
----------------------------------------------------------------------
.../page-queries/components/queries-notebook/controller.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/b4a95e7b/modules/web-console/frontend/app/components/page-queries/components/queries-notebook/controller.js
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/app/components/page-queries/components/queries-notebook/controller.js b/modules/web-console/frontend/app/components/page-queries/components/queries-notebook/controller.js
index 859d1f7..6118afa 100644
--- a/modules/web-console/frontend/app/components/page-queries/components/queries-notebook/controller.js
+++ b/modules/web-console/frontend/app/components/page-queries/components/queries-notebook/controller.js
@@ -936,7 +936,7 @@ export class NotebookCtrl {
const _startWatch = () => {
const awaitClusters$ = fromPromise(
- agentMgr.startClusterWatch('Back to Configuration', 'default-state'));
+ agentMgr.startClusterWatch('Leave Queries', 'default-state'));
const finishLoading$ = defer(() => {
if (!$root.IgniteDemoMode)
[26/50] [abbrv] ignite git commit: IGNITE-8334 Web Console: Added
highlighting for focused "eye" icon.
Posted by dp...@apache.org.
IGNITE-8334 Web Console: Added highlighting for focused "eye" icon.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/00a330a7
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/00a330a7
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/00a330a7
Branch: refs/heads/ignite-5789-1
Commit: 00a330a7d1c64dfd782ba5e330006352256f8745
Parents: 1098ba5
Author: Ilya Borisov <kl...@gmail.com>
Authored: Tue May 22 15:39:19 2018 +0700
Committer: Alexey Kuznetsov <ak...@apache.org>
Committed: Tue May 22 15:39:19 2018 +0700
----------------------------------------------------------------------
.../frontend/app/components/password-visibility/style.scss | 4 ++++
1 file changed, 4 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/00a330a7/modules/web-console/frontend/app/components/password-visibility/style.scss
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/app/components/password-visibility/style.scss b/modules/web-console/frontend/app/components/password-visibility/style.scss
index 6f5130b..67457eb 100644
--- a/modules/web-console/frontend/app/components/password-visibility/style.scss
+++ b/modules/web-console/frontend/app/components/password-visibility/style.scss
@@ -46,5 +46,9 @@ password-visibility-toggle-button {
outline: none;
padding: 0 !important;
margin: 0 !important;
+
+ &:focus {
+ color: #0067b9;
+ }
}
}