[
https://issues.apache.org/jira/browse/FLINK-5091?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=15715486#comment-15715486
]
ASF GitHub Bot commented on FLINK-5091:
---------------------------------------
Github user mxm commented on a diff in the pull request:
https://github.com/apache/flink/pull/2915#discussion_r90664693
--- Diff:
flink-runtime/src/main/java/org/apache/flink/runtime/clusterframework/overlays/FlinkDistributionOverlay.java
---
@@ -0,0 +1,126 @@
+/*
+ * 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.flink.runtime.clusterframework.overlays;
+
+import org.apache.flink.configuration.Configuration;
+import org.apache.flink.core.fs.Path;
+import org.apache.flink.runtime.clusterframework.ContainerSpecification;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.Map;
+
+import static
org.apache.flink.configuration.ConfigConstants.ENV_FLINK_BIN_DIR;
+import static
org.apache.flink.configuration.ConfigConstants.ENV_FLINK_CONF_DIR;
+import static
org.apache.flink.configuration.ConfigConstants.ENV_FLINK_HOME_DIR;
+import static
org.apache.flink.configuration.ConfigConstants.ENV_FLINK_LIB_DIR;
+import static org.apache.flink.util.Preconditions.checkNotNull;
+
+/**
+ * Overlays Flink into a container, based on supplied bin/conf/lib
directories.
+ *
+ * The overlayed Flink is indistinguishable from (and interchangeable with)
+ * a normal installation of Flink. For a docker image-based container, it
should be
+ * possible to bypass this overlay and rely on the normal installation
method.
+ *
+ * The following files are copied to the container:
+ * - flink/bin/
+ * - flink/conf/
+ * - flink/lib/
+ */
+public class FlinkDistributionOverlay extends AbstractContainerOverlay {
+
+ private static final Logger LOG =
LoggerFactory.getLogger(FlinkDistributionOverlay.class);
+
+ static final Path TARGET_ROOT = new Path("flink");
+
+ final File flinkBinPath;
+ final File flinkConfPath;
+ final File flinkLibPath;
+
+ public FlinkDistributionOverlay(File flinkBinPath, File flinkConfPath,
File flinkLibPath) {
+ this.flinkBinPath = checkNotNull(flinkBinPath);
+ this.flinkConfPath = checkNotNull(flinkConfPath);
+ this.flinkLibPath = checkNotNull(flinkLibPath);
+ }
+
+ @Override
+ public void configure(ContainerSpecification container) throws
IOException {
+
+ container.getEnvironmentVariables().put(ENV_FLINK_HOME_DIR,
TARGET_ROOT.toString());
+
+ // add the paths to the container specification.
+ addPathRecursively(flinkBinPath, TARGET_ROOT, container);
+ addPathRecursively(flinkConfPath, TARGET_ROOT, container);
+ addPathRecursively(flinkLibPath, TARGET_ROOT, container);
+ }
+
+ public static Builder newBuilder() {
+ return new Builder();
+ }
+
+ /**
+ * A builder for the {@link FlinkDistributionOverlay}.
+ */
+ public static class Builder {
+ File flinkBinPath;
+ File flinkConfPath;
+ File flinkLibPath;
+
+ /**
+ * Configures the overlay using the current environment.
+ *
+ * Locates Flink using FLINK_???_DIR environment variables as
provided to all Flink processes by config.sh.
+ *
+ * @param globalConfiguration the current configuration.
+ */
--- End diff --
indention is off here
> Formalize the AppMaster environment for docker compability
> ----------------------------------------------------------
>
> Key: FLINK-5091
> URL: https://issues.apache.org/jira/browse/FLINK-5091
> Project: Flink
> Issue Type: Sub-task
> Components: Cluster Management, Mesos
> Reporter: Eron Wright
> Assignee: Eron Wright
> Fix For: 1.2.0
>
>
> For scenarios where the AppMaster is launched from a docker image, it would
> be ideal to use the installed Flink rather than rely on a special file layout
> in the sandbox directory.
> This is related to DCOS integration, which (in 1.2) will launch the AppMaster
> via Marathon (as a top-level DCOS service). The existing code assumed that
> only the dispatcher (coming in 1.3) would launch the AppMaster.
--
This message was sent by Atlassian JIRA
(v6.3.4#6332)
