Improve client wait [ci fast]

Signed-off-by: Paolo Di Tommaso <paolo.ditommaso@gmail.com>
nextflow-io · Apr 12, 2024 · 6e022f1 · 6e022f1
1 parent c108374
commit 6e022f1
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 17 deletions.
diff --git a/plugins/nf-wave/src/main/io/seqera/wave/plugin/WaveClient.groovy b/plugins/nf-wave/src/main/io/seqera/wave/plugin/WaveClient.groovy
@@ -586,28 +586,23 @@ class WaveClient {
         }
     }
 
-    protected URI imageToManifestUri(String image) {
-        final p = image.indexOf('/')
-        if( p==-1 ) throw new IllegalArgumentException("Invalid container name: $image")
-        final result = 'https://' + image.substring(0,p) + '/v2' + image.substring(p).replace(':','/manifests/')
-        return new URI(result)
-    }
-
     void awaitCompletion(String buildId) {
         final long maxAwait = Duration.ofMinutes(15).toMillis();
         final long startTime = Instant.now().toEpochMilli();
-        final random = new Random()
-        while( true ) {
-            if( isComplete(buildId) ) {
-                return;
-            }
+        while( !isComplete(buildId) ) {
             if( System.currentTimeMillis()-startTime > maxAwait ) {
-                break;
+                break
             }
-            Thread.sleep((random.nextInt(5) + 9) * 1_000)
+            Thread.sleep(randomRange(10,15) * 1_000)
         }
     }
 
+    protected static int randomRange(int min, int max) {
+        assert min<max
+        Random rand = new Random();
+        return rand.nextInt((max - min) + 1) + min;
+    }
+
     protected boolean isComplete(String buildId) {
         final String statusEndpoint = endpoint + "/v1alpha1/builds/"+buildId+"/status";
         final HttpRequest req = HttpRequest.newBuilder()
@@ -617,13 +612,13 @@ class WaveClient {
             .build();
 
         final HttpResponse<String> resp = httpSend(req);
-        log.debug("Wave response: statusCode={}; body={}", resp.statusCode(), resp.body());
+        log.debug("Wave build status response: statusCode={}; body={}", resp.statusCode(), resp.body())
         if( resp.statusCode()==200 ) {
             final result = jsonToBuildStatusResponse(resp.body())
-            return result.status == BuildStatusResponse.Status.COMPLETED;
+            return result.status == BuildStatusResponse.Status.COMPLETED
         }
         else {
-            String msg = String.format("Wave invalid response: [%s] %s", resp.statusCode(), resp.body());
+            String msg = String.format("Wave invalid response: GET %s [%s] %s", statusEndpoint, resp.statusCode(), resp.body());
             throw new BadResponseException(msg)
         }
     }

diff --git a/plugins/nf-wave/src/test/io/seqera/wave/plugin/WaveClientTest.groovy b/plugins/nf-wave/src/test/io/seqera/wave/plugin/WaveClientTest.groovy
@@ -1201,4 +1201,12 @@ class WaveClientTest extends Specification {
             true)
     }
 
+    def 'should test range' () {
+        expect:
+        100 .times { assert WaveClient.randomRange(10, 20) >= 10 }
+        100 .times { assert WaveClient.randomRange(10, 20) <= 20 }
+        100 .times { assert WaveClient.randomRange(0, 10) <= 10 }
+        100 .times { assert WaveClient.randomRange(0, 10) >= 0 }
+    }
+
 }