big-data/hadoop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

YARN-11413. Fix Junit Test ERROR Introduced By YARN-6412. (#5289)

Browse Source 
* YARN-11413. Fix Junit Test ERROR Introduced By YARN-6412.

* YARN-11413. Fix CheckStyle.

* YARN-11413. Fix CheckStyle.

Co-authored-by: slfan1989 <louj1988@@>
This commit is contained in:
slfan1989 2023-01-12 21:29:05 +08:00 committed by GitHub
parent f26d8bc9bd
commit 3d21cff263
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/conf/TestConfigurationFieldsBase.java
View File

@ -194,7 +194,7 @@ public abstract class TestConfigurationFieldsBase {
HashMap<String,String> retVal = new HashMap<>(); HashMap<String,String> retVal = new HashMap<>();
// Setup regexp for valid properties // Setup regexp for valid properties
String propRegex = "^[A-Za-z][A-Za-z0-9_-]+(\\.[A-Za-z0-9_-]+)+$"; String propRegex = "^[A-Za-z][A-Za-z0-9_-]+(\\.[A-Za-z%s0-9_-]+)+$";
Pattern p = Pattern.compile(propRegex); Pattern p = Pattern.compile(propRegex);
// Iterate through class member variables // Iterate through class member variables

14
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/test/java/org/apache/hadoop/yarn/conf/TestYarnConfigurationFields.java
View File

@ -223,6 +223,20 @@ public void initializeMemberVariables() {
"yarn.log-aggregation.file-controller.TFile.class"); "yarn.log-aggregation.file-controller.TFile.class");
// Add the filters used for checking for collision of default values. // Add the filters used for checking for collision of default values.
initDefaultValueCollisionCheck(); initDefaultValueCollisionCheck();
configurationPropsToSkipCompare.add(YarnConfiguration.LOG_AGGREGATION_REMOTE_APP_LOG_DIR_FMT);
configurationPropsToSkipCompare.add(
YarnConfiguration.LOG_AGGREGATION_REMOTE_APP_LOG_DIR_SUFFIX_FMT);
configurationPropsToSkipCompare.add(YarnConfiguration.LOG_AGGREGATION_FILE_CONTROLLER_FMT);
configurationPropsToSkipCompare.add(YarnConfiguration.NM_AUX_SERVICE_FMT);
configurationPropsToSkipCompare.add(
YarnConfiguration.NM_HEALTH_CHECK_SCRIPT_TIMEOUT_MS_TEMPLATE);
configurationPropsToSkipCompare.add(YarnConfiguration.NM_HEALTH_CHECK_SCRIPT_OPTS_TEMPLATE);
configurationPropsToSkipCompare.add(YarnConfiguration.NM_HEALTH_CHECK_SCRIPT_PATH_TEMPLATE);
configurationPropsToSkipCompare.add(
YarnConfiguration.NM_HEALTH_CHECK_SCRIPT_INTERVAL_MS_TEMPLATE);
configurationPropsToSkipCompare.add(YarnConfiguration.NM_AUX_SERVICE_REMOTE_CLASSPATH);
configurationPropsToSkipCompare.add(YarnConfiguration.LINUX_CONTAINER_RUNTIME_CLASS_FMT);
} }
/** /**