Skip to content

[ZEPPELIN-923] Apply new mechanism to ShellInterpreter #956

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

Closed
AhyoungRyu wants to merge 3 commits into from
Closed

[ZEPPELIN-923] Apply new mechanism to ShellInterpreter #956

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b70d650
ZEPPELIN-923: Apply new interpreter mechanism to Shell interpreter
AhyoungRyu Jun 3, 2016
be3e22e
ZEPPELIN-923: Change defaultValue 5000 -> 60000
AhyoungRyu Jun 3, 2016
3df8c7d
ZEPPELIN-923: exclude interpreter-setting.json
AhyoungRyu Jun 5, 2016
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
1 change: 1 addition & 0 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -475,6 +475,7 @@
<exclude>conf/zeppelin-env.sh</exclude>
<exclude>spark-*-bin*/**</exclude>
<exclude>.spark-dist/**</exclude>
<exclude>**/interpreter-setting.json</exclude>

<!-- bundled from bootstrap -->
<exclude>docs/assets/themes/zeppelin/bootstrap/**</exclude>
Expand Down
15 changes: 0 additions & 15 deletions shell/src/main/java/org/apache/zeppelin/shell/ShellInterpreter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,27 +45,12 @@ public class ShellInterpreter extends Interpreter {
Logger logger = LoggerFactory.getLogger(ShellInterpreter.class);
private static final String EXECUTOR_KEY = "executor";
public static final String SHELL_COMMAND_TIMEOUT = "shell.command.timeout.millisecs";
public static final String DEFAULT_COMMAND_TIMEOUT = "600000";
int commandTimeOut;
private static final boolean isWindows = System
.getProperty("os.name")
.startsWith("Windows");
final String shell = isWindows ? "cmd /c" : "bash -c";

static {
Interpreter.register(
"sh",
"sh",
ShellInterpreter.class.getName(),
new InterpreterPropertyBuilder()
.add(
SHELL_COMMAND_TIMEOUT,
DEFAULT_COMMAND_TIMEOUT,
"Shell command time out in millisecs. Default = 600000")
.build()
);
}

public ShellInterpreter(Properties property) {
super(property);
}
Expand Down
15 changes: 15 additions & 0 deletions shell/src/main/resources/interpreter-setting.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
[
{
"group": "sh",
"name": "sh",
"className": "org.apache.zeppelin.shell.ShellInterpreter",
"properties": {
"shell.command.timeout.millisecs": {
"envName": "SHELL_COMMAND_TIMEOUT",
"propertyName": "shell.command.timeout.millisecs",
"defaultValue": "60000",
"description": "Shell command time out in millisecs. Default = 60000"
}
}
}
]