Merge pull request #40 from Percona-Lab/PSMDB_no_fork

PSMDB disabled --fork option
Percona-Lab · Mar 21, 2024 · c858a94 · c858a94
2 parents e0a80c7 + 96a7ddd
commit c858a94
Show file tree

Hide file tree

Showing 9 changed files with 23 additions and 22 deletions.
diff --git a/pmm_psmdb-pbm_setup/Dockerfile b/pmm_psmdb-pbm_setup/Dockerfile
@@ -67,6 +67,7 @@ RUN set -ex; \
     else \
         yum -y install pmm2-client-${PMM_CLIENT_VERSION}-6.el9 ; \
     fi && \
+    sed 's/Type=forking/#Type=forking/' -i /usr/lib/systemd/system/mongod.service && \
     systemctl enable mongod && \
     systemctl enable pbm-agent && \
     systemctl enable pmm-agent && \

diff --git a/pmm_psmdb-pbm_setup/conf/mongod-cfg/mongod.conf b/pmm_psmdb-pbm_setup/conf/mongod-cfg/mongod.conf
@@ -10,7 +10,7 @@ systemLog:
   destination: syslog
 
 processManagement:
-  fork: true
+#  fork: true
   pidFilePath: /var/run/mongod.pid
 
 net:

diff --git a/pmm_psmdb-pbm_setup/conf/mongod-rs/mongod.conf b/pmm_psmdb-pbm_setup/conf/mongod-rs/mongod.conf
@@ -10,7 +10,7 @@ systemLog:
   destination: syslog
 
 processManagement:
-  fork: true
+#  fork: true
   pidFilePath: /var/run/mongod.pid
 
 net:

diff --git a/pmm_psmdb-pbm_setup/conf/mongod-rs1/mongod.conf b/pmm_psmdb-pbm_setup/conf/mongod-rs1/mongod.conf
@@ -10,7 +10,7 @@ systemLog:
   destination: syslog
 
 processManagement:
-  fork: true
+#  fork: true
   pidFilePath: /var/run/mongod.pid
 
 net:

diff --git a/pmm_psmdb-pbm_setup/conf/mongod-rs2/mongod.conf b/pmm_psmdb-pbm_setup/conf/mongod-rs2/mongod.conf
@@ -10,7 +10,7 @@ systemLog:
   destination: syslog
 
 processManagement:
-  fork: true
+#  fork: true
   pidFilePath: /var/run/mongod.pid
 
 net:

diff --git a/pmm_psmdb-pbm_setup/docker-compose-rs.yaml b/pmm_psmdb-pbm_setup/docker-compose-rs.yaml
@@ -31,7 +31,7 @@ services:
       - ./conf/pbm:/etc/pbm
       - ./conf/mongod-rs:/etc/mongod
       - ./conf/datagen:/etc/datagen:ro
-      - /sys/fs/cgroup:/sys/fs/cgroup:ro
+      - /sys/fs/cgroup:/sys/fs/cgroup:rw
       - /tmp/backup_data:/tmp/backup_data
     privileged: true
     environment:
@@ -57,7 +57,7 @@ services:
     volumes:
       - ./conf/pbm:/etc/pbm
       - ./conf/mongod-rs:/etc/mongod
-      - /sys/fs/cgroup:/sys/fs/cgroup:ro
+      - /sys/fs/cgroup:/sys/fs/cgroup:rw
       - /tmp/backup_data:/tmp/backup_data
     privileged: true
     environment:
@@ -83,7 +83,7 @@ services:
     volumes:
       - ./conf/pbm:/etc/pbm
       - ./conf/mongod-rs:/etc/mongod
-      - /sys/fs/cgroup:/sys/fs/cgroup:ro
+      - /sys/fs/cgroup:/sys/fs/cgroup:rw
       - /tmp/backup_data:/tmp/backup_data
     privileged: true
     environment:
@@ -111,7 +111,7 @@ services:
     volumes:
       - ./conf/pbm:/etc/pbm
       - ./conf/mongod-rs:/etc/mongod
-      - /sys/fs/cgroup:/sys/fs/cgroup:ro
+      - /sys/fs/cgroup:/sys/fs/cgroup:rw
       - /tmp/backup_data:/tmp/backup_data
     privileged: true
     environment:
@@ -137,7 +137,7 @@ services:
     volumes:
       - ./conf/pbm:/etc/pbm
       - ./conf/mongod-rs:/etc/mongod
-      - /sys/fs/cgroup:/sys/fs/cgroup:ro
+      - /sys/fs/cgroup:/sys/fs/cgroup:rw
       - /tmp/backup_data:/tmp/backup_data
     privileged: true
     environment:
@@ -163,7 +163,7 @@ services:
     volumes:
       - ./conf/pbm:/etc/pbm
       - ./conf/mongod-rs:/etc/mongod
-      - /sys/fs/cgroup:/sys/fs/cgroup:ro
+      - /sys/fs/cgroup:/sys/fs/cgroup:rw
       - /tmp/backup_data:/tmp/backup_data
     privileged: true
     environment:

diff --git a/pmm_psmdb-pbm_setup/docker-compose-sharded.yaml b/pmm_psmdb-pbm_setup/docker-compose-sharded.yaml
@@ -20,7 +20,7 @@ services:
     volumes:
       - ./conf/pbm:/etc/pbm
       - ./conf/mongod-rs1:/etc/mongod
-      - /sys/fs/cgroup:/sys/fs/cgroup:ro
+      - /sys/fs/cgroup:/sys/fs/cgroup:rw
     privileged: true
     environment:
       - "PBM_MONGODB_URI=mongodb://${PBM_USER:-pbm}:${PBM_PASS:-pbmpass}@127.0.0.1:27017"
