projects
/
ganeti-local
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
backend: Two small style fixes
[ganeti-local]
/
lib
/
jqueue.py
diff --git
a/lib/jqueue.py
b/lib/jqueue.py
index
f7e0557
..
62a5f4a
100644
(file)
--- a/
lib/jqueue.py
+++ b/
lib/jqueue.py
@@
-190,6
+190,13
@@
class _QueuedJob(object):
# Condition to wait for changes
self.change = threading.Condition(self.queue._lock)
# Condition to wait for changes
self.change = threading.Condition(self.queue._lock)
+ def __repr__(self):
+ status = ["%s.%s" % (self.__class__.__module__, self.__class__.__name__),
+ "id=%s" % self.id,
+ "ops=%s" % ",".join([op.input.Summary() for op in self.ops])]
+
+ return "<%s at %#x>" % (" ".join(status), id(self))
+
@classmethod
def Restore(cls, queue, state):
"""Restore a _QueuedJob from serialized state:
@classmethod
def Restore(cls, queue, state):
"""Restore a _QueuedJob from serialized state:
@@
-875,7
+882,7
@@
class JobQueue(object):
@return: the path to the job file
"""
@return: the path to the job file
"""
- return os.path.join(constants.QUEUE_DIR, "job-%s" % job_id)
+ return utils.PathJoin(constants.QUEUE_DIR, "job-%s" % job_id)
@classmethod
def _GetArchivedJobPath(cls, job_id):
@classmethod
def _GetArchivedJobPath(cls, job_id):
@@
-887,8
+894,8
@@
class JobQueue(object):
@return: the path to the archived job file
"""
@return: the path to the archived job file
"""
- path = "%s/job-%s" % (cls._GetArchiveDirectory(job_id), job_id)
- return os.path.join(constants.JOB_QUEUE_ARCHIVE_DIR, path)
+ return utils.PathJoin(constants.JOB_QUEUE_ARCHIVE_DIR,
+ cls._GetArchiveDirectory(job_id), "job-%s" % job_id)
@classmethod
def _ExtractJobID(cls, name):
@classmethod
def _ExtractJobID(cls, name):
@@
-1314,7
+1321,7
@@
class JobQueue(object):
all_job_ids = self._GetJobIDsUnlocked(archived=False)
pending = []
for idx, job_id in enumerate(all_job_ids):
all_job_ids = self._GetJobIDsUnlocked(archived=False)
pending = []
for idx, job_id in enumerate(all_job_ids):
- last_touched = idx
+ last_touched = idx + 1
# Not optimal because jobs could be pending
# TODO: Measure average duration for job archival and take number of
# Not optimal because jobs could be pending
# TODO: Measure average duration for job archival and take number of
@@
-1344,7
+1351,7
@@
class JobQueue(object):
if pending:
archived_count += self._ArchiveJobsUnlocked(pending)
if pending:
archived_count += self._ArchiveJobsUnlocked(pending)
- return (archived_count, len(all_job_ids) - last_touched - 1)
+ return (archived_count, len(all_job_ids) - last_touched)
@staticmethod
def _GetJobInfoUnlocked(job, fields):
@staticmethod
def _GetJobInfoUnlocked(job, fields):