bosh-director 1.2690.4.0 → 1.2693.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (4) hide show
  1. checksums.yaml +4 -4
  2. data/lib/bosh/director/problem_handlers/missing_disk.rb +31 -14
  3. data/lib/bosh/director/version.rb +1 -1
  4. metadata +25 -25
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 501bc6eab4e09e5f03c4c412bcaf3f303dcd5d18
4
- data.tar.gz: 9460d41bd7d3e77ca482038a9c21e0ecde9e3394
3
+ metadata.gz: 5f433b1bfa2a7cd7da0b9ef426551b5076607805
4
+ data.tar.gz: 781213725f4968f831a9bcbe4dbc9b81a5c06326
5
5
  SHA512:
6
- metadata.gz: 4237e87e27c4cff757c172ac903ba78c36600ffba7af4de843cff891abec44087b3c9d495b7e12925eb7ea189286250d8d6ae77da5db5982a0a5682fc2aa872f
7
- data.tar.gz: 4e0fc053132943f6ce8be816426dfa20fda5306c7243251d9627abbfa43b128083bea9403978f1057a6c43a1644cdfa83882c649ed8f7d5908f6ec0f41b96725
6
+ metadata.gz: a04a700cce70cebbdb5a013b32db08225928981259d35ca70dd77fa522a747086c42c4a253e61ca27f2cedd03ff4fe4944a8f65f2f2a55a4ad14f716e083aac8
7
+ data.tar.gz: 9d0e6527985ab9dce7b178b3ce57adb0668eb07d65c7c9d19b911bf31facb52a5cc57c2c4a6f8f6e1e459be12f08ba8de25be2800aca52f7d09ee040ab2a15f8
data/lib/bosh/director/problem_handlers/missing_disk.rb CHANGED
@@ -45,28 +45,45 @@ module Bosh::Director
45
45
  @disk.update(active: false)
46
46
  end
47
47
 
48
- agent_client = agent_client(@vm)
49
- disk_list = []
48
+ # If VM is present we try to unmount and detach disk from VM
49
+ if @vm.cid && cloud.has_vm?(@vm.cid)
50
+ agent_client = agent_client(@vm)
51
+ disk_list = []
50
52
 
51
- begin
52
- disk_list = agent_client.list_disk
53
- if disk_list.include?(@disk.disk_cid)
54
- agent_client.unmount_disk(@disk.disk_cid)
53
+ begin
54
+ disk_list = agent_client.list_disk
55
+ if disk_list.include?(@disk.disk_cid)
56
+ @logger.debug('Trying to unmount disk')
57
+ agent_client.unmount_disk(@disk.disk_cid)
58
+ end
59
+
60
+ rescue Bosh::Director::RpcTimeout
61
+ # When agent is not responding it probably is failing to
62
+ # access missing disk. We continue with sending detach_disk
63
+ # which should update agent settings.json and it should be
64
+ # restarted successfully.
65
+ @logger.debug('Agent is not responding, skipping unmount')
66
+ rescue Bosh::Director::RpcRemoteException => e
67
+ handler_error("Cannot unmount disk, #{e.message}")
55
68
  end
56
69
 
57
- rescue Bosh::Director::RpcTimeout
58
- handler_error('Cannot unmount disk, agent is not responding')
59
- rescue Bosh::Director::RpcRemoteException => e
60
- handler_error("Cannot unmount disk, #{e.message}")
70
+ begin
71
+ @logger.debug('Sending cpi request: detach_disk')
72
+ cloud.detach_disk(@vm.cid, @disk.disk_cid) if @vm.cid
73
+ rescue Bosh::Clouds::DiskNotAttached
74
+ end
61
75
  end
62
76
 
77
+ @logger.debug('Deleting disk snapshots')
78
+ Api::SnapshotManager.delete_snapshots(@disk.snapshots)
79
+
63
80
  begin
64
- cloud.detach_disk(@vm.cid, @disk.disk_cid) if @vm.cid
65
- rescue Bosh::Clouds::DiskNotAttached
81
+ @logger.debug('Sending cpi request: delete_disk')
82
+ cloud.delete_disk(@disk.disk_cid)
83
+ rescue Bosh::Clouds::DiskNotFound
66
84
  end
