Merge pull request #1594 from szyn/v0_11_to_master-pr-1593

[V0_11_To_Master] Fix ECS task log lost issue
treasure-data · Jun 4, 2021 · d60a7a8 · d60a7a8
2 parents 8ec0b46 + 7ebe068
commit d60a7a8
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 0 deletions.
diff --git a/digdag-standards/src/main/java/io/digdag/standards/command/EcsCommandExecutor.java b/digdag-standards/src/main/java/io/digdag/standards/command/EcsCommandExecutor.java
@@ -60,6 +60,7 @@
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
+import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
 
 public class EcsCommandExecutor
@@ -329,6 +330,14 @@ CommandStatus createNextCommandStatus(
                 if (previousExecutorStatus.get("logging_finished_at") != null) {
                     break;
                 }
+                try {
+                    // Just to avoid DOS attack to ECS endpoint
+                    TimeUnit.SECONDS.sleep(2);
+                }
+                catch (InterruptedException e) {
+                    Thread.currentThread().interrupt();
+                    throw new RuntimeException(e);
+                }
             }
             while (Instant.now().getEpochSecond() < timeout);
 

diff --git a/digdag-standards/src/main/java/io/digdag/standards/command/ecs/DefaultEcsClient.java b/digdag-standards/src/main/java/io/digdag/standards/command/ecs/DefaultEcsClient.java
@@ -270,6 +270,8 @@ public GetLogEventsResult getLog(
             final Optional<String> nextToken)
     {
         final GetLogEventsRequest request = new GetLogEventsRequest()
+                // This should be true when using `nextToken`. See the doc for details.
+                .withStartFromHead(true)
                 .withLogGroupName(groupName)
                 .withLogStreamName(streamName);
         if (nextToken.isPresent()) {