mirror of
https://github.com/apache/zeppelin
synced 2026-05-24 09:38:26 +00:00
remove debug console message.
This commit is contained in:
parent
3d34f9e0bb
commit
3ed556c50d
5 changed files with 1 additions and 30 deletions
|
|
@ -51,7 +51,6 @@ public class RemoteInterpreterEventClient implements ResourcePoolConnector {
|
|||
private final Map<ResourceId, Object> getResourceResponse = new HashMap<>();
|
||||
private final Gson gson = new Gson();
|
||||
|
||||
// cloverhearts
|
||||
/**
|
||||
* Run paragraph
|
||||
* @param runner
|
||||
|
|
@ -61,7 +60,6 @@ public class RemoteInterpreterEventClient implements ResourcePoolConnector {
|
|||
RemoteZeppelinServerController eventBody = new RemoteZeppelinServerController();
|
||||
eventBody.setType(RemoteZeppelinServerControlEvent.REQ_RESOURCE_PARAGRAPH_RUN_CONTEXT);
|
||||
eventBody.setEventOwnerKey(eventOwnerKey);
|
||||
logger.info("clover gson.toJson(runner) - " + gson.toJson(runner));
|
||||
eventBody.setMsg(gson.toJson(runner));
|
||||
|
||||
sendEvent(new RemoteInterpreterEvent(
|
||||
|
|
|
|||
|
|
@ -213,7 +213,6 @@ public class RemoteInterpreterEventPoller extends Thread {
|
|||
} else if (event.getType() == RemoteInterpreterEventType.REMOTE_ZEPPELIN_SERVER_CONTROL) {
|
||||
RemoteZeppelinServerController remoteControlEvent = gson.fromJson(
|
||||
event.getData(), RemoteZeppelinServerController.class);
|
||||
//cloverhearts
|
||||
progressRemoteZeppelinControlEvent(remoteControlEvent);
|
||||
|
||||
}
|
||||
|
|
@ -228,7 +227,6 @@ public class RemoteInterpreterEventPoller extends Thread {
|
|||
}
|
||||
|
||||
private void progressRemoteZeppelinControlEvent(RemoteZeppelinServerController event) {
|
||||
logger.info("clover - received RemoteInterpreterEvent");
|
||||
Gson gson = new Gson();
|
||||
String eventOwnerKey = event.getEventOwnerKey();
|
||||
Client interpreterServer = null;
|
||||
|
|
@ -241,8 +239,6 @@ public class RemoteInterpreterEventPoller extends Thread {
|
|||
ZeppelinServerResourceParagraphRunner runner = gson.fromJson(
|
||||
event.getMsg(), ZeppelinServerResourceParagraphRunner.class);
|
||||
|
||||
logger.info("clover req note id {} p id {} - msg {}",
|
||||
runner.getNoteId(), runner.getParagraphId(), event.getMsg());
|
||||
RemoteZeppelinServerController resResource = new RemoteZeppelinServerController();
|
||||
resResource.setType(RemoteZeppelinServerControlEvent.RES_RESOURCE_PARAGRAPH_RUN_CONTEXT);
|
||||
resResource.setEventOwnerKey(eventOwnerKey);
|
||||
|
|
@ -254,21 +250,15 @@ public class RemoteInterpreterEventPoller extends Thread {
|
|||
runner.getNoteId());
|
||||
}
|
||||
|
||||
logger.info("clover remotework count 1 {}", interpreterContextRunners.size());
|
||||
|
||||
for (InterpreterContextRunner r : interpreterContextRunners) {
|
||||
remoteRunners.add(
|
||||
new ZeppelinServerResourceParagraphRunner(r.getNoteId(), r.getParagraphId())
|
||||
);
|
||||
}
|
||||
|
||||
logger.info("clover remotework count 2 {}", remoteRunners.size());
|
||||
|
||||
resResource.setMsg(gson.toJson(remoteRunners));
|
||||
|
||||
interpreterServer.remoteZeppelinServerControlFeedback(resResource);
|
||||
logger.info("get runner noteid {} paragraphid {}",
|
||||
runner.getNoteId(), runner.getParagraphId());
|
||||
}
|
||||
|
||||
} catch (Exception e) {
|
||||
|
|
@ -284,7 +274,6 @@ public class RemoteInterpreterEventPoller extends Thread {
|
|||
return;
|
||||
}
|
||||
|
||||
logger.info("clover - remote event {}", event.getType());
|
||||
}
|
||||
|
||||
private void sendResourcePoolResponseGetAll(ResourceSet resourceSet) {
|
||||
|
|
|
|||
|
|
@ -347,21 +347,16 @@ public class RemoteInterpreterServer
|
|||
@Override
|
||||
public void remoteZeppelinServerControlFeedback(
|
||||
RemoteZeppelinServerController response) throws TException {
|
||||
logger.info("clover remote zeppelin server controller feedback {}", response);
|
||||
logger.info("clover remote zeppelin server conteroller body {}", response.getMsg());
|
||||
logger.info("remote zeppelin server controller feedback {}", response);
|
||||
if (response.getType() == RemoteZeppelinServerControlEvent.RES_RESOURCE_PARAGRAPH_RUN_CONTEXT) {
|
||||
List<InterpreterContextRunner> intpContextRunners = new LinkedList<>();
|
||||
List<ZeppelinServerResourceParagraphRunner> runners = gson.fromJson(response.getMsg(),
|
||||
new TypeToken<List<ZeppelinServerResourceParagraphRunner>>() {}.getType());
|
||||
logger.info("clover get runner size " + runners.size());
|
||||
for (ZeppelinServerResourceParagraphRunner r : runners) {
|
||||
logger.info("clover runner nid " + r.getNoteId() + " pid " + r.getParagraphId());
|
||||
intpContextRunners.add(new ParagraphRunner(this, r.getNoteId(), r.getParagraphId()));
|
||||
}
|
||||
synchronized (this.remoteWorksResponsePool) {
|
||||
this.remoteWorksResponsePool.put(response.getEventOwnerKey(), intpContextRunners);
|
||||
logger.info("clover feedback remoteWorks {} count {}",
|
||||
response.getEventOwnerKey(), remoteWorksResponsePool.size());
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -614,13 +609,11 @@ public class RemoteInterpreterServer
|
|||
|
||||
@Override
|
||||
public void run() {
|
||||
logger.info("clover call run");
|
||||
server.eventClient.run(this);
|
||||
}
|
||||
}
|
||||
|
||||
static class ZeppelinRemoteWorksController implements RemoteWorksController{
|
||||
//clover
|
||||
Logger logger = LoggerFactory.getLogger(ZeppelinRemoteWorksController.class);
|
||||
|
||||
private final long DEFAULT_TIMEOUT_VALUE = 300000;
|
||||
|
|
@ -648,19 +641,15 @@ public class RemoteInterpreterServer
|
|||
long endTime = System.currentTimeMillis() + timeout;
|
||||
|
||||
while (endTime >= now) {
|
||||
logger.info("clover sleep... size {} key {}",
|
||||
this.remoteWorksResponsePool.size(), eventOwnerKey);
|
||||
synchronized (this.remoteWorksResponsePool) {
|
||||
wasGetData = this.remoteWorksResponsePool.containsKey(eventOwnerKey);
|
||||
}
|
||||
if (wasGetData == true) {
|
||||
logger.info("clover found!!!!!!!!!!!!!");
|
||||
break;
|
||||
}
|
||||
now = System.currentTimeMillis();
|
||||
sleep(500);
|
||||
}
|
||||
logger.info("clover out {}", wasGetData);
|
||||
|
||||
return wasGetData;
|
||||
}
|
||||
|
|
@ -676,7 +665,6 @@ public class RemoteInterpreterServer
|
|||
List<InterpreterContextRunner> runners = null;
|
||||
String ownerKey = generateOwnerKey();
|
||||
|
||||
logger.info("clover request owner key {}", ownerKey);
|
||||
ZeppelinServerResourceParagraphRunner resource = new ZeppelinServerResourceParagraphRunner();
|
||||
resource.setNoteId(noteId);
|
||||
resource.setParagraphId(paragraphID);
|
||||
|
|
@ -685,14 +673,12 @@ public class RemoteInterpreterServer
|
|||
try {
|
||||
this.waitForEvent(ownerKey);
|
||||
} catch (Exception e) {
|
||||
logger.info("clover timeout Interrupt getRemoteContextRunner ", e);
|
||||
return new LinkedList<>();
|
||||
}
|
||||
synchronized (this.remoteWorksResponsePool) {
|
||||
runners = (List<InterpreterContextRunner>) this.remoteWorksResponsePool.get(ownerKey);
|
||||
this.remoteWorksResponsePool.remove(ownerKey);
|
||||
}
|
||||
logger.info("clover out time {} {}", runners.size(), System.currentTimeMillis());
|
||||
return runners;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -65,7 +65,6 @@ struct RemoteApplicationResult {
|
|||
}
|
||||
|
||||
/*
|
||||
cloverhearts
|
||||
remote interpreter process --> request --> zeppelin server
|
||||
*/
|
||||
enum RemoteZeppelinServerControlEvent {
|
||||
|
|
|
|||
|
|
@ -453,7 +453,6 @@ public class Paragraph extends Job implements Serializable, Cloneable {
|
|||
resourcePool = intpGroup.getInterpreterGroup(getUser(), note.getId()).getResourcePool();
|
||||
}
|
||||
|
||||
//cloverhearts
|
||||
List<InterpreterContextRunner> runners = new LinkedList<>();
|
||||
for (Paragraph p : note.getParagraphs()) {
|
||||
runners.add(new ParagraphRunner(note, note.getId(), p.getId()));
|
||||
|
|
|
|||
Loading…
Reference in a new issue