Repository: incubator-gearpump Updated Branches: refs/heads/master f33288fc3 -> 6c9cd6aa4
[GEARPUMP-295] Fix the failure of getting stalling tasks from clock s⦠â¦ervice Author: huafengw <fvunic...@gmail.com> Closes #174 from huafengw/stalling. Project: http://git-wip-us.apache.org/repos/asf/incubator-gearpump/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-gearpump/commit/6c9cd6aa Tree: http://git-wip-us.apache.org/repos/asf/incubator-gearpump/tree/6c9cd6aa Diff: http://git-wip-us.apache.org/repos/asf/incubator-gearpump/diff/6c9cd6aa Branch: refs/heads/master Commit: 6c9cd6aa419733125ae14b2a6b618d2cc54fe6ee Parents: f33288f Author: huafengw <fvunic...@gmail.com> Authored: Thu Apr 20 15:07:04 2017 +0800 Committer: manuzhang <owenzhang1...@gmail.com> Committed: Thu Apr 20 15:07:12 2017 +0800 ---------------------------------------------------------------------- .../main/scala/org/apache/gearpump/cluster/ClusterMessage.scala | 2 +- .../main/scala/org/apache/gearpump/services/AppMasterService.scala | 2 +- .../scala/org/apache/gearpump/streaming/appmaster/AppMaster.scala | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-gearpump/blob/6c9cd6aa/core/src/main/scala/org/apache/gearpump/cluster/ClusterMessage.scala ---------------------------------------------------------------------- diff --git a/core/src/main/scala/org/apache/gearpump/cluster/ClusterMessage.scala b/core/src/main/scala/org/apache/gearpump/cluster/ClusterMessage.scala index 73e0649..e8956ac 100644 --- a/core/src/main/scala/org/apache/gearpump/cluster/ClusterMessage.scala +++ b/core/src/main/scala/org/apache/gearpump/cluster/ClusterMessage.scala @@ -106,7 +106,7 @@ object ClientToMaster { * pin-point which task has stalling clock value, and usually it means something wrong on * that machine. */ - case class GetStallingTasks(appId: Int) + case object GetStallingTasks /** * Request app master for a short list of cluster app that administrators should be aware of. http://git-wip-us.apache.org/repos/asf/incubator-gearpump/blob/6c9cd6aa/services/jvm/src/main/scala/org/apache/gearpump/services/AppMasterService.scala ---------------------------------------------------------------------- diff --git a/services/jvm/src/main/scala/org/apache/gearpump/services/AppMasterService.scala b/services/jvm/src/main/scala/org/apache/gearpump/services/AppMasterService.scala index 53ee692..6ea4e36 100644 --- a/services/jvm/src/main/scala/org/apache/gearpump/services/AppMasterService.scala +++ b/services/jvm/src/main/scala/org/apache/gearpump/services/AppMasterService.scala @@ -92,7 +92,7 @@ class AppMasterService(val master: ActorRef, } } ~ path("stallingtasks") { - onComplete(askAppMaster[StallingTasks](master, appId, GetStallingTasks(appId))) { + onComplete(askAppMaster[StallingTasks](master, appId, GetStallingTasks)) { case Success(value) => complete(write(value)) case Failure(ex) => failWith(ex) http://git-wip-us.apache.org/repos/asf/incubator-gearpump/blob/6c9cd6aa/streaming/src/main/scala/org/apache/gearpump/streaming/appmaster/AppMaster.scala ---------------------------------------------------------------------- diff --git a/streaming/src/main/scala/org/apache/gearpump/streaming/appmaster/AppMaster.scala b/streaming/src/main/scala/org/apache/gearpump/streaming/appmaster/AppMaster.scala index 15df0b3..ba4b058 100644 --- a/streaming/src/main/scala/org/apache/gearpump/streaming/appmaster/AppMaster.scala +++ b/streaming/src/main/scala/org/apache/gearpump/streaming/appmaster/AppMaster.scala @@ -254,7 +254,7 @@ class AppMaster(appContext: AppMasterContext, app: AppDescription) extends Appli } else { historyMetricsService.get forward query } - case getStalling: GetStallingTasks => + case getStalling@GetStallingTasks => clockService.foreach(_ forward getStalling) case replaceDAG: ReplaceProcessor => dagManager forward replaceDAG