forked from apache/spark
-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[SPARK-50021][CORE][UI][3.4] Fix
ApplicationPage
to hide App UI lin…
…ks when UI is disabled This PR aims to fix `ApplicationPage` to hide UI link when UI is disabled. Previously, Spark throws `HTTP ERROR 500 java.lang.IllegalArgumentException: Invalid URI host: null (authority: null)` like the following **1. PREPARATION** ``` $ cat conf/spark-defaults.conf spark.ui.reverseProxy true spark.ui.reverseProxyUrl http://localhost:8080 $ sbin/start-master.sh $ sbin/start-worker.sh spark://$(hostname):7077 $ bin/spark-shell --master spark://$(hostname):7077 -c spark.ui.enabled=false ``` **2. BEFORE** <img width="496" alt="Screenshot 2024-10-17 at 21 24 32" src="https://github.com/user-attachments/assets/9884790c-a294-4e61-b630-7758c5532afc"> <img width="1002" alt="Screenshot 2024-10-17 at 21 24 51" src="https://github.com/user-attachments/assets/f1e3a121-37ba-4525-a433-21ad15402edf"> **3. AFTER** <img width="493" alt="Screenshot 2024-10-17 at 21 22 26" src="https://github.com/user-attachments/assets/7a1ef578-3d9f-495e-9545-6edd26b4d565"> Yes, but previously it was a broken link. Pass the CIs with the newly added test case. No.
- Loading branch information
1 parent
abaf5a7
commit cf99216
Showing
2 changed files
with
83 additions
and
4 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
73 changes: 73 additions & 0 deletions
73
core/src/test/scala/org/apache/spark/deploy/master/ui/ApplicationPageSuite.scala
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,73 @@ | ||
/* | ||
* 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 | ||
* | ||
* http://www.apache.org/licenses/LICENSE-2.0 | ||
* | ||
* 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.spark.deploy.master.ui | ||
|
||
import java.util.Date | ||
import javax.servlet.http.HttpServletRequest | ||
|
||
import org.mockito.Mockito.{mock, when} | ||
|
||
import org.apache.spark.SparkFunSuite | ||
import org.apache.spark.deploy.ApplicationDescription | ||
import org.apache.spark.deploy.DeployMessages.{MasterStateResponse, RequestMasterState} | ||
import org.apache.spark.deploy.master.{ApplicationInfo, ApplicationState, Master} | ||
import org.apache.spark.resource.ResourceProfile | ||
import org.apache.spark.rpc.RpcEndpointRef | ||
|
||
class ApplicationPageSuite extends SparkFunSuite { | ||
|
||
private val master = mock(classOf[Master]) | ||
|
||
private val rp = new ResourceProfile(Map.empty, Map.empty) | ||
private val desc = ApplicationDescription("name", Some(4), null, "appUiUrl", rp) | ||
private val descWithoutUI = ApplicationDescription("name", Some(4), null, "", rp) | ||
private val appFinished = new ApplicationInfo(0, "app-finished", desc, new Date, null, 1) | ||
appFinished.markFinished(ApplicationState.FINISHED) | ||
private val appLive = new ApplicationInfo(0, "app-live", desc, new Date, null, 1) | ||
private val appLiveWithoutUI = | ||
new ApplicationInfo(0, "app-live-without-ui", descWithoutUI, new Date, null, 1) | ||
|
||
private val state = mock(classOf[MasterStateResponse]) | ||
when(state.completedApps).thenReturn(Array(appFinished)) | ||
when(state.activeApps).thenReturn(Array(appLive, appLiveWithoutUI)) | ||
|
||
private val rpc = mock(classOf[RpcEndpointRef]) | ||
when(rpc.askSync[MasterStateResponse](RequestMasterState)).thenReturn(state) | ||
|
||
private val masterWebUI = mock(classOf[MasterWebUI]) | ||
when(masterWebUI.master).thenReturn(master) | ||
when(masterWebUI.masterEndpointRef).thenReturn(rpc) | ||
|
||
test("SPARK-45774: Application Detail UI") { | ||
val request = mock(classOf[HttpServletRequest]) | ||
when(request.getParameter("appId")).thenReturn("app-live") | ||
|
||
val result = new ApplicationPage(masterWebUI).render(request).toString() | ||
assert(result.contains("Application Detail UI")) | ||
assert(!result.contains("Application History UI")) | ||
} | ||
|
||
test("SPARK-50021: Application Detail UI is empty when spark.ui.enabled=false") { | ||
val request = mock(classOf[HttpServletRequest]) | ||
when(request.getParameter("appId")).thenReturn("app-live-without-ui") | ||
|
||
val result = new ApplicationPage(masterWebUI).render(request).toString() | ||
assert(result.contains("Application UI:</strong> Disabled")) | ||
assert(!result.contains("Application History UI")) | ||
} | ||
} |