1、增加内存限制

12 files changed, 48 insertions, 4 deletions

diff --git a/roles/app_global/tasks/main.yml b/roles/app_global/tasks/main.yml
index bf9c908..acd0b9a 100644
--- a/roles/app_global/tasks/main.yml
+++ b/roles/app_global/tasks/main.yml
@@ -25,9 +25,12 @@
     name: emqx.service
     state: started
     enabled: yes
+    daemon_reload: yes
+    
 
 - name: "Start app-sketch-global"
   systemd:
     name: app-sketch-global.service
     state: started
     enabled: yes
+    daemon_reload: yes
diff --git a/roles/certstore/files/memory.conf b/roles/certstore/files/memory.conf
new file mode 100644
index 0000000..d6411dc
--- /dev/null
+++ b/roles/certstore/files/memory.conf
@@ -0,0 +1,2 @@
+[Service]
+MemoryMax=10G
\ No newline at end of file
diff --git a/roles/certstore/tasks/main.yml b/roles/certstore/tasks/main.yml
index c15e9ea..bc00e5c 100644
--- a/roles/certstore/tasks/main.yml
+++ b/roles/certstore/tasks/main.yml
@@ -23,6 +23,12 @@
     src: "{{ role_path }}/templates/zlog.conf.j2"
     dest: /opt/tsg/certstore/conf/zlog.conf
 
+- name: "copy memory limit file to certstore.service.d"
+  copy:
+    src: "{{ role_path }}/files/memory.conf"
+    dest: /etc/systemd/system/certstore.service.d/
+    mode: 0644
+
 - name: "start certstore"
   systemd:
     name: certstore.service
diff --git a/roles/mrzcpd/files/memory.conf b/roles/mrzcpd/files/memory.conf
new file mode 100644
index 0000000..f082028
--- /dev/null
+++ b/roles/mrzcpd/files/memory.conf
@@ -0,0 +1,2 @@
+[Service]
+MemoryMax=100G
\ No newline at end of file
diff --git a/roles/mrzcpd/tasks/main.yml b/roles/mrzcpd/tasks/main.yml
index 1d703de..c5c6581 100644
--- a/roles/mrzcpd/tasks/main.yml
+++ b/roles/mrzcpd/tasks/main.yml
@@ -111,7 +111,7 @@
     dest: /opt/mrzcpd/etc/mrtunnat.conf
   when: 
     - nic_traffic_mirror is not defined
-    -  == 3
+    - tsg_access_type == 3
 
 - name: "update mrtunnat.conf.ATCA_Vlan_Flipping"
   template:
@@ -161,12 +161,18 @@
     daemon_reload: yes
   when: nic_traffic_mirror is defined
 
+- name: "copy memory limit file to tfe.service.d"
+  copy:
+    src: "{{ role_path }}/files/memory.conf"
+    dest: /etc/systemd/system/mrzcpd.service.d/
+    mode: 0644
 
 - name: "mask mrzcpd on server_tun_mode"
   systemd:
     name: mrzcpd
     enabled: no
     masked: yes
+    daemon_reload: yes
   when: 
     - tsg_access_type == 0
 
@@ -175,5 +181,6 @@
     name: mrtunnat
     enabled: no
     masked: yes
+    daemon_reload: yes
   when: 
     - tsg_access_type == 0
diff --git a/roles/proxy_status/tasks/main.yml b/roles/proxy_status/tasks/main.yml
index 8403fa9..aa4e750 100644
--- a/roles/proxy_status/tasks/main.yml
+++ b/roles/proxy_status/tasks/main.yml
@@ -14,7 +14,7 @@
   copy:
     src: "{{ role_path }}/files/proxy-status.service"
     dest: "/usr/lib/systemd/system/"   
-    mode: 0755  
+    mode: 0644
 
 - name: "enable proxy-status"
   systemd:
diff --git a/roles/sapp/files/memory.conf b/roles/sapp/files/memory.conf
new file mode 100644
index 0000000..f082028
--- /dev/null
+++ b/roles/sapp/files/memory.conf
@@ -0,0 +1,2 @@
+[Service]
+MemoryMax=100G
\ No newline at end of file
diff --git a/roles/sapp/tasks/main.yml b/roles/sapp/tasks/main.yml
index ecf3e63..6e57f06 100644
--- a/roles/sapp/tasks/main.yml
+++ b/roles/sapp/tasks/main.yml
@@ -51,7 +51,13 @@
   template:
     src: "{{ role_path }}/templates/sapp.service.j2"
     dest: /usr/lib/systemd/system/sapp.service
-    mode: 0755
+    mode: 0644
+
+- name: "copy memory limit file to sapp.service.d"
+  copy:
+    src: "{{ role_path }}/files/memory.conf"
+    dest: /etc/systemd/system/sapp.service.d/
+    mode: 0644
 
 - name: "enable sapp"
   systemd:
diff --git a/roles/tfe/files/memory.conf b/roles/tfe/files/memory.conf
new file mode 100644
index 0000000..f082028
--- /dev/null
+++ b/roles/tfe/files/memory.conf
@@ -0,0 +1,2 @@
+[Service]
+MemoryMax=100G
\ No newline at end of file
diff --git a/roles/tfe/tasks/main.yml b/roles/tfe/tasks/main.yml
index bb7918d..58cdc92 100644
--- a/roles/tfe/tasks/main.yml
+++ b/roles/tfe/tasks/main.yml
@@ -8,7 +8,7 @@
   copy:
     src: "{{ role_path }}/files/tfe.service"
     dest: /usr/lib/systemd/system/
-    mode: 0755
+    mode: 0644
  
 - name: "install tfe rpms from localhost"
   yum:
@@ -63,6 +63,12 @@
     src: "{{ role_path }}/templates/require-mrzcpd.conf.j2"
     dest: /etc/systemd/system/tfe.service.d/require-mrzcpd.conf
 
+- name: "copy memory limit file to tfe.service.d"
+  copy:
+    src: "{{ role_path }}/files/memory.conf"
+    dest: /etc/systemd/system/tfe.service.d/
+    mode: 0644
+
 - name: "enable tfe-env"
   systemd:
     name: tfe-env
diff --git a/roles/tsg-diagnose/files/memory.conf b/roles/tsg-diagnose/files/memory.conf
new file mode 100644
index 0000000..f082028
--- /dev/null
+++ b/roles/tsg-diagnose/files/memory.conf
@@ -0,0 +1,2 @@
+[Service]
+MemoryMax=100G
\ No newline at end of file
diff --git a/roles/tsg-diagnose/tasks/main.yml b/roles/tsg-diagnose/tasks/main.yml
index ce4bde4..e180f1b 100644
--- a/roles/tsg-diagnose/tasks/main.yml
+++ b/roles/tsg-diagnose/tasks/main.yml
@@ -28,6 +28,12 @@
 - name: "tsg-diagnose init certs"
   shell: /bin/sh /opt/tsg/tsg-diagnose/deploy/init_certs/init_badssl_certs.sh
 
+- name: "copy memory limit file to tsg-diagnose.service.d"
+  copy:
+    src: "{{ role_path }}/files/memory.conf"
+    dest: /etc/systemd/system/tsg-diagnose.service.d/
+    mode: 0644
+
 - name: 'Tsg-diagnose service start'
   systemd:
     name: tsg-diagnose