openstack
/
fuel-main
Code Issues Proposed changes

[astute] Fix puppet runtime propagation.

This commit is contained in:
Andrey Danin 2013-01-18 13:46:05 +04:00 committed by default
parent e7bf4cfd31
commit adf28db000
2 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
astute/lib/astute/puppetd.rb
View File

@ -15,15 +15,15 @@ module Astute
n.results[:data][:resources]['failed'] != 0}
error_nodes = []
faiding_out_nodes = []
hang_out_nodes = []
idle_nodes = []
hang_nodes = []
now = Time.now.to_i
failed_nodes.each do |n|
if n.results[:data][:status] == 'running'
if n.results[:data][:time]['last_run'] - now > PUPPET_FADE_TIMEOUT
hang_out_nodes << n.results[:sender]
if n.results[:data][:runtime] > PUPPET_FADE_TIMEOUT
hang_nodes << n.results[:sender]
else
faiding_out_nodes << n.results[:sender]
idle_nodes << n.results[:sender]
end
else
error_nodes << n.results[:sender]
@ -35,13 +35,13 @@ module Astute
idle_nodes = last_run.map {|n| n.results[:sender]} - finished.map {|n| n.results[:sender]}
nodes_to_check = idle_nodes + succeed_nodes + error_nodes + faiding_out_nodes + hang_out_nodes
nodes_to_check = idle_nodes + succeed_nodes + error_nodes + hang_nodes
unless nodes_to_check.size == last_run.size
raise "Shoud never happen. Internal error in nodes statuses calculation. Statuses calculated for: #{nodes_to_check.inspect},"
"nodes passed to check statuses of: #{last_run.map {|n| n.results[:sender]}}"
end
return {'succeed' => succeed_nodes, 'error' => error_nodes, 'idle' => idle_nodes,
'faiding' => faiding_out_nodes, 'hang' => hang_out_nodes}
'hang' => hang_nodes}
end
public
@ -113,7 +113,7 @@ module Astute
end
ctx.reporter.report('nodes' => nodes_to_report) if nodes_to_report.any?
# we will iterate only over idle nodes and those that we restart deployment for
nodes_to_check = calc_nodes['idle'] + nodes_to_retry + calc_nodes['faiding']
nodes_to_check = calc_nodes['idle'] + nodes_to_retry
break if nodes_to_check.empty?
sleep 2

3
mcagent/puppetd.rb
View File

@ -77,7 +77,8 @@ module MCollective
reply[:stopped] = reply[:status] == 'stopped' ? 1 : 0
reply[:lastrun] = 0
reply[:lastrun] = File.stat(@statefile).mtime.to_i if File.exists?(@statefile)
reply[:output] = "Currently #{reply[:status]}; last completed run #{Time.now.to_i - reply[:lastrun]} seconds ago"
reply[:runtime] = Time.now.to_i - reply[:lastrun]
reply[:output] = "Currently #{reply[:status]}; last completed run #{reply[:runtime]} seconds ago"
end
def puppet_daemon_status