killall -9增加-q选项, 无进程存在时, 也不打印错误消息

6 files changed, 50 insertions, 22 deletions

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(){