You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by fh...@apache.org on 2016/11/17 22:46:33 UTC
[2/2] flink git commit: [FLINK-5058] [scala-shell] Set correct value
for TaskManager memory parameter.
[FLINK-5058] [scala-shell] Set correct value for TaskManager memory parameter.
This closes #2799.
Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/a67d3f80
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/a67d3f80
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/a67d3f80
Branch: refs/heads/master
Commit: a67d3f80c9782cfc8f70586b086a86ba897e6dbc
Parents: df0d057
Author: iteblog <wy...@163.com>
Authored: Mon Nov 14 19:04:28 2016 +0800
Committer: Fabian Hueske <fh...@apache.org>
Committed: Thu Nov 17 17:55:53 2016 +0100
----------------------------------------------------------------------
.../src/main/scala/org/apache/flink/api/scala/FlinkShell.scala | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flink/blob/a67d3f80/flink-scala-shell/src/main/scala/org/apache/flink/api/scala/FlinkShell.scala
----------------------------------------------------------------------
diff --git a/flink-scala-shell/src/main/scala/org/apache/flink/api/scala/FlinkShell.scala b/flink-scala-shell/src/main/scala/org/apache/flink/api/scala/FlinkShell.scala
index 3499b9e..4d3adb2 100644
--- a/flink-scala-shell/src/main/scala/org/apache/flink/api/scala/FlinkShell.scala
+++ b/flink-scala-shell/src/main/scala/org/apache/flink/api/scala/FlinkShell.scala
@@ -242,7 +242,7 @@ object FlinkShell {
// set configuration from user input
yarnConfig.jobManagerMemory.foreach((jmMem) => args ++= Seq("-yjm", jmMem.toString))
- yarnConfig.slots.foreach((tmMem) => args ++= Seq("-ytm", tmMem.toString))
+ yarnConfig.taskManagerMemory.foreach((tmMem) => args ++= Seq("-ytm", tmMem.toString))
yarnConfig.name.foreach((name) => args ++= Seq("-ynm", name.toString))
yarnConfig.queue.foreach((queue) => args ++= Seq("-yqu", queue.toString))
yarnConfig.slots.foreach((slots) => args ++= Seq("-ys", slots.toString))