Integrations: Fix FileIO client initialization thread safety (apache#…

…4461) Co-authored-by: Prashant Singh <[email protected]>
regadas · Apr 3, 2022 · c34c505 · c34c505
1 parent 7ac5061
commit c34c505
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 6 deletions.
diff --git a/aliyun/src/main/java/org/apache/iceberg/aliyun/oss/OSSFileIO.java b/aliyun/src/main/java/org/apache/iceberg/aliyun/oss/OSSFileIO.java
@@ -47,7 +47,7 @@ public class OSSFileIO implements FileIO {
 
   private SerializableSupplier<OSS> oss;
   private AliyunProperties aliyunProperties;
-  private transient OSS client;
+  private transient volatile OSS client;
   private MetricsContext metrics = MetricsContext.nullMetrics();
   private final AtomicBoolean isResourceClosed = new AtomicBoolean(false);
 
@@ -89,7 +89,11 @@ public void deleteFile(String path) {
 
   private OSS client() {
     if (client == null) {
-      client = oss.get();
+      synchronized (this) {
+        if (client == null) {
+          client = oss.get();
+        }
+      }
     }
     return client;
   }

diff --git a/dell/src/main/java/org/apache/iceberg/dell/ecs/EcsFileIO.java b/dell/src/main/java/org/apache/iceberg/dell/ecs/EcsFileIO.java
@@ -42,7 +42,7 @@ public class EcsFileIO implements FileIO {
   private SerializableSupplier<S3Client> s3;
   private DellProperties dellProperties;
   private DellClientFactory dellClientFactory;
-  private transient S3Client client;
+  private transient volatile S3Client client;
   private final AtomicBoolean isResourceClosed = new AtomicBoolean(false);
 
   @Override
@@ -64,7 +64,11 @@ public void deleteFile(String path) {
 
   private S3Client client() {
     if (client == null) {
-      client = s3.get();
+      synchronized (this) {
+        if (client == null) {
+          client = s3.get();
+        }
+      }
     }
     return client;
   }

diff --git a/gcp/src/main/java/org/apache/iceberg/gcp/gcs/GCSFileIO.java b/gcp/src/main/java/org/apache/iceberg/gcp/gcs/GCSFileIO.java
@@ -49,7 +49,7 @@ public class GCSFileIO implements FileIO {
 
   private SerializableSupplier<Storage> storageSupplier;
   private GCPProperties gcpProperties;
-  private transient Storage storage;
+  private transient volatile Storage storage;
   private MetricsContext metrics = MetricsContext.nullMetrics();
   private final AtomicBoolean isResourceClosed = new AtomicBoolean(false);
 
@@ -96,7 +96,11 @@ public void deleteFile(String path) {
 
   private Storage client() {
     if (storage == null) {
-      storage = storageSupplier.get();
+      synchronized (this) {
+        if (storage == null) {
+          storage = storageSupplier.get();
+        }
+      }
     }
     return storage;
   }