andy/glusterfs
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gcron: catch OSError as well as IOError

Browse Source 
In case os.open() fails because the file does not exist, an OSError is
raised. To prevent the script to abort uncleanly, catch the OSError in
addition to the IOError.

Change-Id: I48e5b23e17d63639cc33db51b4229249a9887880
Fixes: bz#1590193
Signed-off-by: Niels de Vos <ndevos@redhat.com>
This commit is contained in:
Niels de Vos 2018-06-12 09:49:09 +02:00 committed by Amar Tumballi
parent 6ac82e8306
commit 26b52694fe
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
extras/snap_scheduler/gcron.py
View File

@ -105,10 +105,10 @@ def doJob(name, lockFile, jobFunc, volname):
else:
log.info("Job %s has been processed already", name)
fcntl.flock(f, fcntl.LOCK_UN)
except IOError as (errno, strerror):
except (OSError, IOError) as (errno, strerror):
log.info("Job %s is being processed by another agent", name)
os.close(f)
except IOError as (errno, strerror):
except (OSError, IOError) as (errno, strerror):
log.debug("Failed to open lock file %s : %s", lockFile, strerror)
log.error("Failed to process job %s", name)
success = False