[
https://issues.apache.org/jira/browse/FLINK-5091?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=15715492#comment-15715492
]
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_r90666707
--- Diff:
flink-runtime/src/test/java/org/apache/flink/runtime/clusterframework/overlays/HadoopConfOverlayTest.java
---
@@ -0,0 +1,119 @@
+/*
+ * 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.ConfigConstants;
+import org.apache.flink.configuration.Configuration;
+import org.apache.flink.core.fs.Path;
+import org.apache.flink.core.testutils.CommonTestUtils;
+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 java.util.HashMap;
+import java.util.Map;
+
+import static org.junit.Assert.assertEquals;
+
+import static
org.apache.flink.runtime.clusterframework.overlays.HadoopConfOverlay.TARGET_CONF_DIR;
+
+public class HadoopConfOverlayTest extends ContainerOverlayTestBase {
+
+ @Rule
+ public TemporaryFolder tempFolder = new TemporaryFolder();
+
+ @Test
+ public void testConfigure() throws Exception {
+
+ File confDir = tempFolder.newFolder();
+ initConfDir(confDir);
+
+ HadoopConfOverlay overlay = new HadoopConfOverlay(confDir);
+
+ ContainerSpecification spec = new ContainerSpecification();
+ overlay.configure(spec);
+
+ assertEquals(TARGET_CONF_DIR.getPath(),
spec.getEnvironmentVariables().get("HADOOP_CONF_DIR"));
+ assertEquals(TARGET_CONF_DIR.getPath(),
spec.getDynamicConfiguration().getString(ConfigConstants.PATH_HADOOP_CONFIG,
null));
+
+ checkArtifact(spec, new Path(TARGET_CONF_DIR, "core-site.xml"));
+ checkArtifact(spec, new Path(TARGET_CONF_DIR, "hdfs-site.xml"));
+ }
+
+ @Test
+ public void testNoConf() throws Exception {
+ HadoopConfOverlay overlay = new HadoopConfOverlay(null);
+
+ ContainerSpecification containerSpecification = new
ContainerSpecification();
+ overlay.configure(containerSpecification);
+ }
+
+ @Test
+ public void testBuilderFromEnvironment() throws Exception {
+
+ // verify that the builder picks up various environment
locations
+ HadoopConfOverlay.Builder builder;
+ Map<String, String> env;
+
+ // fs.hdfs.hadoopconf
+ File confDir = tempFolder.newFolder();
+ initConfDir(confDir);
+ Configuration conf = new Configuration();
+ conf.setString(ConfigConstants.PATH_HADOOP_CONFIG,
confDir.getAbsolutePath());
+ builder = HadoopConfOverlay.newBuilder().fromEnvironment(conf);
+ assertEquals(confDir, builder.hadoopConfDir);
+
+ // HADOOP_CONF_DIR
+ env = new HashMap<String, String>(System.getenv());
+ env.remove("HADOOP_HOME");
+ env.put("HADOOP_CONF_DIR", confDir.getAbsolutePath());
+ CommonTestUtils.setEnv(env);
+ builder = HadoopConfOverlay.newBuilder().fromEnvironment(new
Configuration());
+ assertEquals(confDir, builder.hadoopConfDir);
+
+ // HADOOP_HOME/conf
+ File homeDir = tempFolder.newFolder();
+ confDir = initConfDir(new File(homeDir, "conf"));
+ env = new HashMap<String, String>(System.getenv());
+ env.remove("HADOOP_CONF_DIR");
+ env.put("HADOOP_HOME", homeDir.getAbsolutePath());
--- End diff --
Should we restore the original environment for all test cases in an
@AfterTest method?
> 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)
