Skip to content

Commit a635825

Browse files
authored
Revert "Add draining for cc_uploader (#529)" (#544)
This reverts commit 45d2a21. This original commit introduces the requirement that cc_uploader is co-located on the same VM as the cloud_controller_ng job. While this is the case in cf-deployment, this is not the case for all deployments of CF (like the VMware one). As this commit has broken our deployment, and its not easy for us simply to relocate the job, we propose we revert this and discuss options going forwards. The cc_uploader originally was designed an independent process, typically processes that require to be co-located are within the same job. E.g. nginx, cloud_controller_ng and cloud_controller_local_worker. Some options: * Investigate a way to generically drain uploads from any source in nginx rather than specifically in cc_uploader. * Current timeout is [10 seconds](https://github.com/cloudfoundry/cloud_controller_ng/blob/5c4dac049bd28979284aeab1efa48c7075676131/lib/cloud_controller/drain.rb#L9) * Find a way to sync draining between jobs without requiring co-location. * Keep the co-location requirement for draining but behind a capi-property.
1 parent c40eded commit a635825

File tree

2 files changed

+0
-3
lines changed

2 files changed

+0
-3
lines changed

jobs/cc_uploader/monit

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,4 @@ check process cc_uploader
22
with pidfile /var/vcap/sys/run/bpm/cc_uploader/cc_uploader.pid
33
start program "/var/vcap/jobs/bpm/bin/bpm start cc_uploader"
44
stop program "/var/vcap/jobs/bpm/bin/bpm stop cc_uploader"
5-
depends on cloud_controller_ng
65
group vcap

jobs/cloud_controller_ng/templates/shutdown_drain.rb.erb

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@ $LOAD_PATH.unshift('/var/vcap/packages/cloud_controller_ng/cloud_controller_ng/l
66
require 'cloud_controller/drain'
77

88
@drain = VCAP::CloudController::Drain.new('/var/vcap/sys/log/cloud_controller_ng')
9-
10-
@drain.shutdown_cc_uploader('/var/vcap/sys/run/bpm/cc_uploader/cc_uploader.pid')
119
@drain.shutdown_nginx('/var/vcap/sys/run/bpm/cloud_controller_ng/nginx.pid', <%= p("cc.nginx_drain_timeout") %>)
1210
@drain.shutdown_cc('/var/vcap/sys/run/bpm/cloud_controller_ng/cloud_controller_ng.pid')
1311
@threads = []

0 commit comments

Comments
 (0)