You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@zeppelin.apache.org by mo...@apache.org on 2017/03/18 20:27:56 UTC
zeppelin git commit: ZEPPELIN-2256. poll job progress is called twice
Repository: zeppelin
Updated Branches:
refs/heads/master 287ffd50e -> 37b6b02d1
ZEPPELIN-2256. poll job progress is called twice
### What is this PR for?
Minor change to only call getProgress one time.
### What type of PR is it?
[Improvement]
### Todos
* [ ] - Task
### What is the Jira issue?
* https://issues.apache.org/jira/browse/ZEPPELIN-2256
### How should this be tested?
Before
```
DEBUG [2017-03-14 10:03:44,376] ({pool-2-thread-6} BaseLivyInterprereter.java[callRestAPI]:441) - Get response, StatusCode: 200, responseBody: {"id":1,"state":"running","output":null,"progress":0.6}
INFO [2017-03-14 10:03:44,777] ({pool-1-thread-3} BaseLivyInterprereter.java[getProgress]:181) - progress:60
INFO [2017-03-14 10:03:44,778] ({pool-1-thread-3} BaseLivyInterprereter.java[getProgress]:181) - progress:60
INFO [2017-03-14 10:03:45,284] ({pool-1-thread-3} BaseLivyInterprereter.java[getProgress]:181) - progress:60
INFO [2017-03-14 10:03:45,284] ({pool-1-thread-3} BaseLivyInterprereter.java[getProgress]:181) - progress:60
DEBUG [2017-03-14 10:03:45,378] ({pool-2-thread-6} BaseLivyInterprereter.java[callRestAPI]:407) - Call rest api in http://localhost:8999/sessions/11/statements/1, method: GET, jsonData:
DEBUG [2017-03-14 10:03:45,387] ({pool-2-thread-6} BaseLivyInterprereter.java[callRestAPI]:441) - Get response, StatusCode: 200, responseBody: {"id":1,"state":"running","output":null,"progress":0.8}
INFO [2017-03-14 10:03:45,786] ({pool-1-thread-3} BaseLivyInterprereter.java[getProgress]:181) - progress:80
INFO [2017-03-14 10:03:45,786] ({pool-1-thread-3} BaseLivyInterprereter.java[getProgress]:181) - progress:80
INFO [2017-03-14 10:03:46,291] ({pool-1-thread-3} BaseLivyInterprereter.java[getProgress]:181) - progress:80
INFO [2017-03-14 10:03:46,292] ({pool-1-thread-3} BaseLivyInterprereter.java[getProgress]:181) - progress:80
DEBUG [2017-03-14 10:03:46,392] ({pool-2-thread-6} BaseLivyInterprereter.java[callRestAPI]:407) - Call rest api in http://localhost:8999/sessions/11/statements/1, method: GET, jsonData:
DEBUG [2017-03-14 10:03:46,422] ({pool-2-thread-6} BaseLivyInterprereter.java[callRestAPI]:441) - Get response, StatusCode: 200, responseBody: {"id":1,"state":"running","output":null,"progress":0.9}
INFO [2017-03-14 10:03:46,795] ({pool-1-thread-3} BaseLivyInterprereter.java[getProgress]:181) - progress:90
INFO [2017-03-14 10:03:46,796] ({pool-1-thread-3} BaseLivyInterprereter.java[getProgress]:181) - progress:90
INFO [2017-03-14 10:03:47,297] ({pool-1-thread-3} BaseLivyInterprereter.java[getProgress]:181) - progress:90
INFO [2017-03-14 10:03:47,297] ({pool-1-thread-3} BaseLivyInterprereter.java[getProgress]:181) - progress:90
```
After
```
DEBUG [2017-03-14 11:15:57,176] ({pool-2-thread-2} BaseLivyInterprereter.java[callRestAPI]:432) - Get response, StatusCode: 200, responseBody: {"id":0,"state":"running","output":null,"progress":0.6}
INFO [2017-03-14 11:15:57,439] ({pool-1-thread-3} BaseLivyInterprereter.java[getProgress]:176) - getProcess:**********
INFO [2017-03-14 11:15:57,942] ({pool-1-thread-3} BaseLivyInterprereter.java[getProgress]:176) - getProcess:**********
DEBUG [2017-03-14 11:15:58,177] ({pool-2-thread-2} BaseLivyInterprereter.java[callRestAPI]:398) - Call rest api in http://localhost:8999/sessions/4/statements/0, method: GET, jsonData:
DEBUG [2017-03-14 11:15:58,193] ({pool-2-thread-2} BaseLivyInterprereter.java[callRestAPI]:432) - Get response, StatusCode: 200, responseBody: {"id":0,"state":"running","output":null,"progress":0.8}
INFO [2017-03-14 11:15:58,443] ({pool-1-thread-3} BaseLivyInterprereter.java[getProgress]:176) - getProcess:**********
INFO [2017-03-14 11:15:58,947] ({pool-1-thread-3} BaseLivyInterprereter.java[getProgress]:176) - getProcess:**********
DEBUG [2017-03-14 11:15:59,195] ({pool-2-thread-2} BaseLivyInterprereter.java[callRestAPI]:398) - Call rest api in http://localhost:8999/sessions/4/statements/0, method: GET, jsonData:
DEBUG [2017-03-14 11:15:59,213] ({pool-2-thread-2} BaseLivyInterprereter.java[callRestAPI]:432) - Get response, StatusCode: 200, responseBody: {"id":0,"state":"running","output":null,"progress":0.9}
INFO [2017-03-14 11:15:59,451] ({pool-1-thread-3} BaseLivyInterprereter.java[getProgress]:176) - getProcess:**********
INFO [2017-03-14 11:15:59,957] ({pool-1-thread-3} BaseLivyInterprereter.java[getProgress]:176) - getProcess:**********
```
### Questions:
* Does the licenses files need update? No
* Is there breaking changes for older versions? No
* Does this needs documentation? No
Author: Jeff Zhang <zj...@apache.org>
Closes #2131 from zjffdu/ZEPPELIN-2256 and squashes the following commits:
d2c27b7 [Jeff Zhang] [ZEPPELIN-2256]. poll job progress is called twice
Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo
Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/37b6b02d
Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/37b6b02d
Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/37b6b02d
Branch: refs/heads/master
Commit: 37b6b02d1a9d988f8bbd7124e108f71bfbd23a7d
Parents: 287ffd5
Author: Jeff Zhang <zj...@apache.org>
Authored: Tue Mar 14 11:17:27 2017 +0800
Committer: Lee moon soo <mo...@apache.org>
Committed: Sat Mar 18 13:27:53 2017 -0700
----------------------------------------------------------------------
.../src/main/java/org/apache/zeppelin/socket/NotebookServer.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/zeppelin/blob/37b6b02d/zeppelin-server/src/main/java/org/apache/zeppelin/socket/NotebookServer.java
----------------------------------------------------------------------
diff --git a/zeppelin-server/src/main/java/org/apache/zeppelin/socket/NotebookServer.java b/zeppelin-server/src/main/java/org/apache/zeppelin/socket/NotebookServer.java
index 128d59d..1a6f0be 100644
--- a/zeppelin-server/src/main/java/org/apache/zeppelin/socket/NotebookServer.java
+++ b/zeppelin-server/src/main/java/org/apache/zeppelin/socket/NotebookServer.java
@@ -2139,7 +2139,7 @@ public class NotebookServer extends WebSocketServlet
@Override
public void onProgressUpdate(Job job, int progress) {
notebookServer.broadcast(note.getId(),
- new Message(OP.PROGRESS).put("id", job.getId()).put("progress", job.progress()));
+ new Message(OP.PROGRESS).put("id", job.getId()).put("progress", progress));
}
@Override