You are viewing a plain text version of this content. The canonical link for it is here.
Posted to yarn-commits@hadoop.apache.org by sz...@apache.org on 2014/02/19 20:57:42 UTC
svn commit: r1569890 - in
/hadoop/common/branches/HDFS-5535/hadoop-yarn-project: ./
hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/conf/
hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/
hadoop-yarn/hadoop-yarn-serv...
Author: szetszwo
Date: Wed Feb 19 19:57:36 2014
New Revision: 1569890
URL: http://svn.apache.org/r1569890
Log:
Merge r1555021 through r1569889 from trunk.
Added:
hadoop/common/branches/HDFS-5535/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/resources/hadoop-policy.xml
- copied unchanged from r1569889, hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/resources/hadoop-policy.xml
hadoop/common/branches/HDFS-5535/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/resources/yarn-site.xml
- copied unchanged from r1569889, hadoop/common/trunk/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/resources/yarn-site.xml
Modified:
hadoop/common/branches/HDFS-5535/hadoop-yarn-project/CHANGES.txt
hadoop/common/branches/HDFS-5535/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/conf/ConfigurationProvider.java
hadoop/common/branches/HDFS-5535/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/conf/YarnConfiguration.java
hadoop/common/branches/HDFS-5535/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/FileSystemBasedConfigurationProvider.java
hadoop/common/branches/HDFS-5535/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/LocalConfigurationProvider.java
hadoop/common/branches/HDFS-5535/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/AdminService.java
hadoop/common/branches/HDFS-5535/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ApplicationMasterService.java
hadoop/common/branches/HDFS-5535/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ClientRMService.java
hadoop/common/branches/HDFS-5535/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/NodesListManager.java
hadoop/common/branches/HDFS-5535/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ResourceManager.java
hadoop/common/branches/HDFS-5535/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ResourceTrackerService.java
hadoop/common/branches/HDFS-5535/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ahs/RMApplicationHistoryWriter.java
hadoop/common/branches/HDFS-5535/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/rmapp/RMAppImpl.java
hadoop/common/branches/HDFS-5535/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/rmapp/attempt/RMAppAttemptImpl.java
hadoop/common/branches/HDFS-5535/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/CapacityScheduler.java
hadoop/common/branches/HDFS-5535/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/MockAM.java
hadoop/common/branches/HDFS-5535/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestApplicationMasterService.java
hadoop/common/branches/HDFS-5535/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestRMAdminService.java
hadoop/common/branches/HDFS-5535/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/ahs/TestRMApplicationHistoryWriter.java
hadoop/common/branches/HDFS-5535/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/rmapp/TestRMAppTransitions.java
hadoop/common/branches/HDFS-5535/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/rmapp/attempt/TestRMAppAttemptTransitions.java
hadoop/common/branches/HDFS-5535/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-web-proxy/src/main/java/org/apache/hadoop/yarn/server/webproxy/WebAppProxyServer.java
Modified: hadoop/common/branches/HDFS-5535/hadoop-yarn-project/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-5535/hadoop-yarn-project/CHANGES.txt?rev=1569890&r1=1569889&r2=1569890&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-5535/hadoop-yarn-project/CHANGES.txt (original)
+++ hadoop/common/branches/HDFS-5535/hadoop-yarn-project/CHANGES.txt Wed Feb 19 19:57:36 2014
@@ -22,6 +22,8 @@ Release 2.5.0 - UNRELEASED
NEW FEATURES
IMPROVEMENTS
+ YARN-1479. Invalid NaN values in Hadoop REST API JSON response (Chen He via
+ jeagles)
OPTIMIZATIONS
@@ -200,6 +202,10 @@ Release 2.4.0 - UNRELEASED
be available across RM failover by making using of a remote
configuration-provider. (Xuan Gong via vinodkv)
+ YARN-1666. Modified RM HA handling of include/exclude node-lists to be
+ available across RM failover by making using of a remote
+ configuration-provider. (Xuan Gong via vinodkv)
+
OPTIMIZATIONS
BUG FIXES
@@ -295,6 +301,14 @@ Release 2.4.0 - UNRELEASED
YARN-1724. Race condition in Fair Scheduler when continuous scheduling is
turned on (Sandy Ryza)
+ YARN-1590. Fixed ResourceManager, web-app proxy and MR JobHistoryServer to
+ expand _HOST properly in their kerberos principles. (Mohammad Kamrul Islam
+ va vinodkv)
+
+ YARN-1428. Fixed RM to write the final state of RMApp/RMAppAttempt to the
+ application history store in the transition to the final state. (Contributed
+ by Zhijie Shen)
+
Release 2.3.1 - UNRELEASED
INCOMPATIBLE CHANGES
Modified: hadoop/common/branches/HDFS-5535/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/conf/ConfigurationProvider.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-5535/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/conf/ConfigurationProvider.java?rev=1569890&r1=1569889&r2=1569890&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-5535/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/conf/ConfigurationProvider.java (original)
+++ hadoop/common/branches/HDFS-5535/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/conf/ConfigurationProvider.java Wed Feb 19 19:57:36 2014
@@ -19,6 +19,8 @@
package org.apache.hadoop.yarn.conf;
import java.io.IOException;
+import java.io.InputStream;
+
import org.apache.hadoop.classification.InterfaceAudience.Private;
import org.apache.hadoop.classification.InterfaceStability.Unstable;
import org.apache.hadoop.conf.Configuration;
@@ -42,15 +44,16 @@ public abstract class ConfigurationProvi
}
/**
- * Get the configuration and combine with bootstrapConf
+ * Opens an InputStream at the indicated file
* @param bootstrapConf Configuration
* @param name The configuration file name
* @return configuration
* @throws YarnException
* @throws IOException
*/
- public abstract Configuration getConfiguration(Configuration bootstrapConf,
- String name) throws YarnException, IOException;
+ public abstract InputStream getConfigurationInputStream(
+ Configuration bootstrapConf, String name) throws YarnException,
+ IOException;
/**
* Derived classes initialize themselves using this method.
Modified: hadoop/common/branches/HDFS-5535/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/conf/YarnConfiguration.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-5535/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/conf/YarnConfiguration.java?rev=1569890&r1=1569889&r2=1569890&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-5535/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/conf/YarnConfiguration.java (original)
+++ hadoop/common/branches/HDFS-5535/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/conf/YarnConfiguration.java Wed Feb 19 19:57:36 2014
@@ -45,22 +45,31 @@ public class YarnConfiguration extends C
"hadoop-policy.xml";
@Private
- public static final String YARN_SITE_XML_FILE = "yarn-site.xml";
+ public static final String YARN_SITE_CONFIGURATION_FILE = "yarn-site.xml";
+
+ private static final String YARN_DEFAULT_CONFIGURATION_FILE =
+ "yarn-default.xml";
@Private
public static final String CORE_SITE_CONFIGURATION_FILE = "core-site.xml";
+ @Private
+ public static final List<String> RM_CONFIGURATION_FILES =
+ Collections.unmodifiableList(Arrays.asList(
+ CS_CONFIGURATION_FILE,
+ HADOOP_POLICY_CONFIGURATION_FILE,
+ YARN_SITE_CONFIGURATION_FILE,
+ CORE_SITE_CONFIGURATION_FILE));
+
@Evolving
public static final int APPLICATION_MAX_TAGS = 10;
@Evolving
public static final int APPLICATION_MAX_TAG_LENGTH = 100;
- private static final String YARN_DEFAULT_XML_FILE = "yarn-default.xml";
-
static {
- Configuration.addDefaultResource(YARN_DEFAULT_XML_FILE);
- Configuration.addDefaultResource(YARN_SITE_XML_FILE);
+ Configuration.addDefaultResource(YARN_DEFAULT_CONFIGURATION_FILE);
+ Configuration.addDefaultResource(YARN_SITE_CONFIGURATION_FILE);
}
//Configurations
@@ -861,6 +870,9 @@ public class YarnConfiguration extends C
/** The address for the web proxy.*/
public static final String PROXY_ADDRESS =
PROXY_PREFIX + "address";
+ public static final int DEFAULT_PROXY_PORT = 9099;
+ public static final String DEFAULT_PROXY_ADDRESS =
+ "0.0.0.0:" + DEFAULT_RM_PORT;
/**
* YARN Service Level Authorization
Modified: hadoop/common/branches/HDFS-5535/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/FileSystemBasedConfigurationProvider.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-5535/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/FileSystemBasedConfigurationProvider.java?rev=1569890&r1=1569889&r2=1569890&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-5535/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/FileSystemBasedConfigurationProvider.java (original)
+++ hadoop/common/branches/HDFS-5535/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/FileSystemBasedConfigurationProvider.java Wed Feb 19 19:57:36 2014
@@ -19,6 +19,8 @@
package org.apache.hadoop.yarn;
import java.io.IOException;
+import java.io.InputStream;
+
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.hadoop.classification.InterfaceAudience.Private;
@@ -41,15 +43,27 @@ public class FileSystemBasedConfiguratio
private Path configDir;
@Override
- public synchronized Configuration getConfiguration(Configuration bootstrapConf,
- String name) throws IOException, YarnException {
- Path configPath = new Path(this.configDir, name);
- if (!fs.exists(configPath)) {
- throw new YarnException("Can not find Configuration: " + name + " in "
- + configDir);
+ public synchronized InputStream getConfigurationInputStream(
+ Configuration bootstrapConf, String name) throws IOException,
+ YarnException {
+ if (name == null || name.isEmpty()) {
+ throw new YarnException(
+ "Illegal argument! The parameter should not be null or empty");
+ }
+ Path filePath;
+ if (YarnConfiguration.RM_CONFIGURATION_FILES.contains(name)) {
+ filePath = new Path(this.configDir, name);
+ if (!fs.exists(filePath)) {
+ throw new YarnException("Can not find Configuration: " + name + " in "
+ + configDir);
+ }
+ } else {
+ filePath = new Path(name);
+ if (!fs.exists(filePath)) {
+ throw new YarnException("Can not find file: " + name);
+ }
}
- bootstrapConf.addResource(fs.open(configPath));
- return bootstrapConf;
+ return fs.open(filePath);
}
@Override
Modified: hadoop/common/branches/HDFS-5535/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/LocalConfigurationProvider.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-5535/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/LocalConfigurationProvider.java?rev=1569890&r1=1569889&r2=1569890&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-5535/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/LocalConfigurationProvider.java (original)
+++ hadoop/common/branches/HDFS-5535/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/LocalConfigurationProvider.java Wed Feb 19 19:57:36 2014
@@ -18,11 +18,15 @@
package org.apache.hadoop.yarn;
+import java.io.FileInputStream;
import java.io.IOException;
+import java.io.InputStream;
+
import org.apache.hadoop.classification.InterfaceAudience.Private;
import org.apache.hadoop.classification.InterfaceStability.Unstable;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.yarn.conf.ConfigurationProvider;
+import org.apache.hadoop.yarn.conf.YarnConfiguration;
import org.apache.hadoop.yarn.exceptions.YarnException;
@Private
@@ -30,9 +34,15 @@ import org.apache.hadoop.yarn.exceptions
public class LocalConfigurationProvider extends ConfigurationProvider {
@Override
- public Configuration getConfiguration(Configuration bootstrapConf,
+ public InputStream getConfigurationInputStream(Configuration bootstrapConf,
String name) throws IOException, YarnException {
- return bootstrapConf;
+ if (name == null || name.isEmpty()) {
+ throw new YarnException(
+ "Illegal argument! The parameter should not be null or empty");
+ } else if (YarnConfiguration.RM_CONFIGURATION_FILES.contains(name)) {
+ return bootstrapConf.getConfResourceAsInputStream(name);
+ }
+ return new FileInputStream(name);
}
@Override
Modified: hadoop/common/branches/HDFS-5535/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/AdminService.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-5535/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/AdminService.java?rev=1569890&r1=1569889&r2=1569890&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-5535/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/AdminService.java (original)
+++ hadoop/common/branches/HDFS-5535/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/AdminService.java Wed Feb 19 19:57:36 2014
@@ -26,7 +26,6 @@ import java.util.Set;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.hadoop.conf.Configuration;
-import org.apache.hadoop.yarn.LocalConfigurationProvider;
import org.apache.hadoop.fs.CommonConfigurationKeysPublic;
import org.apache.hadoop.ha.HAServiceProtocol;
import org.apache.hadoop.ha.HAServiceStatus;
@@ -313,9 +312,7 @@ public class AdminService extends Compos
RefreshQueuesResponse response =
recordFactory.newRecordInstance(RefreshQueuesResponse.class);
try {
- Configuration conf = getConfiguration(getConfig(),
- YarnConfiguration.CS_CONFIGURATION_FILE);
- rmContext.getScheduler().reinitialize(conf, this.rmContext);
+ rmContext.getScheduler().reinitialize(getConfig(), this.rmContext);
RMAuditLogger.logSuccess(user.getShortUserName(), argName,
"AdminService");
return response;
@@ -331,23 +328,27 @@ public class AdminService extends Compos
@Override
public RefreshNodesResponse refreshNodes(RefreshNodesRequest request)
throws YarnException, StandbyException {
+ String argName = "refreshNodes";
UserGroupInformation user = checkAcls("refreshNodes");
if (!isRMActive()) {
- RMAuditLogger.logFailure(user.getShortUserName(), "refreshNodes",
+ RMAuditLogger.logFailure(user.getShortUserName(), argName,
adminAcl.toString(), "AdminService",
"ResourceManager is not active. Can not refresh nodes.");
throwStandbyException();
}
try {
- rmContext.getNodesListManager().refreshNodes(new YarnConfiguration());
- RMAuditLogger.logSuccess(user.getShortUserName(), "refreshNodes",
+ Configuration conf =
+ getConfiguration(new Configuration(false),
+ YarnConfiguration.YARN_SITE_CONFIGURATION_FILE);
+ rmContext.getNodesListManager().refreshNodes(conf);
+ RMAuditLogger.logSuccess(user.getShortUserName(), argName,
"AdminService");
return recordFactory.newRecordInstance(RefreshNodesResponse.class);
} catch (IOException ioe) {
LOG.info("Exception refreshing nodes ", ioe);
- RMAuditLogger.logFailure(user.getShortUserName(), "refreshNodes",
+ RMAuditLogger.logFailure(user.getShortUserName(), argName,
adminAcl.toString(), "AdminService", "Exception refreshing nodes");
throw RPCUtil.getRemoteException(ioe);
}
@@ -368,7 +369,7 @@ public class AdminService extends Compos
}
Configuration conf =
- getConfiguration(getConfig(),
+ getConfiguration(new Configuration(false),
YarnConfiguration.CORE_SITE_CONFIGURATION_FILE);
ProxyUsers.refreshSuperUserGroupsConfiguration(conf);
RMAuditLogger.logSuccess(user.getShortUserName(),
@@ -393,7 +394,7 @@ public class AdminService extends Compos
}
Groups.getUserToGroupsMappingService(
- getConfiguration(getConfig(),
+ getConfiguration(new Configuration(false),
YarnConfiguration.CORE_SITE_CONFIGURATION_FILE)).refresh();
RMAuditLogger.logSuccess(user.getShortUserName(), argName, "AdminService");
@@ -415,7 +416,8 @@ public class AdminService extends Compos
throwStandbyException();
}
Configuration conf =
- getConfiguration(getConfig(), YarnConfiguration.YARN_SITE_XML_FILE);
+ getConfiguration(new Configuration(false),
+ YarnConfiguration.YARN_SITE_CONFIGURATION_FILE);
adminAcl = new AccessControlList(conf.get(
YarnConfiguration.YARN_ADMIN_ACL,
YarnConfiguration.DEFAULT_YARN_ADMIN_ACL));
@@ -448,7 +450,7 @@ public class AdminService extends Compos
PolicyProvider policyProvider = RMPolicyProvider.getInstance();
Configuration conf =
- getConfiguration(getConfig(),
+ getConfiguration(new Configuration(false),
YarnConfiguration.HADOOP_POLICY_CONFIGURATION_FILE);
refreshServiceAcls(conf, policyProvider);
@@ -463,13 +465,8 @@ public class AdminService extends Compos
private synchronized void refreshServiceAcls(Configuration configuration,
PolicyProvider policyProvider) {
- if (this.rmContext.getConfigurationProvider() instanceof
- LocalConfigurationProvider) {
- this.server.refreshServiceAcl(configuration, policyProvider);
- } else {
- this.server.refreshServiceAclWithLoadedConfiguration(configuration,
- policyProvider);
- }
+ this.server.refreshServiceAclWithLoadedConfiguration(configuration,
+ policyProvider);
}
@Override
@@ -519,8 +516,9 @@ public class AdminService extends Compos
private synchronized Configuration getConfiguration(Configuration conf,
String confFileName) throws YarnException, IOException {
- return this.rmContext.getConfigurationProvider().getConfiguration(conf,
- confFileName);
+ conf.addResource(this.rmContext.getConfigurationProvider()
+ .getConfigurationInputStream(conf, confFileName));
+ return conf;
}
@VisibleForTesting
Modified: hadoop/common/branches/HDFS-5535/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ApplicationMasterService.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-5535/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ApplicationMasterService.java?rev=1569890&r1=1569889&r2=1569890&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-5535/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ApplicationMasterService.java (original)
+++ hadoop/common/branches/HDFS-5535/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ApplicationMasterService.java Wed Feb 19 19:57:36 2014
@@ -39,7 +39,6 @@ import org.apache.hadoop.security.author
import org.apache.hadoop.security.token.TokenIdentifier;
import org.apache.hadoop.service.AbstractService;
import org.apache.hadoop.util.StringUtils;
-import org.apache.hadoop.yarn.LocalConfigurationProvider;
import org.apache.hadoop.yarn.api.ApplicationMasterProtocol;
import org.apache.hadoop.yarn.api.protocolrecords.AllocateRequest;
import org.apache.hadoop.yarn.api.protocolrecords.AllocateResponse;
@@ -140,10 +139,10 @@ public class ApplicationMasterService ex
if (conf.getBoolean(
CommonConfigurationKeysPublic.HADOOP_SECURITY_AUTHORIZATION,
false)) {
- refreshServiceAcls(
- this.rmContext.getConfigurationProvider().getConfiguration(conf,
- YarnConfiguration.HADOOP_POLICY_CONFIGURATION_FILE),
- RMPolicyProvider.getInstance());
+ conf.addResource(this.rmContext.getConfigurationProvider()
+ .getConfigurationInputStream(conf,
+ YarnConfiguration.HADOOP_POLICY_CONFIGURATION_FILE));
+ refreshServiceAcls(conf, RMPolicyProvider.getInstance());
}
this.server.start();
@@ -403,6 +402,15 @@ public class ApplicationMasterService ex
return resync;
}
+ //filter illegal progress values
+ float filteredProgress = request.getProgress();
+ if (Float.isNaN(filteredProgress) || filteredProgress == Float.NEGATIVE_INFINITY
+ || filteredProgress < 0) {
+ request.setProgress(0);
+ } else if (filteredProgress > 1 || filteredProgress == Float.POSITIVE_INFINITY) {
+ request.setProgress(1);
+ }
+
// Send the status update to the appAttempt.
this.rmContext.getDispatcher().getEventHandler().handle(
new RMAppAttemptStatusupdateEvent(appAttemptId, request
@@ -584,13 +592,8 @@ public class ApplicationMasterService ex
public void refreshServiceAcls(Configuration configuration,
PolicyProvider policyProvider) {
- if (this.rmContext.getConfigurationProvider() instanceof
- LocalConfigurationProvider) {
- this.server.refreshServiceAcl(configuration, policyProvider);
- } else {
- this.server.refreshServiceAclWithLoadedConfiguration(configuration,
- policyProvider);
- }
+ this.server.refreshServiceAclWithLoadedConfiguration(configuration,
+ policyProvider);
}
@Override
Modified: hadoop/common/branches/HDFS-5535/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ClientRMService.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-5535/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ClientRMService.java?rev=1569890&r1=1569889&r2=1569890&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-5535/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ClientRMService.java (original)
+++ hadoop/common/branches/HDFS-5535/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ClientRMService.java Wed Feb 19 19:57:36 2014
@@ -43,7 +43,6 @@ import org.apache.hadoop.security.UserGr
import org.apache.hadoop.security.authorize.PolicyProvider;
import org.apache.hadoop.security.token.Token;
import org.apache.hadoop.service.AbstractService;
-import org.apache.hadoop.yarn.LocalConfigurationProvider;
import org.apache.hadoop.yarn.api.ApplicationClientProtocol;
import org.apache.hadoop.yarn.api.protocolrecords.ApplicationsRequestScope;
import org.apache.hadoop.yarn.api.protocolrecords.CancelDelegationTokenRequest;
@@ -171,10 +170,10 @@ public class ClientRMService extends Abs
if (conf.getBoolean(
CommonConfigurationKeysPublic.HADOOP_SECURITY_AUTHORIZATION,
false)) {
- refreshServiceAcls(
- this.rmContext.getConfigurationProvider().getConfiguration(conf,
- YarnConfiguration.HADOOP_POLICY_CONFIGURATION_FILE),
- RMPolicyProvider.getInstance());
+ conf.addResource(this.rmContext.getConfigurationProvider()
+ .getConfigurationInputStream(conf,
+ YarnConfiguration.HADOOP_POLICY_CONFIGURATION_FILE));
+ refreshServiceAcls(conf, RMPolicyProvider.getInstance());
}
this.server.start();
@@ -807,13 +806,8 @@ public class ClientRMService extends Abs
void refreshServiceAcls(Configuration configuration,
PolicyProvider policyProvider) {
- if (this.rmContext.getConfigurationProvider() instanceof
- LocalConfigurationProvider) {
- this.server.refreshServiceAcl(configuration, policyProvider);
- } else {
- this.server.refreshServiceAclWithLoadedConfiguration(configuration,
- policyProvider);
- }
+ this.server.refreshServiceAclWithLoadedConfiguration(configuration,
+ policyProvider);
}
private boolean isAllowedDelegationTokenOp() throws IOException {
Modified: hadoop/common/branches/HDFS-5535/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/NodesListManager.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-5535/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/NodesListManager.java?rev=1569890&r1=1569889&r2=1569890&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-5535/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/NodesListManager.java (original)
+++ hadoop/common/branches/HDFS-5535/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/NodesListManager.java Wed Feb 19 19:57:36 2014
@@ -32,12 +32,15 @@ import org.apache.hadoop.service.Abstrac
import org.apache.hadoop.util.HostsFileReader;
import org.apache.hadoop.yarn.conf.YarnConfiguration;
import org.apache.hadoop.yarn.event.EventHandler;
+import org.apache.hadoop.yarn.exceptions.YarnException;
import org.apache.hadoop.yarn.exceptions.YarnRuntimeException;
import org.apache.hadoop.yarn.server.resourcemanager.rmapp.RMApp;
import org.apache.hadoop.yarn.server.resourcemanager.rmapp.RMAppNodeUpdateEvent;
import org.apache.hadoop.yarn.server.resourcemanager.rmapp.RMAppNodeUpdateEvent.RMAppNodeUpdateType;
import org.apache.hadoop.yarn.server.resourcemanager.rmnode.RMNode;
+import com.google.common.annotations.VisibleForTesting;
+
@SuppressWarnings("unchecked")
public class NodesListManager extends AbstractService implements
EventHandler<NodesListManagerEvent> {
@@ -51,6 +54,9 @@ public class NodesListManager extends Ab
private final RMContext rmContext;
+ private String includesFile;
+ private String excludesFile;
+
public NodesListManager(RMContext rmContext) {
super(NodesListManager.class.getName());
this.rmContext = rmContext;
@@ -63,25 +69,17 @@ public class NodesListManager extends Ab
// Read the hosts/exclude files to restrict access to the RM
try {
- this.hostsReader =
- new HostsFileReader(
- conf.get(YarnConfiguration.RM_NODES_INCLUDE_FILE_PATH,
- YarnConfiguration.DEFAULT_RM_NODES_INCLUDE_FILE_PATH),
- conf.get(YarnConfiguration.RM_NODES_EXCLUDE_FILE_PATH,
- YarnConfiguration.DEFAULT_RM_NODES_EXCLUDE_FILE_PATH)
- );
+ this.includesFile = conf.get(YarnConfiguration.RM_NODES_INCLUDE_FILE_PATH,
+ YarnConfiguration.DEFAULT_RM_NODES_INCLUDE_FILE_PATH);
+ this.excludesFile = conf.get(YarnConfiguration.RM_NODES_EXCLUDE_FILE_PATH,
+ YarnConfiguration.DEFAULT_RM_NODES_EXCLUDE_FILE_PATH);
+ this.hostsReader =
+ createHostsFileReader(this.includesFile, this.excludesFile);
printConfiguredHosts();
+ } catch (YarnException ex) {
+ disableHostsFileReader(ex);
} catch (IOException ioe) {
- LOG.warn("Failed to init hostsReader, disabling", ioe);
- try {
- this.hostsReader =
- new HostsFileReader(YarnConfiguration.DEFAULT_RM_NODES_INCLUDE_FILE_PATH,
- YarnConfiguration.DEFAULT_RM_NODES_EXCLUDE_FILE_PATH);
- } catch (IOException ioe2) {
- // Should *never* happen
- this.hostsReader = null;
- throw new YarnRuntimeException(ioe2);
- }
+ disableHostsFileReader(ioe);
}
super.serviceInit(conf);
}
@@ -103,17 +101,25 @@ public class NodesListManager extends Ab
}
}
- public void refreshNodes(Configuration yarnConf) throws IOException {
+ public void refreshNodes(Configuration yarnConf) throws IOException,
+ YarnException {
synchronized (hostsReader) {
if (null == yarnConf) {
yarnConf = new YarnConfiguration();
}
- hostsReader.updateFileNames(yarnConf.get(
- YarnConfiguration.RM_NODES_INCLUDE_FILE_PATH,
- YarnConfiguration.DEFAULT_RM_NODES_INCLUDE_FILE_PATH), yarnConf.get(
- YarnConfiguration.RM_NODES_EXCLUDE_FILE_PATH,
- YarnConfiguration.DEFAULT_RM_NODES_EXCLUDE_FILE_PATH));
- hostsReader.refresh();
+ includesFile =
+ yarnConf.get(YarnConfiguration.RM_NODES_INCLUDE_FILE_PATH,
+ YarnConfiguration.DEFAULT_RM_NODES_INCLUDE_FILE_PATH);
+ excludesFile =
+ yarnConf.get(YarnConfiguration.RM_NODES_EXCLUDE_FILE_PATH,
+ YarnConfiguration.DEFAULT_RM_NODES_EXCLUDE_FILE_PATH);
+ hostsReader.updateFileNames(includesFile, excludesFile);
+ hostsReader.refresh(
+ includesFile.isEmpty() ? null : this.rmContext
+ .getConfigurationProvider().getConfigurationInputStream(
+ this.conf, includesFile), excludesFile.isEmpty() ? null
+ : this.rmContext.getConfigurationProvider()
+ .getConfigurationInputStream(this.conf, excludesFile));
printConfiguredHosts();
}
}
@@ -174,4 +180,43 @@ public class NodesListManager extends Ab
LOG.error("Ignoring invalid eventtype " + event.getType());
}
}
+
+ private void disableHostsFileReader(Exception ex) {
+ LOG.warn("Failed to init hostsReader, disabling", ex);
+ try {
+ this.includesFile =
+ conf.get(YarnConfiguration.DEFAULT_RM_NODES_INCLUDE_FILE_PATH);
+ this.excludesFile =
+ conf.get(YarnConfiguration.DEFAULT_RM_NODES_EXCLUDE_FILE_PATH);
+ this.hostsReader =
+ createHostsFileReader(this.includesFile, this.excludesFile);
+ } catch (IOException ioe2) {
+ // Should *never* happen
+ this.hostsReader = null;
+ throw new YarnRuntimeException(ioe2);
+ } catch (YarnException e) {
+ // Should *never* happen
+ this.hostsReader = null;
+ throw new YarnRuntimeException(e);
+ }
+ }
+
+ @VisibleForTesting
+ public HostsFileReader getHostsReader() {
+ return this.hostsReader;
+ }
+
+ private HostsFileReader createHostsFileReader(String includesFile,
+ String excludesFile) throws IOException, YarnException {
+ HostsFileReader hostsReader =
+ new HostsFileReader(includesFile,
+ (includesFile == null || includesFile.isEmpty()) ? null
+ : this.rmContext.getConfigurationProvider()
+ .getConfigurationInputStream(this.conf, includesFile),
+ excludesFile,
+ (excludesFile == null || excludesFile.isEmpty()) ? null
+ : this.rmContext.getConfigurationProvider()
+ .getConfigurationInputStream(this.conf, excludesFile));
+ return hostsReader;
+ }
}
Modified: hadoop/common/branches/HDFS-5535/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ResourceManager.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-5535/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ResourceManager.java?rev=1569890&r1=1569889&r2=1569890&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-5535/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ResourceManager.java (original)
+++ hadoop/common/branches/HDFS-5535/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ResourceManager.java Wed Feb 19 19:57:36 2014
@@ -19,6 +19,7 @@
package org.apache.hadoop.yarn.server.resourcemanager;
import java.io.IOException;
+import java.net.InetSocketAddress;
import java.util.List;
import java.util.concurrent.BlockingQueue;
import java.util.concurrent.LinkedBlockingQueue;
@@ -29,8 +30,6 @@ import org.apache.hadoop.classification.
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.ha.HAServiceProtocol;
import org.apache.hadoop.ha.HAServiceProtocol.HAServiceState;
-import org.apache.hadoop.http.HttpConfig;
-import org.apache.hadoop.http.HttpConfig.Policy;
import org.apache.hadoop.metrics2.lib.DefaultMetricsSystem;
import org.apache.hadoop.metrics2.source.JvmMetrics;
import org.apache.hadoop.security.Groups;
@@ -43,7 +42,6 @@ import org.apache.hadoop.util.ExitUtil;
import org.apache.hadoop.util.ReflectionUtils;
import org.apache.hadoop.util.ShutdownHookManager;
import org.apache.hadoop.util.StringUtils;
-import org.apache.hadoop.yarn.LocalConfigurationProvider;
import org.apache.hadoop.yarn.YarnUncaughtExceptionHandler;
import org.apache.hadoop.yarn.api.records.ApplicationAttemptId;
import org.apache.hadoop.yarn.api.records.ApplicationId;
@@ -190,19 +188,18 @@ public class ResourceManager extends Com
ConfigurationProviderFactory.getConfigurationProvider(conf);
this.configurationProvider.init(this.conf);
rmContext.setConfigurationProvider(configurationProvider);
- if (!(this.configurationProvider instanceof LocalConfigurationProvider)) {
- // load yarn-site.xml
- this.conf =
- this.configurationProvider.getConfiguration(this.conf,
- YarnConfiguration.YARN_SITE_XML_FILE);
- // load core-site.xml
- this.conf =
- this.configurationProvider.getConfiguration(this.conf,
- YarnConfiguration.CORE_SITE_CONFIGURATION_FILE);
- // Do refreshUserToGroupsMappings with loaded core-site.xml
- Groups.getUserToGroupsMappingServiceWithLoadedConfiguration(this.conf)
- .refresh();
- }
+
+ // load yarn-site.xml
+ this.conf.addResource(this.configurationProvider
+ .getConfigurationInputStream(this.conf,
+ YarnConfiguration.YARN_SITE_CONFIGURATION_FILE));
+ // load core-site.xml
+ this.conf.addResource(this.configurationProvider
+ .getConfigurationInputStream(this.conf,
+ YarnConfiguration.CORE_SITE_CONFIGURATION_FILE));
+ // Do refreshUserToGroupsMappings with loaded core-site.xml
+ Groups.getUserToGroupsMappingServiceWithLoadedConfiguration(this.conf)
+ .refresh();
// register the handlers for all AlwaysOn services using setupDispatcher().
rmDispatcher = setupDispatcher();
@@ -894,8 +891,9 @@ public class ResourceManager extends Com
}
protected void doSecureLogin() throws IOException {
+ InetSocketAddress socAddr = getBindAddress(conf);
SecurityUtil.login(this.conf, YarnConfiguration.RM_KEYTAB,
- YarnConfiguration.RM_PRINCIPAL);
+ YarnConfiguration.RM_PRINCIPAL, socAddr.getHostName());
}
@Override
@@ -1042,4 +1040,17 @@ public class ResourceManager extends Com
addIfService(rmDispatcher);
rmContext.setDispatcher(rmDispatcher);
}
+
+
+ /**
+ * Retrieve RM bind address from configuration
+ *
+ * @param conf
+ * @return InetSocketAddress
+ */
+public static InetSocketAddress getBindAddress(Configuration conf) {
+ return conf.getSocketAddr(YarnConfiguration.RM_ADDRESS,
+ YarnConfiguration.DEFAULT_RM_ADDRESS,
+ YarnConfiguration.DEFAULT_RM_PORT);
+ }
}
Modified: hadoop/common/branches/HDFS-5535/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ResourceTrackerService.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-5535/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ResourceTrackerService.java?rev=1569890&r1=1569889&r2=1569890&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-5535/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ResourceTrackerService.java (original)
+++ hadoop/common/branches/HDFS-5535/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ResourceTrackerService.java Wed Feb 19 19:57:36 2014
@@ -29,7 +29,6 @@ import org.apache.hadoop.net.Node;
import org.apache.hadoop.security.authorize.PolicyProvider;
import org.apache.hadoop.service.AbstractService;
import org.apache.hadoop.util.VersionUtil;
-import org.apache.hadoop.yarn.LocalConfigurationProvider;
import org.apache.hadoop.yarn.api.records.ApplicationAttemptId;
import org.apache.hadoop.yarn.api.records.ContainerId;
import org.apache.hadoop.yarn.api.records.ContainerState;
@@ -164,10 +163,10 @@ public class ResourceTrackerService exte
if (conf.getBoolean(
CommonConfigurationKeysPublic.HADOOP_SECURITY_AUTHORIZATION,
false)) {
- refreshServiceAcls(
- this.rmContext.getConfigurationProvider().getConfiguration(conf,
- YarnConfiguration.HADOOP_POLICY_CONFIGURATION_FILE),
- RMPolicyProvider.getInstance());
+ conf.addResource(this.rmContext.getConfigurationProvider()
+ .getConfigurationInputStream(conf,
+ YarnConfiguration.HADOOP_POLICY_CONFIGURATION_FILE));
+ refreshServiceAcls(conf, RMPolicyProvider.getInstance());
}
this.server.start();
@@ -421,13 +420,8 @@ public class ResourceTrackerService exte
void refreshServiceAcls(Configuration configuration,
PolicyProvider policyProvider) {
- if (this.rmContext.getConfigurationProvider() instanceof
- LocalConfigurationProvider) {
- this.server.refreshServiceAcl(configuration, policyProvider);
- } else {
- this.server.refreshServiceAclWithLoadedConfiguration(configuration,
- policyProvider);
- }
+ this.server.refreshServiceAclWithLoadedConfiguration(configuration,
+ policyProvider);
}
@VisibleForTesting
Modified: hadoop/common/branches/HDFS-5535/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ahs/RMApplicationHistoryWriter.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-5535/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ahs/RMApplicationHistoryWriter.java?rev=1569890&r1=1569889&r2=1569890&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-5535/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ahs/RMApplicationHistoryWriter.java (original)
+++ hadoop/common/branches/HDFS-5535/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ahs/RMApplicationHistoryWriter.java Wed Feb 19 19:57:36 2014
@@ -43,9 +43,12 @@ import org.apache.hadoop.yarn.server.app
import org.apache.hadoop.yarn.server.applicationhistoryservice.records.ApplicationStartData;
import org.apache.hadoop.yarn.server.applicationhistoryservice.records.ContainerFinishData;
import org.apache.hadoop.yarn.server.applicationhistoryservice.records.ContainerStartData;
+import org.apache.hadoop.yarn.server.resourcemanager.RMServerUtils;
import org.apache.hadoop.yarn.server.resourcemanager.ResourceManager;
import org.apache.hadoop.yarn.server.resourcemanager.rmapp.RMApp;
+import org.apache.hadoop.yarn.server.resourcemanager.rmapp.RMAppState;
import org.apache.hadoop.yarn.server.resourcemanager.rmapp.attempt.RMAppAttempt;
+import org.apache.hadoop.yarn.server.resourcemanager.rmapp.attempt.RMAppAttemptState;
import org.apache.hadoop.yarn.server.resourcemanager.rmcontainer.RMContainer;
/**
@@ -219,12 +222,13 @@ public class RMApplicationHistoryWriter
}
@SuppressWarnings("unchecked")
- public void applicationFinished(RMApp app) {
+ public void applicationFinished(RMApp app, RMAppState finalState) {
dispatcher.getEventHandler().handle(
new WritingApplicationFinishEvent(app.getApplicationId(),
ApplicationFinishData.newInstance(app.getApplicationId(),
app.getFinishTime(), app.getDiagnostics().toString(),
- app.getFinalApplicationStatus(), app.createApplicationState())));
+ app.getFinalApplicationStatus(),
+ RMServerUtils.createApplicationState(finalState))));
}
@SuppressWarnings("unchecked")
@@ -239,15 +243,16 @@ public class RMApplicationHistoryWriter
}
@SuppressWarnings("unchecked")
- public void applicationAttemptFinished(RMAppAttempt appAttempt) {
+ public void applicationAttemptFinished(RMAppAttempt appAttempt,
+ RMAppAttemptState finalState) {
if (historyServiceEnabled) {
dispatcher.getEventHandler().handle(
new WritingApplicationAttemptFinishEvent(appAttempt.getAppAttemptId(),
ApplicationAttemptFinishData.newInstance(
appAttempt.getAppAttemptId(), appAttempt.getDiagnostics()
.toString(), appAttempt.getTrackingUrl(), appAttempt
- .getFinalApplicationStatus(), appAttempt
- .createApplicationAttemptState())));
+ .getFinalApplicationStatus(),
+ RMServerUtils.createApplicationAttemptState(finalState))));
}
}
Modified: hadoop/common/branches/HDFS-5535/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/rmapp/RMAppImpl.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-5535/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/rmapp/RMAppImpl.java?rev=1569890&r1=1569889&r2=1569890&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-5535/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/rmapp/RMAppImpl.java (original)
+++ hadoop/common/branches/HDFS-5535/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/rmapp/RMAppImpl.java Wed Feb 19 19:57:36 2014
@@ -112,9 +112,7 @@ public class RMAppImpl implements RMApp,
private long storedFinishTime = 0;
private RMAppAttempt currentAttempt;
private String queue;
- @SuppressWarnings("rawtypes")
private EventHandler handler;
- private static final FinalTransition FINAL_TRANSITION = new FinalTransition();
private static final AppFinishedTransition FINISHED_TRANSITION =
new AppFinishedTransition();
@@ -705,7 +703,6 @@ public class RMAppImpl implements RMApp,
* either as an exception for failure or null for success, or the client will
* be left waiting forever.
*/
- @SuppressWarnings("unchecked")
private static final class RMAppMoveTransition extends RMAppTransition {
public void transition(RMAppImpl app, RMAppEvent event) {
RMAppMoveEvent moveEvent = (RMAppMoveEvent) event;
@@ -723,7 +720,6 @@ public class RMAppImpl implements RMApp,
}
}
- @SuppressWarnings("unchecked")
private static final class RMAppRecoveredTransition implements
MultipleArcTransition<RMAppImpl, RMAppEvent, RMAppState> {
@@ -742,7 +738,7 @@ public class RMAppImpl implements RMApp,
// The app has completed.
if (app.recoveredFinalState != null) {
- FINAL_TRANSITION.transition(app, event);
+ new FinalTransition(app.recoveredFinalState).transition(app, event);
return app.recoveredFinalState;
}
@@ -824,7 +820,7 @@ public class RMAppImpl implements RMApp,
LOG.info(msg);
app.diagnostics.append(msg);
// Inform the node for app-finish
- FINAL_TRANSITION.transition(app, event);
+ new FinalTransition(RMAppState.FAILED).transition(app, event);
}
}
@@ -937,6 +933,10 @@ public class RMAppImpl implements RMApp,
}
private static class AppFinishedTransition extends FinalTransition {
+ public AppFinishedTransition() {
+ super(RMAppState.FINISHED);
+ }
+
public void transition(RMAppImpl app, RMAppEvent event) {
RMAppFinishedAttemptEvent finishedEvent =
(RMAppFinishedAttemptEvent)event;
@@ -980,6 +980,10 @@ public class RMAppImpl implements RMApp,
private static class AppKilledTransition extends FinalTransition {
+ public AppKilledTransition() {
+ super(RMAppState.KILLED);
+ }
+
@Override
public void transition(RMAppImpl app, RMAppEvent event) {
app.diagnostics.append(getAppKilledDiagnostics());
@@ -1002,6 +1006,10 @@ public class RMAppImpl implements RMApp,
private static final class AppRejectedTransition extends
FinalTransition{
+ public AppRejectedTransition() {
+ super(RMAppState.FAILED);
+ }
+
public void transition(RMAppImpl app, RMAppEvent event) {
RMAppRejectedEvent rejectedEvent = (RMAppRejectedEvent)event;
app.diagnostics.append(rejectedEvent.getMessage());
@@ -1011,6 +1019,12 @@ public class RMAppImpl implements RMApp,
private static class FinalTransition extends RMAppTransition {
+ private final RMAppState finalState;
+
+ public FinalTransition(RMAppState finalState) {
+ this.finalState = finalState;
+ }
+
private Set<NodeId> getNodesOnWhichAttemptRan(RMAppImpl app) {
Set<NodeId> nodes = new HashSet<NodeId>();
for (RMAppAttempt attempt : app.attempts.values()) {
@@ -1035,10 +1049,8 @@ public class RMAppImpl implements RMApp,
new RMAppManagerEvent(app.applicationId,
RMAppManagerEventType.APP_COMPLETED));
- // TODO: We need to fix for the problem that RMApp enters the final state
- // after RMAppAttempt in the killing case
app.rmContext.getRMApplicationHistoryWriter()
- .applicationFinished(app);
+ .applicationFinished(app, finalState);
};
}
Modified: hadoop/common/branches/HDFS-5535/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/rmapp/attempt/RMAppAttemptImpl.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-5535/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/rmapp/attempt/RMAppAttemptImpl.java?rev=1569890&r1=1569889&r2=1569890&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-5535/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/rmapp/attempt/RMAppAttemptImpl.java (original)
+++ hadoop/common/branches/HDFS-5535/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/rmapp/attempt/RMAppAttemptImpl.java Wed Feb 19 19:57:36 2014
@@ -1053,7 +1053,7 @@ public class RMAppAttemptImpl implements
appAttempt.removeCredentials(appAttempt);
appAttempt.rmContext.getRMApplicationHistoryWriter()
- .applicationAttemptFinished(appAttempt);
+ .applicationAttemptFinished(appAttempt, finalAttemptState);
}
}
Modified: hadoop/common/branches/HDFS-5535/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/CapacityScheduler.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-5535/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/CapacityScheduler.java?rev=1569890&r1=1569889&r2=1569890&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-5535/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/CapacityScheduler.java (original)
+++ hadoop/common/branches/HDFS-5535/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/CapacityScheduler.java Wed Feb 19 19:57:36 2014
@@ -35,7 +35,6 @@ import org.apache.hadoop.conf.Configurab
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.security.AccessControlException;
import org.apache.hadoop.security.UserGroupInformation;
-import org.apache.hadoop.yarn.LocalConfigurationProvider;
import org.apache.hadoop.yarn.api.records.ApplicationAttemptId;
import org.apache.hadoop.yarn.api.records.ApplicationId;
import org.apache.hadoop.yarn.api.records.ApplicationResourceUsageReport;
@@ -263,19 +262,8 @@ public class CapacityScheduler extends A
reinitialize(Configuration conf, RMContext rmContext) throws IOException {
Configuration configuration = new Configuration(conf);
if (!initialized) {
- if (rmContext.getConfigurationProvider() instanceof
- LocalConfigurationProvider) {
- this.conf = new CapacitySchedulerConfiguration(configuration, true);
- } else {
- try {
- this.conf =
- new CapacitySchedulerConfiguration(rmContext
- .getConfigurationProvider().getConfiguration(configuration,
- YarnConfiguration.CS_CONFIGURATION_FILE), false);
- } catch (Exception e) {
- throw new IOException(e);
- }
- }
+ this.rmContext = rmContext;
+ this.conf = loadCapacitySchedulerConfiguration(configuration);
validateConf(this.conf);
this.minimumAllocation = this.conf.getMinimumAllocation();
this.maximumAllocation = this.conf.getMaximumAllocation();
@@ -283,7 +271,6 @@ public class CapacityScheduler extends A
this.usePortForNodeName = this.conf.getUsePortForNodeName();
this.applications =
new ConcurrentHashMap<ApplicationId, SchedulerApplication>();
- this.rmContext = rmContext;
initializeQueues(this.conf);
@@ -294,10 +281,7 @@ public class CapacityScheduler extends A
"maximumAllocation=<" + getMaximumResourceCapability() + ">");
} else {
CapacitySchedulerConfiguration oldConf = this.conf;
- this.conf =
- new CapacitySchedulerConfiguration(conf,
- rmContext.getConfigurationProvider() instanceof
- LocalConfigurationProvider);
+ this.conf = loadCapacitySchedulerConfiguration(configuration);
validateConf(this.conf);
try {
LOG.info("Re-initializing queues...");
@@ -1042,4 +1026,16 @@ public class CapacityScheduler extends A
queue.collectSchedulerApplications(apps);
return apps;
}
+
+ private CapacitySchedulerConfiguration loadCapacitySchedulerConfiguration(
+ Configuration configuration) throws IOException {
+ try {
+ configuration.addResource(this.rmContext.getConfigurationProvider()
+ .getConfigurationInputStream(configuration,
+ YarnConfiguration.CS_CONFIGURATION_FILE));
+ return new CapacitySchedulerConfiguration(configuration, false);
+ } catch (Exception e) {
+ throw new IOException(e);
+ }
+ }
}
Modified: hadoop/common/branches/HDFS-5535/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/MockAM.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-5535/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/MockAM.java?rev=1569890&r1=1569889&r2=1569890&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-5535/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/MockAM.java (original)
+++ hadoop/common/branches/HDFS-5535/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/MockAM.java Wed Feb 19 19:57:36 2014
@@ -197,6 +197,29 @@ public class MockAM {
}
}
+ public AllocateResponse allocate(AllocateRequest allocateRequest)
+ throws Exception {
+ final AllocateRequest req = allocateRequest;
+ req.setResponseId(++responseId);
+
+ UserGroupInformation ugi =
+ UserGroupInformation.createRemoteUser(attemptId.toString());
+ Token<AMRMTokenIdentifier> token =
+ context.getRMApps().get(attemptId.getApplicationId())
+ .getRMAppAttempt(attemptId).getAMRMToken();
+ ugi.addTokenIdentifier(token.decodeIdentifier());
+ try {
+ return ugi.doAs(new PrivilegedExceptionAction<AllocateResponse>() {
+ @Override
+ public AllocateResponse run() throws Exception {
+ return amRMProtocol.allocate(req);
+ }
+ });
+ } catch (UndeclaredThrowableException e) {
+ throw (Exception) e.getCause();
+ }
+ }
+
public void unregisterAppAttempt() throws Exception {
waitForState(RMAppAttemptState.RUNNING);
final FinishApplicationMasterRequest req =
Modified: hadoop/common/branches/HDFS-5535/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestApplicationMasterService.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-5535/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestApplicationMasterService.java?rev=1569890&r1=1569889&r2=1569890&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-5535/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestApplicationMasterService.java (original)
+++ hadoop/common/branches/HDFS-5535/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestApplicationMasterService.java Wed Feb 19 19:57:36 2014
@@ -18,23 +18,58 @@
package org.apache.hadoop.yarn.server.resourcemanager;
+import com.google.common.collect.Maps;
import junit.framework.Assert;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.security.UserGroupInformation;
import org.apache.hadoop.yarn.api.protocolrecords.AllocateResponse;
-import org.apache.hadoop.yarn.api.records.Container;
-import org.apache.hadoop.yarn.api.records.ContainerId;
+import org.apache.hadoop.yarn.api.protocolrecords.RegisterApplicationMasterRequest;
+import org.apache.hadoop.yarn.api.protocolrecords.RegisterApplicationMasterResponse;
+import org.apache.hadoop.yarn.api.protocolrecords.impl.pb.AllocateRequestPBImpl;
+import org.apache.hadoop.yarn.api.records.*;
import org.apache.hadoop.yarn.conf.YarnConfiguration;
+import org.apache.hadoop.yarn.event.Dispatcher;
+import org.apache.hadoop.yarn.event.EventHandler;
+import org.apache.hadoop.yarn.event.InlineDispatcher;
import org.apache.hadoop.yarn.exceptions.InvalidContainerReleaseException;
+import org.apache.hadoop.yarn.exceptions.YarnException;
+import org.apache.hadoop.yarn.security.AMRMTokenIdentifier;
import org.apache.hadoop.yarn.security.ContainerTokenIdentifier;
import org.apache.hadoop.yarn.server.resourcemanager.rmapp.RMApp;
-import org.apache.hadoop.yarn.server.resourcemanager.rmapp.attempt.RMAppAttempt;
+import org.apache.hadoop.yarn.server.resourcemanager.rmapp.attempt.*;
+import org.apache.hadoop.yarn.server.resourcemanager.scheduler.AbstractYarnScheduler;
+import org.apache.hadoop.yarn.server.resourcemanager.scheduler.Allocation;
import org.apache.hadoop.yarn.server.resourcemanager.scheduler.ResourceScheduler;
import org.apache.hadoop.yarn.server.resourcemanager.scheduler.fifo.FifoScheduler;
+import org.apache.hadoop.yarn.server.resourcemanager.ahs.RMApplicationHistoryWriter;
+import org.apache.hadoop.yarn.server.resourcemanager.recovery.RMStateStore;
+import org.apache.hadoop.yarn.server.resourcemanager.rmapp.RMAppState;
+import org.apache.hadoop.yarn.server.resourcemanager.rmapp.attempt.event.RMAppAttemptStatusupdateEvent;
+import org.apache.hadoop.yarn.server.resourcemanager.rmcontainer.ContainerAllocationExpirer;
+import org.apache.hadoop.yarn.server.resourcemanager.scheduler.YarnScheduler;
+import org.apache.hadoop.yarn.server.resourcemanager.rmapp.MockRMApp;
+
+import org.apache.hadoop.yarn.server.resourcemanager.security.NMTokenSecretManagerInRM;
import org.apache.hadoop.yarn.server.utils.BuilderUtils;
import org.junit.BeforeClass;
import org.junit.Test;
+import org.mockito.ArgumentCaptor;
+
+import java.io.IOException;
+import java.nio.ByteBuffer;
+import java.security.PrivilegedExceptionAction;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.concurrent.ConcurrentMap;
+
+import static java.lang.Thread.sleep;
+import static org.mockito.Matchers.any;
+import static org.mockito.Matchers.anyList;
+import static org.mockito.Mockito.*;
public class TestApplicationMasterService {
private static final Log LOG = LogFactory.getLog(TestFifoScheduler.class);
@@ -73,7 +108,7 @@ public class TestApplicationMasterServic
nm1.nodeHeartbeat(true);
while (alloc1Response.getAllocatedContainers().size() < 1) {
LOG.info("Waiting for containers to be created for app 1...");
- Thread.sleep(1000);
+ sleep(1000);
alloc1Response = am1.schedule();
}
@@ -113,7 +148,7 @@ public class TestApplicationMasterServic
nm1.nodeHeartbeat(true);
while (alloc1Response.getAllocatedContainers().size() < 1) {
LOG.info("Waiting for containers to be created for app 1...");
- Thread.sleep(1000);
+ sleep(1000);
alloc1Response = am1.schedule();
}
@@ -145,4 +180,70 @@ public class TestApplicationMasterServic
}
}
}
+
+ @Test(timeout=1200000)
+ public void testProgressFilter() throws Exception{
+ MockRM rm = new MockRM(conf);
+ rm.start();
+
+ // Register node1
+ MockNM nm1 = rm.registerNode("127.0.0.1:1234", 6 * GB);
+
+ // Submit an application
+ RMApp app1 = rm.submitApp(2048);
+
+ nm1.nodeHeartbeat(true);
+ RMAppAttempt attempt1 = app1.getCurrentAppAttempt();
+ MockAM am1 = rm.sendAMLaunched(attempt1.getAppAttemptId());
+ am1.registerAppAttempt();
+ am1.setAMRMProtocol(rm.getApplicationMasterService());
+
+ AllocateRequestPBImpl allocateRequest = new AllocateRequestPBImpl();
+ List<ContainerId> release = new ArrayList<ContainerId>();
+ List<ResourceRequest> ask = new ArrayList<ResourceRequest>();
+ allocateRequest.setReleaseList(release);
+ allocateRequest.setAskList(ask);
+
+ allocateRequest.setProgress(Float.POSITIVE_INFINITY);
+ am1.allocate(allocateRequest);
+ while(attempt1.getProgress()!=1){
+ LOG.info("Waiting for allocate event to be handled ...");
+ sleep(100);
+ }
+
+ allocateRequest.setProgress(Float.NaN);
+ am1.allocate(allocateRequest);
+ while(attempt1.getProgress()!=0){
+ LOG.info("Waiting for allocate event to be handled ...");
+ sleep(100);
+ }
+
+ allocateRequest.setProgress((float)9);
+ am1.allocate(allocateRequest);
+ while(attempt1.getProgress()!=1){
+ LOG.info("Waiting for allocate event to be handled ...");
+ sleep(100);
+ }
+
+ allocateRequest.setProgress(Float.NEGATIVE_INFINITY);
+ am1.allocate(allocateRequest);
+ while(attempt1.getProgress()!=0){
+ LOG.info("Waiting for allocate event to be handled ...");
+ sleep(100);
+ }
+
+ allocateRequest.setProgress((float)0.5);
+ am1.allocate(allocateRequest);
+ while(attempt1.getProgress()!=0.5){
+ LOG.info("Waiting for allocate event to be handled ...");
+ sleep(100);
+ }
+
+ allocateRequest.setProgress((float)-1);
+ am1.allocate(allocateRequest);
+ while(attempt1.getProgress()!=0){
+ LOG.info("Waiting for allocate event to be handled ...");
+ sleep(100);
+ }
+ }
}
Modified: hadoop/common/branches/HDFS-5535/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestRMAdminService.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-5535/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestRMAdminService.java?rev=1569890&r1=1569889&r2=1569890&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-5535/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestRMAdminService.java (original)
+++ hadoop/common/branches/HDFS-5535/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestRMAdminService.java Wed Feb 19 19:57:36 2014
@@ -24,8 +24,10 @@ import java.io.DataOutputStream;
import java.io.File;
import java.io.FileOutputStream;
import java.io.IOException;
+import java.io.PrintWriter;
import java.util.ArrayList;
import java.util.List;
+import java.util.Set;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.CommonConfigurationKeys;
@@ -41,6 +43,7 @@ import org.apache.hadoop.security.author
import org.apache.hadoop.yarn.conf.YarnConfiguration;
import org.apache.hadoop.yarn.exceptions.YarnException;
import org.apache.hadoop.yarn.server.api.protocolrecords.RefreshAdminAclsRequest;
+import org.apache.hadoop.yarn.server.api.protocolrecords.RefreshNodesRequest;
import org.apache.hadoop.yarn.server.api.protocolrecords.RefreshQueuesRequest;
import org.apache.hadoop.yarn.server.api.protocolrecords.RefreshServiceAclsRequest;
import org.apache.hadoop.yarn.server.api.protocolrecords.RefreshSuperUserGroupsConfigurationRequest;
@@ -452,6 +455,69 @@ public class TestRMAdminService {
}
+ @Test
+ public void testRefreshNodesWithLocalConfigurationProvider() {
+ rm = new MockRM(configuration);
+ rm.init(configuration);
+ rm.start();
+
+ try {
+ rm.adminService.refreshNodes(RefreshNodesRequest.newInstance());
+ } catch (Exception ex) {
+ fail("Using localConfigurationProvider. Should not get any exception.");
+ }
+ }
+
+ @Test
+ public void testRefreshNodesWithFileSystemBasedConfigurationProvider()
+ throws IOException, YarnException {
+ configuration.set(YarnConfiguration.RM_CONFIGURATION_PROVIDER_CLASS,
+ "org.apache.hadoop.yarn.FileSystemBasedConfigurationProvider");
+ try {
+ rm = new MockRM(configuration);
+ rm.init(configuration);
+ rm.start();
+ fail("Should throw an exception");
+ } catch (Exception ex) {
+ // Expect exception here
+ }
+
+ // upload default configurations
+ uploadDefaultConfiguration();
+
+ try {
+ rm = new MockRM(configuration);
+ rm.init(configuration);
+ rm.start();
+ } catch (Exception ex) {
+ fail("Should not get any exceptions");
+ }
+
+ final File excludeHostsFile = new File(tmpDir.toString(), "excludeHosts");
+ if (excludeHostsFile.exists()) {
+ excludeHostsFile.delete();
+ }
+ if (!excludeHostsFile.createNewFile()) {
+ Assert.fail("Can not create " + "excludeHosts");
+ }
+ PrintWriter fileWriter = new PrintWriter(excludeHostsFile);
+ fileWriter.write("0.0.0.0:123");
+ fileWriter.close();
+
+ uploadToRemoteFileSystem(new Path(excludeHostsFile.getAbsolutePath()));
+
+ Configuration yarnConf = new YarnConfiguration();
+ yarnConf.set(YarnConfiguration.RM_NODES_EXCLUDE_FILE_PATH, this.workingPath
+ + "/excludeHosts");
+ uploadConfiguration(yarnConf, YarnConfiguration.YARN_SITE_CONFIGURATION_FILE);
+
+ rm.adminService.refreshNodes(RefreshNodesRequest.newInstance());
+ Set<String> excludeHosts =
+ rm.getNodesListManager().getHostsReader().getExcludedHosts();
+ Assert.assertTrue(excludeHosts.size() == 1);
+ Assert.assertTrue(excludeHosts.contains("0.0.0.0:123"));
+ }
+
private String writeConfigurationXML(Configuration conf, String confXMLName)
throws IOException {
DataOutputStream output = null;
Modified: hadoop/common/branches/HDFS-5535/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/ahs/TestRMApplicationHistoryWriter.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-5535/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/ahs/TestRMApplicationHistoryWriter.java?rev=1569890&r1=1569889&r2=1569890&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-5535/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/ahs/TestRMApplicationHistoryWriter.java (original)
+++ hadoop/common/branches/HDFS-5535/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/ahs/TestRMApplicationHistoryWriter.java Wed Feb 19 19:57:36 2014
@@ -137,8 +137,6 @@ public class TestRMApplicationHistoryWri
new StringBuilder("test diagnostics info"));
when(app.getFinalApplicationStatus()).thenReturn(
FinalApplicationStatus.UNDEFINED);
- when(app.createApplicationState())
- .thenReturn(YarnApplicationState.FINISHED);
return app;
}
@@ -156,8 +154,6 @@ public class TestRMApplicationHistoryWri
when(appAttempt.getTrackingUrl()).thenReturn("test url");
when(appAttempt.getFinalApplicationStatus()).thenReturn(
FinalApplicationStatus.UNDEFINED);
- when(appAttempt.createApplicationAttemptState()).thenReturn(
- YarnApplicationAttemptState.FINISHED);
return appAttempt;
}
@@ -200,7 +196,7 @@ public class TestRMApplicationHistoryWri
Assert.assertEquals(0L, appHD.getSubmitTime());
Assert.assertEquals(1L, appHD.getStartTime());
- writer.applicationFinished(app);
+ writer.applicationFinished(app, RMAppState.FINISHED);
for (int i = 0; i < MAX_RETRIES; ++i) {
appHD = store.getApplication(ApplicationId.newInstance(0, 1));
if (appHD.getYarnApplicationState() != null) {
@@ -241,7 +237,7 @@ public class TestRMApplicationHistoryWri
ApplicationAttemptId.newInstance(ApplicationId.newInstance(0, 1), 1), 1),
appAttemptHD.getMasterContainerId());
- writer.applicationAttemptFinished(appAttempt);
+ writer.applicationAttemptFinished(appAttempt, RMAppAttemptState.FINISHED);
for (int i = 0; i < MAX_RETRIES; ++i) {
appAttemptHD =
store.getApplicationAttempt(ApplicationAttemptId.newInstance(
@@ -326,9 +322,10 @@ public class TestRMApplicationHistoryWri
writer.containerStarted(container);
writer.containerFinished(container);
}
- writer.applicationAttemptFinished(appAttempt);
+ writer.applicationAttemptFinished(
+ appAttempt, RMAppAttemptState.FINISHED);
}
- writer.applicationFinished(app);
+ writer.applicationFinished(app, RMAppState.FINISHED);
}
for (int i = 0; i < MAX_RETRIES; ++i) {
if (allEventsHandled(20 * 10 * 10 + 20 * 10 + 20)) {
@@ -369,7 +366,7 @@ public class TestRMApplicationHistoryWri
}
@Override
- public void applicationFinished(RMApp app) {
+ public void applicationFinished(RMApp app, RMAppState finalState) {
}
@Override
@@ -377,7 +374,8 @@ public class TestRMApplicationHistoryWri
}
@Override
- public void applicationAttemptFinished(RMAppAttempt appAttempt) {
+ public void applicationAttemptFinished(
+ RMAppAttempt appAttempt, RMAppAttemptState finalState) {
}
@Override
Modified: hadoop/common/branches/HDFS-5535/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/rmapp/TestRMAppTransitions.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-5535/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/rmapp/TestRMAppTransitions.java?rev=1569890&r1=1569889&r2=1569890&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-5535/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/rmapp/TestRMAppTransitions.java (original)
+++ hadoop/common/branches/HDFS-5535/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/rmapp/TestRMAppTransitions.java Wed Feb 19 19:57:36 2014
@@ -57,7 +57,6 @@ import org.apache.hadoop.yarn.server.res
import org.apache.hadoop.yarn.server.resourcemanager.rmapp.attempt.RMAppAttempt;
import org.apache.hadoop.yarn.server.resourcemanager.rmapp.attempt.RMAppAttemptEvent;
import org.apache.hadoop.yarn.server.resourcemanager.rmapp.attempt.RMAppAttemptEventType;
-import org.apache.hadoop.yarn.server.resourcemanager.rmapp.attempt.RMAppAttemptState;
import org.apache.hadoop.yarn.server.resourcemanager.rmapp.attempt.event.RMAppAttemptUpdateSavedEvent;
import org.apache.hadoop.yarn.server.resourcemanager.rmcontainer.ContainerAllocationExpirer;
import org.apache.hadoop.yarn.server.resourcemanager.scheduler.YarnScheduler;
@@ -71,6 +70,7 @@ import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
+import org.mockito.ArgumentCaptor;
@RunWith(value = Parameterized.class)
@@ -308,16 +308,6 @@ public class TestRMAppTransitions {
"Application killed by user.", diag.toString());
}
- private void assertAppAndAttemptKilled(RMApp application)
- throws InterruptedException {
- sendAttemptUpdateSavedEvent(application);
- sendAppUpdateSavedEvent(application);
- assertKilled(application);
- Assert.assertEquals(RMAppAttemptState.KILLED, application
- .getCurrentAppAttempt().getAppAttemptState());
- assertAppFinalStateSaved(application);
- }
-
private void assertFailed(RMApp application, String regex) {
assertTimesAtFinish(application);
assertAppState(RMAppState.FAILED, application);
@@ -511,7 +501,7 @@ public class TestRMAppTransitions {
sendAppUpdateSavedEvent(application);
assertKilled(application);
assertAppFinalStateNotSaved(application);
- verify(writer).applicationFinished(any(RMApp.class));
+ verifyApplicationFinished(RMAppState.KILLED);
}
@Test
@@ -528,7 +518,7 @@ public class TestRMAppTransitions {
sendAppUpdateSavedEvent(application);
assertFailed(application, rejectedText);
assertAppFinalStateNotSaved(application);
- verify(writer).applicationFinished(any(RMApp.class));
+ verifyApplicationFinished(RMAppState.FAILED);
}
@Test (timeout = 30000)
@@ -543,7 +533,7 @@ public class TestRMAppTransitions {
rmDispatcher.await();
sendAppUpdateSavedEvent(application);
assertKilled(application);
- verify(writer).applicationFinished(any(RMApp.class));
+ verifyApplicationFinished(RMAppState.KILLED);
}
@Test (timeout = 30000)
@@ -560,7 +550,7 @@ public class TestRMAppTransitions {
sendAppUpdateSavedEvent(application);
assertFailed(application, rejectedText);
assertAppFinalStateSaved(application);
- verify(writer).applicationFinished(any(RMApp.class));
+ verifyApplicationFinished(RMAppState.FAILED);
}
@Test (timeout = 30000)
@@ -577,7 +567,7 @@ public class TestRMAppTransitions {
sendAppUpdateSavedEvent(application);
assertFailed(application, rejectedText);
assertAppFinalStateSaved(application);
- verify(writer).applicationFinished(any(RMApp.class));
+ verifyApplicationFinished(RMAppState.FAILED);
}
@Test
@@ -592,7 +582,7 @@ public class TestRMAppTransitions {
sendAppUpdateSavedEvent(application);
assertKilled(application);
assertAppFinalStateSaved(application);
- verify(writer).applicationFinished(any(RMApp.class));
+ verifyApplicationFinished(RMAppState.KILLED);
}
@Test
@@ -627,7 +617,7 @@ public class TestRMAppTransitions {
sendAppUpdateSavedEvent(application);
assertFailed(application, ".*" + message + ".*Failing the application.*");
assertAppFinalStateSaved(application);
- verify(writer).applicationFinished(any(RMApp.class));
+ verifyApplicationFinished(RMAppState.FAILED);
}
@Test
@@ -649,7 +639,7 @@ public class TestRMAppTransitions {
sendAppUpdateSavedEvent(application);
assertKilled(application);
assertAppFinalStateSaved(application);
- verify(writer).applicationFinished(any(RMApp.class));
+ verifyApplicationFinished(RMAppState.KILLED);
}
@Test
@@ -672,7 +662,7 @@ public class TestRMAppTransitions {
sendAttemptUpdateSavedEvent(application);
sendAppUpdateSavedEvent(application);
assertKilled(application);
- verify(writer).applicationFinished(any(RMApp.class));
+ verifyApplicationFinished(RMAppState.KILLED);
}
@Test
@@ -727,7 +717,7 @@ public class TestRMAppTransitions {
rmDispatcher.await();
assertFailed(application, ".*Failing the application.*");
assertAppFinalStateSaved(application);
- verify(writer).applicationFinished(any(RMApp.class));
+ verifyApplicationFinished(RMAppState.FAILED);
}
@Test
@@ -785,7 +775,7 @@ public class TestRMAppTransitions {
StringBuilder diag = application.getDiagnostics();
Assert.assertEquals("application diagnostics is not correct",
"", diag.toString());
- verify(writer).applicationFinished(any(RMApp.class));
+ verifyApplicationFinished(RMAppState.FINISHED);
}
@Test (timeout = 30000)
@@ -810,10 +800,10 @@ public class TestRMAppTransitions {
rmDispatcher.await();
assertTimesAtFinish(application);
assertAppState(RMAppState.FAILED, application);
+ verifyApplicationFinished(RMAppState.FAILED);
assertTimesAtFinish(application);
assertAppState(RMAppState.FAILED, application);
- verify(writer).applicationFinished(any(RMApp.class));
}
@Test (timeout = 30000)
@@ -856,10 +846,10 @@ public class TestRMAppTransitions {
rmDispatcher.await();
assertTimesAtFinish(application);
assertAppState(RMAppState.KILLED, application);
+ verifyApplicationFinished(RMAppState.KILLED);
assertTimesAtFinish(application);
assertAppState(RMAppState.KILLED, application);
- verify(writer).applicationFinished(any(RMApp.class));
}
@Test
@@ -871,4 +861,11 @@ public class TestRMAppTransitions {
report = app.createAndGetApplicationReport("clientuser", true);
Assert.assertNotNull(report.getApplicationResourceUsageReport());
}
+
+ private void verifyApplicationFinished(RMAppState state) {
+ ArgumentCaptor<RMAppState> finalState =
+ ArgumentCaptor.forClass(RMAppState.class);
+ verify(writer).applicationFinished(any(RMApp.class), finalState.capture());
+ Assert.assertEquals(state, finalState.getValue());
+ }
}
Modified: hadoop/common/branches/HDFS-5535/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/rmapp/attempt/TestRMAppAttemptTransitions.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-5535/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/rmapp/attempt/TestRMAppAttemptTransitions.java?rev=1569890&r1=1569889&r2=1569890&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-5535/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/rmapp/attempt/TestRMAppAttemptTransitions.java (original)
+++ hadoop/common/branches/HDFS-5535/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/rmapp/attempt/TestRMAppAttemptTransitions.java Wed Feb 19 19:57:36 2014
@@ -103,6 +103,7 @@ import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
+import org.mockito.ArgumentCaptor;
@RunWith(value = Parameterized.class)
public class TestRMAppAttemptTransitions {
@@ -367,6 +368,7 @@ public class TestRMAppAttemptTransitions
// verify(application).handle(anyObject());
verify(application).handle(any(RMAppRejectedEvent.class));
verifyTokenCount(applicationAttempt.getAppAttemptId(), 1);
+ verifyApplicationAttemptFinished(RMAppAttemptState.FAILED);
}
/**
@@ -384,9 +386,9 @@ public class TestRMAppAttemptTransitions
assertEquals(0, applicationAttempt.getRanNodes().size());
assertNull(applicationAttempt.getFinalApplicationStatus());
verifyTokenCount(applicationAttempt.getAppAttemptId(), 1);
- verify(writer).applicationAttemptFinished(any(RMAppAttempt.class));
verifyAttemptFinalStateSaved();
assertFalse(transferStateFromPreviousAttempt);
+ verifyApplicationAttemptFinished(RMAppAttemptState.KILLED);
}
/**
@@ -460,8 +462,8 @@ public class TestRMAppAttemptTransitions
// Check events
verify(application, times(1)).handle(any(RMAppFailedAttemptEvent.class));
verifyTokenCount(applicationAttempt.getAppAttemptId(), 1);
- verify(writer).applicationAttemptFinished(any(RMAppAttempt.class));
verifyAttemptFinalStateSaved();
+ verifyApplicationAttemptFinished(RMAppAttemptState.FAILED);
}
/**
@@ -496,7 +498,6 @@ public class TestRMAppAttemptTransitions
assertEquals(getProxyUrl(applicationAttempt),
applicationAttempt.getTrackingUrl());
}
- verify(writer).applicationAttemptStarted(any(RMAppAttempt.class));
// TODO - need to add more checks relevant to this state
}
@@ -544,6 +545,7 @@ public class TestRMAppAttemptTransitions
assertEquals(finalStatus, applicationAttempt.getFinalApplicationStatus());
verifyTokenCount(applicationAttempt.getAppAttemptId(), 1);
assertFalse(transferStateFromPreviousAttempt);
+ verifyApplicationAttemptFinished(RMAppAttemptState.FINISHED);
}
@@ -806,7 +808,7 @@ public class TestRMAppAttemptTransitions
assertEquals(RMAppAttemptState.FAILED,
applicationAttempt.getAppAttemptState());
verifyTokenCount(applicationAttempt.getAppAttemptId(), 1);
- verify(writer).applicationAttemptFinished(any(RMAppAttempt.class));
+ verifyApplicationAttemptFinished(RMAppAttemptState.FAILED);
}
@Test
@@ -846,6 +848,7 @@ public class TestRMAppAttemptTransitions
assertEquals(rmAppPageUrl, applicationAttempt.getOriginalTrackingUrl());
assertEquals(rmAppPageUrl, applicationAttempt.getTrackingUrl());
verifyAMHostAndPortInvalidated();
+ verifyApplicationAttemptFinished(RMAppAttemptState.FAILED);
}
@Test
@@ -883,6 +886,7 @@ public class TestRMAppAttemptTransitions
assertEquals(rmAppPageUrl, applicationAttempt.getTrackingUrl());
verifyTokenCount(applicationAttempt.getAppAttemptId(), 1);
verifyAMHostAndPortInvalidated();
+ verifyApplicationAttemptFinished(RMAppAttemptState.KILLED);
}
@Test(timeout=10000)
@@ -903,6 +907,7 @@ public class TestRMAppAttemptTransitions
assertEquals(rmAppPageUrl, applicationAttempt.getOriginalTrackingUrl());
assertEquals(rmAppPageUrl, applicationAttempt.getTrackingUrl());
verifyTokenCount(applicationAttempt.getAppAttemptId(), 1);
+ verifyApplicationAttemptFinished(RMAppAttemptState.FAILED);
}
@Test(timeout=20000)
@@ -925,6 +930,7 @@ public class TestRMAppAttemptTransitions
assertEquals(rmAppPageUrl, applicationAttempt.getTrackingUrl());
verifyTokenCount(applicationAttempt.getAppAttemptId(), 1);
verifyAMHostAndPortInvalidated();
+ verifyApplicationAttemptFinished(RMAppAttemptState.FAILED);
}
@Test
@@ -1177,6 +1183,7 @@ public class TestRMAppAttemptTransitions
applicationAttempt.getAppAttemptState());
// should not kill containers when attempt fails.
assertTrue(transferStateFromPreviousAttempt);
+ verifyApplicationAttemptFinished(RMAppAttemptState.FAILED);
// failed attempt captured the container finished event.
assertEquals(0, applicationAttempt.getJustFinishedContainers().size());
@@ -1216,6 +1223,7 @@ public class TestRMAppAttemptTransitions
assertEquals(RMAppAttemptState.FAILED,
applicationAttempt.getAppAttemptState());
assertFalse(transferStateFromPreviousAttempt);
+ verifyApplicationAttemptFinished(RMAppAttemptState.FAILED);
}
private void verifyTokenCount(ApplicationAttemptId appAttemptId, int count) {
@@ -1245,4 +1253,13 @@ public class TestRMAppAttemptTransitions
assertEquals("N/A", applicationAttempt.getHost());
assertEquals(-1, applicationAttempt.getRpcPort());
}
+
+ private void verifyApplicationAttemptFinished(RMAppAttemptState state) {
+ ArgumentCaptor<RMAppAttemptState> finalState =
+ ArgumentCaptor.forClass(RMAppAttemptState.class);
+ verify(writer).applicationAttemptFinished(
+ any(RMAppAttempt.class), finalState.capture());
+ Assert.assertEquals(state, finalState.getValue());
+ }
+
}
Modified: hadoop/common/branches/HDFS-5535/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-web-proxy/src/main/java/org/apache/hadoop/yarn/server/webproxy/WebAppProxyServer.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-5535/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-web-proxy/src/main/java/org/apache/hadoop/yarn/server/webproxy/WebAppProxyServer.java?rev=1569890&r1=1569889&r2=1569890&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-5535/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-web-proxy/src/main/java/org/apache/hadoop/yarn/server/webproxy/WebAppProxyServer.java (original)
+++ hadoop/common/branches/HDFS-5535/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-web-proxy/src/main/java/org/apache/hadoop/yarn/server/webproxy/WebAppProxyServer.java Wed Feb 19 19:57:36 2014
@@ -19,6 +19,7 @@
package org.apache.hadoop.yarn.server.webproxy;
import java.io.IOException;
+import java.net.InetSocketAddress;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -69,8 +70,21 @@ public class WebAppProxyServer extends C
* @throws IOException on any error.
*/
protected void doSecureLogin(Configuration conf) throws IOException {
+ InetSocketAddress socAddr = getBindAddress(conf);
SecurityUtil.login(conf, YarnConfiguration.PROXY_KEYTAB,
- YarnConfiguration.PROXY_PRINCIPAL);
+ YarnConfiguration.PROXY_PRINCIPAL, socAddr.getHostName());
+ }
+
+ /**
+ * Retrieve PROXY bind address from configuration
+ *
+ * @param conf
+ * @return InetSocketAddress
+ */
+ public static InetSocketAddress getBindAddress(Configuration conf) {
+ return conf.getSocketAddr(YarnConfiguration.PROXY_ADDRESS,
+ YarnConfiguration.DEFAULT_PROXY_ADDRESS,
+ YarnConfiguration.DEFAULT_PROXY_PORT);
}
public static void main(String[] args) {