forked from quarkusio/quarkus
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Allow concurrent invocation of blocking gRPC services by removing glo…
…bal ordering Fix quarkusio#40155 Previously, the code utilized `executeBlocking` with `ordered=true` to maintain event order. However, this approach enforced global order instead of per-call order. This commit corrects the behavior, ensuring per-call order preservation using the BlockingExecutionHandler lock.
- Loading branch information
1 parent
4d68cc6
commit 2a2bb84
Showing
3 changed files
with
108 additions
and
1 deletion.
There are no files selected for viewing
88 changes: 88 additions & 0 deletions
88
...ployment/src/test/java/io/quarkus/grpc/server/blocking/MultiThreadedBlockingImplTest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,88 @@ | ||
package io.quarkus.grpc.server.blocking; | ||
|
||
import java.time.Duration; | ||
import java.util.concurrent.CountDownLatch; | ||
import java.util.concurrent.ExecutorService; | ||
import java.util.concurrent.Executors; | ||
import java.util.concurrent.TimeUnit; | ||
|
||
import org.acme.Request; | ||
import org.acme.Response; | ||
import org.acme.StandardBlockingGrpcServiceGrpc; | ||
import org.jboss.logging.Logger; | ||
import org.jboss.shrinkwrap.api.ShrinkWrap; | ||
import org.jboss.shrinkwrap.api.spec.JavaArchive; | ||
import org.junit.jupiter.api.AfterAll; | ||
import org.junit.jupiter.api.Assertions; | ||
import org.junit.jupiter.api.Test; | ||
import org.junit.jupiter.api.extension.RegisterExtension; | ||
|
||
import io.grpc.stub.StreamObserver; | ||
import io.quarkus.grpc.GrpcClient; | ||
import io.quarkus.grpc.GrpcService; | ||
import io.quarkus.grpc.runtime.devmode.GrpcServices; | ||
import io.quarkus.test.QuarkusUnitTest; | ||
import io.smallrye.common.annotation.Blocking; | ||
import io.vertx.core.impl.ConcurrentHashSet; | ||
|
||
public class MultiThreadedBlockingImplTest { | ||
|
||
private static final Logger logger = Logger.getLogger(GrpcServices.class); | ||
|
||
@RegisterExtension | ||
static final QuarkusUnitTest config = new QuarkusUnitTest() | ||
.setFlatClassPath(true) | ||
.setArchiveProducer( | ||
() -> ShrinkWrap.create(JavaArchive.class) | ||
.addPackage(StandardBlocking.class.getPackage()) | ||
.addPackage( | ||
StandardBlockingGrpcServiceGrpc.StandardBlockingGrpcServiceImplBase.class.getPackage())); | ||
|
||
@GrpcClient | ||
StandardBlockingGrpcServiceGrpc.StandardBlockingGrpcServiceBlockingStub client; | ||
|
||
static ExecutorService executor = Executors.newCachedThreadPool(); | ||
|
||
@AfterAll | ||
static void cleanup() { | ||
executor.shutdown(); | ||
} | ||
|
||
@Test | ||
void testTheBlockingCallsCanBeDispatchedOnMultipleThreads() throws InterruptedException { | ||
int count = 100; | ||
ConcurrentHashSet<String> threads = new ConcurrentHashSet<>(); | ||
CountDownLatch latch = new CountDownLatch(count); | ||
for (int i = 0; i < count; i++) { | ||
int id = i; | ||
executor.submit(() -> { | ||
threads.add(invokeService(id)); | ||
latch.countDown(); | ||
}); | ||
} | ||
|
||
Assertions.assertTrue(latch.await(10, TimeUnit.SECONDS)); | ||
Assertions.assertTrue(threads.size() > 1); | ||
} | ||
|
||
String invokeService(int id) { | ||
return client.invoke(Request.newBuilder().setId(id).build()).getThread(); | ||
} | ||
|
||
@GrpcService | ||
@Blocking | ||
static class StandardBlocking extends StandardBlockingGrpcServiceGrpc.StandardBlockingGrpcServiceImplBase { | ||
@Override | ||
public void invoke(Request request, StreamObserver<Response> responseObserver) { | ||
try { | ||
Thread.sleep(Duration.ofSeconds(2).toMillis()); | ||
} catch (InterruptedException e) { | ||
Thread.currentThread().interrupt(); | ||
throw new RuntimeException(e); | ||
} | ||
responseObserver.onNext(Response.newBuilder() | ||
.setId(request.getId()).setThread(Thread.currentThread().getName()).build()); | ||
responseObserver.onCompleted(); | ||
} | ||
} | ||
} |
19 changes: 19 additions & 0 deletions
19
extensions/grpc/deployment/src/test/proto/blocking/BlockingGrpcService.proto
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,19 @@ | ||
syntax = "proto3"; | ||
|
||
option java_multiple_files = true; | ||
option java_package = "org.acme"; | ||
|
||
package hello; | ||
|
||
service StandardBlockingGrpcService { | ||
rpc Invoke (Request) returns (Response) {} | ||
} | ||
|
||
message Request { | ||
int32 id = 1; | ||
} | ||
|
||
message Response { | ||
int32 id = 1; | ||
string thread = 2; | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters