You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@samza.apache.org by jg...@apache.org on 2014/06/11 21:42:19 UTC
git commit: SAMZA-288: Remove kill-AM-over-REST call
Repository: incubator-samza
Updated Branches:
refs/heads/master 41403ab37 -> aaf0f64c4
SAMZA-288: Remove kill-AM-over-REST call
Project: http://git-wip-us.apache.org/repos/asf/incubator-samza/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-samza/commit/aaf0f64c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-samza/tree/aaf0f64c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-samza/diff/aaf0f64c
Branch: refs/heads/master
Commit: aaf0f64c45530219c4ec6ee6a163a34015d2fbc9
Parents: 41403ab
Author: Jakob Homan <jg...@apache.org>
Authored: Wed Jun 11 12:42:13 2014 -0700
Committer: Jakob Homan <jg...@apache.org>
Committed: Wed Jun 11 12:42:13 2014 -0700
----------------------------------------------------------------------
.../org/apache/samza/webapp/ApplicationMasterRestServlet.scala | 4 ----
1 file changed, 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-samza/blob/aaf0f64c/samza-yarn/src/main/scala/org/apache/samza/webapp/ApplicationMasterRestServlet.scala
----------------------------------------------------------------------
diff --git a/samza-yarn/src/main/scala/org/apache/samza/webapp/ApplicationMasterRestServlet.scala b/samza-yarn/src/main/scala/org/apache/samza/webapp/ApplicationMasterRestServlet.scala
index 17a96f0..32f7b2f 100644
--- a/samza-yarn/src/main/scala/org/apache/samza/webapp/ApplicationMasterRestServlet.scala
+++ b/samza-yarn/src/main/scala/org/apache/samza/webapp/ApplicationMasterRestServlet.scala
@@ -26,7 +26,6 @@ import org.apache.samza.job.yarn.SamzaAppMasterState
import org.apache.samza.job.yarn.ClientHelper
import org.apache.samza.metrics._
import scala.collection.JavaConversions._
-import scala.collection.immutable.TreeMap
import org.apache.hadoop.yarn.conf.YarnConfiguration
import org.codehaus.jackson.map.ObjectMapper
import java.util.HashMap
@@ -100,7 +99,4 @@ class ApplicationMasterRestServlet(config: Config, state: SamzaAppMasterState, r
jsonMapper.writeValueAsString(new HashMap[String, Object](status))
}
- get("/am/kill") {
- client.kill(state.appAttemptId.getApplicationId)
- }
}