YARN-11413. Fix Junit Test ERROR Introduced By YARN-6412. (#5289)
* 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:
parent
f26d8bc9bd
commit
3d21cff263
|
@ -194,7 +194,7 @@ public abstract class TestConfigurationFieldsBase {
|
|||
HashMap<String,String> retVal = new HashMap<>();
|
||||
|
||||
// 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);
|
||||
|
||||
// Iterate through class member variables
|
||||
|
|
|
@ -223,6 +223,20 @@ public class TestYarnConfigurationFields extends TestConfigurationFieldsBase {
|
|||
"yarn.log-aggregation.file-controller.TFile.class");
|
||||
// Add the filters used for checking for collision of default values.
|
||||
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);
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
Loading…
Reference in New Issue