Author: szetszwo
Date: Sat Jul 27 07:08:40 2013
New Revision: 1507590
URL: http://svn.apache.org/r1507590
Log:
svn merge -c 1507259 from trunk for HADOOP-9756. Remove the deprecated
getServer(..) methods from RPC.
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-app/src/main/java/org/apache/hadoop/mapred/TaskAttemptListenerImpl.java
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/mapred/TestAuditLogger.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/trunk/hadoop-mapreduce-project:r1507259
Propchange:
hadoop/common/branches/branch-2.1-beta/hadoop-mapreduce-project/CHANGES.txt
------------------------------------------------------------------------------
Merged /hadoop/common/trunk/hadoop-mapreduce-project/CHANGES.txt:r1507259
Propchange: hadoop/common/branches/branch-2.1-beta/hadoop-mapreduce-project/bin/
------------------------------------------------------------------------------
Merged /hadoop/common/trunk/hadoop-mapreduce-project/bin:r1507259
Propchange:
hadoop/common/branches/branch-2.1-beta/hadoop-mapreduce-project/conf/
------------------------------------------------------------------------------
Merged /hadoop/common/trunk/hadoop-mapreduce-project/conf:r1507259
Modified:
hadoop/common/branches/branch-2.1-beta/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapred/TaskAttemptListenerImpl.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.1-beta/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapred/TaskAttemptListenerImpl.java?rev=1507590&r1=1507589&r2=1507590&view=diff
==============================================================================
---
hadoop/common/branches/branch-2.1-beta/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapred/TaskAttemptListenerImpl.java
(original)
+++
hadoop/common/branches/branch-2.1-beta/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapred/TaskAttemptListenerImpl.java
Sat Jul 27 07:08:40 2013
@@ -63,7 +63,7 @@ import org.apache.hadoop.yarn.exceptions
* This class HAS to be in this package to access package private
* methods/classes.
*/
-@SuppressWarnings({"unchecked" , "deprecation"})
+@SuppressWarnings({"unchecked"})
public class TaskAttemptListenerImpl extends CompositeService
implements TaskUmbilicalProtocol, TaskAttemptListener {
@@ -118,11 +118,14 @@ public class TaskAttemptListenerImpl ext
protected void startRpcServer() {
Configuration conf = getConfig();
try {
- server =
- RPC.getServer(TaskUmbilicalProtocol.class, this, "0.0.0.0", 0,
- conf.getInt(MRJobConfig.MR_AM_TASK_LISTENER_THREAD_COUNT,
- MRJobConfig.DEFAULT_MR_AM_TASK_LISTENER_THREAD_COUNT),
- false, conf, jobTokenSecretManager);
+ server =
+ new RPC.Builder(conf).setProtocol(TaskUmbilicalProtocol.class)
+ .setInstance(this).setBindAddress("0.0.0.0")
+ .setPort(0).setNumHandlers(
+ conf.getInt(MRJobConfig.MR_AM_TASK_LISTENER_THREAD_COUNT,
+ MRJobConfig.DEFAULT_MR_AM_TASK_LISTENER_THREAD_COUNT))
+ .setVerbose(false).setSecretManager(jobTokenSecretManager)
+ .build();
// Enable service authorization?
if (conf.getBoolean(
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/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/resources/mapred-default.xml:r1507259
Modified:
hadoop/common/branches/branch-2.1-beta/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestAuditLogger.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/mapred/TestAuditLogger.java?rev=1507590&r1=1507589&r2=1507590&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/mapred/TestAuditLogger.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/mapred/TestAuditLogger.java
Sat Jul 27 07:08:40 2013
@@ -137,11 +137,12 @@ public class TestAuditLogger extends Tes
/**
* Test {@link AuditLogger} with IP set.
*/
- @SuppressWarnings("deprecation")
public void testAuditLoggerWithIP() throws Exception {
Configuration conf = new Configuration();
// start the IPC server
- Server server = RPC.getServer(new MyTestRPCServer(), "0.0.0.0", 0, conf);
+ Server server = new RPC.Builder(conf).setProtocol(TestProtocol.class)
+ .setInstance(new MyTestRPCServer()).setBindAddress("0.0.0.0")
+ .setPort(0).build();
server.start();
InetSocketAddress addr = NetUtils.getConnectAddress(server);
Propchange:
hadoop/common/branches/branch-2.1-beta/hadoop-mapreduce-project/hadoop-mapreduce-examples/
------------------------------------------------------------------------------
Merged
/hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-examples:r1507259
