Merge pull request #211 from cdlliuy/dev_v1.2.2_hotfix

final build for v1.2.3 for scf ONLY

.final_builds/jobs/apiserver/index.yml

@@ -19,4 +19,8 @@ builds:
     version: a7ac264e681b44969e8452e760dd407d69e5a91f
     blobstore_id: 0823935c-9a2f-4436-5a20-b8a9624e61d9
     sha1: d61157359a85223b3e27ee2a22dfb0fd6099f721
+  b61ae64f20eb5f0cd126c9e1cdba2d42527179f4d9dea4d6f9a09d717a2714ab:
+    version: b61ae64f20eb5f0cd126c9e1cdba2d42527179f4d9dea4d6f9a09d717a2714ab
+    blobstore_id: 22be6269-1f32-4719-5329-cd1a9dd56771
+    sha1: sha256:6fd7d10785be383a7fd8e888e1fdf52b72dbde57c3e3fdaa5665dbecd01ea9d8
 format-version: "2"

.final_builds/jobs/eventgenerator/index.yml

@@ -11,6 +11,10 @@ builds:
     version: 29259a83af8337e4f71378234491272a386693e5
     blobstore_id: c338f9f4-5324-4554-5a18-473d7d518d8d
     sha1: 4628f247a8633b30736265e4ca75be0acfa32441
+  a7d3bbcf2fa3e5f9a73cec59125accee9955ba6c037ce7b261fb7beabf687069:
+    version: a7d3bbcf2fa3e5f9a73cec59125accee9955ba6c037ce7b261fb7beabf687069
+    blobstore_id: 8422d7ee-6cf7-406d-5a7a-51ad484515ff
+    sha1: sha256:add7d40fab7f3ede72a7cd5fef2517b2ac4fc914d9f21247bed362e23a485d45
   d9d5df0fa4c236102832506b0b52836cca17a746:
     version: d9d5df0fa4c236102832506b0b52836cca17a746
     blobstore_id: 36a87388-1c99-48a2-4a20-b1520254be33

.final_builds/jobs/metricscollector/index.yml

@@ -3,6 +3,10 @@ builds:
     version: 01b4063e26920df7819a7e5a8aab88cd3d1320f9
     blobstore_id: 4dba04d5-c3bf-4aee-7bee-72b13999e13e
     sha1: ff6d6b0058d3400fe66e7107a567b2bd8a8a1185
+  09baead69ca793913f66b341421e0ee1ae2855c825743a90ac4e673e7cb9977d:
+    version: 09baead69ca793913f66b341421e0ee1ae2855c825743a90ac4e673e7cb9977d
+    blobstore_id: 09268def-2141-4e55-6457-1f0fd8b2ea78
+    sha1: sha256:bce508a5dba9b07cd5d969c084e98d610c038700e63e26cb298e122eff369b7c
   285ba253aecd3c0411c1854fcdc92136eaa272b9:
     version: 285ba253aecd3c0411c1854fcdc92136eaa272b9
     blobstore_id: 0dd665e4-b8ff-42bb-45cd-cf365bf5809f

.final_builds/jobs/operator/index.yml

@@ -3,6 +3,10 @@ builds:
     version: 64649474d0a4d1a5b1d169b7f63b680e418921e0
     blobstore_id: df689926-57d0-47d9-5bca-ca4e710bae69
     sha1: d4580b3ec34741a6725b7ebc8a06270ffc62148a
+  9536890c8079711903c5e4f52859a3bf60713be53d3575c4ca2450acb0a34823:
+    version: 9536890c8079711903c5e4f52859a3bf60713be53d3575c4ca2450acb0a34823
+    blobstore_id: 93356476-2556-49d2-79fe-927d6709f746
+    sha1: sha256:51919c99290bb152ad3b360726a413d6339d0c49739ce79c2057723dd440bf45
   9cdfb514e01fedc27709de9156c17e282e84e106:
     version: 9cdfb514e01fedc27709de9156c17e282e84e106
     blobstore_id: 2dcc97e8-bebe-4aaf-7618-81182764da11

