Skip to content

#5306 (backport) #5307

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

Merged
gianm merged 1 commit into from
Jan 30, 2018
Merged

#5306 (backport) #5307

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
9 changes: 4 additions & 5 deletions server/src/main/java/io/druid/segment/loading/LocalDataSegmentPusher.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,9 +73,8 @@ public String getPathForHadoop(String dataSource)
@Override
public DataSegment push(File dataSegmentFile, DataSegment segment, boolean replaceExisting) throws IOException
{
final String storageDir = this.getStorageDir(segment);
final File baseStorageDir = config.getStorageDirectory();
final File outDir = new File(baseStorageDir, storageDir);
final File outDir = new File(baseStorageDir, this.getStorageDir(segment));

log.info("Copying segment[%s] to local filesystem at location[%s]", segment.getIdentifier(), outDir.toString());

Expand All @@ -93,7 +92,7 @@ public DataSegment push(File dataSegmentFile, DataSegment segment, boolean repla
);
}

final File tmpOutDir = new File(baseStorageDir, intermediateDirFor(storageDir));
final File tmpOutDir = new File(baseStorageDir, makeIntermediateDir());
log.info("Creating intermediate directory[%s] for segment[%s]", tmpOutDir.toString(), segment.getIdentifier());
FileUtils.forceMkdir(tmpOutDir);

Expand Down Expand Up @@ -150,9 +149,9 @@ public Map<String, Object> makeLoadSpec(URI finalIndexZipFilePath)
return ImmutableMap.<String, Object>of("type", "local", "path", finalIndexZipFilePath.getPath());
}

private String intermediateDirFor(String storageDir)
private String makeIntermediateDir()
{
return "intermediate_pushes/" + storageDir + "." + UUID.randomUUID().toString();
return "intermediate_pushes/" + UUID.randomUUID().toString();
}

private long compressSegment(File dataSegmentFile, File dest) throws IOException
Expand Down