From 1410a3891fce8e5aeedfecc0b4014aea624b217d Mon Sep 17 00:00:00 2001
From: Michael Hanselmann <hansmi@google.com>
Date: Thu, 14 Jun 2012 18:38:40 +0200
Subject: [PATCH] jqueue: Move functions related to job ID to jstore
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
These don't really need to be in jqueue, and a new function will
be added to convert job IDs to an integer for queries.
Signed-off-by: Michael Hanselmann <hansmi@google.com>
Reviewed-by: RenΓ© Nussbaumer <rn@google.com>
---
lib/jqueue.py | 45 ++++++---------------------------------------
lib/jstore.py | 36 ++++++++++++++++++++++++++++++++++++
2 files changed, 42 insertions(+), 39 deletions(-)
diff --git a/lib/jqueue.py b/lib/jqueue.py
index d91da4556..3b34cbe83 100644
--- a/lib/jqueue.py
+++ b/lib/jqueue.py
@@ -62,7 +62,6 @@ from ganeti import qlang
JOBQUEUE_THREADS = 25
-JOBS_PER_ARCHIVE_DIRECTORY = 10000
# member lock names to be passed to @ssynchronized decorator
_LOCK = "_lock"
@@ -1797,39 +1796,6 @@ class JobQueue(object):
result = self._GetRpc(addrs).call_jobqueue_rename(names, rename)
self._CheckRpcResult(result, self._nodes, "Renaming files (%r)" % rename)
- @staticmethod
- def _FormatJobID(job_id):
- """Convert a job ID to string format.
-
- Currently this just does C{str(job_id)} after performing some
- checks, but if we want to change the job id format this will
- abstract this change.
-
- @type job_id: int or long
- @param job_id: the numeric job id
- @rtype: str
- @return: the formatted job id
-
- """
- if not isinstance(job_id, (int, long)):
- raise errors.ProgrammerError("Job ID '%s' not numeric" % job_id)
- if job_id < 0:
- raise errors.ProgrammerError("Job ID %s is negative" % job_id)
-
- return str(job_id)
-
- @classmethod
- def _GetArchiveDirectory(cls, job_id):
- """Returns the archive directory for a job.
-
- @type job_id: str
- @param job_id: Job identifier
- @rtype: str
- @return: Directory name
-
- """
- return str(int(job_id) / JOBS_PER_ARCHIVE_DIRECTORY)
-
def _NewSerialsUnlocked(self, count):
"""Generates a new job identifier.
@@ -1850,7 +1816,7 @@ class JobQueue(object):
self._UpdateJobQueueFile(constants.JOB_QUEUE_SERIAL_FILE,
"%s\n" % serial, True)
- result = [self._FormatJobID(v)
+ result = [jstore.FormatJobID(v)
for v in range(self._last_serial + 1, serial + 1)]
# Keep it only if we were able to write the file
@@ -1872,8 +1838,8 @@ class JobQueue(object):
"""
return utils.PathJoin(constants.QUEUE_DIR, "job-%s" % job_id)
- @classmethod
- def _GetArchivedJobPath(cls, job_id):
+ @staticmethod
+ def _GetArchivedJobPath(job_id):
"""Returns the archived job file for a give job id.
@type job_id: str
@@ -1883,7 +1849,8 @@ class JobQueue(object):
"""
return utils.PathJoin(constants.JOB_QUEUE_ARCHIVE_DIR,
- cls._GetArchiveDirectory(job_id), "job-%s" % job_id)
+ jstore.GetArchiveDirectory(job_id),
+ "job-%s" % job_id)
@staticmethod
def _GetJobIDsUnlocked(sort=True):
@@ -2220,7 +2187,7 @@ class JobQueue(object):
"""
if not isinstance(job_id, basestring):
- job_id = self._FormatJobID(job_id)
+ job_id = jstore.FormatJobID(job_id)
# Not using in-memory cache as doing so would require an exclusive lock
diff --git a/lib/jstore.py b/lib/jstore.py
index 88b15cc40..e735c7145 100644
--- a/lib/jstore.py
+++ b/lib/jstore.py
@@ -30,6 +30,9 @@ from ganeti import runtime
from ganeti import utils
+JOBS_PER_ARCHIVE_DIRECTORY = 10000
+
+
def _ReadNumericFile(file_name):
"""Reads a file containing a number.
@@ -168,3 +171,36 @@ def SetDrainFlag(drain_flag):
utils.RemoveFile(constants.JOB_QUEUE_DRAIN_FILE)
assert (not drain_flag) ^ CheckDrainFlag()
+
+
+def FormatJobID(job_id):
+ """Convert a job ID to string format.
+
+ Currently this just does C{str(job_id)} after performing some
+ checks, but if we want to change the job id format this will
+ abstract this change.
+
+ @type job_id: int or long
+ @param job_id: the numeric job id
+ @rtype: str
+ @return: the formatted job id
+
+ """
+ if not isinstance(job_id, (int, long)):
+ raise errors.ProgrammerError("Job ID '%s' not numeric" % job_id)
+ if job_id < 0:
+ raise errors.ProgrammerError("Job ID %s is negative" % job_id)
+
+ return str(job_id)
+
+
+def GetArchiveDirectory(job_id):
+ """Returns the archive directory for a job.
+
+ @type job_id: str
+ @param job_id: Job identifier
+ @rtype: str
+ @return: Directory name
+
+ """
+ return str(int(job_id) / JOBS_PER_ARCHIVE_DIRECTORY)
--
GitLab