Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Improve] [Flink-Kubernetes-V2] add observer untrack on Flink-Kubernetes-V2-Session #3216

Merged
merged 8 commits into from
Oct 8, 2023
Merged

[Improve] [Flink-Kubernetes-V2] add observer untrack on Flink-Kubernetes-V2-Session #3216

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
ff9ae3b
improve README.md
caicancai Sep 20, 2023
77bfdd0
Merge branch 'dev' of https://github.com/caicancai/incubator-streampa…
caicancai Sep 21, 2023
abbdeaf
Merge branch 'dev' of https://github.com/caicancai/incubator-streampa…
caicancai Sep 23, 2023
5169f6d
Merge branch 'dev' of https://github.com/caicancai/incubator-streampa…
caicancai Sep 26, 2023
65b7d70
[Improve]improve README.md
caicancai Sep 26, 2023
58c516a
Merge branch 'dev' of https://github.com/caicancai/incubator-streampa…
caicancai Oct 7, 2023
6a1d40f
[Bug][Flink-Kubernetes-V2] observer.untrack on FLink-Kubernetes-V2-se…
caicancai Oct 7, 2023
9833eb0
Improve KubernetesSessionClientV2.scala at PR#3216.
Al-assad Oct 8, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 19 additions & 8 deletions ...re/src/main/scala/org/apache/streampark/flink/client/impl/KubernetesSessionClientV2.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,17 +17,21 @@
package org.apache.streampark.flink.client.impl

import org.apache.streampark.common.util.Logger
import org.apache.streampark.common.zio.ZIOExt.IOOps
import org.apache.streampark.common.zio.ZIOExt.{IOOps, OptionZIOOps}
import org.apache.streampark.flink.client.`trait`.KubernetesClientV2Trait
import org.apache.streampark.flink.client.bean._
import org.apache.streampark.flink.kubernetes.v2.model.FlinkSessionJobDef
import org.apache.streampark.flink.kubernetes.v2.model.TrackKey.ClusterKey
import org.apache.streampark.flink.kubernetes.v2.observer.FlinkK8sObserver
import org.apache.streampark.flink.kubernetes.v2.operator.FlinkK8sOperator
import org.apache.streampark.flink.kubernetes.v2.operator.OprError.{FlinkResourceNotFound, UnsupportedAction}
import org.apache.streampark.flink.packer.pipeline.ShadedBuildResponse

import org.apache.commons.lang3.StringUtils
import org.apache.flink.client.deployment.application.ApplicationConfiguration
import org.apache.flink.configuration._
import org.apache.flink.runtime.jobgraph.SavepointConfigOptions
import zio.ZIO

import scala.jdk.CollectionConverters.mapAsScalaMapConverter
import scala.util.{Failure, Success}
Expand Down Expand Up @@ -123,13 +127,20 @@ object KubernetesSessionClientV2 extends KubernetesClientV2Trait with Logger {
val namespace = shutDownRequest.kubernetesDeployParam.kubernetesNamespace
def richMsg: String => String = s"[flink-shutdown][clusterId=$name][namespace=$namespace] " + _

FlinkK8sOperator.k8sCrOpr.deleteSessionJob(namespace, name).runIOAsTry match {
case Success(_) =>
logInfo(richMsg("Shutdown Flink cluster successfully."))
ShutDownResponse()
case Failure(err) =>
logError(richMsg(s"Fail to shutdown Flink cluster"), err)
throw err
FlinkK8sObserver.trackedKeys
.find {
case ClusterKey(_, ns, n) => ns == namespace && n == name
case _ => false
}
.someOrUnitZIO(key => FlinkK8sOperator.delete(key.id))
.catchSome {
case _: FlinkResourceNotFound => ZIO.unit
case _: UnsupportedAction => ZIO.unit
}
.as(ShutDownResponse())
.runIOAsTry match {
case Success(result) => logInfo(richMsg("Shutdown Flink cluster successfully.")); result
case Failure(err) => logError(richMsg(s"Fail to shutdown Flink cluster"), err); throw err
}
}

Expand Down