.final_builds/jobs/scalingengine/index.yml

@@ -15,4 +15,8 @@ builds:
     version: b797234bb2e783f3403157c7365d7926add868e7
     blobstore_id: 6d71afcf-894b-4e95-6f39-466aa954e518
     sha1: fdb5ff12f9ace6600a4b67b8d16dd0d7f243346e
+  f8519ceea7443f004f96ced6373374dba0f1bcc53788f0a7bea05d83f44b15b7:
+    version: f8519ceea7443f004f96ced6373374dba0f1bcc53788f0a7bea05d83f44b15b7
+    blobstore_id: 9930d5d1-8abf-4c55-7005-d46142c8dcba
+    sha1: sha256:0fd65f01d433ddef7abfc12f3fa19accf65b5f277aae99cd0bd804806f6a5c8b
 format-version: "2"

.final_builds/jobs/scheduler/index.yml

@@ -1,4 +1,8 @@
 builds:
+  0bcb3d83231800b8ee5443455281650ccc3bc110a4fd649a631cd3a3da45c7cf:
+    version: 0bcb3d83231800b8ee5443455281650ccc3bc110a4fd649a631cd3a3da45c7cf
+    blobstore_id: 5139815e-f634-4190-77d0-103473cd6d50
+    sha1: sha256:f7026acad7eac8ee6bbd23266319fc9e5e17b96117f07da984bf641913dd0fc1
   5c0b7950b70627b26ddfc917dd9b9f12825ab963:
     version: 5c0b7950b70627b26ddfc917dd9b9f12825ab963
     blobstore_id: 5deb691b-d3ac-4989-5ad2-305cead53bd5

.final_builds/jobs/servicebroker/index.yml

@@ -7,6 +7,10 @@ builds:
     version: a684a5a7d32756e79af16c9995a6e8a0cfde1a57
     blobstore_id: bd02f646-a045-4862-50d7-7cd1c8689ca1
     sha1: f88e023ab9f1df465ae30ceb5910be64a47d5412
+  e5ff951764a3740310064a38b49f48f72b45e1aab219c3ae148bb512518a40f7:
+    version: e5ff951764a3740310064a38b49f48f72b45e1aab219c3ae148bb512518a40f7
+    blobstore_id: 55f6a3d6-e07c-43dd-5c7a-53cd7fec2e70
+    sha1: sha256:6f54cf084d180feae0ead6d90395068e4a1605ffe576226c536f501af99537d6
   f9e0e775986a61049e7a5ef6742662c0300e6ea0:
     version: f9e0e775986a61049e7a5ef6742662c0300e6ea0
     blobstore_id: 8091e4f1-c9d0-407b-50ff-dfb2d37ee165

.final_builds/license/index.yml

@@ -3,4 +3,8 @@ builds:
     version: 48b61b4116b8f3c1f4ac32fc3d3c5b7821d576b0
     blobstore_id: 19c7806f-a63a-448f-4de5-b8ece232fd54
     sha1: ddf78daa493dc7ba90543df41c264a950165ac31
+  5f149ff54ea1bd016732d966132934c67638311452ccb203c39b804dc5870814:
+    version: 5f149ff54ea1bd016732d966132934c67638311452ccb203c39b804dc5870814
+    blobstore_id: a71b2b5b-7ef8-48c3-51fd-7eb7fafba81d
+    sha1: sha256:16f2dfd816137072727cec301f62f6822b467ab93b0c7881c45b232840594fc6
 format-version: "2"

.final_builds/packages/apiserver/index.yml

@@ -15,4 +15,8 @@ builds:
     version: a67aa2e76f49a7bf9444bf8fee31bc1679099cdf
     blobstore_id: f48e1529-1551-4d50-59e6-f36291998feb
     sha1: abe71588dd3e331d8bc043fa5f2297f354ed855c
+  d7262f5a99528348a26bb8e550041f6fb6a5e8c268d844cab61e761582facfaf:
+    version: d7262f5a99528348a26bb8e550041f6fb6a5e8c268d844cab61e761582facfaf
+    blobstore_id: 35301550-de25-4159-569f-d56e47899e05
+    sha1: sha256:7d15c6b3b28e06d3beae3884cbcb95d757be8561365ce4e6c829a311ca951deb
 format-version: "2"

