Skip to content

Commit 54f487c

Browse files
keep trying to make tests pass
1 parent 92e3581 commit 54f487c

27 files changed

+85
-58
lines changed

.github/workflows/precommit.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,14 +37,14 @@ env:
3737
TESTS_FILTER: 'checkstyle,javac,javadoc,pylint,shellcheck,shelldocs,blanks,perlcritic,ruby-lint,rubocop'
3838
SUREFIRE_FIRST_PART_FORK_COUNT: '1C'
3939
SUREFIRE_SECOND_PART_FORK_COUNT: '1C'
40+
BUILD_THREAD: '4'
4041
ASF_NIGHTLIES: 'https://nightlies.apache.org'
4142
EXCLUDE_TESTS_URL: 'https://ci-hbase.apache.org/job/HBase-Find-Flaky-Tests/job/${{ github.base_ref }}/lastSuccessfulBuild/artifact/output/excludes'
4243
BUILD_URL_ARTIFACTS: '${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}'
4344

4445
jobs:
4546
precommit-checks:
4647
runs-on: ubuntu-latest
47-
timeout-minutes: 600
4848
continue-on-error: true
4949
strategy:
5050
fail-fast: false
@@ -78,7 +78,7 @@ jobs:
7878
echo "SOURCEDIR=${WORKDIR}/${SRC_REL}" >> $GITHUB_ENV
7979
echo "PATCHDIR=${WORKDIR}/${PATCH_REL}" >> $GITHUB_ENV
8080
echo "DOCKERFILE=${WORKDIR}/${SRC_REL}/dev-support/docker/Dockerfile" >> $GITHUB_ENV
81-
echo "YETUSDIR=${WORKDIR}/yetus" >> $GITHUB_ENV
81+
echo "YETUSDIR=${WORKDIR}/${YETUS_REL}" >> $GITHUB_ENV
8282
echo "CACHE_APACHE_ARTIFACT=${WORKDIR}/${SRC_REL}/dev-support/jenkins-scripts/cache-apache-project-artifact.sh" >> $GITHUB_ENV
8383
echo "YETUS_DRIVER=${WORKDIR}/${SRC_REL}/dev-support/jenkins_precommit_github_yetus.sh" >> $GITHUB_ENV
8484
echo "HIDE_OLD_COMMENTS=${WORKDIR}/${SRC_REL}/dev-support/gh_hide_old_comments.sh" >> $GITHUB_ENV
@@ -108,6 +108,7 @@ jobs:
108108
- name: Run Yetus test-patch
109109
id: test-patch
110110
continue-on-error: true
111+
timeout-minutes: 300
111112
working-directory: ${{ env.WORKDIR }}
112113
env:
113114
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

dev-support/hbase-personality.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -168,6 +168,8 @@ function personality_modules
168168
# https://cwiki.apache.org/confluence/display/MAVEN/Parallel+builds+in+Maven+3
169169
if [[ "${testtype}" == mvnsite ]]; then
170170
yetus_debug "Skip specifying --threads since maven-site-plugin does not support building in parallel."
171+
elif [[ "${testtype}" == unit ]]; then
172+
yetus_debug "Skip specifying --threads since unit tests are parallelized via surefire test runner."
171173
else
172174
if [[ -n "${BUILD_THREAD}" ]]; then
173175
extra="--threads=${BUILD_THREAD}"

hbase-client/src/test/java/org/apache/hadoop/hbase/security/token/TestClientTokenUtil.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
import org.apache.hadoop.hbase.HBaseClassTestRule;
3030
import org.apache.hadoop.hbase.client.AsyncConnection;
3131
import org.apache.hadoop.hbase.client.Connection;
32-
import org.apache.hadoop.hbase.testclassification.SmallTests;
32+
import org.apache.hadoop.hbase.testclassification.MediumTests;
3333
import org.junit.After;
3434
import org.junit.Before;
3535
import org.junit.ClassRule;
@@ -41,7 +41,8 @@
4141

