Skip to content

branch-4.0: [fix](fe) Select S3 storage for cloud plugin downloads #66694

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
CalvinKirs wants to merge 1 commit into
base: branch-4.0
Choose a base branch
from
Open

branch-4.0: [fix](fe) Select S3 storage for cloud plugin downloads #66694

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 13 additions & 5 deletions fe/fe-core/src/main/java/org/apache/doris/common/plugin/CloudPluginDownloader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@
import java.nio.file.Path;
import java.nio.file.Paths;
import java.util.HashMap;
import java.util.List;
import java.util.Map;

/**
Expand Down Expand Up @@ -153,15 +154,22 @@ private static S3ObjStorage createS3Storage(Cloud.ObjectStoreInfoPB objInfo) {
props.put("s3.bucket", objInfo.getBucket());

// Auto-detect storage type (S3, COS, OSS, etc.)
StorageProperties storageProps;
AbstractS3CompatibleProperties storageProps;
try {
storageProps = StorageProperties.createAll(props).stream()
.findFirst()
.orElseThrow(() -> new RuntimeException("Failed to create storage properties"));
storageProps = selectS3CompatibleProperties(StorageProperties.createAll(props));
} catch (UserException e) {
throw new RuntimeException(e);
}

return new S3ObjStorage((AbstractS3CompatibleProperties) storageProps);
return new S3ObjStorage(storageProps);
}

static AbstractS3CompatibleProperties selectS3CompatibleProperties(
List<StorageProperties> storageProperties) {
return storageProperties.stream()
.filter(AbstractS3CompatibleProperties.class::isInstance)
.map(AbstractS3CompatibleProperties.class::cast)
.findFirst()
.orElseThrow(() -> new RuntimeException("Failed to create S3-compatible storage properties"));
}
}
56 changes: 56 additions & 0 deletions fe/fe-core/src/test/java/org/apache/doris/common/plugin/CloudPluginDownloaderTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,15 +19,30 @@

import org.apache.doris.cloud.proto.Cloud;
import org.apache.doris.cloud.rpc.MetaServiceProxy;
import org.apache.doris.common.UserException;
import org.apache.doris.common.plugin.CloudPluginDownloader.PluginType;
import org.apache.doris.datasource.property.storage.AbstractS3CompatibleProperties;
import org.apache.doris.datasource.property.storage.COSProperties;
import org.apache.doris.datasource.property.storage.GCSProperties;
import org.apache.doris.datasource.property.storage.HdfsProperties;
import org.apache.doris.datasource.property.storage.MinioProperties;
import org.apache.doris.datasource.property.storage.OBSProperties;
import org.apache.doris.datasource.property.storage.OSSProperties;
import org.apache.doris.datasource.property.storage.OzoneProperties;
import org.apache.doris.datasource.property.storage.S3Properties;
import org.apache.doris.datasource.property.storage.StorageProperties;

import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.mockito.MockedStatic;
import org.mockito.Mockito;

import java.util.Arrays;
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;

/**
* Unit tests for CloudPluginDownloader using package-private methods for direct white-box testing.
Expand Down Expand Up @@ -160,6 +175,47 @@ void testBuildS3PathEdgeCases() {
Assertions.assertEquals("s3://test-bucket/plugins/java_udf/test-udf@v1.0.jar", specialResult);
}

@Test
void testSelectS3CompatiblePropertiesAfterDefaultHdfs() throws UserException {
Map<String, String> properties = new HashMap<>();
properties.put("s3.endpoint", "s3.us-west-2.amazonaws.com");
properties.put("s3.region", "us-west-2");

List<StorageProperties> storageProperties = StorageProperties.createAll(properties);

Assertions.assertEquals(HdfsProperties.class, storageProperties.get(0).getClass());
Assertions.assertEquals(S3Properties.class,
CloudPluginDownloader.selectS3CompatibleProperties(storageProperties).getClass());
}

@Test
void testSelectEveryS3CompatiblePropertiesType() {
List<Class<? extends AbstractS3CompatibleProperties>> compatibleTypes = Arrays.asList(
S3Properties.class,
OSSProperties.class,
OBSProperties.class,
COSProperties.class,
GCSProperties.class,
MinioProperties.class,
OzoneProperties.class);
StorageProperties hdfsProperties = Mockito.mock(HdfsProperties.class);

for (Class<? extends AbstractS3CompatibleProperties> compatibleType : compatibleTypes) {
AbstractS3CompatibleProperties expected = Mockito.mock(compatibleType);
Assertions.assertSame(expected, CloudPluginDownloader.selectS3CompatibleProperties(
Arrays.asList(hdfsProperties, expected)));
}
}

@Test
void testSelectS3CompatiblePropertiesFailsWithoutCompatibleStorage() {
RuntimeException exception = Assertions.assertThrows(RuntimeException.class,
() -> CloudPluginDownloader.selectS3CompatibleProperties(
Collections.singletonList(Mockito.mock(HdfsProperties.class))));

Assertions.assertEquals("Failed to create S3-compatible storage properties", exception.getMessage());
}

// ============== Enum Tests ==============

@Test
Expand Down
Loading