Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "HADOOP-14062. ApplicationMasterProtocolPBClientImpl.allocate fails with EOFException when RPC privacy is enabled. Contributed by Steven Rand" 

This reverts commit 241c1cc05b.
This commit is contained in:
Jian He 2017-03-08 13:20:01 -08:00
parent 241c1cc05b
commit 2be8947d12
2 changed files with 1 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/Client.java
View File

@ -1768,9 +1768,7 @@ public class Client implements AutoCloseable {
} }
void setSaslClient(SaslRpcClient client) throws IOException { void setSaslClient(SaslRpcClient client) throws IOException {
// Wrap the input stream in a BufferedInputStream to fill the buffer setInputStream(client.getInputStream(in));
// before reading its length (HADOOP-14062).
setInputStream(new BufferedInputStream(client.getInputStream(in)));
setOutputStream(client.getOutputStream(out)); setOutputStream(client.getOutputStream(out));
} }

24
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/test/java/org/apache/hadoop/yarn/client/api/impl/TestAMRMClient.java
View File

@ -137,11 +137,6 @@ public class TestAMRMClient {
// set the minimum allocation so that resource decrease can go under 1024 // set the minimum allocation so that resource decrease can go under 1024
conf.setInt(YarnConfiguration.RM_SCHEDULER_MINIMUM_ALLOCATION_MB, 512); conf.setInt(YarnConfiguration.RM_SCHEDULER_MINIMUM_ALLOCATION_MB, 512);
conf.setLong(YarnConfiguration.NM_LOG_RETAIN_SECONDS, 1); conf.setLong(YarnConfiguration.NM_LOG_RETAIN_SECONDS, 1);
createClientAndCluster(conf);
}
private static void createClientAndCluster(Configuration conf)
throws Exception {
yarnCluster = new MiniYARNCluster(TestAMRMClient.class.getName(), nodeCount, 1, 1); yarnCluster = new MiniYARNCluster(TestAMRMClient.class.getName(), nodeCount, 1, 1);
yarnCluster.init(conf); yarnCluster.init(conf);
yarnCluster.start(); yarnCluster.start();
@ -866,25 +861,6 @@ public class TestAMRMClient {
initAMRMClientAndTest(false); initAMRMClientAndTest(false);
} }
@Test (timeout=60000)
public void testAMRMClientWithSaslEncryption() throws Exception {
conf.set("hadoop.rpc.protection", "privacy");
// we have to create a new instance of MiniYARNCluster to avoid SASL qop
// mismatches between client and server
tearDown();
createClientAndCluster(conf);
startApp();
initAMRMClientAndTest(false);
// recreate the original MiniYARNCluster and YarnClient for other tests
conf.unset("hadoop.rpc.protection");
tearDown();
createClientAndCluster(conf);
// unless we start an application the cancelApp() method will fail when
// it runs after this test
startApp();
}
@Test (timeout=60000) @Test (timeout=60000)
public void testAMRMClientAllocReqId() throws YarnException, IOException { public void testAMRMClientAllocReqId() throws YarnException, IOException {
initAMRMClientAndTest(true); initAMRMClientAndTest(true);