.final_builds/packages/changeloglockcleaner/index.yml

@@ -0,0 +1,6 @@
+builds:
+  c4b31ebb767835efb5046ac7399f7306118baa374dc360ac0b2491f8d0124ea3:
+    version: c4b31ebb767835efb5046ac7399f7306118baa374dc360ac0b2491f8d0124ea3
+    blobstore_id: 5e3d4f48-f6cd-40fa-7441-01d8486f61ff
+    sha1: sha256:018dfa3ebda97431f332b216dc734ce25ebaa5c54cc5e38c99ec91e1ed430360
+format-version: "2"

.final_builds/packages/common/index.yml

@@ -3,6 +3,10 @@ builds:
     version: 39f5b95f8749b5ce33f6d1f3a8a4ad0deba6b8d0
     blobstore_id: 953c7c30-365f-4baa-5997-1996a456cf04
     sha1: 28bda166d1eb8ba6f6ed02891332151962d217a5
+  8875ff1442f3a4c5a2fa0c81f01e02c61dce8168721e93174b8742eee5845ff0:
+    version: 8875ff1442f3a4c5a2fa0c81f01e02c61dce8168721e93174b8742eee5845ff0
+    blobstore_id: 836bdbab-938b-4ebe-7bd9-515b976e842f
+    sha1: sha256:afe7aca351334f3e5c6c5de982284f8eed8599edc93177ddad02e2996981594a
   d0fd517476188c3f64ed5f8ad65195aea6a09a3e:
     version: d0fd517476188c3f64ed5f8ad65195aea6a09a3e
     blobstore_id: 91d57608-cfc5-4f06-50ca-ad38876585c8

.final_builds/packages/db/index.yml

@@ -7,4 +7,8 @@ builds:
     version: d1446ca8081ac72d72aa242931136c67c28ecdaf
     blobstore_id: 3937e469-a596-4087-6d82-9bb57831457c
     sha1: 094c771fa812a8ac2724e9b236c20e4e083b5bc6
+  eb3481324286eaec7bf491bf1dde88ed98d1f2265fcdc8990a0faba052c7d795:
+    version: eb3481324286eaec7bf491bf1dde88ed98d1f2265fcdc8990a0faba052c7d795
+    blobstore_id: 177cb1ee-23cf-40b2-4e9c-50e0e1c92854
+    sha1: sha256:f71ba86df058b4b046b9a693405f5178f5152edbe9b7413d54891272e7110c56
 format-version: "2"

.final_builds/packages/eventgenerator/index.yml

@@ -3,6 +3,10 @@ builds:
     version: 2a6039748074323d6e38ac248937459b52b52e58
     blobstore_id: 329ed5d6-6bd1-47db-7744-63ca1609d553
     sha1: d3ff3097da1eece66ab4a34c1c62f24818285463
+  72ce1ef6a0eae674a37888cf82a852af3c4441918c7eb5a6f67f5c014b8e02d2:
+    version: 72ce1ef6a0eae674a37888cf82a852af3c4441918c7eb5a6f67f5c014b8e02d2
+    blobstore_id: a92c4728-9bec-4738-6262-c0fe79e6a880
+    sha1: sha256:ad3b073516dd3cc4c085b94ae58f553d550f87131f808dcbe9cc315dab01b9ef
   f40e5bcc74daaf43ef114a6d61b23e0e5013d4bf:
     version: f40e5bcc74daaf43ef114a6d61b23e0e5013d4bf
     blobstore_id: 6657d1f5-8b81-4de4-5f3f-cb7a8285d85f

.final_builds/packages/golang/index.yml

@@ -3,4 +3,8 @@ builds:
     version: 5468bfb774131c202f0bbcfb254312268086ceb1
     blobstore_id: 224ab863-bfa7-4a4a-7f61-13827412b52a
     sha1: 8ed8a622d121e2b0ec7fef096afcfb8a62f54909
