[Tiered Storage] Fix Jclouds Azure credential error (#8693)

gaoran10 · codelipenghui · commit caede241027a · 2020-11-26T17:34:20.000+08:00
### Motivation Currently, the tiered storage Azure credential is broken. ### Modifications Change the Azure supplier credential. (cherry picked from commit bf9f619)
diff --git a/tiered-storage/jcloud/src/main/java/org/apache/bookkeeper/mledger/offload/jcloud/impl/BlobStoreManagedLedgerOffloader.java b/tiered-storage/jcloud/src/main/java/org/apache/bookkeeper/mledger/offload/jcloud/impl/BlobStoreManagedLedgerOffloader.java
@@ -103,6 +103,7 @@ public static BlobStoreManagedLedgerOffloader create(TieredStorageConfiguration
                 config.getBucket(), config.getRegion());
 
         blobStores.putIfAbsent(config.getBlobStoreLocation(), config.getBlobStore());
+        log.info("The ledger offloader was created.");
     }
 
     @Override
diff --git a/tiered-storage/jcloud/src/main/java/org/apache/bookkeeper/mledger/offload/jcloud/provider/JCloudBlobStoreProvider.java b/tiered-storage/jcloud/src/main/java/org/apache/bookkeeper/mledger/offload/jcloud/provider/JCloudBlobStoreProvider.java
@@ -131,7 +131,21 @@ public void validate(TieredStorageConfiguration config) throws IllegalArgumentEx
 
         @Override
         public BlobStore getBlobStore(TieredStorageConfiguration config) {
-            return BLOB_STORE_BUILDER.getBlobStore(config);
+            ContextBuilder contextBuilder = ContextBuilder.newBuilder(config.getProviderMetadata());
+            contextBuilder.overrides(config.getOverrides());
+
+            if (config.getProviderCredentials() != null) {
+                Credentials credentials = config.getProviderCredentials().get();
+                return contextBuilder
+                        .credentials(credentials.identity, credentials.credential)
+                        .buildView(BlobStoreContext.class)
+                        .getBlobStore();
+            } else {
+                log.warn("The credentials is null. driver: {}, bucket: {}", config.getDriver(), config.getBucket());
+                return contextBuilder
+                        .buildView(BlobStoreContext.class)
+                        .getBlobStore();
+            }
         }
 
         @Override
@@ -254,11 +268,12 @@ public ProviderMetadata getProviderMetadata() {
                         .credentialsSupplier(config.getCredentials())
                         .buildView(BlobStoreContext.class)
                         .getBlobStore();
-            } else {
-                return contextBuilder
-                        .buildView(BlobStoreContext.class)
-                        .getBlobStore();
-            }
+        } else {
+            log.warn("The credentials is null. driver: {}, bucket: {}", config.getDriver(), config.getBucket());
+            return contextBuilder
+                    .buildView(BlobStoreContext.class)
+                    .getBlobStore();
+        }
 
     };
 

Original file line number	Diff line number	Diff line change
`@@ -103,6 +103,7 @@ public static BlobStoreManagedLedgerOffloader create(TieredStorageConfiguration`
`103`	`103`	`config.getBucket(), config.getRegion());`
`104`	`104`
`105`	`105`	`blobStores.putIfAbsent(config.getBlobStoreLocation(), config.getBlobStore());`
	`106`	`+ log.info("The ledger offloader was created.");`
`106`	`107`	`}`
`107`	`108`
`108`	`109`	`@Override`