This is an automated email from the ASF dual-hosted git repository.
azagrebin pushed a commit to branch flip116
in repository https://gitbox.apache.org/repos/asf/flink.git
commit 46e0dc3aaa34f921162feb38b26f2ca29ce7204b
Author: Andrey Zagrebin <azagre...@apache.org>
AuthorDate: Wed Apr 8 19:43:33 2020 +0300
[FLINK-16745][coordination] Remove unused container cutoff
---
.../generated/resource_manager_configuration.html | 12 ----
docs/ops/memory/mem_migration.md | 5 +-
docs/ops/memory/mem_migration.zh.md | 5 +-
.../flink/configuration/ConfigConstants.java | 12 ++--
.../configuration/ResourceManagerOptions.java | 20 -------
.../test-scripts/common_yarn_docker.sh | 1 -
.../test-scripts/test_kubernetes_session.sh | 1 -
.../runtime/clusterframework/BootstrapTools.java | 28 ---------
.../clusterframework/BootstrapToolsTest.java | 53 -----------------
.../StandaloneResourceManagerFactoryTest.java | 68 ----------------------
.../flink/yarn/YARNHighAvailabilityITCase.java | 4 --
.../yarn/YARNSessionCapacitySchedulerITCase.java | 5 --
.../apache/flink/yarn/YarnConfigurationITCase.java | 4 --
.../flink/yarn/YarnClusterDescriptorTest.java | 3 -
.../apache/flink/yarn/YarnResourceManagerTest.java | 2 -
15 files changed, 9 insertions(+), 214 deletions(-)
diff --git a/docs/_includes/generated/resource_manager_configuration.html
b/docs/_includes/generated/resource_manager_configuration.html
index c1955f8..cb79c38 100644
--- a/docs/_includes/generated/resource_manager_configuration.html
+++ b/docs/_includes/generated/resource_manager_configuration.html
@@ -9,18 +9,6 @@
</thead>
<tbody>
<tr>
- <td><h5>containerized.heap-cutoff-min</h5></td>
- <td style="word-wrap: break-word;">600</td>
- <td>Integer</td>
- <td>Minimum amount of heap memory to remove in Job Master
containers, as a safety margin.</td>
- </tr>
- <tr>
- <td><h5>containerized.heap-cutoff-ratio</h5></td>
- <td style="word-wrap: break-word;">0.25</td>
- <td>Float</td>
- <td>Percentage of heap space to remove from Job Master containers
(YARN / Mesos / Kubernetes), to compensate for other JVM memory usage.</td>
- </tr>
- <tr>
<td><h5>resourcemanager.job.timeout</h5></td>
<td style="word-wrap: break-word;">"5 minutes"</td>
<td>String</td>
diff --git a/docs/ops/memory/mem_migration.md b/docs/ops/memory/mem_migration.md
index e191940..eb2db4f 100644
--- a/docs/ops/memory/mem_migration.md
+++ b/docs/ops/memory/mem_migration.md
@@ -125,9 +125,8 @@ Although, the network memory configuration has not changed
too much it is recomm
It can change if other memory components have new sizes, e.g. the total memory
which the network can be a fraction of.
See also [new detailed memory model](mem_detail.html).
-The container cut-off configuration options,
[`containerized.heap-cutoff-ratio`](config.html#containerized-heap-cutoff-ratio)
-and
[`containerized.heap-cutoff-min`](config.html#containerized-heap-cutoff-min),
have no effect for task manager processes anymore
-but they still have the same semantics for the job manager process. See also
[how to migrate container cut-off](#container-cut-off-memory).
+The container cut-off configuration options, `containerized.heap-cutoff-ratio`
and `containerized.heap-cutoff-min`,
+have no effect anymore. See also [how to migrate container
cut-off](#container-cut-off-memory).
## Total Memory (Previously Heap Memory)
diff --git a/docs/ops/memory/mem_migration.zh.md
b/docs/ops/memory/mem_migration.zh.md
index d51683a..72d2b01 100644
--- a/docs/ops/memory/mem_migration.zh.md
+++ b/docs/ops/memory/mem_migration.zh.md
@@ -121,10 +121,7 @@ Flink 自带的[默认 flink-conf.yaml](#flink-confyaml-中的默认配置) 文
网络内存的大小可能会受到其他内存部分大小变化的影响，例如总内存变化时，根据占比计算出的网络内存也可能发生变化。
请参考[内存模型详解](mem_detail.html)。
-容器切除（Cut-Off）内存相关的配置参数（[`containerized.heap-cutoff-ratio`](config.html#containerized-heap-cutoff-ratio)
-和
[`containerized.heap-cutoff-min`](config.html#containerized-heap-cutoff-min)）将不再对
TaskExecutor 进程生效。
-对于 JobManager 进程，它们仍具有与此前相同的语义。
-请参考[如何升级容器切除内存](#容器切除cut-off内存)。
+容器切除（Cut-Off）内存相关的配置参数（`containerized.heap-cutoff-ratio` 和
`containerized.heap-cutoff-min`）将不再对进程生效。
## 总内存（原堆内存）
diff --git
a/flink-core/src/main/java/org/apache/flink/configuration/ConfigConstants.java
b/flink-core/src/main/java/org/apache/flink/configuration/ConfigConstants.java
index 16fccb1..f1e2de8 100644
---
a/flink-core/src/main/java/org/apache/flink/configuration/ConfigConstants.java
+++
b/flink-core/src/main/java/org/apache/flink/configuration/ConfigConstants.java
@@ -392,14 +392,14 @@ public final class ConfigConstants {
/**
* Percentage of heap space to remove from containers (YARN / Mesos /
Kubernetes), to compensate
* for other JVM memory usage.
- * @deprecated Use {@link
ResourceManagerOptions#CONTAINERIZED_HEAP_CUTOFF_RATIO} instead.
+ * @deprecated Not used anymore, but remain here until Flink 2.0
*/
@Deprecated
public static final String CONTAINERIZED_HEAP_CUTOFF_RATIO =
"containerized.heap-cutoff-ratio";
/**
* Minimum amount of heap memory to remove in containers, as a safety
margin.
- * @deprecated Use {@link
ResourceManagerOptions#CONTAINERIZED_HEAP_CUTOFF_MIN} instead.
+ * @deprecated Not used anymore, but remain here until Flink 2.0
*/
@Deprecated
public static final String CONTAINERIZED_HEAP_CUTOFF_MIN =
"containerized.heap-cutoff-min";
@@ -434,14 +434,14 @@ public final class ConfigConstants {
/**
* Percentage of heap space to remove from containers started by YARN.
- * @deprecated in favor of {@code #CONTAINERIZED_HEAP_CUTOFF_RATIO}
+ * @deprecated Not used anymore, but remain here until Flink 2.0
*/
@Deprecated
public static final String YARN_HEAP_CUTOFF_RATIO =
"yarn.heap-cutoff-ratio";
/**
* Minimum amount of memory to remove from the heap space as a safety
margin.
- * @deprecated in favor of {@code #CONTAINERIZED_HEAP_CUTOFF_MIN}
+ * @deprecated Not used anymore, but remain here until Flink 2.0
*/
@Deprecated
public static final String YARN_HEAP_CUTOFF_MIN =
"yarn.heap-cutoff-min";
@@ -1526,7 +1526,7 @@ public final class ConfigConstants {
/**
* Minimum amount of memory to subtract from the process memory to get
the TaskManager
* heap size. We came up with these values experimentally.
- * @deprecated Use {@link
ResourceManagerOptions#CONTAINERIZED_HEAP_CUTOFF_MIN} instead.
+ * @deprecated Not used anymore, but remain here until Flink 2.0
*/
@Deprecated
public static final int DEFAULT_YARN_HEAP_CUTOFF = 600;
@@ -1534,7 +1534,7 @@ public final class ConfigConstants {
/**
* Relative amount of memory to subtract from Java process memory to
get the TaskManager
* heap size.
- * @deprecated Use {@link
ResourceManagerOptions#CONTAINERIZED_HEAP_CUTOFF_RATIO} instead.
+ * @deprecated Not used anymore, but remain here until Flink 2.0
*/
@Deprecated
public static final float DEFAULT_YARN_HEAP_CUTOFF_RATIO = 0.25f;
diff --git
a/flink-core/src/main/java/org/apache/flink/configuration/ResourceManagerOptions.java
b/flink-core/src/main/java/org/apache/flink/configuration/ResourceManagerOptions.java
index fde942b..4af839f 100644
---
a/flink-core/src/main/java/org/apache/flink/configuration/ResourceManagerOptions.java
+++
b/flink-core/src/main/java/org/apache/flink/configuration/ResourceManagerOptions.java
@@ -57,26 +57,6 @@ public class ResourceManagerOptions {
" Its not possible to use this configuration key to
define port ranges.");
/**
- * Percentage of heap space to remove from Job Master containers (YARN
/ Mesos/ Kubernetes), to compensate
- * for other JVM memory usage.
- */
- public static final ConfigOption<Float> CONTAINERIZED_HEAP_CUTOFF_RATIO
= ConfigOptions
- .key("containerized.heap-cutoff-ratio")
- .defaultValue(0.25f)
- .withDeprecatedKeys("yarn.heap-cutoff-ratio")
- .withDescription("Percentage of heap space to remove from Job
Master containers (YARN / Mesos / Kubernetes), " +
- "to compensate for other JVM memory usage.");
-
- /**
- * Minimum amount of heap memory to remove in Job Master containers, as
a safety margin.
- */
- public static final ConfigOption<Integer> CONTAINERIZED_HEAP_CUTOFF_MIN
= ConfigOptions
- .key("containerized.heap-cutoff-min")
- .defaultValue(600)
- .withDeprecatedKeys("yarn.heap-cutoff-min")
- .withDescription("Minimum amount of heap memory to remove in
Job Master containers, as a safety margin.");
-
- /**
* The timeout for a slot request to be discarded, in milliseconds.
* @deprecated Use {@link JobManagerOptions#SLOT_REQUEST_TIMEOUT}.
*/
diff --git a/flink-end-to-end-tests/test-scripts/common_yarn_docker.sh
b/flink-end-to-end-tests/test-scripts/common_yarn_docker.sh
index bcdff3e..34d6ef4 100755
--- a/flink-end-to-end-tests/test-scripts/common_yarn_docker.sh
+++ b/flink-end-to-end-tests/test-scripts/common_yarn_docker.sh
@@ -123,7 +123,6 @@ function start_hadoop_cluster_and_prepare_flink() {
security.kerberos.login.keytab: /home/hadoop-user/hadoop-user.keytab
security.kerberos.login.principal: hadoop-user
slot.request.timeout: 120000
-containerized.heap-cutoff-min: 100
END
)
docker exec master bash -c "echo \"$FLINK_CONFIG\" >
/home/hadoop-user/$FLINK_DIRNAME/conf/flink-conf.yaml"
diff --git a/flink-end-to-end-tests/test-scripts/test_kubernetes_session.sh
b/flink-end-to-end-tests/test-scripts/test_kubernetes_session.sh
index 1e450ec..b45e1c3 100755
--- a/flink-end-to-end-tests/test-scripts/test_kubernetes_session.sh
+++ b/flink-end-to-end-tests/test-scripts/test_kubernetes_session.sh
@@ -65,7 +65,6 @@ mkdir -p "$(dirname $LOCAL_OUTPUT_PATH)"
"$FLINK_DIR"/bin/kubernetes-session.sh -Dkubernetes.cluster-id=${CLUSTER_ID} \
-Dkubernetes.container.image=${FLINK_IMAGE_NAME} \
-Djobmanager.memory.process.size=768m \
- -Dcontainerized.heap-cutoff-min=100 \
-Dkubernetes.jobmanager.cpu=0.5 \
-Dkubernetes.taskmanager.cpu=0.5 \
-Dkubernetes.container-start-command-template="%java% %classpath% %jvmmem%
%jvmopts% %logging% %class% %args%" \
diff --git
a/flink-runtime/src/main/java/org/apache/flink/runtime/clusterframework/BootstrapTools.java
b/flink-runtime/src/main/java/org/apache/flink/runtime/clusterframework/BootstrapTools.java
index 741edd4..4c7db29 100644
---
a/flink-runtime/src/main/java/org/apache/flink/runtime/clusterframework/BootstrapTools.java
+++
b/flink-runtime/src/main/java/org/apache/flink/runtime/clusterframework/BootstrapTools.java
@@ -25,7 +25,6 @@ import org.apache.flink.configuration.ConfigOption;
import org.apache.flink.configuration.ConfigOptions;
import org.apache.flink.configuration.Configuration;
import org.apache.flink.configuration.CoreOptions;
-import org.apache.flink.configuration.ResourceManagerOptions;
import org.apache.flink.runtime.akka.AkkaUtils;
import org.apache.flink.runtime.entrypoint.parser.CommandLineOptions;
import org.apache.flink.runtime.util.config.memory.ProcessMemoryUtils;
@@ -687,31 +686,4 @@ public class BootstrapTools {
public static String escapeWithDoubleQuote(String value) {
return "\"" + WINDOWS_DOUBLE_QUOTE_ESCAPER.escape(value) + "\"";
}
-
- /**
- * Calculate heap size after cut-off. The heap size after cut-off will
be used to set -Xms and -Xmx for jobmanager
- * start command.
- */
- public static int calculateHeapSize(int memory, Configuration conf) {
-
- final float memoryCutoffRatio =
conf.getFloat(ResourceManagerOptions.CONTAINERIZED_HEAP_CUTOFF_RATIO);
- final int minCutoff =
conf.getInteger(ResourceManagerOptions.CONTAINERIZED_HEAP_CUTOFF_MIN);
-
- if (memoryCutoffRatio > 1 || memoryCutoffRatio < 0) {
- throw new IllegalArgumentException("The configuration
value '"
- +
ResourceManagerOptions.CONTAINERIZED_HEAP_CUTOFF_RATIO.key()
- + "' must be between 0 and 1. Value given=" +
memoryCutoffRatio);
- }
- if (minCutoff > memory) {
- throw new IllegalArgumentException("The configuration
value '"
- +
ResourceManagerOptions.CONTAINERIZED_HEAP_CUTOFF_MIN.key()
- + "' is higher (" + minCutoff + ") than the
requested amount of memory " + memory);
- }
-
- int heapLimit = (int) ((float) memory * memoryCutoffRatio);
- if (heapLimit < minCutoff) {
- heapLimit = minCutoff;
- }
- return memory - heapLimit;
- }
}
diff --git
a/flink-runtime/src/test/java/org/apache/flink/runtime/clusterframework/BootstrapToolsTest.java
b/flink-runtime/src/test/java/org/apache/flink/runtime/clusterframework/BootstrapToolsTest.java
index cba22c5..909ba01 100644
---
a/flink-runtime/src/test/java/org/apache/flink/runtime/clusterframework/BootstrapToolsTest.java
+++
b/flink-runtime/src/test/java/org/apache/flink/runtime/clusterframework/BootstrapToolsTest.java
@@ -27,7 +27,6 @@ import org.apache.flink.configuration.ConfigurationUtils;
import org.apache.flink.configuration.CoreOptions;
import org.apache.flink.configuration.GlobalConfiguration;
import org.apache.flink.configuration.MemorySize;
-import org.apache.flink.configuration.ResourceManagerOptions;
import org.apache.flink.runtime.akka.AkkaUtils;
import org.apache.flink.runtime.concurrent.FutureUtils;
import org.apache.flink.util.ExceptionUtils;
@@ -476,58 +475,6 @@ public class BootstrapToolsTest extends TestLogger {
}
@Test
- public void testHeapCutoff() {
- Configuration conf = new Configuration();
-
conf.setFloat(ResourceManagerOptions.CONTAINERIZED_HEAP_CUTOFF_RATIO, 0.15F);
-
conf.setInteger(ResourceManagerOptions.CONTAINERIZED_HEAP_CUTOFF_MIN, 384);
-
- Assert.assertEquals(616, BootstrapTools.calculateHeapSize(1000,
conf));
- Assert.assertEquals(8500,
BootstrapTools.calculateHeapSize(10000, conf));
-
- // test different configuration
- Assert.assertEquals(3400,
BootstrapTools.calculateHeapSize(4000, conf));
-
-
conf.setString(ResourceManagerOptions.CONTAINERIZED_HEAP_CUTOFF_MIN.key(),
"1000");
-
conf.setString(ResourceManagerOptions.CONTAINERIZED_HEAP_CUTOFF_RATIO.key(),
"0.1");
- Assert.assertEquals(3000,
BootstrapTools.calculateHeapSize(4000, conf));
-
-
conf.setString(ResourceManagerOptions.CONTAINERIZED_HEAP_CUTOFF_RATIO.key(),
"0.5");
- Assert.assertEquals(2000,
BootstrapTools.calculateHeapSize(4000, conf));
-
-
conf.setString(ResourceManagerOptions.CONTAINERIZED_HEAP_CUTOFF_RATIO.key(),
"1");
- Assert.assertEquals(0, BootstrapTools.calculateHeapSize(4000,
conf));
-
- // test also deprecated keys
- conf = new Configuration();
- conf.setDouble(ConfigConstants.YARN_HEAP_CUTOFF_RATIO, 0.15);
- conf.setInteger(ConfigConstants.YARN_HEAP_CUTOFF_MIN, 384);
-
- Assert.assertEquals(616, BootstrapTools.calculateHeapSize(1000,
conf));
- Assert.assertEquals(8500,
BootstrapTools.calculateHeapSize(10000, conf));
- }
-
- @Test(expected = IllegalArgumentException.class)
- public void illegalArgument() {
- final Configuration conf = new Configuration();
-
conf.setString(ResourceManagerOptions.CONTAINERIZED_HEAP_CUTOFF_RATIO.key(),
"1.1");
- BootstrapTools.calculateHeapSize(4000, conf);
- }
-
- @Test(expected = IllegalArgumentException.class)
- public void illegalArgumentNegative() {
- final Configuration conf = new Configuration();
-
conf.setString(ResourceManagerOptions.CONTAINERIZED_HEAP_CUTOFF_RATIO.key(),
"-0.01");
- BootstrapTools.calculateHeapSize(4000, conf);
- }
-
- @Test(expected = IllegalArgumentException.class)
- public void tooMuchCutoff() {
- final Configuration conf = new Configuration();
-
conf.setString(ResourceManagerOptions.CONTAINERIZED_HEAP_CUTOFF_RATIO.key(),
"6000");
- BootstrapTools.calculateHeapSize(4000, conf);
- }
-
- @Test
public void testGetEnvironmentVariables() {
Configuration testConf = new Configuration();
testConf.setString("containerized.master.env.LD_LIBRARY_PATH",
"/usr/lib/native");
diff --git
a/flink-runtime/src/test/java/org/apache/flink/runtime/resourcemanager/StandaloneResourceManagerFactoryTest.java
b/flink-runtime/src/test/java/org/apache/flink/runtime/resourcemanager/StandaloneResourceManagerFactoryTest.java
deleted file mode 100644
index 46aceb2..0000000
---
a/flink-runtime/src/test/java/org/apache/flink/runtime/resourcemanager/StandaloneResourceManagerFactoryTest.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.flink.runtime.resourcemanager;
-
-import org.apache.flink.api.common.time.Time;
-import org.apache.flink.configuration.Configuration;
-import org.apache.flink.configuration.MemorySize;
-import org.apache.flink.configuration.ResourceManagerOptions;
-import org.apache.flink.configuration.TaskManagerOptions;
-import org.apache.flink.runtime.clusterframework.types.ResourceID;
-import org.apache.flink.runtime.entrypoint.ClusterInformation;
-import org.apache.flink.runtime.heartbeat.TestingHeartbeatServices;
-import
org.apache.flink.runtime.highavailability.TestingHighAvailabilityServices;
-import org.apache.flink.runtime.metrics.groups.UnregisteredMetricGroups;
-import org.apache.flink.runtime.rpc.RpcUtils;
-import org.apache.flink.runtime.rpc.TestingRpcService;
-import org.apache.flink.runtime.util.TestingFatalErrorHandler;
-import org.apache.flink.util.TestLogger;
-
-import org.junit.Test;
-
-/**
- * Tests for the {@link StandaloneResourceManagerFactory}.
- */
-public class StandaloneResourceManagerFactoryTest extends TestLogger {
-
- @Test
- public void
createResourceManager_WithLessMemoryThanContainerizedHeapCutoffMin_ShouldSucceed()
throws Exception {
- final StandaloneResourceManagerFactory resourceManagerFactory =
StandaloneResourceManagerFactory.INSTANCE;
-
- final TestingRpcService rpcService = new TestingRpcService();
- try {
- final Configuration configuration = new Configuration();
-
configuration.set(TaskManagerOptions.TOTAL_PROCESS_MEMORY, new MemorySize(128 *
1024 * 1024));
-
configuration.setInteger(ResourceManagerOptions.CONTAINERIZED_HEAP_CUTOFF_MIN,
600);
-
- final ResourceManager<ResourceID> ignored =
resourceManagerFactory.createResourceManager(
- configuration,
- ResourceID.generate(),
- rpcService,
- new TestingHighAvailabilityServices(),
- new TestingHeartbeatServices(),
- new TestingFatalErrorHandler(),
- new ClusterInformation("foobar", 1234),
- null,
-
UnregisteredMetricGroups.createUnregisteredResourceManagerMetricGroup());
- } finally {
- RpcUtils.terminateRpcService(rpcService,
Time.seconds(10L));
- }
- }
-
-}
diff --git
a/flink-yarn-tests/src/test/java/org/apache/flink/yarn/YARNHighAvailabilityITCase.java
b/flink-yarn-tests/src/test/java/org/apache/flink/yarn/YARNHighAvailabilityITCase.java
index b4ec5ea..a8b799a 100644
---
a/flink-yarn-tests/src/test/java/org/apache/flink/yarn/YARNHighAvailabilityITCase.java
+++
b/flink-yarn-tests/src/test/java/org/apache/flink/yarn/YARNHighAvailabilityITCase.java
@@ -28,7 +28,6 @@ import org.apache.flink.configuration.Configuration;
import org.apache.flink.configuration.HighAvailabilityOptions;
import org.apache.flink.configuration.JobManagerOptions;
import org.apache.flink.configuration.MemorySize;
-import org.apache.flink.configuration.ResourceManagerOptions;
import org.apache.flink.configuration.RestartStrategyOptions;
import org.apache.flink.configuration.TaskManagerOptions;
import org.apache.flink.runtime.execution.ExecutionState;
@@ -285,9 +284,6 @@ public class YARNHighAvailabilityITCase extends
YarnTestBase {
flinkConfiguration.setString(RestartStrategyOptions.RESTART_STRATEGY,
"fixed-delay");
flinkConfiguration.setInteger(RestartStrategyOptions.RESTART_STRATEGY_FIXED_DELAY_ATTEMPTS,
Integer.MAX_VALUE);
- final int minMemory = 100;
-
flinkConfiguration.setInteger(ResourceManagerOptions.CONTAINERIZED_HEAP_CUTOFF_MIN,
minMemory);
-
return createYarnClusterDescriptor(flinkConfiguration);
}
diff --git
a/flink-yarn-tests/src/test/java/org/apache/flink/yarn/YARNSessionCapacitySchedulerITCase.java
b/flink-yarn-tests/src/test/java/org/apache/flink/yarn/YARNSessionCapacitySchedulerITCase.java
index cd310b2..c8b6280 100644
---
a/flink-yarn-tests/src/test/java/org/apache/flink/yarn/YARNSessionCapacitySchedulerITCase.java
+++
b/flink-yarn-tests/src/test/java/org/apache/flink/yarn/YARNSessionCapacitySchedulerITCase.java
@@ -24,7 +24,6 @@ import org.apache.flink.client.cli.CliFrontend;
import org.apache.flink.configuration.Configuration;
import org.apache.flink.configuration.GlobalConfiguration;
import org.apache.flink.configuration.JobManagerOptions;
-import org.apache.flink.configuration.ResourceManagerOptions;
import org.apache.flink.runtime.rest.RestClient;
import org.apache.flink.runtime.rest.RestClientConfiguration;
import
org.apache.flink.runtime.rest.handler.legacy.messages.ClusterOverviewWithVersion;
@@ -498,9 +497,6 @@ public class YARNSessionCapacitySchedulerITCase extends
YarnTestBase {
"-yt", flinkLibFolder.getAbsolutePath(),
"-yt", flinkShadedHadoopDir.getAbsolutePath(),
"-yjm", "768m",
- // test if the cutoff is passed correctly (only
useful when larger than the value
- // of containerized.heap-cutoff-min (default:
600MB)
- "-yD",
ResourceManagerOptions.CONTAINERIZED_HEAP_CUTOFF_RATIO.key() + "=0.7",
"-yD", YarnConfigOptions.APPLICATION_TAGS.key()
+ "=test-tag",
"-ytm", "1024m",
"-ys", "2", // test requesting slots from YARN.
@@ -580,7 +576,6 @@ public class YARNSessionCapacitySchedulerITCase extends
YarnTestBase {
});
Assert.assertNotNull("Unable to locate JobManager log",
jobmanagerLog);
content = FileUtils.readFileToString(jobmanagerLog);
- // TM was started with 1024 but we cut off 70% (NOT THE
DEFAULT VALUE)
String expected = "Starting TaskManagers";
Assert.assertTrue("Expected string '" + expected + "'
not found in JobManager log: '" + jobmanagerLog + "'",
content.contains(expected));
diff --git
a/flink-yarn-tests/src/test/java/org/apache/flink/yarn/YarnConfigurationITCase.java
b/flink-yarn-tests/src/test/java/org/apache/flink/yarn/YarnConfigurationITCase.java
index ee538d4..900abb6 100644
---
a/flink-yarn-tests/src/test/java/org/apache/flink/yarn/YarnConfigurationITCase.java
+++
b/flink-yarn-tests/src/test/java/org/apache/flink/yarn/YarnConfigurationITCase.java
@@ -25,7 +25,6 @@ import org.apache.flink.client.program.ClusterClient;
import org.apache.flink.client.program.PackagedProgram;
import org.apache.flink.client.program.PackagedProgramUtils;
import org.apache.flink.configuration.Configuration;
-import org.apache.flink.configuration.ResourceManagerOptions;
import org.apache.flink.configuration.JobManagerOptions;
import org.apache.flink.configuration.MemorySize;
import org.apache.flink.configuration.TaskManagerOptions;
@@ -85,9 +84,6 @@ public class YarnConfigurationITCase extends YarnTestBase {
final YarnClient yarnClient = getYarnClient();
final Configuration configuration = new
Configuration(flinkConfiguration);
- // disable heap cutoff min
-
configuration.setInteger(ResourceManagerOptions.CONTAINERIZED_HEAP_CUTOFF_MIN,
0);
-
final int slotsPerTaskManager = 3;
configuration.set(TaskManagerOptions.NUM_TASK_SLOTS,
slotsPerTaskManager);
final int masterMemory = 768;
diff --git
a/flink-yarn/src/test/java/org/apache/flink/yarn/YarnClusterDescriptorTest.java
b/flink-yarn/src/test/java/org/apache/flink/yarn/YarnClusterDescriptorTest.java
index 09d2133..661e0d3 100644
---
a/flink-yarn/src/test/java/org/apache/flink/yarn/YarnClusterDescriptorTest.java
+++
b/flink-yarn/src/test/java/org/apache/flink/yarn/YarnClusterDescriptorTest.java
@@ -24,7 +24,6 @@ import org.apache.flink.configuration.ConfigConstants;
import org.apache.flink.configuration.Configuration;
import org.apache.flink.configuration.CoreOptions;
import org.apache.flink.configuration.IllegalConfigurationException;
-import org.apache.flink.configuration.ResourceManagerOptions;
import org.apache.flink.core.testutils.CommonTestUtils;
import org.apache.flink.runtime.jobmanager.JobManagerProcessSpec;
import org.apache.flink.runtime.util.config.memory.ProcessMemoryUtils;
@@ -101,7 +100,6 @@ public class YarnClusterDescriptorTest extends TestLogger {
@Test
public void testFailIfTaskSlotsHigherThanMaxVcores() throws
ClusterDeploymentException {
final Configuration flinkConfiguration = new Configuration();
-
flinkConfiguration.setInteger(ResourceManagerOptions.CONTAINERIZED_HEAP_CUTOFF_MIN,
0);
YarnClusterDescriptor clusterDescriptor =
createYarnClusterDescriptor(flinkConfiguration);
@@ -130,7 +128,6 @@ public class YarnClusterDescriptorTest extends TestLogger {
Configuration configuration = new Configuration();
// overwrite vcores in config
configuration.setInteger(YarnConfigOptions.VCORES,
Integer.MAX_VALUE);
-
configuration.setInteger(ResourceManagerOptions.CONTAINERIZED_HEAP_CUTOFF_MIN,
0);
YarnClusterDescriptor clusterDescriptor =
createYarnClusterDescriptor(configuration);
diff --git
a/flink-yarn/src/test/java/org/apache/flink/yarn/YarnResourceManagerTest.java
b/flink-yarn/src/test/java/org/apache/flink/yarn/YarnResourceManagerTest.java
index 122029c..7de870f 100755
---
a/flink-yarn/src/test/java/org/apache/flink/yarn/YarnResourceManagerTest.java
+++
b/flink-yarn/src/test/java/org/apache/flink/yarn/YarnResourceManagerTest.java
@@ -23,7 +23,6 @@ import org.apache.flink.api.common.time.Time;
import org.apache.flink.configuration.Configuration;
import org.apache.flink.configuration.IllegalConfigurationException;
import org.apache.flink.configuration.MemorySize;
-import org.apache.flink.configuration.ResourceManagerOptions;
import org.apache.flink.configuration.TaskManagerOptions;
import org.apache.flink.runtime.clusterframework.ApplicationStatus;
import org.apache.flink.runtime.clusterframework.BootstrapTools;
@@ -148,7 +147,6 @@ public class YarnResourceManagerTest extends TestLogger {
testingFatalErrorHandler = new TestingFatalErrorHandler();
flinkConfig = new Configuration();
-
flinkConfig.setInteger(ResourceManagerOptions.CONTAINERIZED_HEAP_CUTOFF_MIN,
100);
flinkConfig.set(TaskManagerOptions.TOTAL_FLINK_MEMORY,
MemorySize.parse("1g"));
File root = folder.getRoot();