@@ -40,7 +40,7 @@ services:
     volumes:
       - ./conf/pbm:/etc/pbm
       - ./conf/mongod-rs1:/etc/mongod
-      - /sys/fs/cgroup:/sys/fs/cgroup:ro
+      - /sys/fs/cgroup:/sys/fs/cgroup:rw
     privileged: true
     environment:
       - "PBM_MONGODB_URI=mongodb://${PBM_USER:-pbm}:${PBM_PASS:-pbmpass}@127.0.0.1:27017"
@@ -60,7 +60,7 @@ services:
     volumes:
       - ./conf/pbm:/etc/pbm
       - ./conf/mongod-rs1:/etc/mongod
-      - /sys/fs/cgroup:/sys/fs/cgroup:ro
+      - /sys/fs/cgroup:/sys/fs/cgroup:rw
     privileged: true
     environment:
       - "PBM_MONGODB_URI=mongodb://${PBM_USER:-pbm}:${PBM_PASS:-pbmpass}@127.0.0.1:27017"
@@ -80,7 +80,7 @@ services:
     volumes:
       - ./conf/pbm:/etc/pbm
       - ./conf/mongod-rs2:/etc/mongod
-      - /sys/fs/cgroup:/sys/fs/cgroup:ro
+      - /sys/fs/cgroup:/sys/fs/cgroup:rw
     privileged: true
     environment:
       - "PBM_MONGODB_URI=mongodb://${PBM_USER:-pbm}:${PBM_PASS:-pbmpass}@127.0.0.1:27017"
@@ -100,7 +100,7 @@ services:
     volumes:
       - ./conf/pbm:/etc/pbm
       - ./conf/mongod-rs2:/etc/mongod
-      - /sys/fs/cgroup:/sys/fs/cgroup:ro
+      - /sys/fs/cgroup:/sys/fs/cgroup:rw
     privileged: true
     environment:
       - "PBM_MONGODB_URI=mongodb://${PBM_USER:-pbm}:${PBM_PASS:-pbmpass}@127.0.0.1:27017"
@@ -120,7 +120,7 @@ services:
     volumes:
       - ./conf/pbm:/etc/pbm
       - ./conf/mongod-rs2:/etc/mongod
-      - /sys/fs/cgroup:/sys/fs/cgroup:ro
+      - /sys/fs/cgroup:/sys/fs/cgroup:rw
     privileged: true
     environment:
       - "PBM_MONGODB_URI=mongodb://${PBM_USER:-pbm}:${PBM_PASS:-pbmpass}@127.0.0.1:27017"
@@ -140,7 +140,7 @@ services:
     volumes:
       - ./conf/pbm:/etc/pbm
       - ./conf/mongod-cfg:/etc/mongod
-      - /sys/fs/cgroup:/sys/fs/cgroup:ro
+      - /sys/fs/cgroup:/sys/fs/cgroup:rw
     privileged: true
     environment:
       - "PBM_MONGODB_URI=mongodb://${PBM_USER:-pbm}:${PBM_PASS:-pbmpass}@127.0.0.1:27017"
@@ -160,7 +160,7 @@ services:
     volumes:
       - ./conf/pbm:/etc/pbm
       - ./conf/mongod-cfg:/etc/mongod
-      - /sys/fs/cgroup:/sys/fs/cgroup:ro
+      - /sys/fs/cgroup:/sys/fs/cgroup:rw
     privileged: true
     environment:
       - "PBM_MONGODB_URI=mongodb://${PBM_USER:-pbm}:${PBM_PASS:-pbmpass}@127.0.0.1:27017"
@@ -180,7 +180,7 @@ services:
     volumes:
       - ./conf/pbm:/etc/pbm
       - ./conf/mongod-cfg:/etc/mongod
-      - /sys/fs/cgroup:/sys/fs/cgroup:ro
+      - /sys/fs/cgroup:/sys/fs/cgroup:rw
     privileged: true
     environment:
       - "PBM_MONGODB_URI=mongodb://${PBM_USER:-pbm}:${PBM_PASS:-pbmpass}@127.0.0.1:27017"
@@ -200,7 +200,7 @@ services:
     ports:
         - "127.0.0.1:27017:27017"
     volumes:
-      - /sys/fs/cgroup:/sys/fs/cgroup:ro
+      - /sys/fs/cgroup:/sys/fs/cgroup:rw
       - ./conf/datagen:/etc/datagen:ro
     privileged: true
     command: "mongos --keyFile=/etc/keyfile --configdb rscfg/rscfg01:27017,rscfg02:27017,rscfg03:27017 --port 27017 --bind_ip 0.0.0.0"

diff --git a/pmm_psmdb_diffauth_setup/conf/mongod.conf b/pmm_psmdb_diffauth_setup/conf/mongod.conf
@@ -10,7 +10,7 @@ systemLog:
   destination: syslog
 
 processManagement:
-  fork: true
+#  fork: true
   pidFilePath: /var/run/mongod.pid
 
 net:

diff --git a/pmm_psmdb_diffauth_setup/docker-compose-pmm-psmdb.yml b/pmm_psmdb_diffauth_setup/docker-compose-pmm-psmdb.yml
@@ -44,7 +44,7 @@ services:
     volumes:
       - ./conf:/etc/mongod
       - ./certs:/mongodb_certs
-      - /sys/fs/cgroup:/sys/fs/cgroup:ro
+      - /sys/fs/cgroup:/sys/fs/cgroup:rw
       - 'psmdb-server-data:/data/db'
     privileged: true
     ports: