Skip to content

Commit e1f4a75

Browse files
turboFei子懿
authored and
子懿
committed
[CELEBORN-2020][FOLLOWUP] Fix CLI master commands authentication testing
### What changes were proposed in this pull request? Fix the remaining master sub commands that does not transfer auth header. ### Why are the changes needed? Before, this mistake was not detected by GA. Because the authentication configs was not trasnferred when setting mini celeborn cluster. ### Does this PR introduce _any_ user-facing change? No. ### How was this patch tested? UT. Closes #3303 from turboFei/auth_header_followup. Authored-by: Wang, Fei <[email protected]> Signed-off-by: 子懿 <[email protected]> (cherry picked from commit 5a50686) Signed-off-by: 子懿 <[email protected]>
1 parent 1dbf31c commit e1f4a75

File tree

2 files changed

+6
-3
lines changed

2 files changed

+6
-3
lines changed

cli/src/main/scala/org/apache/celeborn/cli/master/MasterSubcommandImpl.scala

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,8 @@ class MasterSubcommandImpl extends Runnable with MasterSubcommand {
113113
workerApi.sendWorkerEvent(sendWorkerEventRequest, commonOptions.getAuthHeader)
114114
}
115115

116-
private[master] def runShowWorkerEventInfo: WorkerEventsResponse = workerApi.getWorkerEvents
116+
private[master] def runShowWorkerEventInfo: WorkerEventsResponse =
117+
workerApi.getWorkerEvents(commonOptions.getAuthHeader)
117118

118119
private[master] def runShowLostWorkers: Seq[WorkerTimestampData] = {
119120
val lostWorkers = runShowWorkers.getLostWorkers.asScala.toSeq

cli/src/test/scala/org/apache/celeborn/cli/TestCelebornCliCommands.scala

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,10 @@ class TestCelebornCliCommands extends CelebornFunSuite with MiniClusterFeature {
5656

5757
override def beforeAll(): Unit = {
5858
logInfo("test initialized, setup celeborn mini cluster")
59-
val (m, w) =
60-
setupMiniClusterWithRandomPorts(workerConf = celebornConf.getAll.toMap, workerNum = 1)
59+
val (m, w) = setupMiniClusterWithRandomPorts(
60+
masterConf = celebornConf.getAll.toMap,
61+
workerConf = celebornConf.getAll.toMap,
62+
workerNum = 1)
6163
master = m
6264
worker = w.head
6365
super.beforeAll()

0 commit comments

Comments
 (0)