+  bbd0a3649b73d3421556fd39f9c948d0cd2f407bf9a48b5db23a061ac217d5a0:
+    version: bbd0a3649b73d3421556fd39f9c948d0cd2f407bf9a48b5db23a061ac217d5a0
+    blobstore_id: ba6565ce-2fd0-47b3-6554-95e222da2f51
+    sha1: sha256:738803372078b0264265f4aaf70b2638ebe6916989771c40d35d91c1d3649e2a
 format-version: "2"

.final_builds/packages/java/index.yml

@@ -1,4 +1,8 @@
 builds:
+  04ef59849aa17f1099c2eaf3e732d5031627e4a378a5860911db99509313cbc4:
+    version: 04ef59849aa17f1099c2eaf3e732d5031627e4a378a5860911db99509313cbc4
+    blobstore_id: ae04f6db-1b0c-4959-7e2a-f181ca4ac81e
+    sha1: sha256:d4f0a1e2989c798e2ceeaaa02058d8162b406375270d6d2e51db83400f8d1c0e
   f5351e174a5ecd441d096008e1d00bfef8921bfb:
     version: f5351e174a5ecd441d096008e1d00bfef8921bfb
     blobstore_id: 5c71bf9b-c73a-4dc7-7d93-b8afad64762d

.final_builds/packages/metricscollector/index.yml

@@ -1,4 +1,8 @@
 builds:
+  531abd3386c9e6554215fb1e8e0a5a0c7fd838b2c8eface63b5615af3676fd96:
+    version: 531abd3386c9e6554215fb1e8e0a5a0c7fd838b2c8eface63b5615af3676fd96
+    blobstore_id: e069b6af-5c14-4154-476b-04236458778c
+    sha1: sha256:0fffdb7a9b5f077bc2203bb03289bfc927210dff610b80b35a6fd887d6ef9ed7
   59ababbb28a46c4910207e29f7d20d55d44a8b92:
     version: 59ababbb28a46c4910207e29f7d20d55d44a8b92
     blobstore_id: aac61fd4-906b-46c5-416b-773a332a6192

.final_builds/packages/nodejs/index.yml

@@ -1,4 +1,8 @@
 builds:
+  7bd1bb3cc99210e2dff868160d0680cb2672504f852e7646f9038120b29f0619:
+    version: 7bd1bb3cc99210e2dff868160d0680cb2672504f852e7646f9038120b29f0619
+    blobstore_id: e480e955-1caf-4155-6d48-47b611928892
+    sha1: sha256:6d64996dadaf2430f2cd042001c83f9f5480c8671680220d5a8e7cff4c3903d0
   b853162bf1b8c2008affac4861f2569b99e2c9bc:
     version: b853162bf1b8c2008affac4861f2569b99e2c9bc
     blobstore_id: 7d184cc3-77a1-4e52-7a7a-d635db11b893

.final_builds/packages/operator/index.yml

@@ -11,6 +11,10 @@ builds:
     version: 9003a72dfd3239e06588523d63b42f5ed2440092
     blobstore_id: 1c251e86-ebd9-4472-7f8b-10f02993e8b1
     sha1: d927923e5072d40a3b3e90d46e85ef0249466598
+  94925b87df3fb340b8e7176abfd1add6ece694c03d103b9afec06e83b9e08d87:
+    version: 94925b87df3fb340b8e7176abfd1add6ece694c03d103b9afec06e83b9e08d87
+    blobstore_id: 8eb259f6-fa92-4aec-6a21-97100c5e72c5
+    sha1: sha256:6ae291e1d14937dc184551c3ecca2070bff71c3e6edcf8121bccfc425fc66186
   cebc3447a20c0eac3ffb82ed08ed3724eb977ba5:
     version: cebc3447a20c0eac3ffb82ed08ed3724eb977ba5
     blobstore_id: f05e5b3a-9b46-45ce-6ef1-e5d9a85b931a

.final_builds/packages/scalingengine/index.yml

@@ -1,4 +1,8 @@
 builds:
