[FLINK-8684][mesos] Make MESOS_RM_TASKS_SLOTS an alias

laubersder · Apr 12, 2018 · a926bc6 · a926bc6
1 parent 0a5a64a
commit a926bc6
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/docs/_includes/generated/mesos_task_manager_configuration.html b/docs/_includes/generated/mesos_task_manager_configuration.html
@@ -65,7 +65,7 @@
  <tr>
  <td><h5>taskmanager.numberOfTaskSlots</h5></td>
  <td style="word-wrap: break-word;">1</td>
- <td></td>
+ <td>The number of parallel operator or user function instances that a single TaskManager can run. If this value is larger than 1, a single TaskManager takes multiple instances of a function or operator. That way, the TaskManager can utilize multiple CPU cores, but at the same time, the available memory is divided between the different operator or function instances. This value is typically proportional to the number of physical CPU cores that the TaskManager's machine has (e.g., equal to the number of cores, or half the number of cores).</td>
  </tr>
  </tbody>
 </table>
diff --git a/...main/java/org/apache/flink/mesos/runtime/clusterframework/MesosTaskManagerParameters.java b/...main/java/org/apache/flink/mesos/runtime/clusterframework/MesosTaskManagerParameters.java
@@ -18,10 +18,10 @@
 
 package org.apache.flink.mesos.runtime.clusterframework;
 
-import org.apache.flink.configuration.ConfigConstants;
 import org.apache.flink.configuration.ConfigOption;
 import org.apache.flink.configuration.Configuration;
 import org.apache.flink.configuration.IllegalConfigurationException;
+import org.apache.flink.configuration.TaskManagerOptions;
 import org.apache.flink.runtime.clusterframework.ContaineredTaskManagerParameters;
 import org.apache.flink.util.Preconditions;
 
@@ -51,8 +51,7 @@ public class MesosTaskManagerParameters {
  public static final Pattern TASK_ID_PATTERN = Pattern.compile("_TASK_", Pattern.LITERAL);
 
  public static final ConfigOption<Integer> MESOS_RM_TASKS_SLOTS =
- key(ConfigConstants.TASK_MANAGER_NUM_TASK_SLOTS)
- .defaultValue(1);
+ TaskManagerOptions.NUM_TASK_SLOTS;
 
  public static final ConfigOption<Integer> MESOS_RM_TASKS_MEMORY_MB =
  key("mesos.resourcemanager.tasks.mem")