hadoop-common-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jia...@apache.org
Subject hadoop git commit: Revert "HADOOP-14062. ApplicationMasterProtocolPBClientImpl.allocate fails with EOFException when RPC privacy is enabled. Contributed by Steven Rand"
Date Wed, 08 Mar 2017 21:21:00 GMT
Repository: hadoop
Updated Branches:
  refs/heads/branch-2 f1fd20be8 -> ea8d53de6


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

This reverts commit 36eda5af75a1c98b507ea497fce51aa936b2c699.


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/ea8d53de
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/ea8d53de
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/ea8d53de

Branch: refs/heads/branch-2
Commit: ea8d53de6a4d3e0b2972d815056518911b85cead
Parents: f1fd20b
Author: Jian He <jianhe@apache.org>
Authored: Wed Mar 8 13:20:26 2017 -0800
Committer: Jian He <jianhe@apache.org>
Committed: Wed Mar 8 13:20:45 2017 -0800

----------------------------------------------------------------------
 .../main/java/org/apache/hadoop/ipc/Client.java |  4 +---
 .../yarn/client/api/impl/TestAMRMClient.java    | 24 --------------------
 2 files changed, 1 insertion(+), 27 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hadoop/blob/ea8d53de/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/Client.java
----------------------------------------------------------------------
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/Client.java
b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/Client.java
index 32da353..5d3f22f 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/Client.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/Client.java
@@ -1770,9 +1770,7 @@ public class Client implements AutoCloseable {
     }
 
     void setSaslClient(SaslRpcClient client) throws IOException {
-      // Wrap the input stream in a BufferedInputStream to fill the buffer
-      // before reading its length (HADOOP-14062).
-      setInputStream(new BufferedInputStream(client.getInputStream(in)));
+      setInputStream(client.getInputStream(in));
       setOutputStream(client.getOutputStream(out));
     }
 

http://git-wip-us.apache.org/repos/asf/hadoop/blob/ea8d53de/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/test/java/org/apache/hadoop/yarn/client/api/impl/TestAMRMClient.java
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/test/java/org/apache/hadoop/yarn/client/api/impl/TestAMRMClient.java
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/test/java/org/apache/hadoop/yarn/client/api/impl/TestAMRMClient.java
index 329746b..06ae828 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/test/java/org/apache/hadoop/yarn/client/api/impl/TestAMRMClient.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/test/java/org/apache/hadoop/yarn/client/api/impl/TestAMRMClient.java
@@ -159,11 +159,6 @@ public class TestAMRMClient {
     // set the minimum allocation so that resource decrease can go under 1024
     conf.setInt(YarnConfiguration.RM_SCHEDULER_MINIMUM_ALLOCATION_MB, 512);
     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.init(conf);
     yarnCluster.start();
@@ -873,25 +868,6 @@ public class TestAMRMClient {
   }
 
   @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)
   public void testAMRMClientAllocReqId() throws YarnException, IOException {
     initAMRMClientAndTest(true);
   }


---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org


Mime
View raw message