Une MAJ de sécurité est nécessaire sur notre version actuelle. Elle sera effectuée lundi 02/08 entre 12h30 et 13h. L'interruption de service devrait durer quelques minutes (probablement moins de 5 minutes).

Commit 13bd1650 authored by Jérémie Gaidamour's avatar Jérémie Gaidamour
Browse files

[dev] run-g5kchecks: skip reservation for existing output files

parent d8adb4be
...@@ -248,6 +248,11 @@ else # ! options[:force] ...@@ -248,6 +248,11 @@ else # ! options[:force]
cluster_uid = node_uid.split(/-/).first cluster_uid = node_uid.split(/-/).first
next if options[:clusters] && ! options[:clusters].include?(cluster_uid) # -c and -n info should be consistent next if options[:clusters] && ! options[:clusters].include?(cluster_uid) # -c and -n info should be consistent
next if ! nodes_status.keys.include?(fnode_uid) # the node does not belong to this site next if ! nodes_status.keys.include?(fnode_uid) # the node does not belong to this site
if File.exist?("output/#{fnode_uid}.yaml")
puts "output/#{fnode_uid}.yaml exist. Remove this file if you want to run g5k-checks again on this node."
next
end
jobs << oarsub(site_uid, "{host='#{fnode_uid}'}", options[:queue]) jobs << oarsub(site_uid, "{host='#{fnode_uid}'}", options[:queue])
} }
...@@ -272,6 +277,11 @@ else # ! options[:force] ...@@ -272,6 +277,11 @@ else # ! options[:force]
next if File.exist?("output/#{fnode_uid}.yaml") # skip reservation if we alread have the node info next if File.exist?("output/#{fnode_uid}.yaml") # skip reservation if we alread have the node info
next if status != "busy" # only busy nodes next if status != "busy" # only busy nodes
if File.exist?("output/#{fnode_uid}.yaml")
puts "output/#{fnode_uid}.yaml exist. Remove this file if you want to run g5k-checks again on this node."
next
end
jobs << oarsub(site_uid, "{host='#{fnode_uid}'}", options[:queue]) jobs << oarsub(site_uid, "{host='#{fnode_uid}'}", options[:queue])
} }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment