Author: szetszwo
Date: Sat Jul 27 06:50:53 2013
New Revision: 1507583
URL: http://svn.apache.org/r1507583
Log:
svn merge -c 1507582 from branch-2 for YARN-84. Use Builder to build RPC server.
Modified:
hadoop/common/branches/branch-2.1-beta/hadoop-mapreduce-project/ (props
changed)
hadoop/common/branches/branch-2.1-beta/hadoop-mapreduce-project/CHANGES.txt
(props changed)
hadoop/common/branches/branch-2.1-beta/hadoop-mapreduce-project/bin/
(props changed)
hadoop/common/branches/branch-2.1-beta/hadoop-mapreduce-project/conf/
(props changed)
hadoop/common/branches/branch-2.1-beta/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/resources/mapred-default.xml
(props changed)
hadoop/common/branches/branch-2.1-beta/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/security/TestUmbilicalProtocolWithJobToken.java
hadoop/common/branches/branch-2.1-beta/hadoop-mapreduce-project/hadoop-mapreduce-examples/
(props changed)
Propchange: hadoop/common/branches/branch-2.1-beta/hadoop-mapreduce-project/
------------------------------------------------------------------------------
Merged /hadoop/common/branches/branch-2/hadoop-mapreduce-project:r1507582
Merged /hadoop/common/trunk/hadoop-mapreduce-project:r1380921
Propchange:
hadoop/common/branches/branch-2.1-beta/hadoop-mapreduce-project/CHANGES.txt
------------------------------------------------------------------------------
Merged
/hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt:r1507582
Merged /hadoop/common/trunk/hadoop-mapreduce-project/CHANGES.txt:r1380921
Propchange: hadoop/common/branches/branch-2.1-beta/hadoop-mapreduce-project/bin/
------------------------------------------------------------------------------
Merged /hadoop/common/trunk/hadoop-mapreduce-project/bin:r1380921
Merged /hadoop/common/branches/branch-2/hadoop-mapreduce-project/bin:r1507582
Propchange:
hadoop/common/branches/branch-2.1-beta/hadoop-mapreduce-project/conf/
------------------------------------------------------------------------------
Merged /hadoop/common/branches/branch-2/hadoop-mapreduce-project/conf:r1507582
Merged /hadoop/common/trunk/hadoop-mapreduce-project/conf:r1380921
Propchange:
hadoop/common/branches/branch-2.1-beta/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/resources/mapred-default.xml
------------------------------------------------------------------------------
Merged
/hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/resources/mapred-default.xml:r1507582
Merged
/hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/resources/mapred-default.xml:r1380921
Modified:
hadoop/common/branches/branch-2.1-beta/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/security/TestUmbilicalProtocolWithJobToken.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.1-beta/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/security/TestUmbilicalProtocolWithJobToken.java?rev=1507583&r1=1507582&r2=1507583&view=diff
==============================================================================
---
hadoop/common/branches/branch-2.1-beta/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/security/TestUmbilicalProtocolWithJobToken.java
(original)
+++
hadoop/common/branches/branch-2.1-beta/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/security/TestUmbilicalProtocolWithJobToken.java
Sat Jul 27 06:50:53 2013
@@ -91,8 +91,10 @@ public class TestUmbilicalProtocolWithJo
.when(mockTT).getProtocolSignature(anyString(), anyLong(), anyInt());
JobTokenSecretManager sm = new JobTokenSecretManager();
- final Server server = RPC.getServer(TaskUmbilicalProtocol.class, mockTT,
- ADDRESS, 0, 5, true, conf, sm);
+ final Server server = new RPC.Builder(conf)
+ .setProtocol(TaskUmbilicalProtocol.class).setInstance(mockTT)
+ .setBindAddress(ADDRESS).setPort(0).setNumHandlers(5).setVerbose(true)
+ .setSecretManager(sm).build();
server.start();
Propchange:
hadoop/common/branches/branch-2.1-beta/hadoop-mapreduce-project/hadoop-mapreduce-examples/
------------------------------------------------------------------------------
Merged
/hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-examples:r1507582
Merged
/hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-examples:r1380921
