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

Merge pull request #330 from metamx/s3-docs-naming 

fix naming and docs
This commit is contained in:
fjy 2013-12-16 16:58:15 -08:00
parent 48d677d135 178c26f9f7
commit dbd551e6a8
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
docs/content/Configuration.md
View File

@ -285,9 +285,10 @@ This deep storage is used to interface with Amazon's S3.
|Property|Description|Default|
|--------|-----------|-------|
|`druid.storage.bucket`|S3 bucket name.|none|
|`druid.storage.basekey`|S3 base key.|none|
|`druid.storage.basekey`|S3 object key prefix for storage.|none|
|`druid.storage.disableAcl`|Boolean flag for ACL.|false|
|`druid.storage.archiveBucket`|S3 bucket name where segments get archived to when running the indexing service *archive task*|none|
|`druid.storage.archiveBucket`|S3 bucket name for archiving when running the indexing-service *archive task*.|none|
|`druid.storage.archiveBasekey`|S3 object key prefix for archiving.|none|
#### HDFS Deep Storage

3
s3-extensions/src/main/java/io/druid/storage/s3/S3DataSegmentArchiver.java
View File

@ -21,7 +21,6 @@ package io.druid.storage.s3;
import com.google.common.collect.ImmutableMap;
import com.google.inject.Inject;
import com.metamx.common.MapUtils;
import io.druid.segment.loading.DataSegmentArchiver;
import io.druid.segment.loading.SegmentLoadingException;
import io.druid.timeline.DataSegment;
@ -46,7 +45,7 @@ public class S3DataSegmentArchiver extends S3DataSegmentMover implements DataSeg
public DataSegment archive(DataSegment segment) throws SegmentLoadingException
{
String targetS3Bucket = config.getArchiveBucket();
String targetS3BaseKey = config.getArchiveBaseKey();
String targetS3BaseKey = config.getArchiveBasekey();
return move(
segment,

6
s3-extensions/src/main/java/io/druid/storage/s3/S3DataSegmentArchiverConfig.java
View File

@ -27,15 +27,15 @@ public class S3DataSegmentArchiverConfig
public String archiveBucket = "";
@JsonProperty
public String archiveBaseKey = "";
public String archiveBasekey = "";
public String getArchiveBucket()
{
return archiveBucket;
}
public String getArchiveBaseKey()
public String getArchiveBasekey()
{
return archiveBaseKey;
return archiveBasekey;
}
}