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

Make optional Peon "stdin" check (#4760)

This commit is contained in:
Egor Riashin 2017-09-12 00:37:01 +03:00 committed by Roman Leventov
parent 23c0357816
commit 6f3e52b3db
2 changed files with 37 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
indexing-service/src/main/java/io/druid/indexing/worker/executor/ExecutorLifecycle.java
View File

@ -139,29 +139,31 @@ public class ExecutorLifecycle
throw Throwables.propagate(e);
}
// Spawn monitor thread to keep a watch on parent's stdin
// If stdin reaches eof, the parent is gone, and we should shut down
parentMonitorExec.submit(
new Runnable()
{
@Override
public void run()
if (taskExecutorConfig.isParentStreamDefined()) {
// Spawn monitor thread to keep a watch on parent's stdin
// If stdin reaches eof, the parent is gone, and we should shut down
parentMonitorExec.submit(
new Runnable()
{
try {
while (parentStream.read() != -1) {
// Toss the byte
@Override
public void run()
{
try {
while (parentStream.read() != -1) {
// Toss the byte
}
}
catch (Exception e) {
log.error(e, "Failed to read from stdin");
}
}
catch (Exception e) {
log.error(e, "Failed to read from stdin");
}
// Kind of gross, but best way to kill the JVM as far as I know
log.info("Triggering JVM shutdown.");
System.exit(2);
// Kind of gross, but best way to kill the JVM as far as I know
log.info("Triggering JVM shutdown.");
System.exit(2);
}
}
}
);
);
}
// Won't hurt in remote mode, and is required for setting up locks in local mode:
try {

17
indexing-service/src/main/java/io/druid/indexing/worker/executor/ExecutorLifecycleConfig.java
View File

@ -20,7 +20,6 @@
package io.druid.indexing.worker.executor;
import com.fasterxml.jackson.annotation.JsonProperty;
import io.druid.java.util.common.ISE;
import javax.validation.constraints.NotNull;
@ -43,6 +42,22 @@ public class ExecutorLifecycleConfig
@JsonProperty
@Pattern(regexp = "\\{stdin\\}")
private String parentStreamName = "stdin";
@JsonProperty
private boolean parentStreamDefined = true;
/**
* Should parent stream be monitored.
*/
public boolean isParentStreamDefined()
{
return parentStreamDefined;
}
public ExecutorLifecycleConfig setParentStreamDefined(boolean parentStreamDefined)
{
this.parentStreamDefined = parentStreamDefined;
return this;
}
public File getTaskFile()
{