Skip to content

YARN-11913: Remove deprecated properties from yarn-default.xml #8149

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
cnauroth wants to merge 1 commit into from
+36 −9
Closed

YARN-11913: Remove deprecated properties from yarn-default.xml #8149

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 0 additions & 9 deletions hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/yarn-default.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1072,15 +1072,6 @@
<value>/yarn/conf</value>
</property>

<property>
<description>The setting that controls whether yarn system metrics is
published to the Timeline server (version one) or not, by RM.
This configuration is now deprecated in favor of
yarn.system-metrics-publisher.enabled.</description>
<name>yarn.resourcemanager.system-metrics-publisher.enabled</name>
<value>false</value>
</property>

<property>
<description>The setting that controls whether yarn system metrics is
published on the Timeline service or not by RM And NM.</description>
Expand Down
36 changes: 36 additions & 0 deletions ...n/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/conf/TestYarnConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,22 @@
package org.apache.hadoop.yarn.conf;

import java.net.InetSocketAddress;
import java.io.InputStream;
import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.TimeUnit;
import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;

import org.apache.commons.lang3.math.NumberUtils;
import org.junit.jupiter.api.Test;

import org.w3c.dom.Document;
import org.w3c.dom.NodeList;

import org.apache.hadoop.yarn.webapp.util.WebAppUtils;

import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertNotSame;
Expand Down Expand Up @@ -266,4 +275,31 @@ void checkRmAmExpiryIntervalSetting() throws Exception {
assertTrue(NumberUtils.isDigits(rmAmExpiryIntervalMS1));
assertEquals(600000, Long.parseLong(rmAmExpiryIntervalMS1));
}

@Test
public void testNoDeprecationsByDefault() throws Exception {
// Force initialization to make sure deprecations are recorded for later calls to isDeprecated.
new YarnConfiguration();

// This test directly parses the default XML configuration file to check for deprecated
// properties, bypassing normalization logic in the Configuration class that might hide them.
DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
DocumentBuilder db = dbf.newDocumentBuilder();
List<String> deprecatedProps = new ArrayList<>();

try (InputStream is = getClass().getResourceAsStream("/yarn-default.xml")) {
Document doc = db.parse(is);
NodeList props = doc.getElementsByTagName("name");
for (int i = 0; i < props.getLength(); ++i) {
String prop = props.item(i).getTextContent();
if (YarnConfiguration.isDeprecated(prop)) {
deprecatedProps.add(prop);
}
}
}

assertThat(deprecatedProps)
.as("By default, deprecated properties should be empty: %s", deprecatedProps)
.isEmpty();
}
}