Merge pull request #943 from zhicwu/cli-client

Fix timeout issues

Author: zhicwu

.github/workflows/benchmark.yml

@@ -107,7 +107,7 @@ jobs:
         continue-on-error: true
       - name: Build project
         run: |
-          mvn --batch-mode --update-snapshots -DskipTests -pl clickhouse-benchmark -am package
+          mvn --batch-mode -DskipTests -pl clickhouse-benchmark -am package
           cd clickhouse-benchmark
           java -DclickhouseVersion="21.8" -jar target/benchmarks.jar -rf json ${{ github.event.inputs.options }} > output.txt
           echo "BENCHMARK_REPORT<<EOF" >> $GITHUB_ENV

.github/workflows/build.yml

@@ -91,7 +91,7 @@ jobs:
         run: mvn --batch-mode --update-snapshots -Drelease -DskipTests install
       - name: Build
         run: |
-          mvn --batch-mode --update-snapshots -Drelease -DclickhouseVersion=${{ matrix.clickhouse }} -Dprotocol=${{ matrix.protocol }} verify
+          mvn --batch-mode -Drelease -DclickhouseVersion=${{ matrix.clickhouse }} -Dprotocol=${{ matrix.protocol }} verify
       - name: Upload test results
         uses: actions/upload-artifact@v2
         if: failure()

.github/workflows/timezone.yml

@@ -61,8 +61,7 @@ jobs:
             --also-make install
       - name: Test JDBC driver
         run: |
-          mvn --batch-mode --update-snapshots \
-            --projects clickhouse-jdbc \
+          mvn --batch-mode --projects clickhouse-jdbc \
             -DclickhouseTimezone=${{ matrix.serverTz }} \
             -DclickhouseVersion=22.3 \
             -Duser.timezone=${{ matrix.clientTz }} \

clickhouse-cli-client/src/main/java/com/clickhouse/client/cli/ClickHouseCommandLine.java

@@ -69,7 +69,7 @@ static boolean check(int timeout, String command, String... args) {
                 }
                 return exitValue == 0;
             } else {
-                log.trace("Timed out waiting for command %s to complete", list);
+                log.trace("Timed out after waiting %d ms for command %s to complete", timeout, list);
             }
         } catch (InterruptedException e) {
             Thread.currentThread().interrupt();
@@ -358,33 +358,31 @@ IOException getError() {
                 error = "";
             }
             try {
-                if (!process.waitFor(request.getConfig().getSocketTimeout(), TimeUnit.MILLISECONDS)) {
-                    return new IOException("Timed out waiting for command to terminate");
+                int exitValue = process.waitFor();
+                if (exitValue != 0) {
+                    if (error.isEmpty()) {
+                        error = ClickHouseUtils.format("Command exited with value %d", exitValue);
+                    } else {
+                        int index = error.trim().indexOf('\n');
+                        error = index > 0 ? error.substring(index + 1) : error;
+                    }
+                } else {
+                    if (!error.isEmpty()) {
+                        // TODO update response summary
+                        log.trace(() -> {
+                            for (String line : error.split("\n")) {
+                                log.trace(line);
+                            }
+                            return "";
+                        });
+                    }
+                    error = "";
                 }
             } catch (InterruptedException e) {
                 Thread.currentThread().interrupt();
                 process.destroyForcibly();
                 throw new CompletionException(e);
             }
-            if (process.exitValue() != 0) {
-                if (error.isEmpty()) {
-                    error = ClickHouseUtils.format("Command exited with value %d", process.exitValue());
-                } else {
-                    int index = error.trim().indexOf('\n');
-                    error = index > 0 ? error.substring(index + 1) : error;
-                }
-            } else {
-                if (!error.isEmpty()) {
-                    // TODO update response summary
-                    log.trace(() -> {
-                        for (String line : error.split("\n")) {
-                            log.trace(line);
-                        }
-                        return "";
-                    });
-                }
-                error = "";
-            }
         }
         return !ClickHouseChecker.isNullOrBlank(error) ? new IOException(error) : null;
     }

clickhouse-client/src/main/java/com/clickhouse/client/ClickHouseClient.java

@@ -105,16 +105,8 @@ static ClickHouseOutputStream getAsyncRequestOutputStream(ClickHouseConfig confi
         final CountDownLatch latch = new CountDownLatch(1);
         final ClickHousePipedOutputStream stream = ClickHouseDataStreamFactory.getInstance()
                 .createPipedOutputStream(config, () -> {
-                    long timeout = config.getSocketTimeout();
                     try {
-                        if (timeout > 0L) {
-                            if (!latch.await(timeout, TimeUnit.MILLISECONDS)) {
-                                throw new IllegalStateException(
-                                        ClickHouseUtils.format("Async write timed out after %d ms", timeout));
-                            }
-                        } else {
-                            latch.await();
-                        }
+                        latch.await();
 
                         if (postCloseAction != null) {
                             postCloseAction.run();