From a0d0900f18a1108c0693b1e517b10affc7716033 Mon Sep 17 00:00:00 2001 From: zhengchenyu Date: Tue, 20 Aug 2024 20:18:23 +0800 Subject: [PATCH 1/4] change c code on hadoop-common so that we can trigger docker ci: precommit-run Centos 7 --- .../native/src/org/apache/hadoop/io/erasurecode/erasure_coder.c | 1 - 1 file changed, 1 deletion(-) diff --git a/hadoop-common-project/hadoop-common/src/main/native/src/org/apache/hadoop/io/erasurecode/erasure_coder.c b/hadoop-common-project/hadoop-common/src/main/native/src/org/apache/hadoop/io/erasurecode/erasure_coder.c index e7ea07af4cae5..43446edc6592a 100644 --- a/hadoop-common-project/hadoop-common/src/main/native/src/org/apache/hadoop/io/erasurecode/erasure_coder.c +++ b/hadoop-common-project/hadoop-common/src/main/native/src/org/apache/hadoop/io/erasurecode/erasure_coder.c @@ -221,6 +221,5 @@ int generateDecodeMatrix(IsalDecoder* pCoder) { } } } - return 0; } From 0da28f0c34e988cf706b275e8bceb929bc65b437 Mon Sep 17 00:00:00 2001 From: zhengchenyu Date: Tue, 20 Aug 2024 20:28:49 +0800 Subject: [PATCH 2/4] fix test --- .../hadoop/service/launcher/TestServiceInterruptHandling.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/service/launcher/TestServiceInterruptHandling.java b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/service/launcher/TestServiceInterruptHandling.java index c21fa8b73073f..8181e07fae01f 100644 --- a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/service/launcher/TestServiceInterruptHandling.java +++ b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/service/launcher/TestServiceInterruptHandling.java @@ -38,7 +38,7 @@ public class TestServiceInterruptHandling @Test public void testRegisterAndRaise() throws Throwable { InterruptCatcher catcher = new InterruptCatcher(); - String name = IrqHandler.CONTROL_C; + String name = "USR2"; IrqHandler irqHandler = new IrqHandler(name, catcher); irqHandler.bind(); assertEquals(0, irqHandler.getSignalCount()); From 1953b5cf5cedfc1f537706d0aaab9e193b735e75 Mon Sep 17 00:00:00 2001 From: zhengchenyu Date: Wed, 21 Aug 2024 08:09:20 +0800 Subject: [PATCH 3/4] trigger ci From 83fb5d41eaea3e6ad5cd3801f54acf28c238e1a7 Mon Sep 17 00:00:00 2001 From: zhengchenyu Date: Thu, 22 Aug 2024 09:46:37 +0800 Subject: [PATCH 4/4] recover the native code --- .../native/src/org/apache/hadoop/io/erasurecode/erasure_coder.c | 1 + 1 file changed, 1 insertion(+) diff --git a/hadoop-common-project/hadoop-common/src/main/native/src/org/apache/hadoop/io/erasurecode/erasure_coder.c b/hadoop-common-project/hadoop-common/src/main/native/src/org/apache/hadoop/io/erasurecode/erasure_coder.c index 43446edc6592a..e7ea07af4cae5 100644 --- a/hadoop-common-project/hadoop-common/src/main/native/src/org/apache/hadoop/io/erasurecode/erasure_coder.c +++ b/hadoop-common-project/hadoop-common/src/main/native/src/org/apache/hadoop/io/erasurecode/erasure_coder.c @@ -221,5 +221,6 @@ int generateDecodeMatrix(IsalDecoder* pCoder) { } } } + return 0; }