You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by rx...@apache.org on 2013/12/25 10:54:10 UTC
[1/3] git commit: Fixed job name in the java streaming example.
Updated Branches:
refs/heads/master 85a344b4f -> 4842a07da
Fixed job name in the java streaming example.
Project: http://git-wip-us.apache.org/repos/asf/incubator-spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-spark/commit/a8bb8638
Tree: http://git-wip-us.apache.org/repos/asf/incubator-spark/tree/a8bb8638
Diff: http://git-wip-us.apache.org/repos/asf/incubator-spark/diff/a8bb8638
Branch: refs/heads/master
Commit: a8bb86389d8dc8efeff83561aea044a3c4924df5
Parents: c64a53a
Author: azuryyu <az...@gmail.com>
Authored: Tue Dec 24 16:52:20 2013 +0800
Committer: azuryyu <az...@gmail.com>
Committed: Tue Dec 24 16:52:20 2013 +0800
----------------------------------------------------------------------
.../org/apache/spark/streaming/examples/JavaKafkaWordCount.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-spark/blob/a8bb8638/examples/src/main/java/org/apache/spark/streaming/examples/JavaKafkaWordCount.java
----------------------------------------------------------------------
diff --git a/examples/src/main/java/org/apache/spark/streaming/examples/JavaKafkaWordCount.java b/examples/src/main/java/org/apache/spark/streaming/examples/JavaKafkaWordCount.java
index 9a8e420..22994fb 100644
--- a/examples/src/main/java/org/apache/spark/streaming/examples/JavaKafkaWordCount.java
+++ b/examples/src/main/java/org/apache/spark/streaming/examples/JavaKafkaWordCount.java
@@ -53,7 +53,7 @@ public class JavaKafkaWordCount {
}
// Create the context with a 1 second batch size
- JavaStreamingContext ssc = new JavaStreamingContext(args[0], "NetworkWordCount",
+ JavaStreamingContext ssc = new JavaStreamingContext(args[0], "KafkaWordCount",
new Duration(2000), System.getenv("SPARK_HOME"), System.getenv("SPARK_EXAMPLES_JAR"));
int numThreads = Integer.parseInt(args[4]);
[3/3] git commit: Merge pull request #287 from azuryyu/master
Posted by rx...@apache.org.
Merge pull request #287 from azuryyu/master
Fixed job name in the java streaming example.
Project: http://git-wip-us.apache.org/repos/asf/incubator-spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-spark/commit/4842a07d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-spark/tree/4842a07d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-spark/diff/4842a07d
Branch: refs/heads/master
Commit: 4842a07da856e68c216199ed6efdfd198afa4815
Parents: 85a344b 66b7bea
Author: Reynold Xin <rx...@apache.org>
Authored: Wed Dec 25 01:52:15 2013 -0800
Committer: Reynold Xin <rx...@apache.org>
Committed: Wed Dec 25 01:52:15 2013 -0800
----------------------------------------------------------------------
.../org/apache/spark/streaming/examples/JavaKafkaWordCount.java | 2 +-
.../src/main/scala/org/apache/spark/deploy/yarn/Client.scala | 4 +++-
2 files changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
[2/3] git commit: Make App report interval configurable during 'run
on Yarn'
Posted by rx...@apache.org.
Make App report interval configurable during 'run on Yarn'
Project: http://git-wip-us.apache.org/repos/asf/incubator-spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-spark/commit/66b7bea7
Tree: http://git-wip-us.apache.org/repos/asf/incubator-spark/tree/66b7bea7
Diff: http://git-wip-us.apache.org/repos/asf/incubator-spark/diff/66b7bea7
Branch: refs/heads/master
Commit: 66b7bea7f82efa4f52186d15824d31035be253de
Parents: a8bb863
Author: azuryyu <az...@gmail.com>
Authored: Tue Dec 24 18:16:49 2013 +0800
Committer: azuryyu <az...@gmail.com>
Committed: Tue Dec 24 18:16:49 2013 +0800
----------------------------------------------------------------------
.../src/main/scala/org/apache/spark/deploy/yarn/Client.scala | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-spark/blob/66b7bea7/new-yarn/src/main/scala/org/apache/spark/deploy/yarn/Client.scala
----------------------------------------------------------------------
diff --git a/new-yarn/src/main/scala/org/apache/spark/deploy/yarn/Client.scala b/new-yarn/src/main/scala/org/apache/spark/deploy/yarn/Client.scala
index 9467881..9fdee29 100644
--- a/new-yarn/src/main/scala/org/apache/spark/deploy/yarn/Client.scala
+++ b/new-yarn/src/main/scala/org/apache/spark/deploy/yarn/Client.scala
@@ -437,8 +437,10 @@ class Client(conf: Configuration, args: ClientArguments) extends YarnClientImpl
}
def monitorApplication(appId: ApplicationId): Boolean = {
+ val interval = System.getProperty("spark.yarn.report.interval", "1000").toLong
+
while (true) {
- Thread.sleep(1000)
+ Thread.sleep(interval)
val report = super.getApplicationReport(appId)
logInfo("Application report from ASM: \n" +