Merge pull request #662 from BillyYccc/fix-pooled-connection-hang

Make recycling pooled connection events emitted on the eventloop context associated with connection pool

Author: vietj

vertx-pg-client/src/test/java/io/vertx/pgclient/PgPoolTestBase.java

@@ -55,15 +55,15 @@ protected PgPool createPool(PgConnectOptions connectOptions, int size) {
 
   @Test
   public void testPool(TestContext ctx) {
-    int num = 1000;
+    int num = 5000;
     Async async = ctx.async(num);
     PgPool pool = createPool(options, 4);
     for (int i = 0;i < num;i++) {
       pool.getConnection(ctx.asyncAssertSuccess(conn -> {
-        conn.query("SELECT id, randomnumber from WORLD WHERE id = 1").execute(ar -> {
+        conn.query("SELECT id, randomnumber from WORLD").execute(ar -> {
           if (ar.succeeded()) {
             SqlResult result = ar.result();
-            ctx.assertEquals(1, result.size());
+            ctx.assertEquals(10000, result.size());
           } else {
             ctx.assertEquals("closed", ar.cause().getMessage());
           }
@@ -80,10 +80,10 @@ public void testQuery(TestContext ctx) {
     Async async = ctx.async(num);
     PgPool pool = createPool(options, 4);
     for (int i = 0;i < num;i++) {
-      pool.query("SELECT id, randomnumber from WORLD WHERE id = 1").execute(ar -> {
+      pool.query("SELECT id, randomnumber from WORLD").execute(ar -> {
         if (ar.succeeded()) {
           SqlResult result = ar.result();
-          ctx.assertEquals(1, result.size());
+          ctx.assertEquals(10000, result.size());
         } else {
           ctx.assertEquals("closed", ar.cause().getMessage());
         }

vertx-sql-client/src/main/java/io/vertx/sqlclient/impl/pool/ConnectionPool.java

@@ -169,6 +169,14 @@ public void init(Holder holder) {
 
     @Override
     public void close(Holder holder, Promise<Void> promise) {
+      if (context != null) {
+        context.dispatch(v -> doClose(holder, promise));
+      } else {
+        doClose(holder, promise);
+      }
+    }
+
+    private void doClose(Holder holder, Promise<Void> promise) {
       if (holder != this.holder) {
         String msg;
         if (this.holder == null) {