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

Fix durable storage cleanup (#13853)

This commit is contained in:
Rohan Garg 2023-03-06 09:49:14 +05:30 committed by GitHub
parent a580aca551
commit f33898ed6d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 34 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
extensions-core/multi-stage-query/src/main/java/org/apache/druid/msq/exec/WorkerImpl.java
View File

@ -822,25 +822,24 @@ public class WorkerImpl implements Worker
continue;
}
output.close();
// One caveat with this approach is that in case of a worker crash, while the MM/Indexer systems will delete their
// temp directories where intermediate results were stored, it won't be the case for the external storage.
// Therefore, the logic for cleaning the stage output in case of a worker/machine crash has to be external.
// We currently take care of this in the controller.
if (durableStageStorageEnabled && removeDurableStorageFiles) {
final String folderName = DurableStorageUtils.getTaskIdOutputsFolderName(
task.getControllerTaskId(),
stageId.getStageNumber(),
task.getWorkerNumber(),
task.getId()
);
try {
MSQTasks.makeStorageConnector(context.injector()).deleteRecursively(folderName);
}
catch (Exception e) {
// If an error is thrown while cleaning up a file, log it and try to continue with the cleanup
log.warn(e, "Error while cleaning up folder at path " + folderName);
}
}
// One caveat with this approach is that in case of a worker crash, while the MM/Indexer systems will delete their
// temp directories where intermediate results were stored, it won't be the case for the external storage.
// Therefore, the logic for cleaning the stage output in case of a worker/machine crash has to be external.
// We currently take care of this in the controller.
if (durableStageStorageEnabled && removeDurableStorageFiles) {
final String folderName = DurableStorageUtils.getTaskIdOutputsFolderName(
task.getControllerTaskId(),
stageId.getStageNumber(),
task.getWorkerNumber(),
task.getId()
);
try {
MSQTasks.makeStorageConnector(context.injector()).deleteRecursively(folderName);
}
catch (Exception e) {
// If an error is thrown while cleaning up a file, log it and try to continue with the cleanup
log.warn(e, "Error while cleaning up folder at path " + folderName);
}
}
}

17
extensions-core/s3-extensions/src/main/java/org/apache/druid/storage/s3/output/S3StorageConnector.java
View File

@ -121,6 +121,7 @@ public class S3StorageConnector implements StorageConnector
} else {
readEnd = this.s3Client.getObjectMetadata(config.getBucket(), objectPath(path)).getInstanceLength();
}
AtomicBoolean isSequenceStreamClosed = new AtomicBoolean(false);
// build a sequence input stream from chunks
return new SequenceInputStream(new Enumeration<InputStream>()
@ -128,6 +129,12 @@ public class S3StorageConnector implements StorageConnector
@Override
public boolean hasMoreElements()
{
// checking if the stream was already closed. If it was, then don't iterate over the remaining chunks
// SequenceInputStream's close method closes all the chunk streams in its close. Since we're opening them
// lazily, we don't need to close them.
if (isSequenceStreamClosed.get()) {
return false;
}
// don't stop until the whole object is downloaded
return currReadStart.get() < readEnd;
}
@ -212,7 +219,15 @@ public class S3StorageConnector implements StorageConnector
throw new RE(e, StringUtils.format("Unable to find temp file [%s]", outFile));
}
}
});
})
{
@Override
public void close() throws IOException
{
isSequenceStreamClosed.set(true);
super.close();
}
};
}
@Override