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

services: fix callbacks not being forwarded in binlog interceptors (#4918)

This commit is contained in:
zpencer 2018-10-09 10:45:25 -07:00 committed by GitHub
parent 5eb816b3b1
commit 308887a150
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
services/src/main/java/io/grpc/services/BinlogHelper.java
View File

@ -486,6 +486,7 @@ final class BinlogHelper {
seq.getAndIncrement(),
GrpcLogEntry.Logger.LOGGER_CLIENT,
callId);
super.halfClose();
}
@Override
@ -590,6 +591,7 @@ final class BinlogHelper {
seq.getAndIncrement(),
GrpcLogEntry.Logger.LOGGER_SERVER,
callId);
super.onCancel();
}
};
}

16
services/src/test/java/io/grpc/services/BinlogHelperTest.java
View File

@ -1082,6 +1082,8 @@ public final class BinlogHelperTest {
final AtomicReference<Metadata> actualClientInitial = new AtomicReference<Metadata>();
final AtomicReference<Object> actualRequest = new AtomicReference<Object>();
final SettableFuture<Void> halfCloseCalled = SettableFuture.create();
final SettableFuture<Void> cancelCalled = SettableFuture.create();
Channel channel = new Channel() {
@Override
public <RequestT, ResponseT> ClientCall<RequestT, ResponseT> newCall(
@ -1098,6 +1100,16 @@ public final class BinlogHelperTest {
actualRequest.set(message);
}
@Override
public void cancel(String message, Throwable cause) {
cancelCalled.set(null);
}
@Override
public void halfClose() {
halfCloseCalled.set(null);
}
@Override
public Attributes getAttributes() {
return Attributes.newBuilder().set(Grpc.TRANSPORT_ATTR_REMOTE_ADDR, peer).build();
@ -1181,6 +1193,7 @@ public final class BinlogHelperTest {
/*seq=*/ eq(4L),
eq(Logger.LOGGER_CLIENT),
eq(CALL_ID));
halfCloseCalled.get(1, TimeUnit.SECONDS);
verifyNoMoreInteractions(mockSinkWriter);
}
@ -1223,6 +1236,7 @@ public final class BinlogHelperTest {
/*seq=*/ eq(7L),
eq(Logger.LOGGER_CLIENT),
eq(CALL_ID));
cancelCalled.get(1, TimeUnit.SECONDS);
}
}
@ -1432,6 +1446,7 @@ public final class BinlogHelperTest {
eq(Logger.LOGGER_SERVER),
eq(CALL_ID));
verifyNoMoreInteractions(mockSinkWriter);
verify(mockListener).onHalfClose();
}
// send server msg
@ -1473,6 +1488,7 @@ public final class BinlogHelperTest {
/*seq=*/ eq(7L),
eq(Logger.LOGGER_SERVER),
eq(CALL_ID));
verify(mockListener).onCancel();
}
}