Leverage the BPM-native feature to customise the Postgres shutdown signal

bgandon · bgandon · commit 92196d15577c · 2021-11-01T18:28:44.000+01:00
diff --git a/jobs/postgres-10/monit b/jobs/postgres-10/monit
@@ -1,5 +1,5 @@
 check process postgres
   with pidfile /var/vcap/sys/run/bpm/postgres-10/postgres-10.pid
   start program "/var/vcap/jobs/bpm/bin/bpm start postgres-10" with timeout 300 seconds
-  stop program "/var/vcap/jobs/postgres-10/bin/bpm-stop-postgres"
+  stop program "/var/vcap/jobs/bpm/bin/bpm stop postgres-10"
   group vcap
diff --git a/jobs/postgres-10/spec b/jobs/postgres-10/spec
@@ -7,7 +7,6 @@ templates:
   create-database.erb: bin/create-database
   postgres.erb: bin/postgres
   postgresql.conf.erb: config/postgresql.conf
-  bpm-stop-postgres: bin/bpm-stop-postgres
 
 packages:
   - postgres-10
diff --git a/jobs/postgres-10/templates/bpm-stop-postgres b/jobs/postgres-10/templates/bpm-stop-postgres
diff --git a/jobs/postgres-10/templates/bpm.yml b/jobs/postgres-10/templates/bpm.yml
@@ -3,6 +3,7 @@
 postgres_config = {
   "name" => "postgres-10",
   "executable" => "/var/vcap/jobs/postgres-10/bin/postgres",
+  "shutdown_signal" => "INT",
   "persistent_disk" => true,
   "limits" => {
     "open_files" => 65536,
diff --git a/jobs/postgres-9.4/monit b/jobs/postgres-9.4/monit
@@ -1,5 +1,5 @@
 check process postgres
   with pidfile /var/vcap/sys/run/bpm/postgres-9.4/postgres-9.4.pid
   start program "/var/vcap/jobs/bpm/bin/bpm start postgres-9.4" with timeout 300 seconds
-  stop program "/var/vcap/jobs/postgres-9.4/bin/bpm-stop-postgres"
+  stop program "/var/vcap/jobs/bpm/bin/bpm stop postgres-9.4"
   group vcap
diff --git a/jobs/postgres-9.4/spec b/jobs/postgres-9.4/spec
@@ -7,7 +7,6 @@ templates:
   create-database.erb: bin/create-database
   postgres.erb: bin/postgres
   postgresql.conf.erb: config/postgresql.conf
-  bpm-stop-postgres: bin/bpm-stop-postgres
 
 packages:
   - postgres-9.4
diff --git a/jobs/postgres-9.4/templates/bpm-stop-postgres b/jobs/postgres-9.4/templates/bpm-stop-postgres
diff --git a/jobs/postgres-9.4/templates/bpm.yml b/jobs/postgres-9.4/templates/bpm.yml
@@ -3,6 +3,7 @@
 postgres_config = {
   "name" => "postgres-9.4",
   "executable" => "/var/vcap/jobs/postgres-9.4/bin/postgres",
+  "shutdown_signal" => "INT",
   "persistent_disk" => true,
   "limits" => {
     "open_files" => 65536,
diff --git a/jobs/postgres/monit b/jobs/postgres/monit
@@ -1,5 +1,5 @@
 check process postgres
   with pidfile /var/vcap/sys/run/bpm/postgres/postgres.pid
   start program "/var/vcap/jobs/bpm/bin/bpm start postgres" with timeout 300 seconds
-  stop program "/var/vcap/jobs/postgres/bin/bpm-stop-postgres"
+  stop program "/var/vcap/jobs/bpm/bin/bpm stop postgres"
   group vcap
diff --git a/jobs/postgres/spec b/jobs/postgres/spec
@@ -7,7 +7,6 @@ templates:
   create-database.erb: bin/create-database
   postgres.erb: bin/postgres
   postgresql.conf.erb: config/postgresql.conf
-  bpm-stop-postgres: bin/bpm-stop-postgres
 
 packages:
   - postgres-13
diff --git a/jobs/postgres/templates/bpm-stop-postgres b/jobs/postgres/templates/bpm-stop-postgres
diff --git a/jobs/postgres/templates/bpm.yml b/jobs/postgres/templates/bpm.yml
@@ -3,6 +3,7 @@
 postgres_config = {
   "name" => "postgres",
   "executable" => "/var/vcap/jobs/postgres/bin/postgres",
+  "shutdown_signal" => "INT",
   "additional_volumes" => [
     {
       "path" => "/var/vcap/store/postgres-13",
diff --git a/spec/postgres_bpm_spec.rb b/spec/postgres_bpm_spec.rb
@@ -0,0 +1,49 @@
+require 'yaml'
+require 'bosh/template/evaluation_context'
+require_relative './template_example_group'
+
+shared_examples 'rendered postgres* bpm.yml' do
+  let(:release) { Bosh::Template::Test::ReleaseDir.new(File.join(File.dirname(__FILE__), '..')) }
+  let(:template) { job.template('config/bpm.yml') }
+
+  subject(:rendered_template) do
+    YAML.load(template.render(properties))
+  end
+
+  context 'with standard config' do
+    let(:properties) do
+      {
+        postgres: {
+          adapter: "postgres",
+          database: "bosh",
+          host: "127.0.0.1",
+          listen_address: "127.0.0.1",
+          password: "secret",
+          user: "postgres",
+        },
+      }
+    end
+
+    it 'should use SIGINT as shutdown signal' do
+      expect(rendered_template['processes'][0]).to include('shutdown_signal' => 'INT')
+    end
+  end
+end
+
+describe 'postgres job' do
+  it_should_behave_like 'rendered postgres* bpm.yml' do
+    let(:job) { release.job('postgres') }
+  end
+end
+
+describe 'postgres-10 job' do
+  it_should_behave_like 'rendered postgres* bpm.yml' do
+    let(:job) { release.job('postgres-10') }
+  end
+end
+
+describe 'postgres-9.4 job' do
+  it_should_behave_like 'rendered postgres* bpm.yml' do
+    let(:job) { release.job('postgres-9.4') }
+  end
+end
