Al-assad commented on code in PR #2994: URL: https://github.com/apache/incubator-streampark/pull/2994#discussion_r1318392896
########## streampark-flink/streampark-flink-client/streampark-flink-client-core/src/main/scala/org/apache/streampark/flink/client/impl/KubernetesNativeApplicationClient_V2.scala: ########## @@ -0,0 +1,121 @@ +/* + * 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.streampark.flink.client.impl + +import org.apache.streampark.common.enums.{ApplicationType, DevelopmentMode, ExecutionMode} +import org.apache.streampark.common.zio.ZIOExt.IOOps +import org.apache.streampark.flink.client.`trait`.KubernetesNativeClientTrait +import org.apache.streampark.flink.client.bean._ +import org.apache.streampark.flink.kubernetes.v2.model.{FlinkDeploymentDef, JobDef, JobManagerDef, TaskManagerDef} +import org.apache.streampark.flink.kubernetes.v2.operator.FlinkK8sOperator +import org.apache.streampark.flink.packer.pipeline.DockerImageBuildResponse + +import org.apache.commons.lang3.StringUtils +import org.apache.flink.configuration.{Configuration, DeploymentOptions, ExecutionOptions, JobManagerOptions, PipelineOptions, TaskManagerOptions} +import org.apache.flink.v1beta1.FlinkDeploymentSpec.FlinkVersion + +import scala.collection.JavaConverters._ +import scala.language.postfixOps + +object KubernetesNativeApplicationClient_V2 extends KubernetesNativeClientTrait { + @throws[Exception] + override def doSubmit( + submitRequest: SubmitRequest, + flinkConfig: Configuration): SubmitResponse = { + + // require parameters + require( + StringUtils.isNotBlank(submitRequest.k8sSubmitParam.clusterId), + s"[flink-submit] submit flink job failed, clusterId is null, mode=${flinkConfig.get(DeploymentOptions.TARGET)}" + ) + + // check the last building result + submitRequest.checkBuildResult() + + try { + val spec: FlinkDeploymentDef = convertFlinkDeploymentDef(submitRequest, flinkConfig) + FlinkK8sOperator.deployApplicationJob(submitRequest.id, spec).runIO + val result = SubmitResponse(null, flinkConfig.toMap, submitRequest.jobId, null) + logInfo( + s"[flink-submit] flink job has been submitted. ${flinkConfIdentifierInfo(flinkConfig)}") + result + } catch { + case e: Exception => + logError(s"submit flink job fail in ${submitRequest.executionMode} mode") + throw e + } finally {} + } + + override def doCancel( + cancelRequest: CancelRequest, + flinkConfig: Configuration): CancelResponse = { + flinkConfig.safeSet( + DeploymentOptions.TARGET, + ExecutionMode.KUBERNETES_NATIVE_APPLICATION.getName) + super.doCancel(cancelRequest, flinkConfig) + } + + override def doTriggerSavepoint( + request: TriggerSavepointRequest, + flinkConf: Configuration): SavepointResponse = { + flinkConf.safeSet(DeploymentOptions.TARGET, ExecutionMode.KUBERNETES_NATIVE_APPLICATION.getName) + super.doTriggerSavepoint(request, flinkConf) + } + + private[this] def convertFlinkDeploymentDef( + submitRequest: SubmitRequest, + flinkConfig: Configuration): FlinkDeploymentDef = { + val spec = FlinkDeploymentDef( + name = submitRequest.appName, + namespace = submitRequest.k8sSubmitParam.kubernetesNamespace, + image = submitRequest.buildResult.asInstanceOf[DockerImageBuildResponse].flinkImageTag, + flinkVersion = Option(submitRequest.flinkVersion.majorVersion) + .map(_.replace(".", "_")) + .map("V" + _) + .flatMap(v => FlinkVersion.values().find(_.name() == v)) match { + case Some(version) => version + case None => throw new IllegalArgumentException("Flink version not found") + }, + jobManager = JobManagerDef( + cpu = 1, + memory = flinkConfig.get(JobManagerOptions.TOTAL_PROCESS_MEMORY).toString), + taskManager = TaskManagerDef( + cpu = 1, + memory = flinkConfig.get(TaskManagerOptions.TOTAL_PROCESS_MEMORY).toString), + job = Option( + JobDef( + jarURI = + submitRequest.buildResult.asInstanceOf[DockerImageBuildResponse].dockerInnerMainJarPath, + parallelism = 1, + args = Array(flinkConfig.toMap.get("$internal.application.program-args")), + entryClass = Some(submitRequest.appMain), + initialSavepointPath = Some(submitRequest.savePoint), Review Comment: SubmitRequest.savePoint maybe null or empty, it should be corrected to `Option(submitRequest .savePoint).filter(_.nonEmpty)` ########## streampark-flink/streampark-flink-client/streampark-flink-client-core/src/main/scala/org/apache/streampark/flink/client/impl/KubernetesNativeApplicationClient_V2.scala: ########## @@ -0,0 +1,121 @@ +/* + * 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.streampark.flink.client.impl + +import org.apache.streampark.common.enums.{ApplicationType, DevelopmentMode, ExecutionMode} +import org.apache.streampark.common.zio.ZIOExt.IOOps +import org.apache.streampark.flink.client.`trait`.KubernetesNativeClientTrait +import org.apache.streampark.flink.client.bean._ +import org.apache.streampark.flink.kubernetes.v2.model.{FlinkDeploymentDef, JobDef, JobManagerDef, TaskManagerDef} +import org.apache.streampark.flink.kubernetes.v2.operator.FlinkK8sOperator +import org.apache.streampark.flink.packer.pipeline.DockerImageBuildResponse + +import org.apache.commons.lang3.StringUtils +import org.apache.flink.configuration.{Configuration, DeploymentOptions, ExecutionOptions, JobManagerOptions, PipelineOptions, TaskManagerOptions} +import org.apache.flink.v1beta1.FlinkDeploymentSpec.FlinkVersion + +import scala.collection.JavaConverters._ +import scala.language.postfixOps + +object KubernetesNativeApplicationClient_V2 extends KubernetesNativeClientTrait { + @throws[Exception] + override def doSubmit( + submitRequest: SubmitRequest, + flinkConfig: Configuration): SubmitResponse = { + + // require parameters + require( + StringUtils.isNotBlank(submitRequest.k8sSubmitParam.clusterId), + s"[flink-submit] submit flink job failed, clusterId is null, mode=${flinkConfig.get(DeploymentOptions.TARGET)}" + ) + + // check the last building result + submitRequest.checkBuildResult() + + try { + val spec: FlinkDeploymentDef = convertFlinkDeploymentDef(submitRequest, flinkConfig) + FlinkK8sOperator.deployApplicationJob(submitRequest.id, spec).runIO + val result = SubmitResponse(null, flinkConfig.toMap, submitRequest.jobId, null) + logInfo( + s"[flink-submit] flink job has been submitted. ${flinkConfIdentifierInfo(flinkConfig)}") + result + } catch { + case e: Exception => + logError(s"submit flink job fail in ${submitRequest.executionMode} mode") + throw e + } finally {} + } + + override def doCancel( + cancelRequest: CancelRequest, + flinkConfig: Configuration): CancelResponse = { + flinkConfig.safeSet( + DeploymentOptions.TARGET, + ExecutionMode.KUBERNETES_NATIVE_APPLICATION.getName) + super.doCancel(cancelRequest, flinkConfig) + } + + override def doTriggerSavepoint( + request: TriggerSavepointRequest, + flinkConf: Configuration): SavepointResponse = { + flinkConf.safeSet(DeploymentOptions.TARGET, ExecutionMode.KUBERNETES_NATIVE_APPLICATION.getName) + super.doTriggerSavepoint(request, flinkConf) + } + + private[this] def convertFlinkDeploymentDef( + submitRequest: SubmitRequest, + flinkConfig: Configuration): FlinkDeploymentDef = { + val spec = FlinkDeploymentDef( + name = submitRequest.appName, + namespace = submitRequest.k8sSubmitParam.kubernetesNamespace, + image = submitRequest.buildResult.asInstanceOf[DockerImageBuildResponse].flinkImageTag, + flinkVersion = Option(submitRequest.flinkVersion.majorVersion) + .map(_.replace(".", "_")) + .map("V" + _) + .flatMap(v => FlinkVersion.values().find(_.name() == v)) match { + case Some(version) => version + case None => throw new IllegalArgumentException("Flink version not found") + }, + jobManager = JobManagerDef( + cpu = 1, + memory = flinkConfig.get(JobManagerOptions.TOTAL_PROCESS_MEMORY).toString), + taskManager = TaskManagerDef( + cpu = 1, + memory = flinkConfig.get(TaskManagerOptions.TOTAL_PROCESS_MEMORY).toString), + job = Option( + JobDef( + jarURI = + submitRequest.buildResult.asInstanceOf[DockerImageBuildResponse].dockerInnerMainJarPath, + parallelism = 1, + args = Array(flinkConfig.toMap.get("$internal.application.program-args")), + entryClass = Some(submitRequest.appMain), + initialSavepointPath = Some(submitRequest.savePoint), + allowNonRestoredState = Some(submitRequest.allowNonRestoredState) Review Comment: When submitRequest.savePoint is null, the allowNonRestoredState should be None -- 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. To unsubscribe, e-mail: [email protected] For queries about this service, please contact Infrastructure at: [email protected]
