Skip to content

ZEPPELIN-2421. AngularObject miss AngularObjectListener when it is pushed from frontend #2263

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
zjffdu wants to merge 1 commit into from
Closed

ZEPPELIN-2421. AngularObject miss AngularObjectListener when it is pushed from frontend #2263

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 5 additions & 0 deletions zeppelin-interpreter/src/main/java/org/apache/zeppelin/display/AngularObjectRegistry.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -252,5 +252,10 @@ public Map<String, Map<String, AngularObject>> getRegistry() {

public void setRegistry(Map<String, Map<String, AngularObject>> registry) {
this.registry = registry;
for (Map<String, AngularObject> map : registry.values()) {
for (AngularObject ao : map.values()) {
ao.setListener(angularObjectListener);
}
}
}
}
5 changes: 3 additions & 2 deletions ...er/src/main/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterEventClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
* RemoteInterpreterEventPoller is counter part in ZeppelinServer
*/
public class RemoteInterpreterEventClient implements ResourcePoolConnector {
private final Logger logger = LoggerFactory.getLogger(RemoteInterpreterEvent.class);
private final Logger logger = LoggerFactory.getLogger(RemoteInterpreterEventClient.class);
private final List<RemoteInterpreterEvent> eventQueue = new LinkedList<>();
private final List<ResourceSet> getAllResourceResponse = new LinkedList<>();
private final Map<ResourceId, Object> getResourceResponse = new HashMap<>();
Expand Down Expand Up @@ -415,6 +415,7 @@ public void onInterpreterOutputUpdateAll(
}

private void sendEvent(RemoteInterpreterEvent event) {
logger.debug("Send Event: " + event);
synchronized (eventQueue) {
eventQueue.add(event);
eventQueue.notifyAll();
Expand Down Expand Up @@ -446,7 +447,7 @@ public void onAppOutputUpdate(
appendOutput.put("appId", appId);
appendOutput.put("type", type);
appendOutput.put("data", output);
logger.info("onAppoutputUpdate = {}", output);
logger.debug("onAppoutputUpdate = {}", output);
sendEvent(new RemoteInterpreterEvent(
RemoteInterpreterEventType.OUTPUT_UPDATE,
gson.toJson(appendOutput)));
Expand Down
3 changes: 3 additions & 0 deletions ...er/src/main/java/org/apache/zeppelin/interpreter/remote/RemoteInterpreterEventPoller.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,9 @@ public void run() {
AngularObjectRegistry angularObjectRegistry = interpreterGroup.getAngularObjectRegistry();

try {
if (event.getType() != RemoteInterpreterEventType.NO_OP) {
logger.debug("Receive message from RemoteInterpreter Process: " + event.toString());
}
if (event.getType() == RemoteInterpreterEventType.NO_OP) {
continue;
} else if (event.getType() == RemoteInterpreterEventType.ANGULAR_OBJECT_ADD) {
Expand Down
4 changes: 2 additions & 2 deletions zeppelin-server/src/main/java/org/apache/zeppelin/socket/NotebookServer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -492,7 +492,7 @@ private void broadcast(String noteId, Message m) {
if (socketLists == null || socketLists.size() == 0) {
return;
}
LOG.debug("SEND >> " + m.op);
LOG.debug("SEND >> " + m);
for (NotebookSocket conn : socketLists) {
try {
conn.send(serializeMessage(m));
Expand All @@ -510,7 +510,7 @@ private void broadcastExcept(String noteId, Message m, NotebookSocket exclude) {
if (socketLists == null || socketLists.size() == 0) {
return;
}
LOG.debug("SEND >> " + m.op);
LOG.debug("SEND >> " + m);
for (NotebookSocket conn : socketLists) {
if (exclude.equals(conn)) {
continue;
Expand Down