[S3AG] log warning for missing plugin without exception

Author: jxhan3

hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3a/DefaultS3ClientFactory.java

@@ -439,18 +439,19 @@ private static Region getS3RegionFromEndpoint(final String endpoint,
   }
 
   public static <BuilderT extends S3BaseClientBuilder<BuilderT, ClientT>, ClientT> void
-      applyS3AccessGrantsConfigurations(BuilderT builder, Configuration conf) throws InstantiationIOException {
+      applyS3AccessGrantsConfigurations(BuilderT builder, Configuration conf) {
     boolean s3agEnabled = conf.getBoolean(AWS_S3_ACCESS_GRANTS_ENABLED, false);
     if (s3agEnabled) {
-      if (!isS3AGPluginAvailable()) {
-        throw unavailable(null, S3AG_PLUGIN_CLASSNAME, null, "No S3AG plugin available");
+      if (isS3AGPluginAvailable()) {
+        boolean s3agFallbackEnabled = conf.getBoolean(
+            AWS_S3_ACCESS_GRANTS_FALLBACK_TO_IAM_ENABLED, false);
+        S3AccessGrantsPlugin accessGrantsPlugin =
+            S3AccessGrantsPlugin.builder().enableFallback(s3agFallbackEnabled).build();
+        builder.addPlugin(accessGrantsPlugin);
+        LOG_EXACTLY_ONCE.info("s3ag plugin is added to s3 client with fallback: {}", s3agFallbackEnabled);
+      } else {
+        LOG_EXACTLY_ONCE.warn("s3ag plugin is not available.");
       }
-      boolean s3agFallbackEnabled = conf.getBoolean(
-          AWS_S3_ACCESS_GRANTS_FALLBACK_TO_IAM_ENABLED, false);
-      S3AccessGrantsPlugin accessGrantsPlugin =
-          S3AccessGrantsPlugin.builder().enableFallback(s3agFallbackEnabled).build();
-      builder.addPlugin(accessGrantsPlugin);
-      LOG_EXACTLY_ONCE.info("s3ag plugin is added to s3 client with fallback: {}", s3agFallbackEnabled);
     } else {
       LOG_EXACTLY_ONCE.debug("s3ag plugin is not added to s3 client.");
     }

hadoop-tools/hadoop-aws/src/test/java/org/apache/hadoop/fs/s3a/TestS3AccessGrantConfiguration.java

@@ -77,19 +77,14 @@ private Configuration createConfig(boolean isDefault, boolean s3agEnabled) {
 
   private <BuilderT extends S3BaseClientBuilder<BuilderT, ClientT>, ClientT> void
   applyVerifyS3AGPlugin(BuilderT builder, boolean isDefault, boolean enabled) {
-    try {
-      DefaultS3ClientFactory.applyS3AccessGrantsConfigurations(builder, createConfig(isDefault, enabled));
-      if (enabled){
-        assertEquals(builder.plugins().size(), 1);
-        assertEquals(builder.plugins().get(0).getClass().getName(),
-            "software.amazon.awssdk.s3accessgrants.plugin.S3AccessGrantsPlugin");
-      }
-      else {
-        assertEquals(builder.plugins().size(), 0);
-      }
-    } catch (InstantiationIOException e) {
-      Assert.assertTrue(true);
+    DefaultS3ClientFactory.applyS3AccessGrantsConfigurations(builder, createConfig(isDefault, enabled));
+    if (enabled){
+      assertEquals(builder.plugins().size(), 1);
+      assertEquals(builder.plugins().get(0).getClass().getName(),
+          "software.amazon.awssdk.s3accessgrants.plugin.S3AccessGrantsPlugin");
+    }
+    else {
+      assertEquals(builder.plugins().size(), 0);
     }
   }
-
 }