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

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

This commit is contained in:
Jian He 2017-03-09 19:28:09 -08:00
parent deb9f56946
commit 4478273e5f
2 changed files with 20 additions and 2 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,7 +1768,9 @@ public class Client implements AutoCloseable {
} }
void setSaslClient(SaslRpcClient client) throws IOException { void setSaslClient(SaslRpcClient client) throws IOException {
setInputStream(client.getInputStream(in)); // Wrap the input stream in a BufferedInputStream to fill the buffer
// before reading its length (HADOOP-14062).
setInputStream(new BufferedInputStream(client.getInputStream(in)));
setOutputStream(client.getOutputStream(out)); setOutputStream(client.getOutputStream(out));
} }

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

@ -40,6 +40,7 @@ import java.util.Set;
import java.util.TreeSet; import java.util.TreeSet;
import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.CommonConfigurationKeysPublic;
import org.apache.hadoop.io.DataOutputBuffer; import org.apache.hadoop.io.DataOutputBuffer;
import org.apache.hadoop.io.Text; import org.apache.hadoop.io.Text;
import org.apache.hadoop.security.Credentials; import org.apache.hadoop.security.Credentials;
@ -126,8 +127,12 @@ public class TestAMRMClient {
@Before @Before
public void setup() throws Exception { public void setup() throws Exception {
// start minicluster
conf = new YarnConfiguration(); conf = new YarnConfiguration();
createClusterAndStartApplication();
}
private void createClusterAndStartApplication() throws Exception {
// start minicluster
conf.set(YarnConfiguration.RM_SCHEDULER, schedulerName); conf.set(YarnConfiguration.RM_SCHEDULER, schedulerName);
conf.setLong( conf.setLong(
YarnConfiguration.RM_AMRM_TOKEN_MASTER_KEY_ROLLING_INTERVAL_SECS, YarnConfiguration.RM_AMRM_TOKEN_MASTER_KEY_ROLLING_INTERVAL_SECS,
@ -866,6 +871,17 @@ public class TestAMRMClient {
initAMRMClientAndTest(true); initAMRMClientAndTest(true);
} }
@Test (timeout=60000)
public void testAMRMClientWithSaslEncryption() throws Exception {
// we have to create a new instance of MiniYARNCluster to avoid SASL qop
// mismatches between client and server
teardown();
conf = new YarnConfiguration();
conf.set(CommonConfigurationKeysPublic.HADOOP_RPC_PROTECTION, "privacy");
createClusterAndStartApplication();
initAMRMClientAndTest(false);
}
private void initAMRMClientAndTest(boolean useAllocReqId) private void initAMRMClientAndTest(boolean useAllocReqId)
throws YarnException, IOException { throws YarnException, IOException {
AMRMClient<ContainerRequest> amClient = null; AMRMClient<ContainerRequest> amClient = null;