Skip to content

Commit 7b3079f

Browse files
committed
fix concurrent bucket creation logs. Fix log4j2 logging.
1 parent 09090d2 commit 7b3079f

File tree

4 files changed

+9
-2
lines changed

4 files changed

+9
-2
lines changed

test/s3-tests/src/it/java/software/amazon/awssdk/services/s3/regression/BaseS3RegressionTest.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,8 @@ static void setup() throws InterruptedException, IOException {
8282
eozBucket = S3ChecksumsTestUtils.createEozBucket(s3, getBucketName() + EOZ_SUFFIX, LOG);
8383
apArn = S3ChecksumsTestUtils.createAccessPoint(s3Control, accountId, AP_NAME, bucketName);
8484

85+
LOG.info(() -> "Using bucket: " + bucketName);
86+
8587
}
8688

8789
@AfterEach

test/s3-tests/src/it/java/software/amazon/awssdk/services/s3/regression/S3ChecksumsTestUtils.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -87,11 +87,15 @@ public static void createBucket(S3Client s3, String bucketName, int retryCount,
8787
} else {
8888
throw e;
8989
}
90+
} else if ("OperationAborted".equals(e.awsErrorDetails().errorCode())) {
91+
log.warn(() -> e.awsErrorDetails().errorMessage() + " --- Likely another operation is creating the bucket, "
92+
+ "just wait for the bucket to be available");
9093
} else {
9194
throw e;
9295
}
9396
}
9497

98+
log.info(() -> String.format("waiting for bucket '%s' to be created and available", bucketName));
9599
s3.waiter().waitUntilBucketExists(r -> r.bucket(bucketName));
96100
}
97101

test/s3-tests/src/it/resources/log4j2.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,12 @@
2424
<Root level="WARN">
2525
<AppenderRef ref="ConsoleAppender"/>
2626
</Root>
27-
<Logger name="software.amazon.awssdk.services.s3.regression" level = "DEBUG" />
27+
<Logger name="software.amazon.awssdk.services.s3.regression" level="DEBUG" />
2828
<!-- <Logger name="software.amazon.awssdk" level="WARN" />-->
2929
<!-- <Logger name="software.amazon.awssdk.request" level="DEBUG" />-->
3030
<!-- <Logger name="org.apache.http.wire" level="DEBUG" />-->
3131
<!-- <Logger name="software.amazon.awssdk.services.s3.checksum" level="DEBUG" />-->
3232
<!-- <Logger name="io.netty.handler.logging" level="DEBUG" />-->
3333
<!-- <Logger name="io.netty.handler.codec.http2.Http2FrameLogger" level="DEBUG" />-->
3434
</Loggers>
35-
</Configuration>
35+
</Configuration>

test/s3-tests/src/test/resources/log4j2.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
<Root level="WARN">
2525
<AppenderRef ref="ConsoleAppender"/>
2626
</Root>
27+
<Logger name="software.amazon.awssdk.services.s3.regression" level="DEBUG" />
2728
<!-- <Logger name="software.amazon.awssdk" level="WARN" />-->
2829
<!-- <Logger name="software.amazon.awssdk.request" level="DEBUG" />-->
2930
<!-- <Logger name="org.apache.http.wire" level="DEBUG" />-->

0 commit comments

Comments
 (0)