grpc
/
grpc-java
mirror of https://github.com/grpc/grpc-java.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

core: keepaliveManager not to use Ping.onSuccess; ragard onDataReceive as ping Ack 

Preparing to support server side keepalive.
For the convience on server side, not to use Ping `onSuccess()` callback to cancle shutdownFuture any more, instead, regard `onDataReceived()` as ping Ack and cancel shutdownFuture in it.
This commit is contained in:
ZHANG Dapeng 2017-03-15 11:15:44 -07:00 committed by GitHub
parent 3390b6ae8d
commit c44a4b24dd
2 changed files with 20 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
core/src/main/java/io/grpc/internal/KeepAliveManager.java
View File

@ -162,6 +162,21 @@ public class KeepAliveManager {
// keep one sendPing task always in flight when there're active rpcs.
if (state == State.PING_SCHEDULED) {
state = State.PING_DELAYED;
} else if (state == State.PING_SENT || state == State.IDLE_AND_PING_SENT) {
// Ping acked or effectively ping acked. Cancel shutdown, and then if not idle,
// schedule a new keep-alive ping.
if (shutdownFuture != null) {
shutdownFuture.cancel(false);
}
if (state == State.IDLE_AND_PING_SENT) {
// not to schedule new pings until onTransportActive
state = State.IDLE;
return;
}
// schedule a new ping
state = State.PING_SCHEDULED;
pingFuture =
scheduler.schedule(sendPing, keepAliveDelayInNanos, TimeUnit.NANOSECONDS);
}
}
@ -171,7 +186,7 @@ public class KeepAliveManager {
public synchronized void onTransportActive() {
if (state == State.IDLE) {
// When the transport goes active, we do not reset the nextKeepaliveTime. This allows us to
// quickly check whether the conneciton is still working.
// quickly check whether the connection is still working.
state = State.PING_SCHEDULED;
pingFuture = scheduler.schedule(sendPing, nextKeepaliveTime - ticker.read(),
TimeUnit.NANOSECONDS);
@ -210,23 +225,7 @@ public class KeepAliveManager {
private class KeepAlivePingCallback implements ClientTransport.PingCallback {
@Override
public void onSuccess(long roundTripTimeNanos) {
synchronized (KeepAliveManager.this) {
shutdownFuture.cancel(false);
nextKeepaliveTime = ticker.read() + keepAliveDelayInNanos;
if (state == State.PING_SENT) {
// We have received the ping response so there's no need to shutdown the transport.
// Schedule a new keepalive ping.
pingFuture = scheduler.schedule(sendPing, keepAliveDelayInNanos, TimeUnit.NANOSECONDS);
state = State.PING_SCHEDULED;
}
if (state == State.IDLE_AND_PING_SENT) {
// Transport went idle after we had sent out the ping. We don't need to schedule a new
// ping.
state = State.IDLE;
}
}
}
public void onSuccess(long roundTripTimeNanos) {}
@Override
public void onFailure(Throwable cause) {

9
core/src/test/java/io/grpc/internal/KeepAliveManagerTest.java
View File

@ -95,7 +95,6 @@ public final class KeepAliveManagerTest {
ArgumentCaptor<ClientTransport.PingCallback> pingCallbackCaptor =
ArgumentCaptor.forClass(ClientTransport.PingCallback.class);
verify(transport).ping(pingCallbackCaptor.capture(), isA(Executor.class));
ClientTransport.PingCallback pingCallback = pingCallbackCaptor.getValue();
verify(scheduler, times(2)).schedule(isA(Runnable.class), delayCaptor.capture(),
isA(TimeUnit.class));
delay = delayCaptor.getValue();
@ -104,7 +103,7 @@ public final class KeepAliveManagerTest {
// Ping succeeds. Reschedule another ping.
ticker.time = 1100;
pingCallback.onSuccess(100);
keepAliveManager.onDataReceived();
verify(scheduler, times(3)).schedule(isA(Runnable.class), delayCaptor.capture(),
isA(TimeUnit.class));
// Shutdown task has been cancelled.
@ -280,13 +279,12 @@ public final class KeepAliveManagerTest {
ArgumentCaptor<ClientTransport.PingCallback> pingCallbackCaptor =
ArgumentCaptor.forClass(ClientTransport.PingCallback.class);
verify(transport).ping(pingCallbackCaptor.capture(), isA(Executor.class));
ClientTransport.PingCallback pingCallback = pingCallbackCaptor.getValue();
verify(scheduler, times(2)).schedule(isA(Runnable.class), isA(Long.class), isA(TimeUnit.class));
// Transport becomes idle. No more ping should be scheduled after we receive a ping response.
keepAliveManager.onTransportIdle();
ticker.time = 1100;
pingCallback.onSuccess(100);
keepAliveManager.onDataReceived();
verify(scheduler, times(2)).schedule(isA(Runnable.class), isA(Long.class), isA(TimeUnit.class));
// Shutdown task has been cancelled.
verify(shutdownFuture).cancel(isA(Boolean.class));
@ -399,13 +397,12 @@ public final class KeepAliveManagerTest {
ArgumentCaptor<ClientTransport.PingCallback> pingCallbackCaptor =
ArgumentCaptor.forClass(ClientTransport.PingCallback.class);
verify(transport).ping(pingCallbackCaptor.capture(), isA(Executor.class));
ClientTransport.PingCallback pingCallback = pingCallbackCaptor.getValue();
keepAliveManager.onTransportIdle();
keepAliveManager.onTransportActive();
pingCallback.onSuccess(100);
keepAliveManager.onDataReceived();
// another ping scheduled
verify(scheduler, times(3))