yaooqinn commented on code in PR #43303: URL: https://github.com/apache/spark/pull/43303#discussion_r1351369271
########## core/src/main/scala/org/apache/spark/deploy/JsonProtocol.scala: ########## @@ -210,22 +210,59 @@ private[deploy] object JsonProtocol { * `status` status of the master, * see [[org.apache.spark.deploy.master.RecoveryState.MasterState]] */ - def writeMasterState(obj: MasterStateResponse): JObject = { + def writeMasterState(field: Option[String], obj: MasterStateResponse): JObject = { val aliveWorkers = obj.workers.filter(_.isAlive()) - ("url" -> obj.uri) ~ - ("workers" -> obj.workers.toList.map(writeWorkerInfo)) ~ - ("aliveworkers" -> aliveWorkers.length) ~ - ("cores" -> aliveWorkers.map(_.cores).sum) ~ - ("coresused" -> aliveWorkers.map(_.coresUsed).sum) ~ - ("memory" -> aliveWorkers.map(_.memory).sum) ~ - ("memoryused" -> aliveWorkers.map(_.memoryUsed).sum) ~ - ("resources" -> aliveWorkers.map(_.resourcesInfo).toList.map(writeResourcesInfo)) ~ - ("resourcesused" -> aliveWorkers.map(_.resourcesInfoUsed).toList.map(writeResourcesInfo)) ~ - ("activeapps" -> obj.activeApps.toList.map(writeApplicationInfo)) ~ - ("completedapps" -> obj.completedApps.toList.map(writeApplicationInfo)) ~ - ("activedrivers" -> obj.activeDrivers.toList.map(writeDriverInfo)) ~ - ("completeddrivers" -> obj.completedDrivers.toList.map(writeDriverInfo)) ~ - ("status" -> obj.status.toString) + field match { + case None => + ("url" -> obj.uri) ~ + ("workers" -> obj.workers.toList.map (writeWorkerInfo) ) ~ + ("aliveworkers" -> aliveWorkers.length) ~ + ("cores" -> aliveWorkers.map (_.cores).sum) ~ + ("coresused" -> aliveWorkers.map (_.coresUsed).sum) ~ + ("memory" -> aliveWorkers.map (_.memory).sum) ~ + ("memoryused" -> aliveWorkers.map (_.memoryUsed).sum) ~ + ("resources" -> aliveWorkers.map (_.resourcesInfo).toList.map (writeResourcesInfo) ) ~ + ("resourcesused" -> + aliveWorkers.map (_.resourcesInfoUsed).toList.map (writeResourcesInfo) ) ~ + ("activeapps" -> obj.activeApps.toList.map (writeApplicationInfo) ) ~ + ("completedapps" -> obj.completedApps.toList.map (writeApplicationInfo) ) ~ + ("activedrivers" -> obj.activeDrivers.toList.map (writeDriverInfo) ) ~ + ("completeddrivers" -> obj.completedDrivers.toList.map (writeDriverInfo) ) ~ + ("status" -> obj.status.toString) + case Some(field) => + field match { + case "url" => + ("url" -> obj.uri) + case "workers" => + ("workers" -> obj.workers.toList.map (writeWorkerInfo) ) + case "aliveworkers" => + ("aliveworkers" -> aliveWorkers.length) + case "cores" => + ("cores" -> aliveWorkers.map (_.cores).sum) + case "coresused" => + ("coresused" -> aliveWorkers.map (_.coresUsed).sum) + case "memory" => + ("memory" -> aliveWorkers.map (_.memory).sum) + case "memoryused" => + ("memoryused" -> aliveWorkers.map (_.memoryUsed).sum) + case "resources" => + ("resources" -> aliveWorkers.map (_.resourcesInfo).toList.map (writeResourcesInfo) ) + case "resourcesused" => + ("resourcesused" -> + aliveWorkers.map (_.resourcesInfoUsed).toList.map (writeResourcesInfo) ) + case "activeapps" => + ("activeapps" -> obj.activeApps.toList.map (writeApplicationInfo) ) + case "completedapps" => + ("completedapps" -> obj.completedApps.toList.map (writeApplicationInfo) ) + case "activedrivers" => + ("activedrivers" -> obj.activeDrivers.toList.map (writeDriverInfo) ) + case "completeddrivers" => + ("completeddrivers" -> obj.completedDrivers.toList.map (writeDriverInfo) ) + case "status" => + ("status" -> obj.status.toString) + case field => (field -> "") Review Comment: Use 404? -- 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. To unsubscribe, e-mail: reviews-unsubscr...@spark.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org --------------------------------------------------------------------- To unsubscribe, e-mail: reviews-unsubscr...@spark.apache.org For additional commands, e-mail: reviews-h...@spark.apache.org