Elgato_dark/zeppelin
1
0
Fork 0
mirror of https://github.com/apache/zeppelin synced 2026-05-24 09:38:26 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

exposed timeout and pig executable via interpreter and added comments

Browse source
This commit is contained in:
Ali Bajwa 2015-10-05 23:25:47 -07:00 committed by Jeff Zhang
parent 7abad201a6
commit 2586336e44
1 changed files with 21 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
pig/src/main/java/org/apache/zeppelin/pig/PigInterpreter.java
View file

@ -21,7 +21,6 @@ import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.util.List;
import java.util.Properties;
import java.util.ArrayList;
import java.util.Arrays;
import org.apache.commons.exec.CommandLine;
import org.apache.commons.exec.DefaultExecutor;
@ -40,24 +39,34 @@ import org.slf4j.LoggerFactory;
/**
* Pig interpreter for Zeppelin.
*
* Closely follows code for shell interpreter
* @author abajwa-hw
*
*/
public class PigInterpreter extends Interpreter {
Logger logger = LoggerFactory.getLogger(PigInterpreter.class);
int commandTimeOut = 600000;
//Executable name used to start grunt shell
static final String PIG_START_EXE = "pig.executable";
static final String DEFAULT_START_EXE = "pig";
//Arguments to start pig with. More details available via 'pig -help'
static final String PIG_START_ARGS = "pig.start.args";
static final String DEFAULT_START_ARGS = "-useHCatalog -exectype tez";
//How long to wait before timing out (ms)
static final String PIG_TIMEOUT_MS = "pig.timeout.ms";
static final String DEFAULT_TIMEOUT_MS = "600000";
static {
Interpreter.register(
"pig",
"pig",
PigInterpreter.class.getName(),
new InterpreterPropertyBuilder()
.add(PIG_START_EXE, DEFAULT_START_EXE, "Pig executable used to start grunt shell")
.add(PIG_START_ARGS, DEFAULT_START_ARGS, "Starting arguments")
.add(PIG_TIMEOUT_MS, DEFAULT_TIMEOUT_MS, "Timeout (ms)")
.build()
);
}
@ -75,11 +84,12 @@ public class PigInterpreter extends Interpreter {
@Override
public InterpreterResult interpret(String cmd, InterpreterContext contextInterpreter) {
// use commandline to store string corresponding to pig shell command
// start with pig exectable name (or full path if provided)...
CommandLine cmdLine = CommandLine.parse(getProperty(PIG_START_EXE).trim());
CommandLine cmdLine = CommandLine.parse("pig");
// add any arguments specified
String startArgs = getProperty((PIG_START_ARGS).trim());
// ...add any CLI arguments specified by user in interpreter settings
String startArgs = getProperty(PIG_START_ARGS).trim();
if (startArgs.length() > 0){
logger.info("Start arguments passed to pig: " + startArgs);
List<String> argList = Arrays.asList(startArgs.split("\\s+"));
@ -87,15 +97,18 @@ public class PigInterpreter extends Interpreter {
cmdLine.addArgument(arg, false);
}
}
// ...finally add contents of pig cell after the -e flag
logger.info("Run pig command '" + cmd + "'");
long start = System.currentTimeMillis();
cmdLine.addArgument("-e", false);
cmdLine.addArgument(cmd, false);
// execute command and return success/failure based on its exit value
DefaultExecutor executor = new DefaultExecutor();
ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
executor.setStreamHandler(new PumpStreamHandler(outputStream));
int commandTimeOut = Integer.parseInt(getProperty(PIG_TIMEOUT_MS));
executor.setWatchdog(new ExecuteWatchdog(commandTimeOut));
try {
int exitValue = executor.execute(cmdLine);