shaba/one
1
0
Fork 0
mirror of https://github.com/OpenNebula/one.git synced 2025-09-24 01:44:14 +03:00
Code Releases Wiki Activity

L #-: Use File.empty?

Browse Source 
(cherry picked from commit 88fa753e86)
This commit is contained in:
Tino Vázquez
2023-03-06 11:43:59 +01:00
parent f1b9ad7473
commit ddbaf61264
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/vmm_mad/exec/one_vmm_exec.rb
View File

@@ -400,7 +400,7 @@ class ExecDriver < VirtualMachineDriver
# ---------------------------------------------------------------------- # ----------------------------------------------------------------------
local_dfile = action.data[:local_dfile] local_dfile = action.data[:local_dfile]
if !local_dfile || File.zero?(local_dfile) if !local_dfile || File.empty?(local_dfile)
send_message(ACTION[:deploy], RESULT[:failure], id, send_message(ACTION[:deploy], RESULT[:failure], id,
"Cannot open deployment file #{local_dfile}") "Cannot open deployment file #{local_dfile}")
return return

4
src/vmm_mad/remotes/lib/firecracker/microvm.rb
View File

@@ -224,9 +224,9 @@ class MicroVM
t_start = Time.now t_start = Time.now
timeout = @one.fcrc[:cgroup_delete_timeout] timeout = @one.fcrc[:cgroup_delete_timeout]
next while !File.read(path).empty? && (Time.now - t_start < timeout) next while !File.empty?(path) && (Time.now - t_start < timeout)
File.read(path).empty? File.empty?(path)
rescue Errno::ENOENT rescue Errno::ENOENT
end end
# rubocop:enable Lint/SuppressedException # rubocop:enable Lint/SuppressedException