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

HBASE-16505 Pass deadline to HRegion operations 

Signed-off-by: Michael Stack <stack@apache.org>
This commit is contained in:
Phil Yang 2016-10-10 18:38:50 +08:00 committed by Michael Stack
parent 3830890635
commit a3c29da0b6
3 changed files with 20 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
hbase-server/src/main/java/org/apache/hadoop/hbase/ipc/CallRunner.java
View File

@ -26,6 +26,7 @@ import org.apache.hadoop.hbase.CellScanner;
import org.apache.hadoop.hbase.HBaseInterfaceAudience; import org.apache.hadoop.hbase.HBaseInterfaceAudience;
import org.apache.hadoop.hbase.classification.InterfaceAudience; import org.apache.hadoop.hbase.classification.InterfaceAudience;
import org.apache.hadoop.hbase.classification.InterfaceStability; import org.apache.hadoop.hbase.classification.InterfaceStability;
import org.apache.hadoop.hbase.exceptions.TimeoutIOException;
import org.apache.hadoop.hbase.ipc.RpcServer.Call; import org.apache.hadoop.hbase.ipc.RpcServer.Call;
import org.apache.hadoop.hbase.monitoring.MonitoredRPCHandler; import org.apache.hadoop.hbase.monitoring.MonitoredRPCHandler;
import org.apache.hadoop.hbase.util.Pair; import org.apache.hadoop.hbase.util.Pair;
@ -95,7 +96,7 @@ public class CallRunner {
} }
call.startTime = System.currentTimeMillis(); call.startTime = System.currentTimeMillis();
if (call.startTime > call.deadline) { if (call.startTime > call.deadline) {
RpcServer.LOG.info("Drop timeout call: " + call); RpcServer.LOG.warn("Drop timeout call: " + call);
return; return;
} }
this.status.setStatus("Setting up call"); this.status.setStatus("Setting up call");
@ -122,6 +123,9 @@ public class CallRunner {
// make the call // make the call
resultPair = this.rpcServer.call(call.service, call.md, call.param, call.cellScanner, resultPair = this.rpcServer.call(call.service, call.md, call.param, call.cellScanner,
call.timestamp, this.status, call.startTime, call.timeout); call.timestamp, this.status, call.startTime, call.timeout);
} catch (TimeoutIOException e){
RpcServer.LOG.warn("Can not complete this request in time, drop it: " + call);
return;
} catch (Throwable e) { } catch (Throwable e) {
RpcServer.LOG.debug(Thread.currentThread().getName() + ": " + call.toShortString(), e); RpcServer.LOG.debug(Thread.currentThread().getName() + ": " + call.toShortString(), e);
errorThrowable = e; errorThrowable = e;

7
hbase-server/src/main/java/org/apache/hadoop/hbase/ipc/RpcCallContext.java
View File

@ -85,4 +85,11 @@ public interface RpcCallContext {
long getResponseBlockSize(); long getResponseBlockSize();
void incrementResponseBlockSize(long blockSize); void incrementResponseBlockSize(long blockSize);
/**
* Return the deadline of this call. If we can not complete this call in time, we can throw a
* TimeoutIOException and RPCServer will drop it.
* @return The system timestamp of deadline.
*/
long getDeadline();
} }

8
hbase-server/src/main/java/org/apache/hadoop/hbase/ipc/RpcServer.java
View File

@ -407,7 +407,8 @@ public class RpcServer implements RpcServerInterface, ConfigurationObserver {
return "callId: " + this.id + " service: " + serviceName + return "callId: " + this.id + " service: " + serviceName +
" methodName: " + ((this.md != null) ? this.md.getName() : "n/a") + " methodName: " + ((this.md != null) ? this.md.getName() : "n/a") +
" size: " + StringUtils.TraditionalBinaryPrefix.long2String(this.size, "", 1) + " size: " + StringUtils.TraditionalBinaryPrefix.long2String(this.size, "", 1) +
" connection: " + connection.toString(); " connection: " + connection.toString() +
" deadline: " + deadline;
} }
String toTraceString() { String toTraceString() {
@ -573,6 +574,11 @@ public class RpcServer implements RpcServerInterface, ConfigurationObserver {
responseBlockSize += blockSize; responseBlockSize += blockSize;
} }
@Override
public long getDeadline() {
return deadline;
}
public synchronized void sendResponseIfReady() throws IOException { public synchronized void sendResponseIfReady() throws IOException {
// set param null to reduce memory pressure // set param null to reduce memory pressure
this.param = null; this.param = null;