From 54e5ce9d7b37cf6fd5c067c0e1455c901a9a10a3 Mon Sep 17 00:00:00 2001 From: Khalid Huseynov Date: Tue, 24 Jan 2017 17:45:55 -0800 Subject: [PATCH 1/3] set status FINISHED on empty paragraph this is required since otherwise notebook wouldn't be isTerminated() --- .../src/main/java/org/apache/zeppelin/notebook/Note.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/Note.java b/zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/Note.java index f0eae73aa90..26f4e1a9032 100644 --- a/zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/Note.java +++ b/zeppelin-zengine/src/main/java/org/apache/zeppelin/notebook/Note.java @@ -555,13 +555,14 @@ public synchronized void runAll() { */ public void run(String paragraphId) { Paragraph p = getParagraph(paragraphId); - + p.setListener(jobListenerFactory.getParagraphJobListener(this)); + if (p.isBlankParagraph()) { logger.info("skip to run blank paragraph. {}", p.getId()); + p.setStatus(Job.Status.FINISHED); return; } - p.setListener(jobListenerFactory.getParagraphJobListener(this)); String requiredReplName = p.getRequiredReplName(); Interpreter intp = factory.getInterpreter(p.getUser(), getId(), requiredReplName); From 48fd94e03de3e4347ef41cdc5f464087108d5ce5 Mon Sep 17 00:00:00 2001 From: Khalid Huseynov Date: Tue, 24 Jan 2017 21:42:59 -0800 Subject: [PATCH 2/3] fix test --- .../test/java/org/apache/zeppelin/notebook/NotebookTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zeppelin-zengine/src/test/java/org/apache/zeppelin/notebook/NotebookTest.java b/zeppelin-zengine/src/test/java/org/apache/zeppelin/notebook/NotebookTest.java index 82d280ef05f..dd542586d92 100644 --- a/zeppelin-zengine/src/test/java/org/apache/zeppelin/notebook/NotebookTest.java +++ b/zeppelin-zengine/src/test/java/org/apache/zeppelin/notebook/NotebookTest.java @@ -282,7 +282,7 @@ public void testRunBlankParagraph() throws IOException, SchedulerException, Inte note.run(p1.getId()); Thread.sleep(2 * 1000); - assertEquals(p1.getStatus(), Status.READY); + assertEquals(p1.getStatus(), Status.FINISHED); assertNull(p1.getDateStarted()); notebook.removeNote(note.getId(), anonymous); } From b39cb2aac9ec154c3ff43e6472dc6eb3db1074cb Mon Sep 17 00:00:00 2001 From: Khalid Huseynov Date: Wed, 25 Jan 2017 01:00:03 -0800 Subject: [PATCH 3/3] fix notebook rest api test --- .../test/java/org/apache/zeppelin/rest/NotebookRestApiTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zeppelin-server/src/test/java/org/apache/zeppelin/rest/NotebookRestApiTest.java b/zeppelin-server/src/test/java/org/apache/zeppelin/rest/NotebookRestApiTest.java index d69339c6000..c8b06d1487f 100644 --- a/zeppelin-server/src/test/java/org/apache/zeppelin/rest/NotebookRestApiTest.java +++ b/zeppelin-server/src/test/java/org/apache/zeppelin/rest/NotebookRestApiTest.java @@ -105,7 +105,7 @@ public void testRunParagraphJob() throws IOException { }.getType()); assertEquals(resp.get("status"), "OK"); post.releaseConnection(); - assertEquals(p.getStatus(), Job.Status.READY); + assertEquals(p.getStatus(), Job.Status.FINISHED); // run non-blank paragraph p.setText("test");