bosh-director 1.2372.0 → 1.2375.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (3) hide show
  1. data/lib/bosh/director/jobs/run_errand.rb +17 -11
  2. data/lib/bosh/director/version.rb +1 -1
  3. metadata +19 -19
data/lib/bosh/director/jobs/run_errand.rb CHANGED
@@ -2,6 +2,8 @@ require 'psych'
2
2
 
3
3
  module Bosh::Director
4
4
  class Jobs::RunErrand < Jobs::BaseJob
5
+ include LockHelper
6
+
5
7
  @queue = :normal
6
8
 
7
9
  def self.job_type
@@ -48,22 +50,26 @@ module Bosh::Director
48
50
  private
49
51
 
50
52
  def with_updated_instances(deployment, job, &blk)
51
- logger.info('Starting to prepare for deployment')
52
- prepare_deployment(deployment, job)
53
+ result = nil
54
+
55
+ with_deployment_lock(deployment) do
56
+ logger.info('Starting to prepare for deployment')
57
+ prepare_deployment(deployment, job)
53
58
 
54
- logger.info('Starting to update resource pool')
55
- rp_manager = update_resource_pool(job)
59
+ logger.info('Starting to update resource pool')
60
+ rp_manager = update_resource_pool(job)
56
61
 
57
- logger.info('Starting to update job instances')
58
- job_manager = update_instances(deployment, job)
62
+ logger.info('Starting to update job instances')
63
+ job_manager = update_instances(deployment, job)
59
64
 
60
- result = blk.call
65
+ result = blk.call
61
66
 
62
- logger.info('Starting to delete job instances')
63
- job_manager.delete_instances
67
+ logger.info('Starting to delete job instances')
68
+ job_manager.delete_instances
64
69
 
65
- logger.info('Starting to refill resource pool')
66
- rp_manager.refill
70
+ logger.info('Starting to refill resource pool')
71
+ rp_manager.refill
72
+ end
67
73
 
68
74
  result
69
75
  end
data/lib/bosh/director/version.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  module Bosh
2
2
  module Director
3
- VERSION = '1.2372.0'
3
+ VERSION = '1.2375.0'
4
4
  end
5
5
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: bosh-director
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.2372.0
4
+ version: 1.2375.0
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -34,7 +34,7 @@ dependencies:
34
34
  requirements:
35
35
  - - ~>
36
36
  - !ruby/object:Gem::Version
37
- version: 1.2372.0
37
+ version: 1.2375.0
38
38
  type: :runtime
39
39
  prerelease: false
40
40
  version_requirements: !ruby/object:Gem::Requirement
@@ -42,7 +42,7 @@ dependencies:
42
42
  requirements:
43
43
  - - ~>
44
44
  - !ruby/object:Gem::Version
45
- version: 1.2372.0
45
+ version: 1.2375.0
46
46
  - !ruby/object:Gem::Dependency
47
47
  name: bosh-core
48
48
  requirement: !ruby/object:Gem::Requirement
@@ -50,7 +50,7 @@ dependencies:
50
50
  requirements:
51
51
  - - ~>
52
52
  - !ruby/object:Gem::Version
53
- version: 1.2372.0
53
+ version: 1.2375.0
54
54
  type: :runtime
55
55
  prerelease: false
56
56
  version_requirements: !ruby/object:Gem::Requirement
@@ -58,7 +58,7 @@ dependencies:
58
58
  requirements:
59
59
  - - ~>
60
60
  - !ruby/object:Gem::Version
61
- version: 1.2372.0
61
+ version: 1.2375.0
62
62
  - !ruby/object:Gem::Dependency
63
63
  name: bosh-director-core
64
64
  requirement: !ruby/object:Gem::Requirement
@@ -66,7 +66,7 @@ dependencies:
66
66
  requirements:
67
67
  - - ~>
68
68
  - !ruby/object:Gem::Version
69
- version: 1.2372.0
69
+ version: 1.2375.0
70
70
  type: :runtime
71
71
  prerelease: false
72
72
  version_requirements: !ruby/object:Gem::Requirement
@@ -74,7 +74,7 @@ dependencies:
74
74
  requirements:
75
75
  - - ~>
76
76
  - !ruby/object:Gem::Version
77
- version: 1.2372.0
77
+ version: 1.2375.0
78
78
  - !ruby/object:Gem::Dependency
79
79
  name: bosh_common
