big-data/hadoop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

HADOOP-6099. The RPC module can be configured to not send period pings.

Browse Source 
The default behaviour remains unchanged. (dhruba)



git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@792812 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Dhruba Borthakur 2009-07-10 06:17:55 +00:00
parent 34d67b1cc2
commit c38c5a43ff
3 changed files with 39 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGES.txt
View File

@ -471,6 +471,9 @@ Trunk (unreleased changes)
HADOOP-2366. Support trimmed strings in Configuration. (Michele Catasta
via szetszwo)
HADOOP-6099. The RPC module can be configured to not send period pings.
The default behaviour of sending periodic pings remain unchanged. (dhruba)
OPTIMIZATIONS
HADOOP-5595. NameNode does not need to run a replicator to choose a

23
src/java/org/apache/hadoop/ipc/Client.java
View File

@ -73,6 +73,7 @@ public class Client {
final private int maxRetries; //the max. no. of retries for socket connections
private boolean tcpNoDelay; // if T then disable Nagle's Algorithm
private int pingInterval; // how often sends ping to the server in msecs
final private boolean doPing; //do we need to send ping message
private SocketFactory socketFactory; // how to create sockets
private int refCount = 1;
@ -102,6 +103,22 @@ final static int getPingInterval(Configuration conf) {
return conf.getInt(PING_INTERVAL_NAME, DEFAULT_PING_INTERVAL);
}
/**
* The time after which a RPC will timeout.
* If ping is not enabled (via ipc.client.ping), then the timeout value is the
* same as the pingInterval.
* If ping is enabled, then there is no timeout value.
*
* @param conf Configuration
* @return the timeout period in milliseconds. -1 if no timeout value is set
*/
final public static int getTimeout(Configuration conf) {
if (!conf.getBoolean("ipc.client.ping", true)) {
return getPingInterval(conf);
}
return -1;
}
/**
* Increment this client's reference count
*
@ -317,8 +334,13 @@ private synchronized void setupIOstreams() {
handleConnectionFailure(ioFailures++, maxRetries, ie);
}
}
if (doPing) {
this.in = new DataInputStream(new BufferedInputStream
(new PingInputStream(NetUtils.getInputStream(socket))));
} else {
this.in = new DataInputStream(new BufferedInputStream
(NetUtils.getInputStream(socket)));
}
this.out = new DataOutputStream
(new BufferedOutputStream(NetUtils.getOutputStream(socket)));
writeHeader();
@ -634,6 +656,7 @@ public Client(Class<? extends Writable> valueClass, Configuration conf,
conf.getInt("ipc.client.connection.maxidletime", 10000); //10s
this.maxRetries = conf.getInt("ipc.client.connect.max.retries", 10);
this.tcpNoDelay = conf.getBoolean("ipc.client.tcpnodelay", false);
this.doPing = conf.getBoolean("ipc.client.ping", true);
this.pingInterval = getPingInterval(conf);
if (LOG.isDebugEnabled()) {
LOG.debug("The ping interval is" + this.pingInterval + "ms.");

14
src/test/core/org/apache/hadoop/ipc/TestRPC.java
View File

@ -231,7 +231,7 @@ public void testSlowRpc() throws Exception {
}
public void testCalls() throws Exception {
public void testCalls(Configuration conf) throws Exception {
Server server = RPC.getServer(new TestImpl(), ADDRESS, 0, conf);
TestProtocol proxy = null;
try {
@ -383,9 +383,19 @@ public void testAuthorization() throws Exception {
doRPCs(conf, true);
}
/**
* Switch off setting socketTimeout values on RPC sockets.
* Verify that RPC calls still work ok.
*/
public void testNoPings() throws Exception {
Configuration conf = new Configuration();
conf.setBoolean("ipc.client.ping", false);
new TestRPC("testnoPings").testCalls(conf);
}
public static void main(String[] args) throws Exception {
new TestRPC("test").testCalls();
new TestRPC("test").testCalls(conf);
}
}