andreacavalli/rockserver
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix compilation

Browse Source
This commit is contained in:
Andrea Cavalli 2024-09-14 00:22:04 +02:00
parent 5a69263bd1
commit 86a984c1d6
3 changed files with 22 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/main/java/it/cavallium/rockserver/core/Main.java
View File

@ -111,21 +111,22 @@ public class Main {
clientBuilder.setName(name); clientBuilder.setName(name);
try (var connection = clientBuilder.build()) { try (var connection = clientBuilder.build()) {
LOG.info("Connected to {}", connection); try {
LOG.info("Connected to {}", connection);
thriftServerBuilder.setClient(connection); thriftServerBuilder.setClient(connection);
grpcServerBuilder.setClient(connection); grpcServerBuilder.setClient(connection);
CountDownLatch shutdownLatch = new CountDownLatch(1); CountDownLatch shutdownLatch = new CountDownLatch(1);
Runtime.getRuntime().addShutdownHook(new Thread(shutdownLatch::countDown)); Runtime.getRuntime().addShutdownHook(new Thread(shutdownLatch::countDown));
try (var _ = thriftServerBuilder.build(); try (var _ = thriftServerBuilder.build(); var _ = grpcServerBuilder.build()) {
var _ = grpcServerBuilder.build()) { shutdownLatch.await();
shutdownLatch.await(); LOG.info("Shutting down...");
LOG.info("Shutting down..."); }
} catch (Exception ex) {
LOG.error("Unexpected error", ex);
} }
} catch (InterruptedException e) {
throw new RuntimeException("Interrupted", e);
} }
LOG.info("Shut down successfully"); LOG.info("Shut down successfully");
} }

12
src/main/java/it/cavallium/rockserver/core/impl/rocksdb/TransactionalDB.java
View File

@ -157,17 +157,23 @@ public sealed interface TransactionalDB extends Closeable {
} }
} }
try { try {
db.flushWal(true); if (db.isOwningHandle()) {
db.flushWal(true);
}
} catch (RocksDBException e) { } catch (RocksDBException e) {
exceptions.add(e); exceptions.add(e);
} }
try (var options = new FlushOptions().setWaitForFlush(true).setAllowWriteStall(true)) { try (var options = new FlushOptions().setWaitForFlush(true).setAllowWriteStall(true)) {
db.flush(options); if (db.isOwningHandle()) {
db.flush(options);
}
} catch (RocksDBException e) { } catch (RocksDBException e) {
exceptions.add(e); exceptions.add(e);
} }
try { try {
db.closeE(); if (db.isOwningHandle()) {
db.closeE();
}
} catch (RocksDBException e) { } catch (RocksDBException e) {
exceptions.add(e); exceptions.add(e);
} }

12
src/main/java/it/cavallium/rockserver/core/server/GrpcServer.java
View File

@ -4,11 +4,8 @@ import static it.cavallium.rockserver.core.common.Utils.toMemorySegment;
import com.google.protobuf.ByteString; import com.google.protobuf.ByteString;
import com.google.protobuf.Empty; import com.google.protobuf.Empty;
import com.google.rpc.DebugInfo;
import io.grpc.Metadata;
import io.grpc.Status; import io.grpc.Status;
import io.grpc.netty.NettyServerBuilder; import io.grpc.netty.NettyServerBuilder;
import io.grpc.protobuf.ProtoUtils;
import io.grpc.stub.StreamObserver; import io.grpc.stub.StreamObserver;
import it.cavallium.rockserver.core.client.RocksDBConnection; import it.cavallium.rockserver.core.client.RocksDBConnection;
import it.cavallium.rockserver.core.common.ColumnHashType; import it.cavallium.rockserver.core.common.ColumnHashType;
@ -506,17 +503,10 @@ public class GrpcServer extends Server {
}; };
} }
private static final Metadata.Key<DebugInfo> DEBUG_INFO_TRAILER_KEY =
ProtoUtils.keyForProto(DebugInfo.getDefaultInstance());
private static <PREV, T> BiConsumer<? super PREV, Throwable> handleResponseObserver(Function<PREV, T> resultMapper, private static <PREV, T> BiConsumer<? super PREV, Throwable> handleResponseObserver(Function<PREV, T> resultMapper,
StreamObserver<T> responseObserver) { StreamObserver<T> responseObserver) {
return (value, ex) -> { return (value, ex) -> {
if (ex != null) { if (ex != null) {
Metadata trailers = new Metadata();
trailers.put(DEBUG_INFO_TRAILER_KEY, DebugInfo.newBuilder()
.setDetail("rockserver grpc execution failed")
.build());
var cause = ex; var cause = ex;
if (cause instanceof CompletionException completionException) { if (cause instanceof CompletionException completionException) {
cause = completionException; cause = completionException;
@ -526,7 +516,7 @@ public class GrpcServer extends Server {
} }
var error = Status.INTERNAL.withCause(cause) var error = Status.INTERNAL.withCause(cause)
.withDescription(cause.toString()) .withDescription(cause.toString())
.asException(trailers); .asException();
responseObserver.onError(error); responseObserver.onError(error);
} else { } else {
T mapped; T mapped;