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 2014/06/26 11:47:01 UTC
[36/53] [abbrv] git commit: Changed default number of task slots per
machine to one. Add logging for task slots.
Changed default number of task slots per machine to one.
Add logging for task slots.
Project: http://git-wip-us.apache.org/repos/asf/incubator-flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-flink/commit/fe91d4be
Tree: http://git-wip-us.apache.org/repos/asf/incubator-flink/tree/fe91d4be
Diff: http://git-wip-us.apache.org/repos/asf/incubator-flink/diff/fe91d4be
Branch: refs/heads/travis_test
Commit: fe91d4bea4b1b68477ae52ed0746d5be3f7c709f
Parents: f13ad5b
Author: Stephan Ewen <se...@apache.org>
Authored: Tue Jun 24 16:06:35 2014 +0200
Committer: uce <u....@fu-berlin.de>
Committed: Wed Jun 25 10:57:56 2014 +0200
----------------------------------------------------------------------
.../eu/stratosphere/nephele/taskmanager/TaskManager.java | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/fe91d4be/stratosphere-runtime/src/main/java/eu/stratosphere/nephele/taskmanager/TaskManager.java
----------------------------------------------------------------------
diff --git a/stratosphere-runtime/src/main/java/eu/stratosphere/nephele/taskmanager/TaskManager.java b/stratosphere-runtime/src/main/java/eu/stratosphere/nephele/taskmanager/TaskManager.java
index 789955a..d866c64 100644
--- a/stratosphere-runtime/src/main/java/eu/stratosphere/nephele/taskmanager/TaskManager.java
+++ b/stratosphere-runtime/src/main/java/eu/stratosphere/nephele/taskmanager/TaskManager.java
@@ -46,7 +46,6 @@ import eu.stratosphere.nephele.ExecutionMode;
import eu.stratosphere.runtime.io.network.LocalConnectionManager;
import eu.stratosphere.runtime.io.network.NetworkConnectionManager;
import eu.stratosphere.runtime.io.network.netty.NettyConnectionManager;
-import eu.stratosphere.nephele.instance.Hardware;
import eu.stratosphere.nephele.taskmanager.transferenvelope.RegisterTaskManagerResult;
import eu.stratosphere.nephele.types.IntegerRecord;
@@ -357,10 +356,13 @@ public class TaskManager implements TaskOperationProtocol {
HardwareDescription resources = HardwareDescriptionFactory.extractFromSystem();
int slots = GlobalConfiguration.getInteger(ConfigConstants.TASK_MANAGER_NUM_TASK_SLOTS, -1);
- if (slots == -1) {
- slots = Hardware.getNumberCPUCores();
+ if (slots == -1) {
+ slots = 1;
+ LOG.info("Number of task slots not configured. Creating one task slot.");
} else if (slots <= 0) {
throw new Exception("Illegal value for the number of task slots: " + slots);
+ } else {
+ LOG.info("Creating " + slots + " task slot(s).");
}
this.numberOfSlots = slots;