From: Jay Pfaffman <pfaffman@relaxpc.com>
Date: Wed, 20 Apr 2016 17:19:16 +0000 (-0500)
Subject: Don't set db_work_mem
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=b2f7b7a0d0ae3283fada74e7e794a2295c404af0;p=discourse_docker.git

Don't set db_work_mem
---

diff --git a/launcher b/launcher
index 08d1be3..1f3561f 100755
--- a/launcher
+++ b/launcher
@@ -501,18 +501,6 @@ run_memconfig(){
     echo -e ". . . oops!\n---> db_shared_buffers not found in $config_file. Retaining defaults."
   fi
 
-  # set db_work_mem: "10MB" * GB?
-  db_work_mem=`expr $avail_gb \* 10`
-  echo -e "Setting db_work_mem to $db_work_mem MB\c"
-  sudo sed -i -e "s/^  db_work_mem:.*/  db_work_mem: \"${db_work_mem}MB\"/w $changelog" $config_file
-  if [ -s $changelog ]
-  then
-    echo " successfully."
-    rm $changelog
-  else
-    echo -e ". . . oops!\n---> db_work_mem not found in $config_file. Retaining defaults."
-  fi
-
   # set UNICORN_WORKERS: 2*GB or 2*cores (the same on DO)
   if [ "$avail_gb" -le "2" ]
   then
diff --git a/samples/standalone_template.yml b/samples/standalone_template.yml
index 255076b..228f9a7 100644
--- a/samples/standalone_template.yml
+++ b/samples/standalone_template.yml
@@ -45,7 +45,7 @@ params:
 
   ## Set higher on large instances it defaults to 10MB, for a 3GB install 40MB is a good default
   ## this improves sorting performance, but adds memory usage per-connection
-  db_work_mem: "10MB"
+  # db_work_mem: "10MB"
   #
   ## Which Git revision should this container use? (default: tests-passed)
   #version: tests-passed