You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ozone.apache.org by ad...@apache.org on 2023/10/13 05:35:31 UTC
[ozone] branch HDDS-9299 created (now 4bb201e040)
This is an automated email from the ASF dual-hosted git repository.
adoroszlai pushed a change to branch HDDS-9299
in repository https://gitbox.apache.org/repos/asf/ozone.git
at 4bb201e040 mismatched package
This branch includes the following new commits:
new 6083c93708 Allow marking JUnit4 tests as slow
new 24c64655a8 skip slow JUnit4 integration tests in CI run
new e421ea6bd8 HDDS-9299. Mark TestOmSnapshot#testDayWeekMonthSnapshotCreationAndExpiration as slow
new 9559b2b41b improve doc for test tags/categories
new 4bb201e040 mismatched package
The 5 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@ozone.apache.org
For additional commands, e-mail: commits-help@ozone.apache.org
[ozone] 04/05: improve doc for test tags/categories
Posted by ad...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
adoroszlai pushed a commit to branch HDDS-9299
in repository https://gitbox.apache.org/repos/asf/ozone.git
commit 9559b2b41b468e62a100ab83e70bbd7799ab7dcb
Author: Doroszlai, Attila <ad...@apache.org>
AuthorDate: Fri Oct 13 07:31:17 2023 +0200
improve doc for test tags/categories
---
.../test-utils/src/main/java/org/apache/ozone/test/SlowTest.java | 7 +++++--
.../src/main/java/org/apache/ozone/test/UnhealthyTest.java | 6 +++++-
.../test-utils/src/main/java/org/apache/ozone/test/tag/Flaky.java | 7 ++++---
.../test-utils/src/main/java/org/apache/ozone/test/tag/Native.java | 2 +-
.../test-utils/src/main/java/org/apache/ozone/test/tag/Slow.java | 6 ++++--
.../src/main/java/org/apache/ozone/test/tag/Unhealthy.java | 7 ++++---
6 files changed, 23 insertions(+), 12 deletions(-)
diff --git a/hadoop-hdds/test-utils/src/main/java/org/apache/ozone/test/SlowTest.java b/hadoop-hdds/test-utils/src/main/java/org/apache/ozone/test/SlowTest.java
index 2dca4158a0..88913625a7 100644
--- a/hadoop-hdds/test-utils/src/main/java/org/apache/ozone/test/SlowTest.java
+++ b/hadoop-hdds/test-utils/src/main/java/org/apache/ozone/test/SlowTest.java
@@ -18,8 +18,11 @@
package org.apache.ozone.test;
/**
- * Interface to mark test classes or methods that take too much time.
- * These are excluded from CI runs for each commit and run periodically.
+ * Interface to mark JUnit4 test classes or methods that take too much time.
+ * These are excluded from CI runs for each commit, but can be run manually or
+ * in scheduled runs.
+ *
+ * Usage: <code>@Category(SlowTest.class) @Slow("HDDS-123")</code>
*/
public interface SlowTest {
// category marker
diff --git a/hadoop-hdds/test-utils/src/main/java/org/apache/ozone/test/UnhealthyTest.java b/hadoop-hdds/test-utils/src/main/java/org/apache/ozone/test/UnhealthyTest.java
index c0719bdd2e..c975461af4 100644
--- a/hadoop-hdds/test-utils/src/main/java/org/apache/ozone/test/UnhealthyTest.java
+++ b/hadoop-hdds/test-utils/src/main/java/org/apache/ozone/test/UnhealthyTest.java
@@ -18,8 +18,12 @@
package org.apache.ozone.test;
/**
- * Interface to mark test classes or methods that are unhealthy which
+ * Interface to mark JUnit4 test classes or methods that are unhealthy, which
* means either they are unstable or inconsistent to run.
+ * These are excluded from CI runs for each commit, but can be run manually or
+ * in scheduled runs.
+ *
+ * Usage: <code>@Category(UnhealthyTest.class) @Unhealthy("HDDS-123")</code>
*/
public interface UnhealthyTest {
// category marker
diff --git a/hadoop-hdds/test-utils/src/main/java/org/apache/ozone/test/tag/Flaky.java b/hadoop-hdds/test-utils/src/main/java/org/apache/ozone/test/tag/Flaky.java
index 6b86d58c44..ac63fc9d5b 100644
--- a/hadoop-hdds/test-utils/src/main/java/org/apache/ozone/test/tag/Flaky.java
+++ b/hadoop-hdds/test-utils/src/main/java/org/apache/ozone/test/tag/Flaky.java
@@ -25,9 +25,10 @@ import java.lang.annotation.Target;
import org.junit.jupiter.api.Tag;
/**
- * Annotation to mark test classes or methods with some intermittent failures.
- * These are handled separately from the normal tests. (Not required to pass,
- * may be repeated automatically, etc.)
+ * Annotation to mark JUnit5 test classes or methods that exhibit intermittent
+ * issues. These are run separately from the normal tests in CI. In case of
+ * failure they may be repeated a few times.
+ * Usage: <code>@Flaky("HDDS-123")</code>
*/
@Target({ ElementType.TYPE, ElementType.METHOD })
@Retention(RetentionPolicy.RUNTIME)
diff --git a/hadoop-hdds/test-utils/src/main/java/org/apache/ozone/test/tag/Native.java b/hadoop-hdds/test-utils/src/main/java/org/apache/ozone/test/tag/Native.java
index d11f0fdb9e..1aeb476cb8 100644
--- a/hadoop-hdds/test-utils/src/main/java/org/apache/ozone/test/tag/Native.java
+++ b/hadoop-hdds/test-utils/src/main/java/org/apache/ozone/test/tag/Native.java
@@ -25,7 +25,7 @@ import java.lang.annotation.Target;
import org.junit.jupiter.api.Tag;
/**
- * Annotation to mark test classes that require native libraries.
+ * Annotation to mark JUnit5 test classes that require native libraries.
*/
@Target({ ElementType.TYPE, ElementType.METHOD })
@Retention(RetentionPolicy.RUNTIME)
diff --git a/hadoop-hdds/test-utils/src/main/java/org/apache/ozone/test/tag/Slow.java b/hadoop-hdds/test-utils/src/main/java/org/apache/ozone/test/tag/Slow.java
index 51d312e222..30c4a0a48f 100644
--- a/hadoop-hdds/test-utils/src/main/java/org/apache/ozone/test/tag/Slow.java
+++ b/hadoop-hdds/test-utils/src/main/java/org/apache/ozone/test/tag/Slow.java
@@ -25,8 +25,10 @@ import java.lang.annotation.Target;
import org.junit.jupiter.api.Tag;
/**
- * Annotation to mark test classes or methods that take too much time.
- * These are excluded from CI runs for each commit and run periodically.
+ * Annotation to mark JUnit5 test classes or methods that take too much time.
+ * These are excluded from CI runs for each commit, but can be run manually or
+ * in scheduled runs.
+ * Usage: <code>@Slow("HDDS-123")</code>
*/
@Target({ ElementType.TYPE, ElementType.METHOD })
@Retention(RetentionPolicy.RUNTIME)
diff --git a/hadoop-hdds/test-utils/src/main/java/org/apache/ozone/test/tag/Unhealthy.java b/hadoop-hdds/test-utils/src/main/java/org/apache/ozone/test/tag/Unhealthy.java
index 981c2e15a2..f64d3b741e 100644
--- a/hadoop-hdds/test-utils/src/main/java/org/apache/ozone/test/tag/Unhealthy.java
+++ b/hadoop-hdds/test-utils/src/main/java/org/apache/ozone/test/tag/Unhealthy.java
@@ -25,10 +25,11 @@ import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
/**
- * Annotation to mark test classes or methods that are unhealthy which
+ * Annotation to mark JUnit5 test classes or methods that are unhealthy which
* means either they are unstable or inconsistent to run.
- * These are excluded from CI runs for each commit and should run only
- * during nightly or other scheduled runs.
+ * These are excluded from CI runs for each commit, but can be run manually or
+ * in scheduled runs.
+ * Usage: <code>@Unhealthy("HDDS-123")</code>
*/
@Target({ ElementType.TYPE, ElementType.METHOD })
@Retention(RetentionPolicy.RUNTIME)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@ozone.apache.org
For additional commands, e-mail: commits-help@ozone.apache.org
[ozone] 05/05: mismatched package
Posted by ad...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
adoroszlai pushed a commit to branch HDDS-9299
in repository https://gitbox.apache.org/repos/asf/ozone.git
commit 4bb201e040f8d33405b4ac12d667a11101290af8
Author: Doroszlai, Attila <ad...@apache.org>
AuthorDate: Fri Oct 13 07:31:58 2023 +0200
mismatched package
---
.../src/main/java/org/apache/ozone/test/tag/package-info.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/hadoop-hdds/test-utils/src/main/java/org/apache/ozone/test/tag/package-info.java b/hadoop-hdds/test-utils/src/main/java/org/apache/ozone/test/tag/package-info.java
index d5a60ecef6..e056ba234a 100644
--- a/hadoop-hdds/test-utils/src/main/java/org/apache/ozone/test/tag/package-info.java
+++ b/hadoop-hdds/test-utils/src/main/java/org/apache/ozone/test/tag/package-info.java
@@ -19,4 +19,4 @@
/**
* Tags are annotations for grouping tests.
*/
-package org.apache.ozone.test;
+package org.apache.ozone.test.tag;
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@ozone.apache.org
For additional commands, e-mail: commits-help@ozone.apache.org
[ozone] 01/05: Allow marking JUnit4 tests as slow
Posted by ad...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
adoroszlai pushed a commit to branch HDDS-9299
in repository https://gitbox.apache.org/repos/asf/ozone.git
commit 6083c93708e305ac08b32b7d8fa77b3be77e7b66
Author: Doroszlai, Attila <ad...@apache.org>
AuthorDate: Fri Oct 13 07:12:09 2023 +0200
Allow marking JUnit4 tests as slow
---
.../main/java/org/apache/ozone/test/SlowTest.java | 26 ++++++++++++++++++++++
1 file changed, 26 insertions(+)
diff --git a/hadoop-hdds/test-utils/src/main/java/org/apache/ozone/test/SlowTest.java b/hadoop-hdds/test-utils/src/main/java/org/apache/ozone/test/SlowTest.java
new file mode 100644
index 0000000000..2dca4158a0
--- /dev/null
+++ b/hadoop-hdds/test-utils/src/main/java/org/apache/ozone/test/SlowTest.java
@@ -0,0 +1,26 @@
+/*
+ * 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
+ * <p>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * 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.ozone.test;
+
+/**
+ * Interface to mark test classes or methods that take too much time.
+ * These are excluded from CI runs for each commit and run periodically.
+ */
+public interface SlowTest {
+ // category marker
+}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@ozone.apache.org
For additional commands, e-mail: commits-help@ozone.apache.org
[ozone] 02/05: skip slow JUnit4 integration tests in CI run
Posted by ad...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
adoroszlai pushed a commit to branch HDDS-9299
in repository https://gitbox.apache.org/repos/asf/ozone.git
commit 24c64655a8d77e52b0b57709d9cbe92fe09634b1
Author: Doroszlai, Attila <ad...@apache.org>
AuthorDate: Fri Oct 13 07:13:56 2023 +0200
skip slow JUnit4 integration tests in CI run
---
pom.xml | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/pom.xml b/pom.xml
index 3c0b69462e..b3932ab6c5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2208,7 +2208,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs
<includes>
<include>org.apache.hadoop.ozone.client.**</include>
</includes>
- <excludedGroups>flaky | slow | unhealthy | org.apache.ozone.test.UnhealthyTest</excludedGroups>
+ <excludedGroups>flaky | slow | org.apache.ozone.test.SlowTest | unhealthy | org.apache.ozone.test.UnhealthyTest</excludedGroups>
</configuration>
</plugin>
</plugins>
@@ -2225,7 +2225,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs
<includes>
<include>org.apache.hadoop.ozone.om.**</include>
</includes>
- <excludedGroups>flaky | slow | unhealthy | org.apache.ozone.test.UnhealthyTest</excludedGroups>
+ <excludedGroups>flaky | slow | org.apache.ozone.test.SlowTest | unhealthy | org.apache.ozone.test.UnhealthyTest</excludedGroups>
</configuration>
</plugin>
</plugins>
@@ -2242,7 +2242,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs
<includes>
<include>org.apache.hadoop.ozone.scm.**</include>
</includes>
- <excludedGroups>flaky | slow | unhealthy | org.apache.ozone.test.UnhealthyTest</excludedGroups>
+ <excludedGroups>flaky | slow | org.apache.ozone.test.SlowTest | unhealthy | org.apache.ozone.test.UnhealthyTest</excludedGroups>
</configuration>
</plugin>
</plugins>
@@ -2259,7 +2259,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs
<includes>
<include>org.apache.hadoop.fs.ozone.contract.**</include>
</includes>
- <excludedGroups>flaky | slow | unhealthy | org.apache.ozone.test.UnhealthyTest</excludedGroups>
+ <excludedGroups>flaky | slow | org.apache.ozone.test.SlowTest | unhealthy | org.apache.ozone.test.UnhealthyTest</excludedGroups>
</configuration>
</plugin>
</plugins>
@@ -2279,7 +2279,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs
<excludes>
<exclude>org.apache.hadoop.fs.ozone.contract.**</exclude>
</excludes>
- <excludedGroups>flaky | slow | unhealthy | org.apache.ozone.test.UnhealthyTest</excludedGroups>
+ <excludedGroups>flaky | slow | org.apache.ozone.test.SlowTest | unhealthy | org.apache.ozone.test.UnhealthyTest</excludedGroups>
</configuration>
</plugin>
</plugins>
@@ -2296,7 +2296,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs
<includes>
<include>org.apache.hadoop.hdds.**</include>
</includes>
- <excludedGroups>flaky | slow | unhealthy | org.apache.ozone.test.UnhealthyTest</excludedGroups>
+ <excludedGroups>flaky | slow | org.apache.ozone.test.SlowTest | unhealthy | org.apache.ozone.test.UnhealthyTest</excludedGroups>
</configuration>
</plugin>
</plugins>
@@ -2321,7 +2321,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs
<exclude>org.apache.hadoop.ozone.scm.**</exclude>
<exclude>org.apache.hadoop.ozone.shell.**</exclude>
</excludes>
- <excludedGroups>flaky | slow | unhealthy | org.apache.ozone.test.UnhealthyTest</excludedGroups>
+ <excludedGroups>flaky | slow | org.apache.ozone.test.SlowTest | unhealthy | org.apache.ozone.test.UnhealthyTest</excludedGroups>
</configuration>
</plugin>
</plugins>
@@ -2340,7 +2340,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs
<include>org.apache.hadoop.ozone.freon.**</include>
<include>org.apache.hadoop.ozone.shell.**</include>
</includes>
- <excludedGroups>flaky | slow | unhealthy | org.apache.ozone.test.UnhealthyTest</excludedGroups>
+ <excludedGroups>flaky | slow | org.apache.ozone.test.SlowTest | unhealthy | org.apache.ozone.test.UnhealthyTest</excludedGroups>
</configuration>
</plugin>
</plugins>
@@ -2354,7 +2354,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
- <excludedGroups>flaky | slow | unhealthy | org.apache.ozone.test.UnhealthyTest</excludedGroups>
+ <excludedGroups>flaky | slow | org.apache.ozone.test.SlowTest | unhealthy | org.apache.ozone.test.UnhealthyTest</excludedGroups>
</configuration>
</plugin>
</plugins>
@@ -2369,7 +2369,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<groups>flaky</groups>
- <excludedGroups>slow | unhealthy | org.apache.ozone.test.UnhealthyTest</excludedGroups>
+ <excludedGroups>slow | org.apache.ozone.test.SlowTest | unhealthy | org.apache.ozone.test.UnhealthyTest</excludedGroups>
</configuration>
</plugin>
</plugins>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@ozone.apache.org
For additional commands, e-mail: commits-help@ozone.apache.org
[ozone] 03/05: HDDS-9299. Mark TestOmSnapshot#testDayWeekMonthSnapshotCreationAndExpiration as slow
Posted by ad...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
adoroszlai pushed a commit to branch HDDS-9299
in repository https://gitbox.apache.org/repos/asf/ozone.git
commit e421ea6bd88ef745a9f32311f090c241614df6d6
Author: Doroszlai, Attila <ad...@apache.org>
AuthorDate: Fri Oct 13 07:14:23 2023 +0200
HDDS-9299. Mark TestOmSnapshot#testDayWeekMonthSnapshotCreationAndExpiration as slow
---
.../src/test/java/org/apache/hadoop/ozone/om/TestOmSnapshot.java | 3 +++
1 file changed, 3 insertions(+)
diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOmSnapshot.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOmSnapshot.java
index d19f7fdcf3..409de11d07 100644
--- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOmSnapshot.java
+++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOmSnapshot.java
@@ -74,7 +74,9 @@ import org.apache.hadoop.ozone.upgrade.UpgradeFinalizer;
import org.apache.log4j.Level;
import org.apache.log4j.Logger;
import org.apache.ozone.test.GenericTestUtils;
+import org.apache.ozone.test.SlowTest;
import org.apache.ozone.test.UnhealthyTest;
+import org.apache.ozone.test.tag.Slow;
import org.apache.ozone.test.tag.Unhealthy;
import org.jetbrains.annotations.NotNull;
import org.junit.Assert;
@@ -2122,6 +2124,7 @@ public class TestOmSnapshot {
}
@Test
+ @Category(SlowTest.class) @Slow("HDDS-9299")
public void testDayWeekMonthSnapshotCreationAndExpiration() throws Exception {
String volumeA = "vol-a-" + RandomStringUtils.randomNumeric(5);
String bucketA = "buc-a-" + RandomStringUtils.randomNumeric(5);
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@ozone.apache.org
For additional commands, e-mail: commits-help@ozone.apache.org