You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by rm...@apache.org on 2015/03/03 18:37:08 UTC
flink git commit: [hotfix] Fix loading of wrong TaskManager class
Repository: flink
Updated Branches:
refs/heads/master 226e90584 -> d50e8bff6
[hotfix] Fix loading of wrong TaskManager class
Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/d50e8bff
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/d50e8bff
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/d50e8bff
Branch: refs/heads/master
Commit: d50e8bff665f2272ffc93e15099db69d4292a130
Parents: 226e905
Author: Robert Metzger <rm...@apache.org>
Authored: Tue Mar 3 16:52:22 2015 +0100
Committer: Robert Metzger <rm...@apache.org>
Committed: Tue Mar 3 18:36:34 2015 +0100
----------------------------------------------------------------------
.../scala/org/apache/flink/runtime/taskmanager/TaskManager.scala | 2 +-
flink-yarn/src/main/java/org/apache/flink/yarn/Utils.java | 2 +-
flink-yarn/src/test/java/org/apache/flink/yarn/UtilsTests.java | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flink/blob/d50e8bff/flink-runtime/src/main/scala/org/apache/flink/runtime/taskmanager/TaskManager.scala
----------------------------------------------------------------------
diff --git a/flink-runtime/src/main/scala/org/apache/flink/runtime/taskmanager/TaskManager.scala b/flink-runtime/src/main/scala/org/apache/flink/runtime/taskmanager/TaskManager.scala
index 3d47258..268f6e3 100644
--- a/flink-runtime/src/main/scala/org/apache/flink/runtime/taskmanager/TaskManager.scala
+++ b/flink-runtime/src/main/scala/org/apache/flink/runtime/taskmanager/TaskManager.scala
@@ -868,7 +868,7 @@ object TaskManager {
" - Leave config parameter empty or use 0 to let the system choose a port automatically.")
}
- runTaskManager(taskManagerHostname, actorSystemPort, configuration, classOf[TaskManager])
+ runTaskManager(taskManagerHostname, actorSystemPort, configuration, taskManagerClass)
}
/**
http://git-wip-us.apache.org/repos/asf/flink/blob/d50e8bff/flink-yarn/src/main/java/org/apache/flink/yarn/Utils.java
----------------------------------------------------------------------
diff --git a/flink-yarn/src/main/java/org/apache/flink/yarn/Utils.java b/flink-yarn/src/main/java/org/apache/flink/yarn/Utils.java
index b51631c..3d2c2fa 100644
--- a/flink-yarn/src/main/java/org/apache/flink/yarn/Utils.java
+++ b/flink-yarn/src/main/java/org/apache/flink/yarn/Utils.java
@@ -52,7 +52,7 @@ public class Utils {
private static final Logger LOG = LoggerFactory.getLogger(Utils.class);
- private static final int DEFAULT_HEAP_LIMIT_CAP = 500;
+ private static final int DEFAULT_HEAP_LIMIT_CAP = 700;
private static final float DEFAULT_YARN_HEAP_CUTOFF_RATIO = 0.8f;
/**
http://git-wip-us.apache.org/repos/asf/flink/blob/d50e8bff/flink-yarn/src/test/java/org/apache/flink/yarn/UtilsTests.java
----------------------------------------------------------------------
diff --git a/flink-yarn/src/test/java/org/apache/flink/yarn/UtilsTests.java b/flink-yarn/src/test/java/org/apache/flink/yarn/UtilsTests.java
index 1d01b03..39a9c02 100644
--- a/flink-yarn/src/test/java/org/apache/flink/yarn/UtilsTests.java
+++ b/flink-yarn/src/test/java/org/apache/flink/yarn/UtilsTests.java
@@ -27,6 +27,6 @@ public class UtilsTests {
// ASSUMES DEFAULT Configuration values.
Assert.assertEquals(800, Utils.calculateHeapSize(1000) );
- Assert.assertEquals(9500, Utils.calculateHeapSize(10000) );
+ Assert.assertEquals(9300, Utils.calculateHeapSize(10000) );
}
}