67
85
 
68
- Api::SnapshotManager.delete_snapshots(@disk.snapshots)
69
-
86
+ @logger.debug('Removing disk reference from database')
70
87
  @disk.destroy
71
88
  end
72
89
  end
data/lib/bosh/director/version.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  module Bosh
2
2
  module Director
3
- VERSION = '1.2690.4.0'
3
+ VERSION = '1.2693.0'
4
4
  end
5
5
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: bosh-director
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.2690.4.0
4
+ version: 1.2693.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - VMware
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2014-10-02 00:00:00.000000000 Z
11
+ date: 2014-08-19 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: bcrypt-ruby
@@ -30,154 +30,154 @@ dependencies:
30
30
  requirements:
31
31
  - - "~>"
32
32
  - !ruby/object:Gem::Version
33
- version: 1.2690.4.0
33
+ version: 1.2693.0
34
34
  type: :runtime
35
35
  prerelease: false
36
36
  version_requirements: !ruby/object:Gem::Requirement
37
37
  requirements:
38
38
  - - "~>"
39
39
  - !ruby/object:Gem::Version
40
- version: 1.2690.4.0
40
+ version: 1.2693.0
41
41
  - !ruby/object:Gem::Dependency
42
42
  name: bosh-core
43
43
  requirement: !ruby/object:Gem::Requirement
44
44
  requirements:
45
45
  - - "~>"
46
46
  - !ruby/object:Gem::Version
47
- version: 1.2690.4.0
47
+ version: 1.2693.0
48
48
  type: :runtime
49
49
  prerelease: false
50
50
  version_requirements: !ruby/object:Gem::Requirement
51
51
  requirements:
52
52
  - - "~>"
53
53
  - !ruby/object:Gem::Version
54
- version: 1.2690.4.0
54
+ version: 1.2693.0
55
55
  - !ruby/object:Gem::Dependency
56
56
  name: bosh-director-core
57
57
  requirement: !ruby/object:Gem::Requirement
58
58
  requirements:
59
59
  - - "~>"
60
60
  - !ruby/object:Gem::Version
61
- version: 1.2690.4.0
61
+ version: 1.2693.0
62
62
  type: :runtime
63
63
  prerelease: false
64
64
  version_requirements: !ruby/object:Gem::Requirement
65
65
  requirements:
66
66
  - - "~>"
67
67
  - !ruby/object:Gem::Version
68
- version: 1.2690.4.0
68
+ version: 1.2693.0
69
69
  - !ruby/object:Gem::Dependency
70
70
  name: bosh_common
71
71
  requirement: !ruby/object:Gem::Requirement
72
72
  requirements:
73
73
  - - "~>"
74
74
  - !ruby/object:Gem::Version
75
- version: 1.2690.4.0
75
+ version: 1.2693.0
76
76
  type: :runtime
77
77
  prerelease: false
78
78
  version_requirements: !ruby/object:Gem::Requirement
79
79
  requirements:
80
80
  - - "~>"
81
81
  - !ruby/object:Gem::Version
82
- version: 1.2690.4.0
82
+ version: 1.2693.0
83
83
  - !ruby/object:Gem::Dependency
84
84
  name: bosh-template
85
85
  requirement: !ruby/object:Gem::Requirement
86
86
  requirements:
87
87
  - - "~>"
88
88
  - !ruby/object:Gem::Version
89
- version: 1.2690.4.0
89
+ version: 1.2693.0
90
90
  type: :runtime
91
91
  prerelease: false
92
92
  version_requirements: !ruby/object:Gem::Requirement
93
93
  requirements:
94
94
  - - "~>"
95
95
  - !ruby/object:Gem::Version
96
- version: 1.2690.4.0
96
+ version: 1.2693.0
97
97
  - !ruby/object:Gem::Dependency
98
98
  name: bosh_cpi
99
99
  requirement: !ruby/object:Gem::Requirement
100
100
  requirements:
101
101
  - - "~>"
