Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id D2AB2200C8B for ; Mon, 22 May 2017 17:12:33 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id D17FB160BE5; Mon, 22 May 2017 15:12:33 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 4ABC1160BE6 for ; Mon, 22 May 2017 17:12:32 +0200 (CEST) Received: (qmail 52074 invoked by uid 500); 22 May 2017 15:12:31 -0000 Mailing-List: contact commits-help@ignite.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ignite.apache.org Delivered-To: mailing list commits@ignite.apache.org Received: (qmail 51239 invoked by uid 99); 22 May 2017 15:12:30 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 22 May 2017 15:12:30 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 52813E1863; Mon, 22 May 2017 15:12:30 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: sboikov@apache.org To: commits@ignite.apache.org Date: Mon, 22 May 2017 15:12:52 -0000 Message-Id: <8eea70c496244cf6ae6133df07671a8a@git.apache.org> In-Reply-To: <9fa8b040ac584bb7a9fddc61f3a941b7@git.apache.org> References: <9fa8b040ac584bb7a9fddc61f3a941b7@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [24/50] [abbrv] ignite git commit: ignite-12163 Move oom test in separate suit archived-at: Mon, 22 May 2017 15:12:34 -0000 ignite-12163 Move oom test in separate suit Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/b49754db Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/b49754db Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/b49754db Branch: refs/heads/ignite-5075-pds Commit: b49754db2f392d49a5fb8656d7f2aaaa2f6eadab Parents: 83cd97c Author: Dmitriy Govorukhin Authored: Thu May 18 12:44:50 2017 +0300 Committer: Dmitriy Govorukhin Committed: Thu May 18 12:44:50 2017 +0300 ---------------------------------------------------------------------- .../IgnitePersistentStoreWalTlbSelfTest.java | 10 ++---- .../IgnitePdsOutOfMemoryTestSuite.java | 38 ++++++++++++++++++++ .../ignite/testsuites/IgnitePdsTestSuite2.java | 2 -- 3 files changed, 41 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/b49754db/modules/pds/src/test/java/org/apache/ignite/cache/database/IgnitePersistentStoreWalTlbSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/pds/src/test/java/org/apache/ignite/cache/database/IgnitePersistentStoreWalTlbSelfTest.java b/modules/pds/src/test/java/org/apache/ignite/cache/database/IgnitePersistentStoreWalTlbSelfTest.java index afdcbc7..e34337b 100644 --- a/modules/pds/src/test/java/org/apache/ignite/cache/database/IgnitePersistentStoreWalTlbSelfTest.java +++ b/modules/pds/src/test/java/org/apache/ignite/cache/database/IgnitePersistentStoreWalTlbSelfTest.java @@ -18,7 +18,7 @@ package org.apache.ignite.cache.database; import javax.cache.CacheException; -import org.apache.ignite.IgniteDataStreamer; +import org.apache.ignite.IgniteCache; import org.apache.ignite.configuration.CacheConfiguration; import org.apache.ignite.configuration.IgniteConfiguration; import org.apache.ignite.configuration.MemoryConfiguration; @@ -118,13 +118,9 @@ public class IgnitePersistentStoreWalTlbSelfTest extends GridCommonAbstractTest boolean locked = true; try { - IgniteDataStreamer streamer = ig.dataStreamer(null); - for (int i = 0; i < 100_000; i++) { - streamer.addData(i, 1); + IgniteCache cache = ig.getOrCreateCache("cache"); - if (i > 0 && i % 10_000 == 0) - info("Done put: " + i); - } + cache.put(1, 1); } catch (CacheException ignore) { // expected http://git-wip-us.apache.org/repos/asf/ignite/blob/b49754db/modules/pds/src/test/java/org/apache/ignite/testsuites/IgnitePdsOutOfMemoryTestSuite.java ---------------------------------------------------------------------- diff --git a/modules/pds/src/test/java/org/apache/ignite/testsuites/IgnitePdsOutOfMemoryTestSuite.java b/modules/pds/src/test/java/org/apache/ignite/testsuites/IgnitePdsOutOfMemoryTestSuite.java new file mode 100644 index 0000000..dc733bf --- /dev/null +++ b/modules/pds/src/test/java/org/apache/ignite/testsuites/IgnitePdsOutOfMemoryTestSuite.java @@ -0,0 +1,38 @@ +/* + * 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.testsuites; + +import junit.framework.TestSuite; +import org.apache.ignite.cache.database.IgnitePersistentStoreWalTlbSelfTest; + +/** + * + */ +public class IgnitePdsOutOfMemoryTestSuite extends TestSuite { + /** + * @return Suite. + * @throws Exception If failed. + */ + public static TestSuite suite() throws Exception { + TestSuite suite = new TestSuite("Ignite Persistent Store OOM Test Suite"); + + suite.addTestSuite(IgnitePersistentStoreWalTlbSelfTest.class); + + return suite; + } +} http://git-wip-us.apache.org/repos/asf/ignite/blob/b49754db/modules/pds/src/test/java/org/apache/ignite/testsuites/IgnitePdsTestSuite2.java ---------------------------------------------------------------------- diff --git a/modules/pds/src/test/java/org/apache/ignite/testsuites/IgnitePdsTestSuite2.java b/modules/pds/src/test/java/org/apache/ignite/testsuites/IgnitePdsTestSuite2.java index 9b1d926..223c3cb 100644 --- a/modules/pds/src/test/java/org/apache/ignite/testsuites/IgnitePdsTestSuite2.java +++ b/modules/pds/src/test/java/org/apache/ignite/testsuites/IgnitePdsTestSuite2.java @@ -22,7 +22,6 @@ import org.apache.ignite.cache.database.IgnitePersistentStoreAtomicCacheRebalanc import org.apache.ignite.cache.database.IgnitePersistentStoreTxCacheRebalancingTest; import org.apache.ignite.cache.database.IgnitePersistentStoreContinuousRestartSelfTest; import org.apache.ignite.cache.database.IgnitePersistentStorePageSizesTest; -import org.apache.ignite.cache.database.IgnitePersistentStoreWalTlbSelfTest; import org.apache.ignite.cache.database.IgnitePersistentStoreRecoveryAfterFileCorruptionTest; import org.apache.ignite.cache.database.db.DbPageEvictionDuringPartitionClearSelfTest; import org.apache.ignite.cache.database.db.IgniteDbWholeClusterRestartSelfTest; @@ -49,7 +48,6 @@ public class IgnitePdsTestSuite2 extends TestSuite { suite.addTestSuite(IgniteDataIntegrityTests.class); suite.addTestSuite(IgnitePersistentStoreRecoveryAfterFileCorruptionTest.class); suite.addTestSuite(IgnitePersistentStorePageSizesTest.class); - suite.addTestSuite(IgnitePersistentStoreWalTlbSelfTest.class); // WAL recovery test. suite.addTestSuite(WalRecoveryTxLogicalRecordsTest.class);