Apache
/
druid
mirror of https://github.com/apache/druid.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Switched to default the aws properties.

This commit is contained in:
Brian O'Neill 2013-05-08 16:02:11 -04:00
parent 3eb0f4dfca
commit 8e0c0e6d47
1 changed files with 15 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
server/src/main/java/com/metamx/druid/initialization/ServerInit.java
View File

@ -21,7 +21,6 @@ package com.metamx.druid.initialization;
import java.lang.reflect.InvocationTargetException;
import java.nio.ByteBuffer;
import java.util.HashMap;
import java.util.Map;
import java.util.Properties;
import java.util.concurrent.atomic.AtomicLong;
@ -92,33 +91,23 @@ public class ServerInit
DelegatingSegmentLoader delegateLoader = new DelegatingSegmentLoader();
final QueryableIndexFactory factory = new MMappedQueryableIndexFactory();
SingleSegmentLoader s3segmentLoader= null;
try {
final RestS3Service s3Client = new RestS3Service(
new AWSCredentials(
PropUtils.getProperty(props, "com.metamx.aws.accessKey"),
PropUtils.getProperty(props, "com.metamx.aws.secretKey")
)
);
final S3DataSegmentPuller segmentGetter = new S3DataSegmentPuller(s3Client);
s3segmentLoader = new SingleSegmentLoader(segmentGetter, factory, config);
} catch (com.metamx.common.ISE ise){
log.warn("Could not create s3Client.", ise);
}
Map<String, SegmentLoader> loaderTypes = new HashMap<String, SegmentLoader>();
loaderTypes.put("local", new SingleSegmentLoader(new LocalDataSegmentPuller(), factory, config));
loaderTypes.put("hdfs", new SingleSegmentLoader(new HdfsDataSegmentPuller(new Configuration()), factory, config));
loaderTypes.put("c*",
new SingleSegmentLoader(new CassandraDataSegmentPuller(configFactory.build(CassandraDataSegmentConfig.class)), factory, config));
if (s3segmentLoader != null){
loaderTypes.put("s3", s3segmentLoader);
loaderTypes.put("s3_zip", s3segmentLoader);
}
final RestS3Service s3Client = new RestS3Service(
new AWSCredentials(
props.getProperty("com.metamx.aws.accessKey", ""),
props.getProperty("com.metamx.aws.secretKey", "")
)
);
final S3DataSegmentPuller segmentGetter = new S3DataSegmentPuller(s3Client);
final SingleSegmentLoader s3segmentLoader = new SingleSegmentLoader(segmentGetter, factory, config);
delegateLoader.setLoaderTypes(
ImmutableMap.<String, SegmentLoader>copyOf(loaderTypes)
ImmutableMap.<String, SegmentLoader>builder()
.put("local", new SingleSegmentLoader(new LocalDataSegmentPuller(), factory, config))
.put("hdfs", new SingleSegmentLoader(new HdfsDataSegmentPuller(new Configuration()), factory, config))
.put("s3", s3segmentLoader)
.put("s3_zip", s3segmentLoader)
.put("c*",new SingleSegmentLoader(new CassandraDataSegmentPuller(configFactory.build(CassandraDataSegmentConfig.class)), factory, config))
.build()
);
return delegateLoader;
}