+  41586e7325c08f09d8770debf6d3215dd796251a728eb393de8a5f15d11b1425:
+    version: 41586e7325c08f09d8770debf6d3215dd796251a728eb393de8a5f15d11b1425
+    blobstore_id: eb01ee22-82c2-4c2e-6180-e6abcc07ea82
+    sha1: sha256:562f78769b72e3e7230ee260bc80513fa3fa5e34008eccbfd766cef741da45f0
   43ea628dad0e5f06a41d53d519afa2c0a5aa145c:
     version: 43ea628dad0e5f06a41d53d519afa2c0a5aa145c
     blobstore_id: 2e3ebd55-93e7-4513-6110-6bb915008e4e

.final_builds/packages/scheduler/index.yml

@@ -15,4 +15,8 @@ builds:
     version: fac3597cae26fb8ca195ebcf1d112f8514d58143
     blobstore_id: cbd47d82-9bb9-4933-762f-37e3ef7ce42f
     sha1: aa459e061d7c7fb5a666558addb6cb813015c418
+  fd3d552e327577e4e5e4f9d3be3039d98b76e45674c1a932be3ad437c963f662:
+    version: fd3d552e327577e4e5e4f9d3be3039d98b76e45674c1a932be3ad437c963f662
+    blobstore_id: 80103433-8c55-434a-5acd-1d3c6271ed25
+    sha1: sha256:d691d1a6f57d0e3de78542961794e1c733420ee05748201a99cb4ca36610a420
 format-version: "2"

.final_builds/packages/servicebroker/index.yml

@@ -1,4 +1,8 @@
 builds:
+  12dc2b23c200d202af403796f385668067810b3ee6de55e2ad9b856dba2195cc:
+    version: 12dc2b23c200d202af403796f385668067810b3ee6de55e2ad9b856dba2195cc
+    blobstore_id: eb4b9df3-125b-4482-7899-2271df3a8318
+    sha1: sha256:d2509136f1a4b27abbc8b26a76ee2fbeae17d9883c0a5d3a12ef6ac2801e31e5
   17ad4e6f87e928411a3b4fe2831b86d420d9c3d0:
     version: 17ad4e6f87e928411a3b4fe2831b86d420d9c3d0
     blobstore_id: 6eb9e06a-c3a4-4ec3-4d33-9c8ce34021f4

.gitmodules

@@ -16,3 +16,6 @@
 [submodule "src/gopkg.in/yaml.v2"]
 	path = src/gopkg.in/yaml.v2
 	url = https://gopkg.in/yaml.v2
+[submodule "src/github.com/lib/pq"]
+	path = src/github.com/lib/pq
+	url = https://github.com/lib/pq

jobs/apiserver/spec

@@ -40,6 +40,7 @@ packages:
   - db
   - java
   - common
+  - changeloglockcleaner
 
 properties:
   autoscaler.api_server.cache_ttl:

jobs/apiserver/templates/pre-start.erb

@@ -35,14 +35,16 @@ USER='<%= role['name'] %>'
 PASSWORD='<%= role['password'] %>'
 PORT='<%= p("autoscaler.policy_db.port") %>'
 SSLMODE='<%= p("autoscaler.policy_db.sslmode") %>'
-DBURI="jdbc:postgresql://$HOST:$PORT/$DBNAME?sslmode=$SSLMODE"
+JDBCDBURL="jdbc:postgresql://$HOST:$PORT/$DBNAME?sslmode=$SSLMODE"
+COMMONDBURL="postgres://$USER:$PASSWORD@$HOST:$PORT/$DBNAME?sslmode=$SSLMODE"
 
 <% unless p('autoscaler.policy_db.tls.ca') == "" %>
-DBURI=$DBURI"&sslrootcert=/var/vcap/jobs/apiserver/config/certs/policy_db/ca.crt"
+JDBCDBURL=$JDBCDBURL"&sslrootcert=/var/vcap/jobs/apiserver/config/certs/policy_db/ca.crt"
+COMMONDBURL=$COMMONDBURL"&sslrootcert=/var/vcap/jobs/apiserver/config/certs/policy_db/ca.crt"
 <% end %>
 
 detect_dns $HOST $PORT
