fix: Batch issue fix (GoogleCloudPlatform#7816)

Sita04 · web-flow · commit d19b4657dd0f · 2023-03-30T10:22:48.000+05:30
* fix: batch bucket test contents

* add test annotation

* fix: batch timeout issue and job exists issue

* increase timeout
diff --git a/batch/snippets/src/test/java/BatchBasicIT.java b/batch/snippets/src/test/java/BatchBasicIT.java
@@ -18,6 +18,7 @@
 import com.google.cloud.batch.v1.BatchServiceClient;
 import com.google.cloud.batch.v1.Job;
 import com.google.cloud.batch.v1.JobName;
+import com.google.cloud.testing.junit4.MultipleAttemptsRule;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.PrintStream;
@@ -29,6 +30,7 @@
 import org.junit.AfterClass;
 import org.junit.Before;
 import org.junit.BeforeClass;
+import org.junit.Rule;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.JUnit4;
@@ -38,11 +40,18 @@ public class BatchBasicIT {
 
   private static final String PROJECT_ID = System.getenv("GOOGLE_CLOUD_PROJECT");
   private static final String REGION = "europe-north1";
+  private static final int MAX_ATTEMPT_COUNT = 3;
+  private static final int INITIAL_BACKOFF_MILLIS = 120000; // 2 minutes
   private static String SCRIPT_JOB_NAME;
   private static String CONTAINER_JOB_NAME;
 
   private ByteArrayOutputStream stdOut;
 
+  @Rule
+  public final MultipleAttemptsRule multipleAttemptsRule = new MultipleAttemptsRule(
+      MAX_ATTEMPT_COUNT,
+      INITIAL_BACKOFF_MILLIS);
+
   // Check if the required environment variables are set.
   public static void requireEnvVar(String envVarName) {
     assertWithMessage(String.format("Missing environment variable '%s' ", envVarName))
diff --git a/batch/snippets/src/test/java/BatchTemplateIT.java b/batch/snippets/src/test/java/BatchTemplateIT.java
@@ -102,9 +102,15 @@ public static void setUp()
       // System.out.println("Do nothing");
     }
 
+    // Create instance templates.
     INSTANCE_TEMPLATE = createInstanceTemplate();
     TimeUnit.SECONDS.sleep(10);
 
+    // Create job with template.
+    CreateWithTemplate.createWithTemplate(PROJECT_ID, REGION, SCRIPT_JOB_NAME,
+        INSTANCE_TEMPLATE.getSelfLink());
+    assertThat(stdOut.toString()).contains("Successfully created the job: ");
+
     stdOut.close();
     System.setOut(out);
   }
@@ -222,10 +228,8 @@ public void afterEach() {
 
   @Test
   public void testCreateWithTemplate()
-      throws IOException, ExecutionException, InterruptedException, TimeoutException {
-    CreateWithTemplate.createWithTemplate(PROJECT_ID, REGION, SCRIPT_JOB_NAME,
-        INSTANCE_TEMPLATE.getSelfLink());
-    assertThat(stdOut.toString()).contains("Successfully created the job: ");
+      throws IOException, InterruptedException {
     Util.waitForJobCompletion(Util.getJob(PROJECT_ID, REGION, SCRIPT_JOB_NAME));
+    assertThat(stdOut.toString()).contains("Job completed");
   }
 }
diff --git a/batch/snippets/src/test/java/Util.java b/batch/snippets/src/test/java/Util.java
@@ -107,13 +107,14 @@ public static void waitForJobCompletion(Job job)
     String[] jobName = job.getName().split("/");
     Instant startTime = Instant.now();
     while (WAIT_STATES.contains(job.getStatus().getState())) {
-      if (Instant.now().getEpochSecond() - startTime.getEpochSecond() > 500) {
+      if (Instant.now().getEpochSecond() - startTime.getEpochSecond() > 900) {
         throw new Error("Timed out waiting for operation to complete.");
       }
       job = getJob(jobName[1], jobName[3], jobName[5]);
-      TimeUnit.SECONDS.sleep(5);
+      TimeUnit.SECONDS.sleep(10);
     }
     job = getJob(jobName[1], jobName[3], job.getName().split("/")[5]);
     assertThat(job.getStatus().getState() == State.SUCCEEDED);
+    System.out.println("Job completed.");
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -107,13 +107,14 @@ public static void waitForJobCompletion(Job job)`
`107`	`107`	`String[] jobName = job.getName().split("/");`
`108`	`108`	`Instant startTime = Instant.now();`
`109`	`109`	`while (WAIT_STATES.contains(job.getStatus().getState())) {`
`110`		`- if (Instant.now().getEpochSecond() - startTime.getEpochSecond() > 500) {`
	`110`	`+ if (Instant.now().getEpochSecond() - startTime.getEpochSecond() > 900) {`
`111`	`111`	`throw new Error("Timed out waiting for operation to complete.");`
`112`	`112`	`}`
`113`	`113`	`job = getJob(jobName[1], jobName[3], jobName[5]);`
`114`		`- TimeUnit.SECONDS.sleep(5);`
	`114`	`+ TimeUnit.SECONDS.sleep(10);`
`115`	`115`	`}`
`116`	`116`	`job = getJob(jobName[1], jobName[3], job.getName().split("/")[5]);`
`117`	`117`	`assertThat(job.getStatus().getState() == State.SUCCEEDED);`
	`118`	`+ System.out.println("Job completed.");`
`118`	`119`	`}`
`119`	`120`	`}`