You are viewing a plain text version of this content. The canonical link for it is here.
Posted to reviews@spark.apache.org by GitBox <gi...@apache.org> on 2020/07/14 06:56:57 UTC
[GitHub] [spark] jiangxb1987 commented on a change in pull request #29015: [SPARK-32215] Expose a (protected) /workers/kill endpoint on the MasterWebUI
jiangxb1987 commented on a change in pull request #29015:
URL: https://github.com/apache/spark/pull/29015#discussion_r454137251
##########
File path: core/src/main/scala/org/apache/spark/deploy/master/Master.scala
##########
@@ -863,7 +872,29 @@ private[deploy] class Master(
true
}
- private def decommissionWorker(worker: WorkerInfo): Unit = {
+ private def decommissionHostPorts(hostPorts: Seq[String]): Integer = {
+ val hostPortsParsed = hostPorts.map(Utils.parseHostPort)
+ val (hostPortsWithoutPorts, hostPortsWithPorts) = hostPortsParsed.partition(_._2 == 0)
Review comment:
nit: val (hostPortsWithoutPorts, hostPortsWithPorts) = hostPorts.map(Utils.parseHostPort).partition(_._2 == 0)
##########
File path: core/src/main/scala/org/apache/spark/deploy/master/ui/MasterWebUI.scala
##########
@@ -49,6 +56,23 @@ class MasterWebUI(
"/app/kill", "/", masterPage.handleAppKillRequest, httpMethods = Set("POST")))
attachHandler(createRedirectHandler(
"/driver/kill", "/", masterPage.handleDriverKillRequest, httpMethods = Set("POST")))
+ attachHandler(createServletHandler("/workers/kill", new HttpServlet {
+ override def doPost(req: HttpServletRequest, resp: HttpServletResponse): Unit = {
+ val hostPorts: Seq[String] = Option(req.getParameterValues("host"))
+ .getOrElse(Array[String]()).map(_.toLowerCase(Locale.ROOT)).toSeq
+ logInfo(s"Received request to decommission workers $hostPorts from ${req.getRemoteAddr}")
+ if (!isDecommissioningRequestAllowed(req)) {
+ resp.sendError(HttpServletResponse.SC_METHOD_NOT_ALLOWED)
+ } else {
+ val removedWorkers = masterEndpointRef.askSync[Integer](DecommissionHostPorts(hostPorts))
+ if (removedWorkers <= 0) {
Review comment:
when would the `removedWorkers < 0` happen?
##########
File path: core/src/main/scala/org/apache/spark/deploy/master/ui/MasterWebUI.scala
##########
@@ -49,6 +56,23 @@ class MasterWebUI(
"/app/kill", "/", masterPage.handleAppKillRequest, httpMethods = Set("POST")))
attachHandler(createRedirectHandler(
"/driver/kill", "/", masterPage.handleDriverKillRequest, httpMethods = Set("POST")))
+ attachHandler(createServletHandler("/workers/kill", new HttpServlet {
+ override def doPost(req: HttpServletRequest, resp: HttpServletResponse): Unit = {
+ val hostPorts: Seq[String] = Option(req.getParameterValues("host"))
+ .getOrElse(Array[String]()).map(_.toLowerCase(Locale.ROOT)).toSeq
+ logInfo(s"Received request to decommission workers $hostPorts from ${req.getRemoteAddr}")
+ if (!isDecommissioningRequestAllowed(req)) {
+ resp.sendError(HttpServletResponse.SC_METHOD_NOT_ALLOWED)
+ } else {
+ val removedWorkers = masterEndpointRef.askSync[Integer](DecommissionHostPorts(hostPorts))
Review comment:
will multiple requests block each other, since we use `askSync` here?
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org