-
-java -cp "$DB_DIR/target/lib/*" liquibase.integration.commandline.Main --url "$DBURI" --username=$USER --password=$PASSWORD \
+/var/vcap/packages/changeloglockcleaner/changeloglockcleaner -dburl "$COMMONDBURL" -expired_second 1200
+java -cp "$DB_DIR/target/lib/*" liquibase.integration.commandline.Main --url "$JDBCDBURL" --username=$USER --password=$PASSWORD \
 --driver=org.postgresql.Driver --changeLogFile=$API_DIR/db/api.db.changelog.yml update
 

jobs/eventgenerator/spec

@@ -25,6 +25,7 @@ packages:
   - db
   - eventgenerator
   - common
+  - changeloglockcleaner
 
 provides:
 - name: eventgenerator

jobs/eventgenerator/templates/pre-start.erb

@@ -28,14 +28,16 @@ USER='<%= role['name'] %>'
 PASSWORD='<%= role['password'] %>'
 PORT='<%= p("autoscaler.appmetrics_db.port") %>'
 SSLMODE='<%= p("autoscaler.appmetrics_db.sslmode") %>'
-DBURI="jdbc:postgresql://$HOST:$PORT/$DBNAME?sslmode=$SSLMODE"
+JDBCDBURL="jdbc:postgresql://$HOST:$PORT/$DBNAME?sslmode=$SSLMODE"
+COMMONDBURL="postgres://$USER:$PASSWORD@$HOST:$PORT/$DBNAME?sslmode=$SSLMODE"
 
 <% unless p('autoscaler.appmetrics_db.tls.ca') == "" %>
-DBURI=$DBURI"&sslrootcert=/var/vcap/jobs/eventgenerator/config/certs/appmetrics_db/ca.crt"
+JDBCDBURL=$JDBCDBURL"&sslrootcert=/var/vcap/jobs/eventgenerator/config/certs/appmetrics_db/ca.crt"
+COMMONDBURL=$COMMONDBURL"&sslrootcert=/var/vcap/jobs/eventgenerator/config/certs/appmetrics_db/ca.crt"
 <% end %>
 
 detect_dns $HOST $PORT
 
-java -cp "/var/vcap/packages/db/target/lib/*" liquibase.integration.commandline.Main --url "$DBURI" --username=$USER --password=$PASSWORD \
+/var/vcap/packages/changeloglockcleaner/changeloglockcleaner -dburl "$COMMONDBURL" -expired_second 1200
+java -cp "/var/vcap/packages/db/target/lib/*" liquibase.integration.commandline.Main --url "$JDBCDBURL" --username=$USER --password=$PASSWORD \
 --driver=org.postgresql.Driver --changeLogFile=/var/vcap/packages/eventgenerator/dataaggregator.db.changelog.yml update
-

jobs/metricscollector/spec

@@ -19,6 +19,7 @@ packages:
   - db
   - metricscollector
   - common
+  - changeloglockcleaner
 
 provides:
 - name: metricscollector

jobs/metricscollector/templates/pre-start.erb

@@ -29,14 +29,16 @@ USER='<%= role['name'] %>'
 PASSWORD='<%= role['password'] %>'
 PORT='<%= p("autoscaler.instancemetrics_db.port") %>'
 SSLMODE='<%= p("autoscaler.instancemetrics_db.sslmode") %>'
-DBURI="jdbc:postgresql://$HOST:$PORT/$DBNAME?sslmode=$SSLMODE"
+JDBCDBURL="jdbc:postgresql://$HOST:$PORT/$DBNAME?sslmode=$SSLMODE"
+COMMONDBURL="postgres://$USER:$PASSWORD@$HOST:$PORT/$DBNAME?sslmode=$SSLMODE"
 
 <% unless p('autoscaler.instancemetrics_db.tls.ca') == "" %>
