Merge pull request #1596 from GiganticMinecraft/revert_change

revert changes
GiganticMinecraft · Dec 22, 2023 · 353272d · 353272d
2 parents 03637bf + a4d50a1
commit 353272d
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 13 deletions.
diff --git a/.../app-templates/seichi-debug-minecraft-on-seichiassist-pr/templates/mariadb/configmap.yaml b/.../app-templates/seichi-debug-minecraft-on-seichiassist-pr/templates/mariadb/configmap.yaml
@@ -5,7 +5,7 @@ metadata:
 data:
   my.cnf: |
     [mysqld]
-    innodb_buffer_pool_size = 1500M
+    innodb_buffer_pool_size = 1G
     innodb_log_file_size = 256M
     innodb_flush_log_at_trx_commit = 2
     innodb_write_io_threads = 8

diff --git a/...es/app-templates/seichi-debug-minecraft-on-seichiassist-pr/templates/mariadb/mariadb.yaml b/...es/app-templates/seichi-debug-minecraft-on-seichiassist-pr/templates/mariadb/mariadb.yaml
@@ -25,11 +25,8 @@ spec:
         imagePullPolicy: IfNotPresent
         resources:
           requests:
-            cpu: 2
-            memory: 2Gi
-          limits:
-            cpu: 2
-            memory: 4Gi
+            cpu: 4
+            memory: 9Gi
         env:
         - name: MYSQL_TCP_PORT
           value: "3306"
@@ -71,7 +68,7 @@ spec:
           name: mariadb
           protocol: TCP
         volumeMounts:
-        - mountPath: /var/lib/mysql/seichiassist
+        - mountPath: /var/lib/mysql
           name: storage
         - mountPath: /docker-entrypoint-initdb.d
           name: sqldump-volume
@@ -83,9 +80,6 @@ spec:
         imagePullPolicy: IfNotPresent
         resources:
           requests:
-            cpu: 2
-            memory: 2Gi
-          limits:
             cpu: 2
             memory: 4Gi
         env:
@@ -97,15 +91,17 @@ spec:
         args:
         - sh
         - -c
-        - |
-          mysqldump -umcserver -p${DB_PASSWORD} -h192.168.2.186 --databases flyway_managed_schema seichiassist --ignore-table=seichiassist.mine_stack > /docker-entrypoint-initdb.d/seichiassist.sql
-          mysqldump -umcserver -p${DB_PASSWORD} -h192.168.2.186 seichiassist mine_stack --where 'amount != 0' >> /docker-entrypoint-initdb.d/seichiassist.sql
+        - mysqldump -umcserver -p${DB_PASSWORD} -h192.168.2.186 --databases seichiassist
+          flyway_managed_schema > /docker-entrypoint-initdb.d/seichiassist.sql
         volumeMounts:
         - mountPath: /docker-entrypoint-initdb.d
           name: sqldump-volume
       restartPolicy: Always
       volumes:
       - name: storage
+        emptyDir:
+          medium: Memory
+          sizeLimit: 7Gi
       - name: sqldump-volume
       - name: mariadb-config
         configMap: