You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@samza.apache.org by zj...@apache.org on 2014/05/30 06:34:25 UTC
git commit: SAMZA-186: Upgrade Samza to YARN 2.4
Repository: incubator-samza
Updated Branches:
refs/heads/master 7929e47c2 -> 16be58360
SAMZA-186: Upgrade Samza to YARN 2.4
Project: http://git-wip-us.apache.org/repos/asf/incubator-samza/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-samza/commit/16be5836
Tree: http://git-wip-us.apache.org/repos/asf/incubator-samza/tree/16be5836
Diff: http://git-wip-us.apache.org/repos/asf/incubator-samza/diff/16be5836
Branch: refs/heads/master
Commit: 16be583608c8f0de97141f2524720ba6c5ee61fa
Parents: 7929e47
Author: Zhijie Shen <zs...@hortonworks.com>
Authored: Thu May 29 21:32:55 2014 -0700
Committer: Zhijie Shen <zs...@hortonworks.com>
Committed: Thu May 29 21:32:55 2014 -0700
----------------------------------------------------------------------
build.gradle | 2 --
gradle/dependency-versions.gradle | 2 +-
.../apache/samza/job/yarn/TestSamzaAppMasterLifecycle.scala | 6 ++++++
.../apache/samza/job/yarn/TestSamzaAppMasterTaskManager.scala | 4 ++++
4 files changed, 11 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-samza/blob/16be5836/build.gradle
----------------------------------------------------------------------
diff --git a/build.gradle b/build.gradle
index 45697df..1a1db16 100644
--- a/build.gradle
+++ b/build.gradle
@@ -136,8 +136,6 @@ project(":samza-yarn_$scalaVersion") {
compile("org.apache.hadoop:hadoop-common:$yarnVersion") {
exclude module: 'slf4j-log4j12'
exclude module: 'servlet-api'
- exclude module: 'jetty'
- exclude module: 'jetty-util'
}
compile("org.scalatra:scalatra_$scalaVersion:$scalatraVersion") {
exclude module: 'scala-compiler'
http://git-wip-us.apache.org/repos/asf/incubator-samza/blob/16be5836/gradle/dependency-versions.gradle
----------------------------------------------------------------------
diff --git a/gradle/dependency-versions.gradle b/gradle/dependency-versions.gradle
index 819a578..e50ed40 100644
--- a/gradle/dependency-versions.gradle
+++ b/gradle/dependency-versions.gradle
@@ -11,6 +11,6 @@ ext {
kafkaVersion = "0.8.1"
commonsHttpClientVersion = "3.1"
leveldbVersion = "1.8"
- yarnVersion = "2.2.0"
+ yarnVersion = "2.4.0"
slf4jVersion = "1.6.2"
}
http://git-wip-us.apache.org/repos/asf/incubator-samza/blob/16be5836/samza-yarn/src/test/scala/org/apache/samza/job/yarn/TestSamzaAppMasterLifecycle.scala
----------------------------------------------------------------------
diff --git a/samza-yarn/src/test/scala/org/apache/samza/job/yarn/TestSamzaAppMasterLifecycle.scala b/samza-yarn/src/test/scala/org/apache/samza/job/yarn/TestSamzaAppMasterLifecycle.scala
index cce63eb..3418a4c 100644
--- a/samza-yarn/src/test/scala/org/apache/samza/job/yarn/TestSamzaAppMasterLifecycle.scala
+++ b/samza-yarn/src/test/scala/org/apache/samza/job/yarn/TestSamzaAppMasterLifecycle.scala
@@ -57,6 +57,12 @@ class TestSamzaAppMasterLifecycle {
}
override def getClientToAMTokenMasterKey = null
override def setClientToAMTokenMasterKey(buffer: ByteBuffer) {}
+ override def getContainersFromPreviousAttempts(): java.util.List[Container] = java.util.Collections.emptyList[Container]
+ override def getNMTokensFromPreviousAttempts(): java.util.List[NMToken] = java.util.Collections.emptyList[NMToken]
+ override def getQueue(): String = null
+ override def setContainersFromPreviousAttempts(containers: java.util.List[Container]): Unit = Unit
+ override def setNMTokensFromPreviousAttempts(nmTokens: java.util.List[NMToken]): Unit = Unit
+ override def setQueue(queue: String): Unit = Unit
}
}
override def unregisterApplicationMaster(appStatus: FinalApplicationStatus,
http://git-wip-us.apache.org/repos/asf/incubator-samza/blob/16be5836/samza-yarn/src/test/scala/org/apache/samza/job/yarn/TestSamzaAppMasterTaskManager.scala
----------------------------------------------------------------------
diff --git a/samza-yarn/src/test/scala/org/apache/samza/job/yarn/TestSamzaAppMasterTaskManager.scala b/samza-yarn/src/test/scala/org/apache/samza/job/yarn/TestSamzaAppMasterTaskManager.scala
index 7fd80d5..0442580 100644
--- a/samza-yarn/src/test/scala/org/apache/samza/job/yarn/TestSamzaAppMasterTaskManager.scala
+++ b/samza-yarn/src/test/scala/org/apache/samza/job/yarn/TestSamzaAppMasterTaskManager.scala
@@ -125,6 +125,10 @@ object TestSamzaAppMasterTaskManager {
override def setAMCommand(command: AMCommand) {}
override def getPreemptionMessage = null
override def setPreemptionMessage(request: PreemptionMessage) {}
+ override def getDecreasedContainers(): java.util.List[ContainerResourceDecrease] = java.util.Collections.emptyList[ContainerResourceDecrease]
+ override def getIncreasedContainers(): java.util.List[ContainerResourceIncrease] = java.util.Collections.emptyList[ContainerResourceIncrease]
+ override def setDecreasedContainers(decrease: java.util.List[ContainerResourceDecrease]): Unit = Unit
+ override def setIncreasedContainers(increase: java.util.List[ContainerResourceIncrease]): Unit = Unit
override def getAMCommand = if (reboot) {
AMCommand.AM_RESYNC