-DBURI=$DBURI"&sslrootcert=/var/vcap/jobs/metricscollector/config/certs/appinstancemetrics_db/ca.crt"
+JDBCDBURL=$JDBCDBURL"&sslrootcert=/var/vcap/jobs/metricscollector/config/certs/appinstancemetrics_db/ca.crt"
+COMMONDBURL=$COMMONDBURL"&sslrootcert=/var/vcap/jobs/metricscollector/config/certs/appinstancemetrics_db/ca.crt"
 <% end %>
 
 detect_dns $HOST $PORT
-
-java -cp "/var/vcap/packages/db/target/lib/*" liquibase.integration.commandline.Main --url "$DBURI" --username=$USER --password=$PASSWORD \
+/var/vcap/packages/changeloglockcleaner/changeloglockcleaner -dburl "$COMMONDBURL" -expired_second 1200
+java -cp "/var/vcap/packages/db/target/lib/*" liquibase.integration.commandline.Main --url "$JDBCDBURL" --username=$USER --password=$PASSWORD \
 --driver=org.postgresql.Driver --changeLogFile=/var/vcap/packages/metricscollector/metricscollector.db.changelog.yml update
 

jobs/operator/spec

@@ -25,7 +25,8 @@ packages:
   - common
   - db
   - java
-
+  - changeloglockcleaner
+
 properties:
   autoscaler.cf.api:
     description: "the Cloud Foundry API endpoint"

jobs/operator/templates/pre-start.erb

@@ -33,14 +33,16 @@ USER='<%= role['name'] %>'
 PASSWORD='<%= role['password'] %>'
 PORT='<%= p("autoscaler.lock_db.port") %>'
 SSLMODE='<%= p("autoscaler.lock_db.sslmode") %>'
-DBURI="jdbc:postgresql://$HOST:$PORT/$DBNAME?sslmode=$SSLMODE"
+JDBCDBURL="jdbc:postgresql://$HOST:$PORT/$DBNAME?sslmode=$SSLMODE"
+COMMONDBURL="postgres://$USER:$PASSWORD@$HOST:$PORT/$DBNAME?sslmode=$SSLMODE"
 
 <% unless p('autoscaler.lock_db.tls.ca') == "" %>
-DBURI=$DBURI"&sslrootcert=/var/vcap/jobs/operator/config/certs/lock_db/ca.crt"
+JDBCDBURL=$JDBCDBURL"&sslrootcert=/var/vcap/jobs/operator/config/certs/lock_db/ca.crt"
+COMMONDBURL=$COMMONDBURL"&sslrootcert=/var/vcap/jobs/operator/config/certs/lock_db/ca.crt"
 <% end %>
 
 detect_dns $HOST $PORT
-
-java -cp "$DB_DIR/target/lib/*" liquibase.integration.commandline.Main --url "$DBURI" --username=$USER --password=$PASSWORD \
+/var/vcap/packages/changeloglockcleaner/changeloglockcleaner -dburl "$COMMONDBURL" -expired_second 1200
+java -cp "$DB_DIR/target/lib/*" liquibase.integration.commandline.Main --url "$JDBCDBURL" --username=$USER --password=$PASSWORD \
 --driver=org.postgresql.Driver --changeLogFile=$operator_DIR/operator.db.changelog.yml update
 

jobs/scalingengine/spec

@@ -20,7 +20,8 @@ packages:
   - db
   - scalingengine
   - common
-
+  - changeloglockcleaner
+
 properties:
   autoscaler.scalingengine_db.address:
     description: "IP address on which the scalingenginedb server will listen"

jobs/scalingengine/templates/pre-start.erb

@@ -29,13 +29,15 @@ USER='<%= role['name'] %>'
 PASSWORD='<%= role['password'] %>'
 PORT='<%= p("autoscaler.scalingengine_db.port") %>'
 SSLMODE='<%= p("autoscaler.scalingengine_db.sslmode") %>'
-DBURI="jdbc:postgresql://$HOST:$PORT/$DBNAME?sslmode=$SSLMODE"
+JDBCDBURL="jdbc:postgresql://$HOST:$PORT/$DBNAME?sslmode=$SSLMODE"
+COMMONDBURL="postgres://$USER:$PASSWORD@$HOST:$PORT/$DBNAME?sslmode=$SSLMODE"
 
 <% unless p('autoscaler.scalingengine_db.tls.ca') == "" %>