102
102
  - !ruby/object:Gem::Version
103
- version: 1.2690.4.0
103
+ version: 1.2693.0
104
104
  type: :runtime
105
105
  prerelease: false
106
106
  version_requirements: !ruby/object:Gem::Requirement
107
107
  requirements:
108
108
  - - "~>"
109
109
  - !ruby/object:Gem::Version
110
- version: 1.2690.4.0
110
+ version: 1.2693.0
111
111
  - !ruby/object:Gem::Dependency
112
112
  name: bosh_openstack_cpi
113
113
  requirement: !ruby/object:Gem::Requirement
114
114
  requirements:
115
115
  - - "~>"
116
116
  - !ruby/object:Gem::Version
117
- version: 1.2690.4.0
117
+ version: 1.2693.0
118
118
  type: :runtime
119
119
  prerelease: false
120
120
  version_requirements: !ruby/object:Gem::Requirement
121
121
  requirements:
122
122
  - - "~>"
123
123
  - !ruby/object:Gem::Version
124
- version: 1.2690.4.0
124
+ version: 1.2693.0
125
125
  - !ruby/object:Gem::Dependency
126
126
  name: bosh_aws_cpi
127
127
  requirement: !ruby/object:Gem::Requirement
128
128
  requirements:
129
129
  - - "~>"
130
130
  - !ruby/object:Gem::Version
131
- version: 1.2690.4.0
131
+ version: 1.2693.0
132
132
  type: :runtime
133
133
  prerelease: false
134
134
  version_requirements: !ruby/object:Gem::Requirement
135
135
  requirements:
136
136
  - - "~>"
137
137
  - !ruby/object:Gem::Version
138
- version: 1.2690.4.0
138
+ version: 1.2693.0
139
139
  - !ruby/object:Gem::Dependency
140
140
  name: bosh_vsphere_cpi
141
141
  requirement: !ruby/object:Gem::Requirement
142
142
  requirements:
143
143
  - - "~>"
144
144
  - !ruby/object:Gem::Version
145
- version: 1.2690.4.0
145
+ version: 1.2693.0
146
146
  type: :runtime
147
147
  prerelease: false
148
148
  version_requirements: !ruby/object:Gem::Requirement
149
149
  requirements:
150
150
  - - "~>"
151
151
  - !ruby/object:Gem::Version
152
- version: 1.2690.4.0
152
+ version: 1.2693.0
153
153
  - !ruby/object:Gem::Dependency
154
154
  name: bosh_warden_cpi
155
155
  requirement: !ruby/object:Gem::Requirement
156
156
  requirements:
157
157
  - - "~>"
158
158
  - !ruby/object:Gem::Version
159
- version: 1.2690.4.0
159
+ version: 1.2693.0
160
160
  type: :runtime
161
161
  prerelease: false
162
162
  version_requirements: !ruby/object:Gem::Requirement
163
163
  requirements:
164
164
  - - "~>"
165
165
  - !ruby/object:Gem::Version
166
- version: 1.2690.4.0
166
+ version: 1.2693.0
167
167
  - !ruby/object:Gem::Dependency
168
168
  name: bosh_vcloud_cpi
169
169
  requirement: !ruby/object:Gem::Requirement
170
170
  requirements:
171
171
  - - "~>"
172
172
  - !ruby/object:Gem::Version
173
- version: 0.7.0
173
+ version: 0.5.5
174
174
  type: :runtime
175
175
  prerelease: false
176
176
  version_requirements: !ruby/object:Gem::Requirement
177
177
  requirements:
178
178
  - - "~>"
179
179
  - !ruby/object:Gem::Version
180
- version: 0.7.0
180
+ version: 0.5.5
181
181
  - !ruby/object:Gem::Dependency
182
182
  name: eventmachine
183
183
  requirement: !ruby/object:Gem::Requirement
@@ -460,7 +460,7 @@ dependencies:
460
460
  version: '0'
461
461
  description: |-
462
462
  BOSH Director
463
- f9637b
463
+ 193a56
464
464
  email: support@cloudfoundry.com
465
465
  executables:
466
466
  - bosh-director