You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by tr...@apache.org on 2019/12/12 13:41:29 UTC

[flink] 02/02: [FLINK-15082] Deprecate mesos.resourcemanager.tasks.mem in favour of taskmanager.memory.total-process.size

This is an automated email from the ASF dual-hosted git repository.

trohrmann pushed a commit to branch release-1.10
in repository https://gitbox.apache.org/repos/asf/flink.git

commit d9eefeb0baa4c78202c116084bc39fddc322cc52
Author: Andrey Zagrebin <az...@apache.org>
AuthorDate: Wed Dec 11 13:26:58 2019 +0100

    [FLINK-15082] Deprecate mesos.resourcemanager.tasks.mem in favour of taskmanager.memory.total-process.size
    
    This closes #10513.
---
 docs/_includes/generated/mesos_task_manager_configuration.html      | 6 ------
 .../mesos/runtime/clusterframework/MesosTaskManagerParameters.java  | 6 ++++++
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/docs/_includes/generated/mesos_task_manager_configuration.html b/docs/_includes/generated/mesos_task_manager_configuration.html
index 6351b61..aa24d11 100644
--- a/docs/_includes/generated/mesos_task_manager_configuration.html
+++ b/docs/_includes/generated/mesos_task_manager_configuration.html
@@ -75,12 +75,6 @@
             <td>Optional value to define the TaskManager’s hostname. The pattern _TASK_ is replaced by the actual id of the Mesos task. This can be used to configure the TaskManager to use Mesos DNS (e.g. _TASK_.flink-service.mesos) for name lookups.</td>
         </tr>
         <tr>
-            <td><h5>mesos.resourcemanager.tasks.mem</h5></td>
-            <td style="word-wrap: break-word;">1024</td>
-            <td>Integer</td>
-            <td>Memory to assign to the Mesos workers in MB.</td>
-        </tr>
-        <tr>
             <td><h5>mesos.resourcemanager.tasks.taskmanager-cmd</h5></td>
             <td style="word-wrap: break-word;">"$FLINK_HOME/bin/mesos-taskmanager.sh"</td>
             <td>String</td>
diff --git a/flink-mesos/src/main/java/org/apache/flink/mesos/runtime/clusterframework/MesosTaskManagerParameters.java b/flink-mesos/src/main/java/org/apache/flink/mesos/runtime/clusterframework/MesosTaskManagerParameters.java
index 6f1ac2d..bff126d 100644
--- a/flink-mesos/src/main/java/org/apache/flink/mesos/runtime/clusterframework/MesosTaskManagerParameters.java
+++ b/flink-mesos/src/main/java/org/apache/flink/mesos/runtime/clusterframework/MesosTaskManagerParameters.java
@@ -57,6 +57,12 @@ public class MesosTaskManagerParameters {
 	public static final ConfigOption<Integer> MESOS_RM_TASKS_SLOTS =
 		TaskManagerOptions.NUM_TASK_SLOTS;
 
+	/**
+	 * Total task executor container memory in megabytes to allocate.
+	 *
+	 * @deprecated set explicitly {@link TaskManagerOptions#TOTAL_PROCESS_MEMORY} instead
+	 */
+	@Deprecated
 	public static final ConfigOption<Integer> MESOS_RM_TASKS_MEMORY_MB =
 		key("mesos.resourcemanager.tasks.mem")
 		.defaultValue(1024)