Browse Source

Fixed a minor bug with postgresql

Sometimes postgres would remaining running after all
our directory tomfoolery and we would see an error like
"Error: pid is invalid". The only way to handle this is
to kill all the postgres processes and try to restart
the service
Mike Smith 10 years ago
parent
commit
27bc2f9f5a
1 changed files with 8 additions and 5 deletions
  1. 8 5
      toolset/setup/linux/database.sh

+ 8 - 5
toolset/setup/linux/database.sh

@@ -100,9 +100,11 @@ if [ "$TFB_DISTRIB_CODENAME" == "precise" ]; then
   wget --quiet -O - https://www.postgresql.org/media/keys/ACCC4CF8.asc | sudo apt-key add -
   sudo apt-get update
   sudo apt-get install -y postgresql-9.3 postgresql-client-9.3
-  sudo /etc/init.d/postgresql start
+  sudo service postgresql start
 fi
-sudo /etc/init.d/postgresql stop
+sudo service postgresql stop
+# Sometimes this doesn't work with postgresql
+sudo killall -s 9 -u postgres
 sudo mv postgresql.conf /etc/postgresql/9.3/main/postgresql.conf
 sudo mv pg_hba.conf /etc/postgresql/9.3/main/pg_hba.conf
 
@@ -110,13 +112,14 @@ sudo rm -rf /ssd/postgresql
 sudo cp -R -p /var/lib/postgresql/9.3/main /ssd/postgresql
 sudo mv 60-postgresql-shm.conf /etc/sysctl.d/60-postgresql-shm.conf
 
-sudo /etc/init.d/postgresql start
+sudo service postgresql start
 
 sudo -u postgres psql template1 < create-postgres-database.sql
 sudo -u benchmarkdbuser psql hello_world < create-postgres.sql
 rm create-postgres-database.sql create-postgres.sql
-
-sudo /etc/init.d/postgresql restart
+# Last chance to make sure postgresql starts up correctly
+sudo killall -s 9 -u postgres
+sudo service postgresql restart
 
 ##############################
 # MongoDB