This is an automated email from the ASF dual-hosted git repository.
pan3793 pushed a commit to branch branch-0.6
in repository https://gitbox.apache.org/repos/asf/celeborn.git
The following commit(s) were added to refs/heads/branch-0.6 by this push:
new ed732ccf7 [CELEBORN-2435] Make CelebornConfSuite transport io.mode
expectation platform-aware
ed732ccf7 is described below
commit ed732ccf7f5f25acc5c671e3e915f692842f2410
Author: yangjie01 <[email protected]>
AuthorDate: Thu Aug 20 20:58:47 2026 +0800
[CELEBORN-2435] Make CelebornConfSuite transport io.mode expectation
platform-aware
### What changes were proposed in this pull request?
`CelebornConfSuite`'s `transportTestNetworkIoMode` was hardcoded to
`IOMode.EPOLL.name()`. This PR derives it from `CelebornConf.networkIoMode()`
so the expected value follows the platform (EPOLL on Linux, KQUEUE on macOS,
NIO when no native transport is available), and drops the now-unused `IOMode`
import.
### Why are the changes needed?
Two transport-conf tests fail on macOS because the accessor under test,
`CelebornConf#networkIoMode(module)`, falls back to the platform default
(KQUEUE on macOS) while the expectation is hardcoded EPOLL:
```
"[EPOLL]" -> "[KQUEUE]" (expected, actual)
```
On Linux the assertion passes only because the hardcoded EPOLL happens to
equal the Linux platform default. Deriving the expectation from the same
platform-aware helper keeps the suite meaningful on every platform.
### Does this PR resolve a correctness bug?
- [ ] Yes
### Does this PR introduce _any_ user-facing change?
- [ ] Yes
No: test-only change.
### How was this patch tested?
GitHub Actions (Linux) keeps exercising the EPOLL path. Since the failing
scenario is macOS-only and CI has no macOS runner, verified locally on macOS
(aarch64): before the change the two tests fail with `"[EPOLL]" -> "[KQUEUE]"`;
after the change `mvn -pl common -am test` passes 234/234 in `celeborn-common`.
Closes #3816 from LuciferYang/test-celebornconf-suite-platform-io-mode.
Authored-by: yangjie01 <[email protected]>
Signed-off-by: Cheng Pan <[email protected]>
(cherry picked from commit 77f8c4b7d0f8fb8ed78eda4f3224b1e64cc254bc)
Signed-off-by: Cheng Pan <[email protected]>
---
.../src/test/scala/org/apache/celeborn/common/CelebornConfSuite.scala | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git
a/common/src/test/scala/org/apache/celeborn/common/CelebornConfSuite.scala
b/common/src/test/scala/org/apache/celeborn/common/CelebornConfSuite.scala
index 2fedcdb32..a6dab35f1 100644
--- a/common/src/test/scala/org/apache/celeborn/common/CelebornConfSuite.scala
+++ b/common/src/test/scala/org/apache/celeborn/common/CelebornConfSuite.scala
@@ -20,7 +20,6 @@ package org.apache.celeborn.common
import org.apache.celeborn.CelebornFunSuite
import org.apache.celeborn.common.CelebornConf._
import org.apache.celeborn.common.internal.config.ConfigEntry
-import org.apache.celeborn.common.network.util.IOMode
import org.apache.celeborn.common.protocol.StorageInfo
class CelebornConfSuite extends CelebornFunSuite {
@@ -278,7 +277,7 @@ class CelebornConfSuite extends CelebornFunSuite {
// Transport conf tests
- private val transportTestNetworkIoMode = IOMode.EPOLL.name()
+ private val transportTestNetworkIoMode = CelebornConf.networkIoMode()
private val transportTestNetworkIoPreferDirectBufs =
!NETWORK_IO_PREFER_DIRECT_BUFS.defaultValue.get