"""Module implementing the job queue handling."""
-import os
import errno
from ganeti import constants
"""
try:
- fd = open(file_name, "r")
- except IOError, err:
+ return int(utils.ReadFile(file_name))
+ except EnvironmentError, err:
if err.errno in (errno.ENOENT, ):
return None
raise
- try:
- return int(fd.read(128))
- finally:
- fd.close()
-
def ReadSerial():
"""Read the serial file.
locking mode.
"""
- # Make sure our directories exists
- for path in (constants.QUEUE_DIR, constants.JOB_QUEUE_ARCHIVE_DIR):
- try:
- os.mkdir(path, 0700)
- except OSError, err:
- if err.errno not in (errno.EEXIST, ):
- raise
+ dirs = [(d, constants.JOB_QUEUE_DIRS_MODE) for d in constants.JOB_QUEUE_DIRS]
+ utils.EnsureDirs(dirs)
# Lock queue
- queue_lock = utils.FileLock(constants.JOB_QUEUE_LOCK_FILE)
+ queue_lock = utils.FileLock.Open(constants.JOB_QUEUE_LOCK_FILE)
try:
# The queue needs to be locked in exclusive mode to write to the serial and
# version files.
if serial is None:
# There must be a serious problem
- raise errors.JobQueueError("Can't read/parse the job queue serial file")
+ raise errors.JobQueueError("Can't read/parse the job queue"
+ " serial file")
if not must_lock:
- # There's no need for more error handling. Closing the lock file below in
- # case of an error will unlock it anyway.
+ # There's no need for more error handling. Closing the lock
+ # file below in case of an error will unlock it anyway.
queue_lock.Unlock()
except: