MAPREDUCE-5261. Reverting the patch as it is no longer needed.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1488033 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
parent
a099537780
commit
d95c5a23d9
|
@ -95,7 +95,7 @@ public class SecurityUtil {
|
||||||
* For use only by tests and initialization
|
* For use only by tests and initialization
|
||||||
*/
|
*/
|
||||||
@InterfaceAudience.Private
|
@InterfaceAudience.Private
|
||||||
public static void setTokenServiceUseIp(boolean flag) {
|
static void setTokenServiceUseIp(boolean flag) {
|
||||||
useIpForTokenService = flag;
|
useIpForTokenService = flag;
|
||||||
hostResolver = !useIpForTokenService
|
hostResolver = !useIpForTokenService
|
||||||
? new QualifiedHostResolver()
|
? new QualifiedHostResolver()
|
||||||
|
|
|
@ -303,9 +303,6 @@ Release 2.0.5-beta - UNRELEASED
|
||||||
MAPREDUCE-5257. Fix issues in TestContainerLauncherImpl after YARN-617.
|
MAPREDUCE-5257. Fix issues in TestContainerLauncherImpl after YARN-617.
|
||||||
(Omkar Vinit Joshi via vinodkv)
|
(Omkar Vinit Joshi via vinodkv)
|
||||||
|
|
||||||
MAPREDUCE-5261. Fix issues in TestRMContainerAllocator after YARN-617.
|
|
||||||
(Omkar Vinit Joshi via vinodkv)
|
|
||||||
|
|
||||||
MAPREDUCE-5282. Updating MR App to use immutable ApplicationID after
|
MAPREDUCE-5282. Updating MR App to use immutable ApplicationID after
|
||||||
YARN-716. (Siddharth Seth via vinodkv)
|
YARN-716. (Siddharth Seth via vinodkv)
|
||||||
|
|
||||||
|
|
|
@ -45,7 +45,6 @@ import junit.framework.Assert;
|
||||||
import org.apache.commons.logging.Log;
|
import org.apache.commons.logging.Log;
|
||||||
import org.apache.commons.logging.LogFactory;
|
import org.apache.commons.logging.LogFactory;
|
||||||
import org.apache.hadoop.conf.Configuration;
|
import org.apache.hadoop.conf.Configuration;
|
||||||
import org.apache.hadoop.fs.CommonConfigurationKeys;
|
|
||||||
import org.apache.hadoop.mapreduce.MRJobConfig;
|
import org.apache.hadoop.mapreduce.MRJobConfig;
|
||||||
import org.apache.hadoop.mapreduce.v2.api.records.JobId;
|
import org.apache.hadoop.mapreduce.v2.api.records.JobId;
|
||||||
import org.apache.hadoop.mapreduce.v2.api.records.JobState;
|
import org.apache.hadoop.mapreduce.v2.api.records.JobState;
|
||||||
|
@ -72,7 +71,6 @@ import org.apache.hadoop.mapreduce.v2.util.MRBuilderUtils;
|
||||||
import org.apache.hadoop.metrics2.lib.DefaultMetricsSystem;
|
import org.apache.hadoop.metrics2.lib.DefaultMetricsSystem;
|
||||||
import org.apache.hadoop.net.NetUtils;
|
import org.apache.hadoop.net.NetUtils;
|
||||||
import org.apache.hadoop.net.NetworkTopology;
|
import org.apache.hadoop.net.NetworkTopology;
|
||||||
import org.apache.hadoop.security.SecurityUtil;
|
|
||||||
import org.apache.hadoop.yarn.Clock;
|
import org.apache.hadoop.yarn.Clock;
|
||||||
import org.apache.hadoop.yarn.ClusterInfo;
|
import org.apache.hadoop.yarn.ClusterInfo;
|
||||||
import org.apache.hadoop.yarn.SystemClock;
|
import org.apache.hadoop.yarn.SystemClock;
|
||||||
|
@ -102,7 +100,6 @@ import org.apache.hadoop.yarn.server.resourcemanager.scheduler.event.SchedulerEv
|
||||||
import org.apache.hadoop.yarn.server.resourcemanager.scheduler.fifo.FifoScheduler;
|
import org.apache.hadoop.yarn.server.resourcemanager.scheduler.fifo.FifoScheduler;
|
||||||
import org.apache.hadoop.yarn.util.BuilderUtils;
|
import org.apache.hadoop.yarn.util.BuilderUtils;
|
||||||
import org.junit.After;
|
import org.junit.After;
|
||||||
import org.junit.Before;
|
|
||||||
import org.junit.Test;
|
import org.junit.Test;
|
||||||
|
|
||||||
@SuppressWarnings("unchecked")
|
@SuppressWarnings("unchecked")
|
||||||
|
@ -113,17 +110,9 @@ public class TestRMContainerAllocator {
|
||||||
static final RecordFactory recordFactory = RecordFactoryProvider
|
static final RecordFactory recordFactory = RecordFactoryProvider
|
||||||
.getRecordFactory(null);
|
.getRecordFactory(null);
|
||||||
|
|
||||||
@Before
|
|
||||||
public void setup() {
|
|
||||||
// This is done to make sure token service doesn't use ip.
|
|
||||||
SecurityUtil.setTokenServiceUseIp(false);
|
|
||||||
}
|
|
||||||
|
|
||||||
@After
|
@After
|
||||||
public void tearDown() {
|
public void tearDown() {
|
||||||
DefaultMetricsSystem.shutdown();
|
DefaultMetricsSystem.shutdown();
|
||||||
SecurityUtil.setTokenServiceUseIp(
|
|
||||||
CommonConfigurationKeys.HADOOP_SECURITY_TOKEN_SERVICE_USE_IP_DEFAULT);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
|
|
Loading…
Reference in New Issue