yystopf
/
piflow
forked from opensci/piflow
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix bug: can not get flow state

This commit is contained in:
judy0131 2020-04-28 15:28:24 +08:00
parent a366f1c1ab
commit 39dabc0eb7
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
piflow-server/src/main/scala/cn/piflow/api/HTTPService.scala
View File

@ -70,7 +70,10 @@ object HTTPService extends DefaultJsonProtocol with Directives with SprayJsonSup
if(!appID.equals("")){ if(!appID.equals("")){
var result = API.getFlowInfo(appID) var result = API.getFlowInfo(appID)
println("getFlowInfo result: " + result) println("getFlowInfo result: " + result)
if (result.equals("")){ val resultMap = OptionUtil.getAny(JSON.parseFull(result)).asInstanceOf[Map[String, Any]]
val flowInfoMap = MapUtil.get(resultMap, "flow").asInstanceOf[Map[String, Any]]
if(!flowInfoMap.contains("state")) {
val yarnInfoJson = API.getFlowLog(appID) val yarnInfoJson = API.getFlowLog(appID)
val map = OptionUtil.getAny(JSON.parseFull(yarnInfoJson)).asInstanceOf[Map[String, Any]] val map = OptionUtil.getAny(JSON.parseFull(yarnInfoJson)).asInstanceOf[Map[String, Any]]
val appMap = MapUtil.get(map, "app").asInstanceOf[Map[String, Any]] val appMap = MapUtil.get(map, "app").asInstanceOf[Map[String, Any]]
@ -86,6 +89,7 @@ object HTTPService extends DefaultJsonProtocol with Directives with SprayJsonSup
flowInfoMap += ("endTime" -> "") flowInfoMap += ("endTime" -> "")
flowInfoMap += ("stops" -> List()) flowInfoMap += ("stops" -> List())
result = JsonUtil.format(JsonUtil.toJson(Map("flow" -> flowInfoMap))) result = JsonUtil.format(JsonUtil.toJson(Map("flow" -> flowInfoMap)))
println("getFlowInfo on Yarn: " + result)
} }
Future.successful(HttpResponse(SUCCESS_CODE, entity = result)) Future.successful(HttpResponse(SUCCESS_CODE, entity = result))
}else{ }else{