Elgato_dark/zeppelin
1
0
Fork 0
mirror of https://github.com/apache/zeppelin synced 2026-05-24 09:38:26 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

address code review comments

Browse source
This commit is contained in:
Jeff Zhang 2021-06-21 17:30:19 +08:00
parent bdb4dcbbfa
commit b6a957fd3e
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
zeppelin-plugins/launcher/yarn/src/main/java/org/apache/zeppelin/interpreter/launcher/YarnRemoteInterpreterProcess.java
View file

@ -283,13 +283,13 @@ public class YarnRemoteInterpreterProcess extends RemoteInterpreterProcess {
} catch (URISyntaxException e) {
throw new IOException("Invalid uri: " + distArchive, e);
}
if (distArchiveURI.getScheme() == null || "file".equals(distArchiveURI.getScheme())) {
if ("file".equals(distArchiveURI.getScheme())) {
// zeppelin.yarn.dist.archives is local file
srcPath = localFs.makeQualified(new Path(distArchiveURI));
destPath = copyFileToRemote(stagingDir, srcPath, (short) 1);
} else {
// zeppelin.yarn.dist.archives is files on any hadoop compatible file system
destPath = new Path(removeLink(distArchive));
destPath = new Path(removeFragment(distArchive));
}
String linkName = srcPath.getName();
if (distArchiveURI.getFragment() != null) {
@ -358,7 +358,7 @@ public class YarnRemoteInterpreterProcess extends RemoteInterpreterProcess {
return amContainer;
}
private String removeLink(String path) {
private String removeFragment(String path) {
int pos = path.lastIndexOf("#");
if (pos != -1) {
return path.substring(0, pos);

2
zeppelin-server/src/main/java/org/apache/zeppelin/socket/NotebookSocket.java
View file

@ -67,7 +67,7 @@ public class NotebookSocket extends WebSocketAdapter {
}
public synchronized void send(String serializeMessage) throws IOException {
connection.getRemote().sendString(serializeMessage);
connection.getRemote().sendStringByFuture(serializeMessage);
}
public String getUser() {