Skip to content

Commit fa20631

Browse files
committed
适配私有云,增加指定cos domain的参数cosEndPoint
1 parent 6253580 commit fa20631

File tree

3 files changed

+4
-6
lines changed

3 files changed

+4
-6
lines changed

src/main/java/org/elasticsearch/repositories/cos/COSClientSettings.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,4 +27,5 @@ public class COSClientSettings {
2727
public static final Setting<ByteSizeValue> CHUNK_SIZE =
2828
byteSizeSetting("chunk_size", MAX_CHUNK_SIZE, MIN_CHUNK_SIZE, MAX_CHUNK_SIZE,
2929
Setting.Property.NodeScope, Setting.Property.Dynamic);
30+
public static final Setting<String> CosEndPoint = Setting.simpleString("cosEndPoint", Property.NodeScope, Property.Dynamic);
3031
}

src/main/java/org/elasticsearch/repositories/cos/COSRepositoryPlugin.java

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,11 @@
44
import java.util.List;
55
import java.util.Arrays;
66
import java.util.Map;
7-
import java.security.AccessController;
8-
import java.security.PrivilegedAction;
9-
10-
import org.elasticsearch.SpecialPermission;
117
import org.elasticsearch.cluster.metadata.RepositoryMetaData;
128
import org.elasticsearch.common.xcontent.NamedXContentRegistry;
139
import org.elasticsearch.env.Environment;
1410
import org.elasticsearch.plugins.Plugin;
1511
import org.elasticsearch.plugins.RepositoryPlugin;
16-
import org.elasticsearch.common.settings.Settings;
1712
import org.elasticsearch.common.settings.Setting;
1813
import org.elasticsearch.repositories.Repository;
1914
import org.elasticsearch.threadpool.ThreadPool;
@@ -40,6 +35,6 @@ public Map<String, Repository.Factory> getRepositories(final Environment env,
4035
public List<Setting<?>> getSettings() {
4136
return Arrays.asList(COSClientSettings.REGION, COSClientSettings.ACCESS_KEY_ID, COSClientSettings.ACCESS_KEY_SECRET,
4237
COSClientSettings.APP_ID, COSClientSettings.BUCKET,
43-
COSClientSettings.BASE_PATH, COSClientSettings.COMPRESS, COSClientSettings.CHUNK_SIZE);
38+
COSClientSettings.BASE_PATH, COSClientSettings.COMPRESS, COSClientSettings.CHUNK_SIZE, COSClientSettings.CosEndPoint);
4439
}
4540
}

src/main/java/org/elasticsearch/repositories/cos/COSService.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,11 @@ private synchronized COSClient createClient(RepositoryMetaData metaData) {
2828
String access_key_id = COSRepository.getSetting(COSClientSettings.ACCESS_KEY_ID, metaData);
2929
String access_key_secret = COSRepository.getSetting(COSClientSettings.ACCESS_KEY_SECRET, metaData);
3030
String region = COSRepository.getSetting(COSClientSettings.REGION, metaData);
31+
String endPoint = COSRepository.getSetting(COSClientSettings.CosEndPoint, metaData);
3132

3233
COSCredentials cred = new BasicCOSCredentials(access_key_id, access_key_secret);
3334
ClientConfig clientConfig = new ClientConfig(new Region(region));
35+
clientConfig.setEndPointSuffix(endPoint);
3436
COSClient client = new COSClient(cred, clientConfig);
3537

3638
return client;

0 commit comments

Comments
 (0)