saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Catch read_proc_file exceptions

Browse source
This commit is contained in:
Max Arnold 2024-02-07 06:40:42 -06:00 • committed by Daniel Wozniak
parent cc1f9a4aab
commit bd0d1306fd
1 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
salt/utils/master.py
View file

@ -64,7 +64,14 @@ def clean_proc_dir(opts):
proc_dir = os.path.join(opts["cachedir"], "proc")
for fn_ in os.listdir(proc_dir):
proc_file = os.path.join(proc_dir, fn_)
data = _read_proc_file(proc_file, opts)
try:
data = _read_proc_file(proc_file, opts)
except OSError:
# proc files may be removed at any time during this process by
# the master process that is executing the JID in question, so
# we must ignore ENOENT during this process
log.trace("%s removed during processing by master process", proc_file)
continue
if not data:
try:
log.warning(