bosh-director 1.3120.0 → 1.3122.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (5) hide show
  1. checksums.yaml +4 -4
  2. data/bin/bosh-director-worker +14 -2
  3. data/lib/bosh/director/version.rb +1 -1
  4. data/lib/cloud/dummy.rb +4 -3
  5. metadata +16 -16
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: c1eacdabcbd476e1f91d998548798bb89eb9c4ad
4
- data.tar.gz: 0c5e2a9e7dc48d82345507e4517efbb1e4288f30
3
+ metadata.gz: 7ec6dc203b602d57e98a511fff53b46b3400b02c
4
+ data.tar.gz: e182a9575ff473028360ba30622614a0a85bdcbf
5
5
  SHA512:
6
- metadata.gz: 019db9f1123839223530f8d344d11970b0adf971cf22b1eae5a244a4793f845e05cdf18e5b008caf38c7f39ef16037d57d4568d29b675f5b1bd6d8e9d7e660af
7
- data.tar.gz: 76dbb0c9467656cd9d67f035bfaf69d7d3e064f24e703e159a5a8ea6ae078097c483b10164ee52cf803d629cb77a00256ab10c1d695bf37a6f0ea138dbbc14b1
6
+ metadata.gz: 5f20efc6d54acc5f57519c5106b00f6f5de0ecdf096a1b23104d644452f002b6b5be0ea80b6947bf8e6df505f75b312acfa0ffa067cecd665f9c5a7678359070
7
+ data.tar.gz: 87b3ad7cc3812d3d8336c6e7c470513cc137af3131fd9e15bc509cb93ec93678b2e57b7024dfd15fc6b7caf10ece93362b6be754fb5c0c89dc69ec3d1f59a01b
data/bin/bosh-director-worker CHANGED
@@ -70,6 +70,18 @@ end
70
70
 
71
71
  Resque::Failure.backend = Resque::Failure::Backtrace
72
72
 
73
- worker.log "Starting worker #{worker}"
73
+ begin
74
+ @resque_retries ||= 0
75
+ worker.log "Starting worker #{worker}. Resque info:\n#{Resque.info.inspect}"
76
+ worker.work(ENV['INTERVAL'] || 5) # interval, will block
77
+ rescue Redis::TimeoutError => e
78
+ worker.log "Redis timeout [#{@resque_retries}]. Error : #{e.inspect}"
79
+ while @resque_retries < 10
80
+ @resque_retries += 1
81
+ sleep 0.5
82
+ retry
83
+ end
74
84
 
75
- worker.work(ENV['INTERVAL'] || 5) # interval, will block
85
+ worker.log "Redis timeout max retries reached. Error: #{e.inspect}"
86
+ raise e
87
+ end
data/lib/bosh/director/version.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  module Bosh
2
2
  module Director
3
- VERSION = '1.3120.0'
3
+ VERSION = '1.3122.0'
4
4
  end
5
5
  end
data/lib/cloud/dummy.rb CHANGED
@@ -86,9 +86,10 @@ module Bosh
86
86
  def delete_vm(vm_name)
87
87
  agent_pid = vm_name.to_i
88
88
  Process.kill('KILL', agent_pid)
89
- # rubocop:disable HandleExceptions
90
- rescue Errno::ESRCH
91
- # rubocop:enable HandleExceptions
89
+ # rubocop:disable HandleExceptions
90
+ rescue Errno::EINVAL, Errno::ESRCH, Errno::EPERM => e
91
+ # rubocop:enable HandleExceptions
92
+ @logger.info("Dummy CPI delete_vm failed for agent pid #{vm_name}. #{e}")
92
93
  ensure
93
94
  free_ips(ips_for_vm_id(vm_name)) if has_vm?(vm_name)
94
95
  FileUtils.rm_rf(File.join(@base_dir, 'running_vms', vm_name))
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.3120.0
4
+ version: 1.3122.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - VMware
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2015-10-27 00:00:00.000000000 Z
11
+ date: 2015-10-29 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: bosh_common
@@ -16,98 +16,98 @@ dependencies:
16
16
  requirements:
17
17
  - - "~>"
18
18
  - !ruby/object:Gem::Version
19
- version: 1.3120.0
19
+ version: 1.3122.0
20
20
  type: :runtime
21
21
  prerelease: false
22
22
  version_requirements: !ruby/object:Gem::Requirement
23
23
  requirements:
24
24
  - - "~>"
25
25
  - !ruby/object:Gem::Version
26
- version: 1.3120.0
26
+ version: 1.3122.0
27
27
  - !ruby/object:Gem::Dependency
28
28
  name: bosh_cpi
29
29
  requirement: !ruby/object:Gem::Requirement
30
30
  requirements:
31
31
  - - "~>"
32
32
  - !ruby/object:Gem::Version
33
- version: 1.3120.0
33
+ version: 1.3122.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.3120.0
40
+ version: 1.3122.0
41
41
  - !ruby/object:Gem::Dependency
42
42
  name: bosh-registry
43
43
  requirement: !ruby/object:Gem::Requirement
44
44
  requirements:
45
45
  - - "~>"
46
46
  - !ruby/object:Gem::Version
47
- version: 1.3120.0
47
+ version: 1.3122.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.3120.0
54
+ version: 1.3122.0
55
55
  - !ruby/object:Gem::Dependency
56
56
  name: blobstore_client
57
57
  requirement: !ruby/object:Gem::Requirement
58
58
  requirements:
59
59
  - - "~>"
60
60
  - !ruby/object:Gem::Version
61
- version: 1.3120.0
61
+ version: 1.3122.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.3120.0
68
+ version: 1.3122.0
69
69
  - !ruby/object:Gem::Dependency
70
70
  name: bosh-core
71
71
  requirement: !ruby/object:Gem::Requirement
72
72
  requirements:
73
73
  - - "~>"
74
74
  - !ruby/object:Gem::Version
75
- version: 1.3120.0
75
+ version: 1.3122.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.3120.0
82
+ version: 1.3122.0
83
83
  - !ruby/object:Gem::Dependency
84
84
  name: bosh-director-core
85
85
  requirement: !ruby/object:Gem::Requirement
86
86
  requirements:
87
87
  - - "~>"
88
88
  - !ruby/object:Gem::Version
89
- version: 1.3120.0
89
+ version: 1.3122.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.3120.0
96
+ version: 1.3122.0
97
97
  - !ruby/object:Gem::Dependency
98
98
  name: bosh-template
99
99
  requirement: !ruby/object:Gem::Requirement
100
100
  requirements:
101
101
  - - "~>"
102
102
  - !ruby/object:Gem::Version
103
- version: 1.3120.0
103
+ version: 1.3122.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.3120.0
110
+ version: 1.3122.0
111
111
  - !ruby/object:Gem::Dependency
112
112
  name: bosh_openstack_cpi
113
113
  requirement: !ruby/object:Gem::Requirement