From 1ea145c2266643fa62fc0b61e17521f7e3b1e2ca Mon Sep 17 00:00:00 2001 From: Lee moon soo Date: Mon, 5 Nov 2018 10:08:51 -0800 Subject: [PATCH 1/2] check condition correctly to run all paragraphs --- .../main/java/org/apache/zeppelin/service/NotebookService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zeppelin-server/src/main/java/org/apache/zeppelin/service/NotebookService.java b/zeppelin-server/src/main/java/org/apache/zeppelin/service/NotebookService.java index c2e99d240f0..4cf3bf6c60a 100644 --- a/zeppelin-server/src/main/java/org/apache/zeppelin/service/NotebookService.java +++ b/zeppelin-server/src/main/java/org/apache/zeppelin/service/NotebookService.java @@ -397,7 +397,7 @@ public void runAllParagraphs(String noteId, Map params = (Map) raw.get("params"); Map config = (Map) raw.get("config"); - if (runParagraph(noteId, paragraphId, title, text, params, config, false, true, + if (!runParagraph(noteId, paragraphId, title, text, params, config, false, true, context, callback)) { // stop execution when one paragraph fails. break; From 6cf5dd859ddda20b7f00857e1f85c7558a268069 Mon Sep 17 00:00:00 2001 From: Lee moon soo Date: Mon, 5 Nov 2018 10:17:09 -0800 Subject: [PATCH 2/2] add test runAllParagraphs --- .../zeppelin/service/NotebookServiceTest.java | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/zeppelin-server/src/test/java/org/apache/zeppelin/service/NotebookServiceTest.java b/zeppelin-server/src/test/java/org/apache/zeppelin/service/NotebookServiceTest.java index 0cfdcc1dc16..9d8a7352f03 100644 --- a/zeppelin-server/src/test/java/org/apache/zeppelin/service/NotebookServiceTest.java +++ b/zeppelin-server/src/test/java/org/apache/zeppelin/service/NotebookServiceTest.java @@ -19,6 +19,8 @@ package org.apache.zeppelin.service; import com.google.common.collect.Maps; +import com.google.gson.Gson; +import com.google.gson.reflect.TypeToken; import org.apache.commons.lang.StringUtils; import org.apache.zeppelin.conf.ZeppelinConfiguration; import org.apache.zeppelin.interpreter.Interpreter; @@ -63,6 +65,7 @@ import static org.mockito.Mockito.doCallRealMethod; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.reset; +import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -75,6 +78,8 @@ public class NotebookServiceTest { private ServiceCallback callback = mock(ServiceCallback.class); + private Gson gson = new Gson(); + @Before public void setUp() throws Exception { @@ -320,6 +325,14 @@ public void testParagraphOperations() throws IOException { assertTrue(runStatus); verify(callback).onSuccess(p, context); + // run all paragraphs + reset(callback); + notebookService.runAllParagraphs( + note1.getId(), + gson.fromJson(gson.toJson(note1.getParagraphs()), new TypeToken(){}.getType()), + context, callback); + verify(callback, times(2)).onSuccess(any(), any()); + // run paragraph synchronously via invalid code //TODO(zjffdu) must sleep for a while, otherwise will get wrong status. This should be due to //bug of job component.