Skip to content

ZEPPELIN-544 ] After the restart when setting bug fixes interpreters note paragraphs state. #581

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
cloverhearts wants to merge 2 commits into from
Closed

ZEPPELIN-544 ] After the restart when setting bug fixes interpreters note paragraphs state. #581

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f6fe216
restful api setting-interpreterid bug fix.
cloverhearts Dec 29, 2015
f9294e2
stop job code -> new private method(stopJobAllInterpreter)
cloverhearts Dec 30, 2015
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
34 changes: 20 additions & 14 deletions zeppelin-zengine/src/main/java/org/apache/zeppelin/interpreter/InterpreterFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -519,6 +519,9 @@ public void setPropertyAndRestart(String id, InterpreterOption option,
synchronized (interpreterSettings) {
InterpreterSetting intpsetting = interpreterSettings.get(id);
if (intpsetting != null) {

Copy link
Contributor

@HeartSaVioR HeartSaVioR Dec 30, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It would be better to refactor setPropertyAndRestart() and restart() to remove duplication and prevent diverged issue like this.

Copy link
Member Author

@cloverhearts cloverhearts Dec 30, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@HeartSaVioR Okay, I will attempt to code refactoring.

stopJobAllInterpreter(intpsetting);

intpsetting.getInterpreterGroup().close();
intpsetting.getInterpreterGroup().destroy();

Expand All @@ -541,20 +544,7 @@ public void restart(String id) {
InterpreterSetting intpsetting = interpreterSettings.get(id);
if (intpsetting != null) {

for (Interpreter intp : intpsetting.getInterpreterGroup()) {
for (Job job : intp.getScheduler().getJobsRunning()) {
job.abort();
job.setStatus(Status.ABORT);
logger.info("Job " + job.getJobName() + " aborted ");
}

for (Job job : intp.getScheduler().getJobsWaiting()) {
job.abort();
job.setStatus(Status.ABORT);
logger.info("Job " + job.getJobName() + " aborted ");
}
}

stopJobAllInterpreter(intpsetting);

intpsetting.getInterpreterGroup().close();
intpsetting.getInterpreterGroup().destroy();
Expand All @@ -570,6 +560,22 @@ public void restart(String id) {
}
}

private void stopJobAllInterpreter(InterpreterSetting intpsetting) {
if (intpsetting != null) {
for (Interpreter intp : intpsetting.getInterpreterGroup()) {
for (Job job : intp.getScheduler().getJobsRunning()) {
job.abort();
job.setStatus(Status.ABORT);
logger.info("Job " + job.getJobName() + " aborted ");
}
for (Job job : intp.getScheduler().getJobsWaiting()) {
job.abort();
job.setStatus(Status.ABORT);
logger.info("Job " + job.getJobName() + " aborted ");
}
}
}
}

public void close() {
List<Thread> closeThreads = new LinkedList<Thread>();
Expand Down