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

Merge pull request #200 from activitystream/master 

Minor fixes - maven dependency, unit test that was failing and quirk for third party S3 provider
This commit is contained in:
cheddar 2013-07-25 13:42:53 -07:00
parent 73cc47d79c 2842a40894
commit ea201be555
4 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
client/pom.xml
View File

@ -68,6 +68,10 @@
<groupId>commons-codec</groupId> <groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId> <artifactId>commons-codec</artifactId>
</dependency> </dependency>
<dependency>
<groupId>commons-httpclient</groupId>
<artifactId>commons-httpclient</artifactId>
</dependency>
<dependency> <dependency>
<groupId>org.skife.config</groupId> <groupId>org.skife.config</groupId>
<artifactId>config-magic</artifactId> <artifactId>config-magic</artifactId>

4
examples/src/test/java/druid/examples/web/WebJsonSupplierTest.java
View File

@ -21,11 +21,11 @@ package druid.examples.web;
import org.junit.Test; import org.junit.Test;
import java.net.UnknownHostException; import java.io.IOException;
public class WebJsonSupplierTest public class WebJsonSupplierTest
{ {
@Test(expected = UnknownHostException.class) @Test(expected = IOException.class)
public void checkInvalidUrl() throws Exception public void checkInvalidUrl() throws Exception
{ {

8
server/src/main/java/com/metamx/druid/loading/S3DataSegmentPusher.java
View File

@ -80,7 +80,9 @@ public class S3DataSegmentPusher implements DataSegmentPusher
final String outputBucket = config.getBucket(); final String outputBucket = config.getBucket();
toPush.setBucketName(outputBucket); toPush.setBucketName(outputBucket);
toPush.setKey(outputKey + "/index.zip"); toPush.setKey(outputKey + "/index.zip");
toPush.setAcl(GSAccessControlList.REST_CANNED_BUCKET_OWNER_FULL_CONTROL); if (!config.getDisableAcl()) {
toPush.setAcl(GSAccessControlList.REST_CANNED_BUCKET_OWNER_FULL_CONTROL);
}
log.info("Pushing %s.", toPush); log.info("Pushing %s.", toPush);
s3Client.putObject(outputBucket, toPush); s3Client.putObject(outputBucket, toPush);
@ -96,7 +98,9 @@ public class S3DataSegmentPusher implements DataSegmentPusher
S3Object descriptorObject = new S3Object(descriptorFile); S3Object descriptorObject = new S3Object(descriptorFile);
descriptorObject.setBucketName(outputBucket); descriptorObject.setBucketName(outputBucket);
descriptorObject.setKey(outputKey + "/descriptor.json"); descriptorObject.setKey(outputKey + "/descriptor.json");
descriptorObject.setAcl(GSAccessControlList.REST_CANNED_BUCKET_OWNER_FULL_CONTROL); if (!config.getDisableAcl()) {
descriptorObject.setAcl(GSAccessControlList.REST_CANNED_BUCKET_OWNER_FULL_CONTROL);
}
log.info("Pushing %s", descriptorObject); log.info("Pushing %s", descriptorObject);
s3Client.putObject(outputBucket, descriptorObject); s3Client.putObject(outputBucket, descriptorObject);

4
server/src/main/java/com/metamx/druid/loading/S3DataSegmentPusherConfig.java
View File

@ -32,4 +32,8 @@ public abstract class S3DataSegmentPusherConfig
@Config("druid.pusher.s3.baseKey") @Config("druid.pusher.s3.baseKey")
@Default("") @Default("")
public abstract String getBaseKey(); public abstract String getBaseKey();
@Config("druid.pusher.s3.disableAcl")
@Default("false")
public abstract boolean getDisableAcl();
} }