-DBURI=$DBURI"&sslrootcert=/var/vcap/jobs/scalingengine/config/certs/scalingengine_db/ca.crt"
+JDBCDBURL=$JDBCDBURL"&sslrootcert=/var/vcap/jobs/scalingengine/config/certs/scalingengine_db/ca.crt"
+COMMONDBURL=$COMMONDBURL"&sslrootcert=/var/vcap/jobs/scalingengine/config/certs/scalingengine_db/ca.crt"
 <% end %>
 
 detect_dns $HOST $PORT
-
-java -cp "/var/vcap/packages/db/target/lib/*" liquibase.integration.commandline.Main --url "$DBURI" --username=$USER --password=$PASSWORD \
+/var/vcap/packages/changeloglockcleaner/changeloglockcleaner -dburl "$COMMONDBURL" -expired_second 1200
+java -cp "/var/vcap/packages/db/target/lib/*" liquibase.integration.commandline.Main --url "$JDBCDBURL" --username=$USER --password=$PASSWORD \
 --driver=org.postgresql.Driver --changeLogFile=/var/vcap/packages/scalingengine/scalingengine.db.changelog.yml update

jobs/scheduler/spec

@@ -24,7 +24,8 @@ packages:
   - db
   - java
   - common
-
+  - changeloglockcleaner
+
 properties:
   autoscaler.scheduler.require_consul:
     description: "whether to start consul agent"

jobs/scheduler/templates/pre-start.erb

@@ -33,18 +33,20 @@ USER='<%= role['name'] %>'
 PASSWORD='<%= role['password'] %>'
 PORT='<%= p("autoscaler.scheduler_db.port") %>'
 SSLMODE='<%= p("autoscaler.scheduler_db.sslmode") %>'
-DBURI="jdbc:postgresql://$HOST:$PORT/$DBNAME?sslmode=$SSLMODE"
+JDBCDBURL="jdbc:postgresql://$HOST:$PORT/$DBNAME?sslmode=$SSLMODE"
+COMMONDBURL="postgres://$USER:$PASSWORD@$HOST:$PORT/$DBNAME?sslmode=$SSLMODE"
 
 <% unless p('autoscaler.scheduler_db.tls.ca') == "" %>
-DBURI=$DBURI"&sslrootcert=/var/vcap/jobs/scheduler/config/certs/scheduler_db/ca.crt"
+JDBCDBURL=$JDBCDBURL"&sslrootcert=/var/vcap/jobs/scheduler/config/certs/scheduler_db/ca.crt"
+COMMONDBURL=$COMMONDBURL"&sslrootcert=/var/vcap/jobs/scheduler/config/certs/scheduler_db/ca.crt"
 <% end %>
 
 detect_dns $HOST $PORT
-
-java -cp "$DB_DIR/target/lib/*" liquibase.integration.commandline.Main --url "$DBURI" --username=$USER --password=$PASSWORD \
+/var/vcap/packages/changeloglockcleaner/changeloglockcleaner -dburl "$COMMONDBURL" -expired_second 1200
+java -cp "$DB_DIR/target/lib/*" liquibase.integration.commandline.Main --url "$JDBCDBURL" --username=$USER --password=$PASSWORD \
 --driver=org.postgresql.Driver --changeLogFile=$SCHEDULER_DIR/db/scheduler.changelog-master.yaml update
 
-java -cp "$DB_DIR/target/lib/*" liquibase.integration.commandline.Main --url "$DBURI" --username=$USER --password=$PASSWORD \
+java -cp "$DB_DIR/target/lib/*" liquibase.integration.commandline.Main --url "$JDBCDBURL" --username=$USER --password=$PASSWORD \
 --driver=org.postgresql.Driver --changeLogFile=$SCHEDULER_DIR/db/quartz.changelog-master.yaml update
 
 # Generate key store for the clients communicate with scheduler.