Skip to content
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

Jump to bottom

Use minion data directory as tmp directory for SegmentGenerationAndPushTask #6560

Merged
merged 2 commits into from Feb 10, 2021
Merged

Use minion data directory as tmp directory for SegmentGenerationAndPushTask #6560

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b63a01a
Use minion data directory as tmp directory for SegmentGenerationAndPu…
xiangfu0 Feb 9, 2021
7deceec
Update MinionStarter.java
xiangfu0 Feb 9, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 6 additions & 0 deletions pinot-minion/src/main/java/org/apache/pinot/minion/MinionStarter.java
View file
Open in desktop
Expand Up @@ -226,6 +226,12 @@ public void stop() {
_helixManager.disconnect();
LOGGER.info("Deregistering service status handler");
ServiceStatus.removeServiceStatusCallback(_instanceId);
LOGGER.info("Clean up Minion data directory");
try {
FileUtils.cleanDirectory(MinionContext.getInstance().getDataDir());
} catch (IOException e) {
LOGGER.warn("Failed to clean up Minion data directory: {}", MinionContext.getInstance().getDataDir(), e);
}
LOGGER.info("Pinot minion stopped");
}

Expand Down
6 changes: 4 additions & 2 deletions .../src/main/java/org/apache/pinot/minion/executor/SegmentGenerationAndPushTaskExecutor.java
View file
Open in desktop
Expand Up @@ -27,10 +27,11 @@
import java.util.Map;
import java.util.UUID;
import org.apache.commons.io.FileUtils;
import org.apache.pinot.common.segment.generation.SegmentGenerationUtils;
import org.apache.pinot.common.utils.TarGzCompressionUtils;
import org.apache.pinot.core.minion.PinotTaskConfig;
import org.apache.pinot.minion.MinionContext;
import org.apache.pinot.plugin.ingestion.batch.common.SegmentGenerationTaskRunner;
import org.apache.pinot.common.segment.generation.SegmentGenerationUtils;
import org.apache.pinot.plugin.ingestion.batch.common.SegmentPushUtils;
import org.apache.pinot.spi.config.table.TableConfig;
import org.apache.pinot.spi.data.Schema;
Expand Down Expand Up @@ -102,7 +103,8 @@ public Object executeTask(PinotTaskConfig pinotTaskConfig)
LOGGER.info("Executing SegmentGenerationAndPushTask with task config: {}", pinotTaskConfig);
Map<String, String> taskConfigs = pinotTaskConfig.getConfigs();
SegmentGenerationAndPushResult.Builder resultBuilder = new SegmentGenerationAndPushResult.Builder();
File localTempDir = new File(FileUtils.getTempDirectory(), "pinot-" + UUID.randomUUID());
File localTempDir = new File(new File(MinionContext.getInstance().getDataDir(), "SegmentGenerationAndPushResult"),
"tmp-" + UUID.randomUUID());

try {
// Generate Pinot Segment
Expand Down