4242
import org.apache.hadoop.hbase.shaded.protobuf.ProtobufUtil;
4343

44-
@Category(SmallTests.class)
44+
// Use MediumTests because this test class needs its own JVM
45+
@Category(MediumTests.class)
4546
public class TestClientTokenUtil {
4647

4748
@ClassRule

hbase-common/src/test/java/org/apache/hadoop/hbase/util/TestThreads.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,15 +21,16 @@
2121

2222
import java.util.concurrent.atomic.AtomicBoolean;
2323
import org.apache.hadoop.hbase.HBaseClassTestRule;
24+
import org.apache.hadoop.hbase.testclassification.MediumTests;
2425
import org.apache.hadoop.hbase.testclassification.MiscTests;
25-
import org.apache.hadoop.hbase.testclassification.SmallTests;
2626
import org.junit.ClassRule;
2727
import org.junit.Test;
2828
import org.junit.experimental.categories.Category;
2929
import org.slf4j.Logger;
3030
import org.slf4j.LoggerFactory;
3131

32-
@Category({ MiscTests.class, SmallTests.class })
32+
// Use MediumTests because this test class needs its own JVM
33+
@Category({ MiscTests.class, MediumTests.class })
3334
public class TestThreads {
3435

3536
@ClassRule

hbase-http/src/test/java/org/apache/hadoop/hbase/http/TestGlobalFilter.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,16 +31,17 @@
3131
import javax.servlet.http.HttpServletRequest;
3232
import org.apache.hadoop.conf.Configuration;
3333
import org.apache.hadoop.hbase.HBaseClassTestRule;
34+
import org.apache.hadoop.hbase.testclassification.MediumTests;
3435
import org.apache.hadoop.hbase.testclassification.MiscTests;
35-
import org.apache.hadoop.hbase.testclassification.SmallTests;
3636
import org.apache.hadoop.net.NetUtils;
3737
import org.junit.ClassRule;
3838
import org.junit.Test;
3939
import org.junit.experimental.categories.Category;
4040
import org.slf4j.Logger;
4141
import org.slf4j.LoggerFactory;
4242

43-
@Category({ MiscTests.class, SmallTests.class })
43+
// Use MediumTests because this test class needs its own JVM
44+
@Category({ MiscTests.class, MediumTests.class })
4445
public class TestGlobalFilter extends HttpServerFunctionalTest {
4546
@ClassRule
4647
public static final HBaseClassTestRule CLASS_RULE =

hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAsyncAccessControlAdminApi.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
import org.apache.hadoop.hbase.security.access.SecureTestUtil.AccessTestAction;
3434
import org.apache.hadoop.hbase.security.access.UserPermission;
3535
import org.apache.hadoop.hbase.testclassification.ClientTests;
36-
import org.apache.hadoop.hbase.testclassification.SmallTests;
36+
import org.apache.hadoop.hbase.testclassification.MediumTests;
3737
import org.junit.BeforeClass;
3838
import org.junit.ClassRule;
3939
import org.junit.Test;
@@ -44,7 +44,8 @@
4444
import org.apache.hbase.thirdparty.com.google.common.collect.Lists;
4545

4646
@RunWith(Parameterized.class)
47-
@Category({ ClientTests.class, SmallTests.class })
47+
// Use MediumTests because this test class needs its own JVM
48+
@Category({ ClientTests.class, MediumTests.class })
4849
public class TestAsyncAccessControlAdminApi extends TestAsyncAdminBase {
4950

5051
@ClassRule

hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestClientSideRegionScanner.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
import org.apache.hadoop.hbase.regionserver.RegionScanner;
4848
import org.apache.hadoop.hbase.regionserver.StoreScanner;
4949
import org.apache.hadoop.hbase.testclassification.ClientTests;
50-
import org.apache.hadoop.hbase.testclassification.SmallTests;
50+
import org.apache.hadoop.hbase.testclassification.MediumTests;
5151
import org.apache.hadoop.hbase.util.Bytes;
5252
import org.junit.AfterClass;
5353
import org.junit.Assert;
@@ -57,7 +57,8 @@
5757
import org.junit.Test;
5858
import org.junit.experimental.categories.Category;
5959

60-
@Category({ SmallTests.class, ClientTests.class })
60+
// Use MediumTests because this test class needs its own JVM
61+
@Category({ MediumTests.class, ClientTests.class })
6162
public class TestClientSideRegionScanner {
6263
@ClassRule
6364
public static final HBaseClassTestRule CLASS_RULE =

hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestMetaRegionLocationCache.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
import org.apache.hadoop.hbase.master.RegionState;
3838
import org.apache.hadoop.hbase.security.User;
3939
import org.apache.hadoop.hbase.testclassification.MasterTests;
40-
import org.apache.hadoop.hbase.testclassification.SmallTests;
40+
import org.apache.hadoop.hbase.testclassification.MediumTests;
4141
import org.apache.hadoop.hbase.util.JVMClusterUtil;
4242
import org.apache.hadoop.hbase.zookeeper.MetaTableLocator;
4343
import org.apache.hadoop.hbase.zookeeper.ZKUtil;
@@ -51,7 +51,8 @@
5151

5252
import org.apache.hbase.thirdparty.com.google.common.io.Closeables;
5353

54-
@Category({ SmallTests.class, MasterTests.class })
54+
// Use MediumTests because this test class needs its own JVM
55+
@Category({ MediumTests.class, MasterTests.class })
5556
public class TestMetaRegionLocationCache {
5657
@ClassRule
5758
public static final HBaseClassTestRule CLASS_RULE =

hbase-server/src/test/java/org/apache/hadoop/hbase/io/TestHalfStoreFileReader.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@
6060
import org.apache.hadoop.hbase.regionserver.storefiletracker.StoreFileTracker;
6161
import org.apache.hadoop.hbase.regionserver.storefiletracker.StoreFileTrackerFactory;
6262
import org.apache.hadoop.hbase.testclassification.IOTests;
63-
import org.apache.hadoop.hbase.testclassification.SmallTests;
63+
import org.apache.hadoop.hbase.testclassification.MediumTests;
6464
import org.apache.hadoop.hbase.util.Bytes;
6565
import org.junit.AfterClass;
6666
import org.junit.BeforeClass;
@@ -70,7 +70,8 @@
7070

7171
import org.apache.hbase.thirdparty.io.netty.util.ResourceLeakDetector;
7272

73-
@Category({ IOTests.class, SmallTests.class })
73+
// Use MediumTests because this test class needs its own JVM
74+
@Category({ IOTests.class, MediumTests.class })
7475
public class TestHalfStoreFileReader {
7576

7677
@ClassRule

hbase-server/src/test/java/org/apache/hadoop/hbase/io/hfile/TestChecksum.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
import org.apache.hadoop.hbase.nio.MultiByteBuff;
4646
import org.apache.hadoop.hbase.nio.SingleByteBuff;
4747
import org.apache.hadoop.hbase.testclassification.IOTests;
48-
import org.apache.hadoop.hbase.testclassification.SmallTests;
48+
import org.apache.hadoop.hbase.testclassification.MediumTests;
4949
import org.apache.hadoop.hbase.util.ChecksumType;
5050
import org.junit.Before;
5151
import org.junit.ClassRule;
@@ -54,7 +54,8 @@
5454
import org.slf4j.Logger;
5555
import org.slf4j.LoggerFactory;
5656

57-
@Category({ IOTests.class, SmallTests.class })
57+
// Use MediumTests because this test class needs its own JVM
58+
@Category({ IOTests.class, MediumTests.class })
5859
public class TestChecksum {
5960

6061
@ClassRule

0 commit comments

Comments
 (0)