80
80
  requirement: !ruby/object:Gem::Requirement
@@ -82,7 +82,7 @@ dependencies:
82
82
  requirements:
83
83
  - - ~>
84
84
  - !ruby/object:Gem::Version
85
- version: 1.2372.0
85
+ version: 1.2375.0
86
86
  type: :runtime
87
87
  prerelease: false
88
88
  version_requirements: !ruby/object:Gem::Requirement
@@ -90,7 +90,7 @@ dependencies:
90
90
  requirements:
91
91
  - - ~>
92
92
  - !ruby/object:Gem::Version
93
- version: 1.2372.0
93
+ version: 1.2375.0
94
94
  - !ruby/object:Gem::Dependency
95
95
  name: bosh_cpi
96
96
  requirement: !ruby/object:Gem::Requirement
@@ -98,7 +98,7 @@ dependencies:
98
98
  requirements:
99
99
  - - ~>
100
100
  - !ruby/object:Gem::Version
101
- version: 1.2372.0
101
+ version: 1.2375.0
102
102
  type: :runtime
103
103
  prerelease: false
104
104
  version_requirements: !ruby/object:Gem::Requirement
@@ -106,7 +106,7 @@ dependencies:
106
106
  requirements:
107
107
  - - ~>
108
108
  - !ruby/object:Gem::Version
109
- version: 1.2372.0
109
+ version: 1.2375.0
110
110
  - !ruby/object:Gem::Dependency
111
111
  name: bosh_openstack_cpi
112
112
  requirement: !ruby/object:Gem::Requirement
@@ -114,7 +114,7 @@ dependencies:
114
114
  requirements:
115
115
  - - ~>
116
116
  - !ruby/object:Gem::Version
117
- version: 1.2372.0
117
+ version: 1.2375.0
118
118
  type: :runtime
119
119
  prerelease: false
120
120
  version_requirements: !ruby/object:Gem::Requirement
@@ -122,7 +122,7 @@ dependencies:
122
122
  requirements:
123
123
  - - ~>
124
124
  - !ruby/object:Gem::Version
125
- version: 1.2372.0
125
+ version: 1.2375.0
126
126
  - !ruby/object:Gem::Dependency
127
127
  name: bosh_aws_cpi
128
128
  requirement: !ruby/object:Gem::Requirement
@@ -130,7 +130,7 @@ dependencies:
130
130
  requirements:
131
131
  - - ~>
132
132
  - !ruby/object:Gem::Version
133
- version: 1.2372.0
133
+ version: 1.2375.0
134
134
  type: :runtime
135
135
  prerelease: false
136
136
  version_requirements: !ruby/object:Gem::Requirement
@@ -138,7 +138,7 @@ dependencies:
138
138
  requirements:
139
139
  - - ~>
140
140
  - !ruby/object:Gem::Version
141
- version: 1.2372.0
141
+ version: 1.2375.0
142
142
  - !ruby/object:Gem::Dependency
143
143
  name: bosh_vsphere_cpi
144
144
  requirement: !ruby/object:Gem::Requirement
@@ -146,7 +146,7 @@ dependencies:
146
146
  requirements:
147
147
  - - ~>
148
148
  - !ruby/object:Gem::Version
149
- version: 1.2372.0
149
+ version: 1.2375.0
150
150
  type: :runtime
151
151
  prerelease: false
152
152
  version_requirements: !ruby/object:Gem::Requirement
@@ -154,7 +154,7 @@ dependencies:
154
154
  requirements:
155
155
  - - ~>
156
156
  - !ruby/object:Gem::Version
157
- version: 1.2372.0
157
+ version: 1.2375.0
158
158
  - !ruby/object:Gem::Dependency
159
159
  name: bosh_vcloud_cpi
160
160
  requirement: !ruby/object:Gem::Requirement
@@ -493,7 +493,7 @@ dependencies:
493
493
  version: '1.0'
494
494
  description: ! 'BOSH Director
495
495
 
496
- f82a2c'
496
+ 1813ad'
497
497
  email: support@cloudfoundry.com
498
498
  executables:
499
499
  - bosh-director
@@ -749,7 +749,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
749
749
  version: '0'
750
750
  segments:
751
751
  - 0
752
- hash: 1895965029193441953
752
+ hash: -3749392544553418494
753
753
  requirements: []
754
754
  rubyforge_project:
755
755
  rubygems_version: 1.8.23