This is an automated email from the ASF dual-hosted git repository.
dzamo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/drill.git
The following commit(s) were added to refs/heads/master by this push:
new efca5a3862 Retire the EasyOutOfMemory test category now that we have
swap space. (#2861)
efca5a3862 is described below
commit efca5a3862e43abfba6e98898d54b22f915cce23
Author: James Turton <9107319+jntur...@users.noreply.github.com>
AuthorDate: Sun Dec 31 15:36:44 2023 +0200
Retire the EasyOutOfMemory test category now that we have swap space.
(#2861)
The EasyOutOfMemory test category is a clever workaround to run Drill unit
tests in the memory constrained CI
environment provided by Github Actions that has served us well but that is
no longer needed now that
we set up swap space in the CI workflow. We can retire it for simpler and
faster CI testing.
---
.github/workflows/ci.yml | 13 ++++------
.../apache/drill/categories/EasyOutOfMemory.java | 28 ----------------------
.../org/apache/drill/categories/package-info.java | 2 --
.../exec/TestHiveDrillNativeParquetReader.java | 3 +--
.../drill/TestTpchDistributedConcurrent.java | 3 +--
.../drill/exec/fn/impl/TestAggregateFunctions.java | 3 +--
.../drill/exec/server/TestDrillbitResilience.java | 3 +--
pom.xml | 4 ++--
8 files changed, 11 insertions(+), 48 deletions(-)
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index c9149309f4..833f3d4c62 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -54,7 +54,7 @@ jobs:
# added to the Runner and memory hungry tests are run separately.
run: |
sudo sh -c "
- fallocate -l 2G /tmp/swapfile
+ fallocate -l 4G /tmp/swapfile
chmod 0600 /tmp/swapfile
mkswap /tmp/swapfile
swapon /tmp/swapfile
@@ -62,16 +62,13 @@ jobs:
- name: Build and test
run: |
mvn -P${{ matrix.profile }} install --batch-mode
--no-transfer-progress \
- -DexcludedGroups=org.apache.drill.categories.EasyOutOfMemory \
- -Dhttp.keepAlive=false -Dmaven.wagon.http.pool=false
-Dmaven.wagon.httpconnectionManager.ttlSeconds=120
- - name: Test Specific Categories # EasyOutOfMemory
- run: |
- mvn -P${{ matrix.profile }} test -pl
org.apache.drill.exec:drill-java-exec \
- -Dgroups=org.apache.drill.categories.EasyOutOfMemory \
-Dhttp.keepAlive=false -Dmaven.wagon.http.pool=false
-Dmaven.wagon.httpconnectionManager.ttlSeconds=120
- name: Remove swap space
run : |
- sudo swapoff /tmp/swapfile
+ sudo sh -c "
+ swapoff /tmp/swapfile
+ rm /tmp/swapfile
+ "
checkstyle_protobuf:
name: Run checkstyle and generate protobufs
runs-on: ubuntu-latest
diff --git
a/common/src/test/java/org/apache/drill/categories/EasyOutOfMemory.java
b/common/src/test/java/org/apache/drill/categories/EasyOutOfMemory.java
deleted file mode 100644
index 2dd29456ab..0000000000
--- a/common/src/test/java/org/apache/drill/categories/EasyOutOfMemory.java
+++ /dev/null
@@ -1,28 +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.drill.categories;
-
-/**
- * Split the unit test for EasyOutOfMemory categories.<br/>
- * Note: If you use this category to mark the test class,
- * the CI will use a new clean JVM to test them.
- *
- */
-public interface EasyOutOfMemory extends FlakyTest {
-
-}
diff --git a/common/src/test/java/org/apache/drill/categories/package-info.java
b/common/src/test/java/org/apache/drill/categories/package-info.java
index 4f80760fa9..487924a899 100644
--- a/common/src/test/java/org/apache/drill/categories/package-info.java
+++ b/common/src/test/java/org/apache/drill/categories/package-info.java
@@ -26,7 +26,6 @@
* <li>{@link org.apache.drill.categories.UnlikelyTest}: These tests
represent corner cases, specific bug fixes, or tests for pieces of code that
are unlikely to be changed.
* These are disabled by default</li>
* <li>{@link org.apache.drill.categories.FlakyTest}: A category for tests
that intermittently fail.</li>
- * <li>{@link org.apache.drill.categories.EasyOutOfMemory}: Inherited class
FlakyTest and allow the CI tool uses a new JVM to test the unit.</li>
* </ul>
* </p>
* <p>
@@ -65,4 +64,3 @@
* </p>
*/
package org.apache.drill.categories;
-
diff --git
a/contrib/storage-hive/core/src/test/java/org/apache/drill/exec/TestHiveDrillNativeParquetReader.java
b/contrib/storage-hive/core/src/test/java/org/apache/drill/exec/TestHiveDrillNativeParquetReader.java
index 935489c749..9c7f7bbcbb 100644
---
a/contrib/storage-hive/core/src/test/java/org/apache/drill/exec/TestHiveDrillNativeParquetReader.java
+++
b/contrib/storage-hive/core/src/test/java/org/apache/drill/exec/TestHiveDrillNativeParquetReader.java
@@ -26,7 +26,6 @@ import java.util.HashMap;
import java.util.Map;
import org.apache.drill.PlanTestBase;
-import org.apache.drill.categories.EasyOutOfMemory;
import org.apache.drill.categories.HiveStorageTest;
import org.apache.drill.categories.SlowTest;
import org.apache.drill.common.exceptions.UserRemoteException;
@@ -41,7 +40,7 @@ import org.junit.Test;
import org.junit.experimental.categories.Category;
import org.junit.rules.ExpectedException;
-@Category({SlowTest.class, HiveStorageTest.class, EasyOutOfMemory.class})
+@Category({SlowTest.class, HiveStorageTest.class})
public class TestHiveDrillNativeParquetReader extends HiveTestBase {
@BeforeClass
diff --git
a/exec/java-exec/src/test/java/org/apache/drill/TestTpchDistributedConcurrent.java
b/exec/java-exec/src/test/java/org/apache/drill/TestTpchDistributedConcurrent.java
index 78c6313eef..445212cbc2 100644
---
a/exec/java-exec/src/test/java/org/apache/drill/TestTpchDistributedConcurrent.java
+++
b/exec/java-exec/src/test/java/org/apache/drill/TestTpchDistributedConcurrent.java
@@ -24,7 +24,6 @@ import java.util.Random;
import java.util.Set;
import java.util.concurrent.Semaphore;
-import org.apache.drill.categories.EasyOutOfMemory;
import org.apache.drill.categories.SlowTest;
import org.apache.drill.common.exceptions.UserException;
import org.apache.drill.exec.ExecConstants;
@@ -56,7 +55,7 @@ import static org.junit.Assert.assertNull;
* unstable from running a lot of queries concurrently -- it's not about
* any particular order of execution. We ignore the results.
*/
-@Category({SlowTest.class, EasyOutOfMemory.class})
+@Category({SlowTest.class})
public class TestTpchDistributedConcurrent extends ClusterTest {
private static final Logger logger =
LoggerFactory.getLogger(TestTpchDistributedConcurrent.class);
diff --git
a/exec/java-exec/src/test/java/org/apache/drill/exec/fn/impl/TestAggregateFunctions.java
b/exec/java-exec/src/test/java/org/apache/drill/exec/fn/impl/TestAggregateFunctions.java
index b7dd11089f..f8fa2221ea 100644
---
a/exec/java-exec/src/test/java/org/apache/drill/exec/fn/impl/TestAggregateFunctions.java
+++
b/exec/java-exec/src/test/java/org/apache/drill/exec/fn/impl/TestAggregateFunctions.java
@@ -31,7 +31,6 @@ import org.apache.drill.exec.planner.physical.PlannerSettings;
import org.apache.drill.exec.record.RecordBatchLoader;
import org.apache.drill.exec.record.VectorWrapper;
import org.apache.drill.exec.util.Text;
-import org.apache.drill.categories.EasyOutOfMemory;
import org.apache.drill.categories.OperatorTest;
import org.apache.drill.categories.PlannerTest;
import org.apache.drill.categories.SqlFunctionTest;
@@ -69,7 +68,7 @@ import static org.hamcrest.CoreMatchers.containsString;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
-@Category({ SqlFunctionTest.class, OperatorTest.class, PlannerTest.class,
EasyOutOfMemory.class })
+@Category({ SqlFunctionTest.class, OperatorTest.class, PlannerTest.class })
public class TestAggregateFunctions extends ClusterTest {
@Rule
diff --git
a/exec/java-exec/src/test/java/org/apache/drill/exec/server/TestDrillbitResilience.java
b/exec/java-exec/src/test/java/org/apache/drill/exec/server/TestDrillbitResilience.java
index cc23a06b5f..39ce0bc8d1 100644
---
a/exec/java-exec/src/test/java/org/apache/drill/exec/server/TestDrillbitResilience.java
+++
b/exec/java-exec/src/test/java/org/apache/drill/exec/server/TestDrillbitResilience.java
@@ -29,7 +29,6 @@ import java.io.IOException;
import ch.qos.logback.classic.Level;
import org.apache.commons.math3.util.Pair;
-import org.apache.drill.categories.EasyOutOfMemory;
import org.apache.drill.categories.FlakyTest;
import org.apache.drill.exec.client.DrillClient;
import
org.apache.drill.exec.physical.impl.partitionsender.PartitionSenderRootExec;
@@ -106,7 +105,7 @@ import com.google.common.base.Preconditions;
* <li>specify Level.DEBUG for CURRENT_LOG_LEVEL</li>
* <li>compare trace output for successful test case and failed</li>
*/
-@Category({ SlowTest.class, FlakyTest.class, EasyOutOfMemory.class })
+@Category({ SlowTest.class, FlakyTest.class })
public class TestDrillbitResilience extends ClusterTest {
private static final Logger logger =
org.slf4j.LoggerFactory.getLogger(TestDrillbitResilience.class);
protected static LogFixture logFixture;
diff --git a/pom.xml b/pom.xml
index b787756ab8..b8defc9467 100644
--- a/pom.xml
+++ b/pom.xml
@@ -91,8 +91,8 @@
<javax.validation.api>2.0.1.Final</javax.validation.api>
<asm.version>9.5</asm.version>
<excludedGroups />
- <memoryMb>2560</memoryMb>
- <directMemoryMb>2560</directMemoryMb>
+ <memoryMb>3072</memoryMb>
+ <directMemoryMb>3072</directMemoryMb>
<rat.skip>true</rat.skip>
<license.skip>true</license.skip>
<docker.repository>apache/drill</docker.repository>
