From 7fd94ffa408f78b16ef5ec1849e27cf9abf3e900 Mon Sep 17 00:00:00 2001
From: Aaron Lin <1546848781@qq.com>
Date: Thu, 6 Jan 2022 20:05:05 +0800
Subject: [PATCH] [Improvement][Logger]Remove the logger server from the
 deployment (#7837)

---
 .../templates/statefulset-dolphinscheduler-worker.yaml       | 2 --
 .../templates/svc-dolphinscheduler-worker-headless.yaml      | 4 ----
 script/dolphinscheduler-daemon.sh                            | 2 --
 script/scp-hosts.sh                                          | 2 +-
 script/start-all.sh                                          | 1 -
 script/status-all.sh                                         | 5 +----
 script/stop-all.sh                                           | 1 -
 7 files changed, 2 insertions(+), 15 deletions(-)

diff --git a/deploy/kubernetes/dolphinscheduler/templates/statefulset-dolphinscheduler-worker.yaml b/deploy/kubernetes/dolphinscheduler/templates/statefulset-dolphinscheduler-worker.yaml
index 44328055ff..d148f5122c 100644
--- a/deploy/kubernetes/dolphinscheduler/templates/statefulset-dolphinscheduler-worker.yaml
+++ b/deploy/kubernetes/dolphinscheduler/templates/statefulset-dolphinscheduler-worker.yaml
@@ -59,8 +59,6 @@ spec:
           ports:
             - containerPort: 1234
               name: "worker-port"
-            - containerPort: 50051
-              name: "logger-port"
           env:
             - name: TZ
               value: {{ .Values.timezone }}
diff --git a/deploy/kubernetes/dolphinscheduler/templates/svc-dolphinscheduler-worker-headless.yaml b/deploy/kubernetes/dolphinscheduler/templates/svc-dolphinscheduler-worker-headless.yaml
index 34664fefb7..bb6baf8034 100644
--- a/deploy/kubernetes/dolphinscheduler/templates/svc-dolphinscheduler-worker-headless.yaml
+++ b/deploy/kubernetes/dolphinscheduler/templates/svc-dolphinscheduler-worker-headless.yaml
@@ -28,9 +28,5 @@ spec:
       targetPort: worker-port
       protocol: TCP
       name: worker-port
-    - port: 50051
-      targetPort: logger-port
-      protocol: TCP
-      name: logger-port
   selector:
     {{- include "dolphinscheduler.worker.labels" . | nindent 4 }}
\ No newline at end of file
diff --git a/script/dolphinscheduler-daemon.sh b/script/dolphinscheduler-daemon.sh
index 1c72400916..37263e3c75 100755
--- a/script/dolphinscheduler-daemon.sh
+++ b/script/dolphinscheduler-daemon.sh
@@ -60,8 +60,6 @@ elif [ "$command" = "worker-server" ]; then
   :
 elif [ "$command" = "alert-server" ]; then
   :
-elif [ "$command" = "logger-server" ]; then
-  :
 elif [ "$command" = "standalone-server" ]; then
   :
 else
diff --git a/script/scp-hosts.sh b/script/scp-hosts.sh
index 4f742f9822..2397ede936 100755
--- a/script/scp-hosts.sh
+++ b/script/scp-hosts.sh
@@ -49,7 +49,7 @@ do
   echo "scp dirs to $host/$installPath starting"
 	ssh -p $sshPort $host  "cd $installPath/; rm -rf bin/ conf/ lib/ script/ sql/ ui/"
 
-  for dsDir in bin master-server worker-server alert-server api-server logger-server ui
+  for dsDir in bin master-server worker-server alert-server api-server ui
   do
     # if worker in workersGroupMap
     if [[ "${workersGroupMap[${host}]}" ]]; then
diff --git a/script/start-all.sh b/script/start-all.sh
index 08574069aa..002f99d873 100755
--- a/script/start-all.sh
+++ b/script/start-all.sh
@@ -45,7 +45,6 @@ do
   echo "$worker worker server is starting"
 
   ssh -p $sshPort $worker  "cd $installPath/; sh bin/dolphinscheduler-daemon.sh start worker-server;"
-  ssh -p $sshPort $worker  "cd $installPath/; sh bin/dolphinscheduler-daemon.sh start logger-server;"
 done
 
 ssh -p $sshPort $alertServer  "cd $installPath/; sh bin/dolphinscheduler-daemon.sh start alert-server;"
diff --git a/script/status-all.sh b/script/status-all.sh
index 2fa51d3f16..df19eb9c37 100755
--- a/script/status-all.sh
+++ b/script/status-all.sh
@@ -56,14 +56,11 @@ do
   echo "$master  $masterState"
 done
 
-# 2.worker server and logger-server check state
+# 2.worker server check state
 for worker in ${!workersGroupMap[*]}
 do
   workerState=`ssh -p $sshPort $worker  "cd $installPath/; sh bin/dolphinscheduler-daemon.sh status worker-server;"`
   echo "$worker  $workerState"
-
-  masterState=`ssh -p $sshPort $worker  "cd $installPath/; sh bin/dolphinscheduler-daemon.sh status logger-server;"`
-  echo "$worker  $masterState"
 done
 
 # 3.alter server check state
diff --git a/script/stop-all.sh b/script/stop-all.sh
index 1290f4acdd..6592374659 100755
--- a/script/stop-all.sh
+++ b/script/stop-all.sh
@@ -44,7 +44,6 @@ for worker in ${!workersGroupMap[*]}
 do
   echo "$worker worker server is stopping"
   ssh -p $sshPort $worker  "cd $installPath/; sh bin/dolphinscheduler-daemon.sh stop worker-server;"
-  ssh -p $sshPort $worker  "cd $installPath/; sh bin/dolphinscheduler-daemon.sh stop logger-server;"
 done
 
 ssh -p $sshPort $alertServer  "cd $installPath/; sh bin/dolphinscheduler-daemon.sh stop alert-server;"