core: sleep between state checks for communicator [GH-2163]
This commit is contained in:
parent
5e468dd110
commit
e515ca22ab
|
@ -13,6 +13,7 @@ BUG FIXES:
|
||||||
- core: `Guest#capability?` now works with strings as well
|
- core: `Guest#capability?` now works with strings as well
|
||||||
- core: Fix NoMethodError in the new `Vagrant.has_plugin?` method [GH-2189]
|
- core: Fix NoMethodError in the new `Vagrant.has_plugin?` method [GH-2189]
|
||||||
- core: Convert forwarded port parameters to integers. [GH-2173]
|
- core: Convert forwarded port parameters to integers. [GH-2173]
|
||||||
|
- core: Don't spike CPU to 100% while waiting for machine to boot. [GH-2163]
|
||||||
- hosts/arch: NFS exporting works properly, no exceptions. [GH-2161]
|
- hosts/arch: NFS exporting works properly, no exceptions. [GH-2161]
|
||||||
- hosts/bsd: Use only `sudo` for writing NFS exports. This lets NFS
|
- hosts/bsd: Use only `sudo` for writing NFS exports. This lets NFS
|
||||||
exports work if you have sudo privs but not `su`. [GH-2191]
|
exports work if you have sudo privs but not `su`. [GH-2191]
|
||||||
|
|
|
@ -34,12 +34,18 @@ module Vagrant
|
||||||
# Otherwise, periodically verify the VM isn't in a bad state.
|
# Otherwise, periodically verify the VM isn't in a bad state.
|
||||||
while true
|
while true
|
||||||
state = env[:machine].provider.state.id
|
state = env[:machine].provider.state.id
|
||||||
|
|
||||||
# Used to report invalid states
|
# Used to report invalid states
|
||||||
Thread.current[:last_known_state] = state
|
Thread.current[:last_known_state] = state
|
||||||
|
|
||||||
|
# Check if we have the proper state so we can break out
|
||||||
if !@states.include?(state)
|
if !@states.include?(state)
|
||||||
Thread.current[:result] = false
|
Thread.current[:result] = false
|
||||||
break
|
break
|
||||||
end
|
end
|
||||||
|
|
||||||
|
# Sleep a bit so we don't hit 100% CPU constantly.
|
||||||
|
sleep 1
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
|
@ -55,7 +55,7 @@ module Vagrant
|
||||||
Timeout.timeout(duration) do
|
Timeout.timeout(duration) do
|
||||||
while true
|
while true
|
||||||
return true if ready?
|
return true if ready?
|
||||||
sleep 0.2
|
sleep 0.5
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
rescue Timeout::Error
|
rescue Timeout::Error
|
||||||
|
|
Loading…
Reference in New Issue