forked from apache/flink
-
Notifications
You must be signed in to change notification settings - Fork 12
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[FLINK-14467][mesos] Implement user code classloading in per-job cluster
The MesosJobClusterEntrypoint adds 'usrlib' directory to the container specification if the directory exists. Then jars under the directory are loaded by the FlinkUserCodeClassloader. This closes apache#10256.
- Loading branch information
Showing
8 changed files
with
187 additions
and
10 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
72 changes: 72 additions & 0 deletions
72
...time/src/main/java/org/apache/flink/runtime/clusterframework/overlays/UserLibOverlay.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,72 @@ | ||
| /* | ||
| * 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:https://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.flink.runtime.clusterframework.overlays; | ||
|
|
||
| import org.apache.flink.configuration.ConfigConstants; | ||
| import org.apache.flink.runtime.clusterframework.ContainerSpecification; | ||
|
|
||
| import javax.annotation.Nullable; | ||
|
|
||
| import java.io.File; | ||
| import java.io.IOException; | ||
|
|
||
| /** | ||
| * Overlays the user library into a container. | ||
| * The following directory and files in the directory are copied to the container if it exists: | ||
| * - {@link ConfigConstants#DEFAULT_FLINK_USR_LIB_DIR}/ | ||
| */ | ||
| public class UserLibOverlay extends AbstractContainerOverlay { | ||
|
|
||
| @Nullable | ||
| private final File usrLibDirectory; | ||
|
|
||
| private UserLibOverlay(@Nullable File usrLibDirectory) { | ||
| this.usrLibDirectory = usrLibDirectory; | ||
| } | ||
|
|
||
| @Override | ||
| public void configure(ContainerSpecification container) throws IOException { | ||
| if (usrLibDirectory != null) { | ||
| addPathRecursively(usrLibDirectory, FlinkDistributionOverlay.TARGET_ROOT, container); | ||
| } | ||
| } | ||
|
|
||
| public static UserLibOverlay.Builder newBuilder() { | ||
| return new UserLibOverlay.Builder(); | ||
| } | ||
|
|
||
| /** | ||
| * A builder for the {@link UserLibOverlay}. | ||
| */ | ||
| public static class Builder { | ||
|
|
||
| @Nullable | ||
| private File usrLibDirectory; | ||
|
|
||
| public UserLibOverlay.Builder setUsrLibDirectory(@Nullable File usrLibDirectory) { | ||
| this.usrLibDirectory = usrLibDirectory; | ||
| return this; | ||
| } | ||
|
|
||
| public UserLibOverlay build() { | ||
| return new UserLibOverlay(usrLibDirectory); | ||
| } | ||
|
|
||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
58 changes: 58 additions & 0 deletions
58
.../src/test/java/org/apache/flink/runtime/clusterframework/overlays/UserLibOverlayTest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,58 @@ | ||
| /* | ||
| * 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:https://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.flink.runtime.clusterframework.overlays; | ||
|
|
||
| import org.apache.flink.core.fs.Path; | ||
| import org.apache.flink.runtime.clusterframework.ContainerSpecification; | ||
|
|
||
| import org.junit.Rule; | ||
| import org.junit.Test; | ||
| import org.junit.rules.TemporaryFolder; | ||
|
|
||
| import java.io.File; | ||
|
|
||
| import static org.apache.flink.configuration.ConfigConstants.DEFAULT_FLINK_USR_LIB_DIR; | ||
|
|
||
| /** | ||
| * Test {@link UserLibOverlay}. | ||
| */ | ||
| public class UserLibOverlayTest extends ContainerOverlayTestBase { | ||
|
|
||
| @Rule | ||
| public TemporaryFolder tempFolder = new TemporaryFolder(); | ||
|
|
||
| @Test | ||
| public void testConfigure() throws Exception { | ||
| final File userLibFolder = tempFolder.newFolder(DEFAULT_FLINK_USR_LIB_DIR); | ||
|
|
||
| final Path[] files = createPaths( | ||
| tempFolder.getRoot(), | ||
| "usrlib/job_a.jar", | ||
| "usrlib/lib/dep1.jar", | ||
| "usrlib/lib/dep2.jar"); | ||
|
|
||
| final ContainerSpecification containerSpecification = new ContainerSpecification(); | ||
| final UserLibOverlay overlay = UserLibOverlay.newBuilder().setUsrLibDirectory(userLibFolder).build(); | ||
| overlay.configure(containerSpecification); | ||
|
|
||
| for (Path file : files) { | ||
| checkArtifact(containerSpecification, new Path(FlinkDistributionOverlay.TARGET_ROOT, file.toString())); | ||
| } | ||
| } | ||
| } |