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 comments

Browse source
This commit is contained in:
Jeff Zhang 2021-06-11 10:14:10 +08:00
parent 5fc3e86543
commit a7dca0fd35
3 changed files with 6 additions and 91 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

49
zeppelin-plugins/launcher/yarn/src/main/java/org/apache/zeppelin/interpreter/launcher/YarnLauncherUtil.java
View file

@ -1,49 +0,0 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.apache.zeppelin.interpreter.launcher;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.io.File;
import java.net.URI;
import java.net.URISyntaxException;
public class YarnLauncherUtil {
private static final Logger LOGGER = LoggerFactory.getLogger(YarnLauncherUtil.class);
public static URI resolveURI(String path) {
try {
URI uri = new URI(path);
if (uri.getScheme() != null) {
return uri;
}
// make sure to handle if the path has a fragment (applies to yarn
// distributed cache)
if (uri.getFragment() != null) {
URI absoluteURI = new File(uri.getPath()).getAbsoluteFile().toURI();
return new URI(absoluteURI.getScheme(), absoluteURI.getHost(), absoluteURI.getPath(),
uri.getFragment());
}
} catch (URISyntaxException e) {
LOGGER.warn("Exception when resolveURI: {}, cause : {}", path, e);
}
return new File(path).getAbsoluteFile().toURI();
}
}

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

@ -277,7 +277,12 @@ public class YarnRemoteInterpreterProcess extends RemoteInterpreterProcess {
String yarnDistArchives = launchContext.getProperties().getProperty("zeppelin.yarn.dist.archives");
if (StringUtils.isNotBlank(yarnDistArchives)) {
for (String localArchive : yarnDistArchives.split(",")) {
URI localURI = YarnLauncherUtil.resolveURI(localArchive);
URI localURI = null;
try {
localURI = new URI(localArchive);
} catch (URISyntaxException e) {
throw new IOException("Invalid uri: " + localArchive, e);
}
srcPath = localFs.makeQualified(new Path(localURI));
destPath = copyFileToRemote(stagingDir, srcPath, (short) 1);
String linkName = srcPath.getName();

41
zeppelin-plugins/launcher/yarn/src/test/java/org/apache/zeppelin/interpreter/launcher/YarnLauncherUtilTest.java
View file

@ -1,41 +0,0 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.apache.zeppelin.interpreter.launcher;
import org.junit.Test;
import java.net.URI;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNull;
public class YarnLauncherUtilTest {
@Test
public void testURIUtil() {
URI uri = YarnLauncherUtil.resolveURI("/tmp/env_1");
assertEquals("file", uri.getScheme());
assertEquals("/tmp/env_1", uri.getPath());
assertNull(uri.getFragment());
uri = YarnLauncherUtil.resolveURI("/tmp/env_1#env");
assertEquals("file", uri.getScheme());
assertEquals("/tmp/env_1", uri.getPath());
assertEquals("env", uri.getFragment());
}
}