debug

Author: Ian-Nara

docker-compose.yml

@@ -16,6 +16,9 @@ services:
       - EDGE_PORT=5001
       - KMS_PROVIDER=local-kms
       - LOCALSTACK_HOST=localstack
+      - SERVICES=s3,sqs,kms
+      - DEFAULT_REGION=us-east-1
+      - AWS_DEFAULT_REGION=us-east-1
     healthcheck:
       test: awslocal s3api wait bucket-exists --bucket test-core-bucket
         && awslocal s3api wait bucket-exists --bucket test-optout-bucket
@@ -67,7 +70,7 @@ services:
         && wget --tries=1 --spider http://localhost:8082/ops/healthcheck || exit 1
       interval: 5s
       timeout: 10s
-      retries: 6
+      retries: 12
     networks:
       - e2e_default
 

src/test/java/app/component/Optout.java

@@ -41,11 +41,21 @@ private String getOptoutInternalApiKey() {
      * Triggers delta production on the optout service.
      * This reads from the SQS queue and produces delta files.
      * The endpoint is on port 8082 (optout port + 1).
+     * 
+     * @return JsonNode with response, or null if job already running (409)
      */
     public JsonNode triggerDeltaProduce() throws Exception {
         String deltaProduceUrl = getDeltaProducerBaseUrl() + "/optout/deltaproduce";
-        String response = HttpClient.post(deltaProduceUrl, "", getOptoutInternalApiKey());
-        return OBJECT_MAPPER.readTree(response);
+        try {
+            String response = HttpClient.post(deltaProduceUrl, "", getOptoutInternalApiKey());
+            return OBJECT_MAPPER.readTree(response);
+        } catch (HttpClient.HttpException e) {
+            if (e.getCode() == 409) {
+                // Job already running - this is fine, we'll just wait for it
+                return null;
+            }
+            throw e;
+        }
     }
 
     /**
@@ -59,10 +69,12 @@ public JsonNode getDeltaProduceStatus() throws Exception {
 
     /**
      * Triggers delta production and waits for it to complete.
+     * If a job is already running, waits for that job instead.
      * @param maxWaitSeconds Maximum time to wait for completion
      * @return true if delta production completed successfully
      */
     public boolean triggerDeltaProduceAndWait(int maxWaitSeconds) throws Exception {
+        // Try to trigger - will return null if job already running (409)
         triggerDeltaProduce();
 
         long startTime = System.currentTimeMillis();
@@ -77,6 +89,11 @@ public boolean triggerDeltaProduceAndWait(int maxWaitSeconds) throws Exception {
             if ("COMPLETED".equals(state) || "FAILED".equals(state)) {
                 return "COMPLETED".equals(state);
             }
+            
+            // If idle (no job), try to trigger again
+            if ("idle".equalsIgnoreCase(state) || state.isEmpty()) {
+                triggerDeltaProduce();
+            }
         }
 
         return false; // Timed out

src/test/java/suite/optout/OptoutTest.java

@@ -95,17 +95,15 @@ public void testV2LogoutWithV2IdentityMap(String label, Operator operator, Strin
     public void triggerDeltaProduction() throws Exception {
         LOGGER.info("Triggering delta production on optout service");
 
-        // Trigger delta production
-        JsonNode response = optoutService.triggerDeltaProduce();
-        LOGGER.info("Delta production triggered: {}", response);
-        
-        // Wait for completion
+        // Trigger delta production and wait for completion
+        // This handles 409 (job already running) gracefully
         boolean success = optoutService.triggerDeltaProduceAndWait(DELTA_PRODUCE_WAIT_SECONDS);
-        assertThat(success).as("Delta production should complete successfully").isTrue();
 
         // Get final status
         JsonNode status = optoutService.getDeltaProduceStatus();
-        LOGGER.info("Delta production completed: {}", status);
+        LOGGER.info("Delta production completed with status: {}", status);
+        
+        assertThat(success).as("Delta production should complete successfully").isTrue();
     }
 
     @Order(5)