Skip to content

Plat 3536 #17

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Sep 29, 2023
Merged

Plat 3536 #17

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1548af8
feat: return error
eisbilir Sep 29, 2023
e497ee8
feat: update cancel stream tiout method
eisbilir Sep 29, 2023
b6893be
feat: add stream started log
eisbilir Sep 29, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions src/main/java/com/topcoder/dal/DBAccessor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
import com.topcoder.dal.util.StreamJdbcTemplate;
import com.topcoder.dal.util.ParameterizedExpression;

import io.grpc.Status;
import io.grpc.stub.StreamObserver;
import jdk.jshell.spi.ExecutionControl;
import net.devh.boot.grpc.server.service.GrpcService;
Expand Down Expand Up @@ -317,6 +318,7 @@ public void query(QueryRequest request, StreamObserver<QueryResponse> responseOb

@Override
public StreamObserver<QueryRequest> streamQuery(StreamObserver<QueryResponse> responseObserver) {
logger.info("Stream started");
return new StreamObserver<>() {
Connection con = jdbcTemplate.getConnection();
private final Duration streamTimeout = Duration.ofSeconds(20);
Expand All @@ -327,10 +329,11 @@ public StreamObserver<QueryRequest> streamQuery(StreamObserver<QueryResponse> re

@Override
public void onNext(QueryRequest request) {
resetStreamTimeout();
cancelStreamTimeout();
try {
QueryResponse response = executeQuery(request.getQuery(), con);
responseObserver.onNext(response);
resetStreamTimeout();
} catch (Exception e) {
rollback();
cancelStreamTimeout();
Expand Down Expand Up @@ -377,7 +380,7 @@ private boolean debounce() {

private boolean cancelStreamTimeout() {
ScheduledFuture<?> currentFuture = streamTimeoutFuture.get();
return currentFuture == null || currentFuture.cancel(false);
return currentFuture == null || currentFuture.isCancelled() || currentFuture.cancel(false);
}

private ScheduledFuture<?> scheduleStreamTimeout() {
Expand All @@ -387,7 +390,7 @@ private ScheduledFuture<?> scheduleStreamTimeout() {
logger.error(message);
rollback();
cancelStreamTimeout();
responseObserver.onCompleted();
responseObserver.onError(Status.DEADLINE_EXCEEDED.withDescription(message).asRuntimeException());
}, streamTimeout.plus(DEBOUNCE_INTERVAL).toNanos(), TimeUnit.NANOSECONDS);
}
};
Expand Down
4 changes: 2 additions & 2 deletions src/main/resources/application.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
spring.datasource.url=${DB_URL:jdbc:informix-sqli://localhost:2021/informixoltp:INFORMIXSERVER=informixoltp_tcp}
spring.datasource.username=${DB_USERNAME:informix}
spring.datasource.password=${DB_PASSWORD:1nf0rm1x}
spring.datasource.hikari.connectionTimeout=20000
spring.datasource.hikari.connectionTimeout=30000
spring.datasource.hikari.maximumPoolSize=20
spring.datasource.hikari.leak-detection-threshold: 60000
spring.datasource.hikari.leak-detection-threshold=90000
grpc.server.port=9090
logging.pattern.console=%d{yyyy-MM-dd HH:mm:ss.SSS} [%t] %X{AWS-XRAY-TRACE-ID} [%p] %M - %m%n