Merge pull request #23 from Al-assad/dev

PreStop lifecycle for FE, BE and Broker
linsoss · Nov 25, 2023 · 33603ae · 33603ae
2 parents 616387d + 80b10dd
commit 33603ae
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 0 deletions.
diff --git a/internal/transformer/be_resources.go b/internal/transformer/be_resources.go
@@ -252,6 +252,9 @@ func MakeBeStatefulSet(cr *dapi.DorisCluster, scheme *runtime.Scheme) *appv1.Sta
 			{Name: "be-storage", MountPath: "/opt/apache-doris/be/storage"},
 			{Name: "be-log", MountPath: "/opt/apache-doris/be/log"},
 		},
+		Lifecycle: &corev1.Lifecycle{
+			PreStop: util.NewExecLifecycleHandler("/bin/sh", "-c", "bin/stop_be.sh"),
+		},
 		ReadinessProbe: &corev1.Probe{
 			ProbeHandler:     util.NewTcpSocketProbeHandler(GetBeHeartbeatServicePort(cr)),
 			TimeoutSeconds:   1,

diff --git a/internal/transformer/broker_resources.go b/internal/transformer/broker_resources.go
@@ -169,6 +169,9 @@ func MakeBrokerStatefulSet(cr *dapi.DorisCluster, scheme *runtime.Scheme) *appv1
 		VolumeMounts: []corev1.VolumeMount{
 			{Name: "conf", MountPath: "/opt/apache-doris/broker/conf"},
 		},
+		Lifecycle: &corev1.Lifecycle{
+			PreStop: util.NewExecLifecycleHandler("/bin/sh", "-c", "bin/stop_broker.sh"),
+		},
 		ReadinessProbe: &corev1.Probe{
 			ProbeHandler:     util.NewTcpSocketProbeHandler(GetBrokerIpcPort(cr)),
 			TimeoutSeconds:   1,

diff --git a/internal/transformer/cn_resources.go b/internal/transformer/cn_resources.go
@@ -229,6 +229,9 @@ func MakeCnStatefulSet(cr *dapi.DorisCluster, scheme *runtime.Scheme) *appv1.Sta
 			{Name: "conf", MountPath: "/etc/apache-doris/be/"},
 			{Name: "cn-log", MountPath: "/opt/apache-doris/be/log"},
 		},
+		Lifecycle: &corev1.Lifecycle{
+			PreStop: util.NewExecLifecycleHandler("/bin/sh", "-c", "bin/stop_be.sh"),
+		},
 		ReadinessProbe: &corev1.Probe{
 			ProbeHandler:     util.NewTcpSocketProbeHandler(GetCnHeartbeatServicePort(cr)),
 			TimeoutSeconds:   1,

diff --git a/internal/transformer/fe_resources.go b/internal/transformer/fe_resources.go
@@ -271,6 +271,9 @@ func MakeFeStatefulSet(cr *dapi.DorisCluster, scheme *runtime.Scheme) *appv1.Sta
 			{Name: "fe-meta", MountPath: "/opt/apache-doris/fe/doris-meta"},
 			{Name: "fe-log", MountPath: "/opt/apache-doris/fe/log"},
 		},
+		Lifecycle: &corev1.Lifecycle{
+			PreStop: util.NewExecLifecycleHandler("/bin/sh", "-c", "bin/stop_fe.sh"),
+		},
 		ReadinessProbe: &corev1.Probe{
 			ProbeHandler:        util.NewTcpSocketProbeHandler(GetFeEditLogPort(cr)),
 			InitialDelaySeconds: 3,

diff --git a/internal/util/kubeutil.go b/internal/util/kubeutil.go
@@ -94,6 +94,12 @@ func NewHttpGetProbeHandler(path string, httpPort int32) corev1.ProbeHandler {
 	}
 }
 
+func NewExecLifecycleHandler(command ...string) *corev1.LifecycleHandler {
+	return &corev1.LifecycleHandler{
+		Exec: &corev1.ExecAction{Command: command},
+	}
+}
+
 func NewResourceAvgUtilizationMetricSpec(name corev1.ResourceName, avgUnit *int32) acv2.MetricSpec {
 	return acv2.MetricSpec{
 		Type: acv2.ResourceMetricSourceType,