wangyang0918 commented on a change in pull request #12317:
URL: https://github.com/apache/flink/pull/12317#discussion_r430133100
##########
File path:
flink-yarn/src/main/java/org/apache/flink/yarn/executors/YarnJobClusterExecutorFactory.java
##########
@@ -38,12 +39,16 @@ public String getName() {
}
@Override
- public boolean isCompatibleWith(@Nonnull final Configuration
configuration) {
+ public boolean isCompatibleWith(@ Nonnull final Configuration
configuration) {
Review comment:
Maybe this is a typo here. We should not have unnecessary space here.
##########
File path:
flink-yarn/src/main/java/org/apache/flink/yarn/cli/FallbackYarnSessionCli.java
##########
@@ -0,0 +1,78 @@
+/*
+ * 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.yarn.cli;
+
+import org.apache.flink.annotation.Internal;
+import org.apache.flink.client.cli.AbstractCustomCommandLine;
+import org.apache.flink.configuration.Configuration;
+import org.apache.flink.configuration.DeploymentOptions;
+import org.apache.flink.yarn.configuration.YarnConfigOptions;
+import org.apache.flink.yarn.configuration.YarnDeploymentTarget;
+import org.apache.flink.yarn.executors.YarnJobClusterExecutor;
+import org.apache.flink.yarn.executors.YarnSessionClusterExecutor;
+
+import org.apache.commons.cli.CommandLine;
+import org.apache.commons.cli.Option;
+import org.apache.commons.cli.Options;
+
+/**
+ * A stub Yarn Command Line to throw an exception with the correct
+ * message when the {@code HADOOP_CLASSPATH} is not set.
+ */
+@Internal
+public class FallbackYarnSessionCli extends AbstractCustomCommandLine {
+
+ public static final String ID = "yarn-cluster";
+
+ private final Option applicationId;
+
+ public FallbackYarnSessionCli(Configuration configuration) {
+ super(configuration);
+ applicationId = new Option("yid", "yarnapplicationId", true,
"Attach to running YARN session");
+ }
+
+ @Override
+ public void addGeneralOptions(Options baseOptions) {
+ super.addGeneralOptions(baseOptions);
+ baseOptions.addOption(applicationId);
+ }
+
+ @Override
+ public boolean isActive(CommandLine commandLine) {
+ if (originalIsActive(commandLine)) {
+ throw new
IllegalStateException(YarnDeploymentTarget.ERROR_MESSAGE);
+ }
+ return false;
+ }
+
+ private boolean originalIsActive(CommandLine commandLine) {
Review comment:
So we are intentional to ignore the Yarn properties file here. Right?
##########
File path:
flink-yarn/src/main/java/org/apache/flink/yarn/cli/FallbackYarnSessionCli.java
##########
@@ -0,0 +1,78 @@
+/*
+ * 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.yarn.cli;
+
+import org.apache.flink.annotation.Internal;
+import org.apache.flink.client.cli.AbstractCustomCommandLine;
+import org.apache.flink.configuration.Configuration;
+import org.apache.flink.configuration.DeploymentOptions;
+import org.apache.flink.yarn.configuration.YarnConfigOptions;
+import org.apache.flink.yarn.configuration.YarnDeploymentTarget;
+import org.apache.flink.yarn.executors.YarnJobClusterExecutor;
+import org.apache.flink.yarn.executors.YarnSessionClusterExecutor;
+
+import org.apache.commons.cli.CommandLine;
+import org.apache.commons.cli.Option;
+import org.apache.commons.cli.Options;
+
+/**
+ * A stub Yarn Command Line to throw an exception with the correct
+ * message when the {@code HADOOP_CLASSPATH} is not set.
+ */
+@Internal
+public class FallbackYarnSessionCli extends AbstractCustomCommandLine {
+
+ public static final String ID = "yarn-cluster";
+
+ private final Option applicationId;
+
+ public FallbackYarnSessionCli(Configuration configuration) {
+ super(configuration);
+ applicationId = new Option("yid", "yarnapplicationId", true,
"Attach to running YARN session");
+ }
+
+ @Override
+ public void addGeneralOptions(Options baseOptions) {
+ super.addGeneralOptions(baseOptions);
+ baseOptions.addOption(applicationId);
+ }
+
+ @Override
+ public boolean isActive(CommandLine commandLine) {
+ if (originalIsActive(commandLine)) {
+ throw new
IllegalStateException(YarnDeploymentTarget.ERROR_MESSAGE);
+ }
+ return false;
+ }
+
+ private boolean originalIsActive(CommandLine commandLine) {
Review comment:
Yeah, i agree with you that we do not need to add the logics for Yarn
magic properties file here.
##########
File path:
flink-yarn/src/main/java/org/apache/flink/yarn/cli/FallbackYarnSessionCli.java
##########
@@ -0,0 +1,78 @@
+/*
+ * 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.yarn.cli;
+
+import org.apache.flink.annotation.Internal;
+import org.apache.flink.client.cli.AbstractCustomCommandLine;
+import org.apache.flink.configuration.Configuration;
+import org.apache.flink.configuration.DeploymentOptions;
+import org.apache.flink.yarn.configuration.YarnConfigOptions;
+import org.apache.flink.yarn.configuration.YarnDeploymentTarget;
+import org.apache.flink.yarn.executors.YarnJobClusterExecutor;
+import org.apache.flink.yarn.executors.YarnSessionClusterExecutor;
+
+import org.apache.commons.cli.CommandLine;
+import org.apache.commons.cli.Option;
+import org.apache.commons.cli.Options;
+
+/**
+ * A stub Yarn Command Line to throw an exception with the correct
+ * message when the {@code HADOOP_CLASSPATH} is not set.
+ */
+@Internal
+public class FallbackYarnSessionCli extends AbstractCustomCommandLine {
+
+ public static final String ID = "yarn-cluster";
+
+ private final Option applicationId;
+
+ public FallbackYarnSessionCli(Configuration configuration) {
+ super(configuration);
+ applicationId = new Option("yid", "yarnapplicationId", true,
"Attach to running YARN session");
+ }
+
+ @Override
+ public void addGeneralOptions(Options baseOptions) {
+ super.addGeneralOptions(baseOptions);
+ baseOptions.addOption(applicationId);
+ }
+
+ @Override
+ public boolean isActive(CommandLine commandLine) {
+ if (originalIsActive(commandLine)) {
+ throw new
IllegalStateException(YarnDeploymentTarget.ERROR_MESSAGE);
+ }
+ return false;
+ }
+
+ private boolean originalIsActive(CommandLine commandLine) {
Review comment:
Yeah, i agree with you that we do not need to add the logics for Yarn
magic properties file here.
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
