From e948ec211c8b125c0767b23848e16fbee3773f01 Mon Sep 17 00:00:00 2001
From: lijia <lijia01@iie.ac.cn>
Date: Fri, 20 Sep 2019 20:52:36 +0800
Subject: [PATCH] =?UTF-8?q?killall=20-9=E5=A2=9E=E5=8A=A0-q=E9=80=89?=
 =?UTF-8?q?=E9=A1=B9,=20=E6=97=A0=E8=BF=9B=E7=A8=8B=E5=AD=98=E5=9C=A8?=
 =?UTF-8?q?=E6=97=B6,=20=E4=B9=9F=E4=B8=8D=E6=89=93=E5=8D=B0=E9=94=99?=
 =?UTF-8?q?=E8=AF=AF=E6=B6=88=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hosts.xxg                               | 28 +++++++++++++++++++++++++
 roles/tsg-cli-mcn0/files/tsg-monitor.sh | 18 ++++++++--------
 roles/tsg-cli-mcn1/files/tsg-monitor.sh |  6 +++---
 roles/tsg-cli-mcn2/files/tsg-monitor.sh |  6 +++---
 roles/tsg-cli-mcn3/files/tsg-monitor.sh |  8 +++----
 roles/tsg-cli-mxn/files/tsg-monitor.sh  |  6 +++---
 6 files changed, 50 insertions(+), 22 deletions(-)
 create mode 100644 hosts.xxg

diff --git a/hosts.xxg b/hosts.xxg
new file mode 100644
index 0000000..5052a90
--- /dev/null
+++ b/hosts.xxg
@@ -0,0 +1,28 @@
+[all:vars]
+ansible_user=root
+rpm_file_name=tsg-cli-1.0.7-1.el7.x86_64.rpm 
+
+[sled-mxn]
+192.168.40.165 SN=CBT2201925000001
+
+[sled-mcn0]
+192.168.40.161 SN=CBT2201925000001
+
+[sled-mcn1]
+192.168.40.162 SN=CBT2201925000001
+
+[sled-mcn2]
+192.168.40.163 SN=CBT2201925000001
+
+[sled-mcn3]
+192.168.40.164 SN=CBT2201925000001
+
+[tsg-all:children]
+sled-mxn
+sled-mcn0
+sled-mcn1
+sled-mcn2
+sled-mcn3
+
+
+
diff --git a/roles/tsg-cli-mcn0/files/tsg-monitor.sh b/roles/tsg-cli-mcn0/files/tsg-monitor.sh
index ff78351..13b8497 100644
--- a/roles/tsg-cli-mcn0/files/tsg-monitor.sh
+++ b/roles/tsg-cli-mcn0/files/tsg-monitor.sh
@@ -7,16 +7,16 @@
 #否则长时间运行后, 会有大量后台进程运行
 killall_uncompleted_cmd(){
     #killall -9 tsg_cluster_register
-    killall -9 tsg_diagnose_background
-    killall -9 tsg_update_tags
+    killall -9 -q tsg_diagnose_background
+    killall -9 -q tsg_update_tags
     
-    killall -9 tsg_monit_app
-    killall -9 tsg_monit_intercept
-    killall -9 tsg_monit_interface
-    killall -9 tsg_monit_protocol_v3
-    killall -9 tsg_monit_protocol_v4
-    killall -9 tsg_monit_stream_v3
-    killall -9 tsg_monit_stream_v4
+    killall -9 -q tsg_monit_app
+    killall -9 -q tsg_monit_intercept
+    killall -9 -q tsg_monit_interface
+    killall -9 -q tsg_monit_protocol_v3
+    killall -9 -q tsg_monit_protocol_v4
+    killall -9 -q tsg_monit_stream_v3
+    killall -9 -q tsg_monit_stream_v4
 }
 
 start_background_cmd(){
diff --git a/roles/tsg-cli-mcn1/files/tsg-monitor.sh b/roles/tsg-cli-mcn1/files/tsg-monitor.sh
index b8ca53a..b92fb1e 100644
--- a/roles/tsg-cli-mcn1/files/tsg-monitor.sh
+++ b/roles/tsg-cli-mcn1/files/tsg-monitor.sh
@@ -7,9 +7,9 @@
 #否则长时间运行后, 会有大量后台进程运行
 killall_uncompleted_cmd(){
     #killall -9 tsg_cluster_register
-    killall -9 tsg_diagnose_background
-    killall -9 tsg_update_tags
-    killall -9 tsg_monit_interface
+    killall -9 -q tsg_diagnose_background
+    killall -9 -q tsg_update_tags
+    killall -9 -q tsg_monit_interface
 
 }
 
diff --git a/roles/tsg-cli-mcn2/files/tsg-monitor.sh b/roles/tsg-cli-mcn2/files/tsg-monitor.sh
index cc287a5..8756f76 100644
--- a/roles/tsg-cli-mcn2/files/tsg-monitor.sh
+++ b/roles/tsg-cli-mcn2/files/tsg-monitor.sh
@@ -7,9 +7,9 @@
 #否则长时间运行后, 会有大量后台进程运行
 killall_uncompleted_cmd(){
     #killall -9 tsg_cluster_register
-    killall -9 tsg_diagnose_background
-    killall -9 tsg_update_tags
-    killall -9 tsg_monit_interface
+    killall -9 -q tsg_diagnose_background
+    killall -9 -q tsg_update_tags
+    killall -9 -q tsg_monit_interface
 
 }
 
diff --git a/roles/tsg-cli-mcn3/files/tsg-monitor.sh b/roles/tsg-cli-mcn3/files/tsg-monitor.sh
index dcd0ca5..9d534ee 100644
--- a/roles/tsg-cli-mcn3/files/tsg-monitor.sh
+++ b/roles/tsg-cli-mcn3/files/tsg-monitor.sh
@@ -6,10 +6,10 @@
 #导致10秒内还不结束, 强行杀掉,
 #否则长时间运行后, 会有大量后台进程运行
 killall_uncompleted_cmd(){
-    #killall -9 tsg_cluster_register
-    killall -9 tsg_diagnose_background
-    killall -9 tsg_update_tags
-    killall -9 tsg_monit_interface
+    #killall -9 -q tsg_cluster_register
+    killall -9 -q tsg_diagnose_background
+    killall -9 -q tsg_update_tags
+    killall -9 -q tsg_monit_interface
 
 }
 
diff --git a/roles/tsg-cli-mxn/files/tsg-monitor.sh b/roles/tsg-cli-mxn/files/tsg-monitor.sh
index 34acb56..861df26 100644
--- a/roles/tsg-cli-mxn/files/tsg-monitor.sh
+++ b/roles/tsg-cli-mxn/files/tsg-monitor.sh
@@ -6,9 +6,9 @@
 #导致10秒内还不结束, 要强行杀掉,
 #否则长时间运行后, 会有大量后台进程运行!
 killall_uncompleted_cmd(){
-    killall -9 tsg_cluster_register
-    #killall -9 tsg_diagnose_background
-    killall -9 tsg_update_tags
+    killall -9 -q tsg_cluster_register
+    #killall -9 -q tsg_diagnose_background
+    killall -9 -q tsg_update_tags
 }
 
 start_background_cmd(){