[PATCH master 6/8] Remove unused GetLockInfo from dependency manager

['Klaus Aehlig' via ganeti-devel]

...as removing dead code keeps the code base cleaner.

Signed-off-by: Klaus Aehlig <aeh...@google.com>
---
 lib/jqueue/__init__.py            | 16 ----------------
 test/py/ganeti.jqueue_unittest.py | 17 -----------------
 2 files changed, 33 deletions(-)

diff --git a/lib/jqueue/__init__.py b/lib/jqueue/__init__.py
index 2fdad91..0aa9665 100644
--- a/lib/jqueue/__init__.py
+++ b/lib/jqueue/__init__.py
@@ -1161,22 +1161,6 @@ class _JobDependencyManager:
     self._lock = locking.SharedLock("JobDepMgr")
 
   @locking.ssynchronized(_LOCK, shared=1)
-  def GetLockInfo(self, requested): # pylint: disable=W0613
-    """Retrieves information about waiting jobs.
-
-    @type requested: set
-    @param requested: Requested information, see C{query.LQ_*}
-
-    """
-    # No need to sort here, that's being done by the lock manager and query
-    # library. There are no priorities for notifying jobs, hence all show up as
-    # one item under "pending".
-    return [("job/%s" % job_id, None, None,
-             [("job", [job.id for job in waiters])])
-            for job_id, waiters in self._waiters.items()
-            if waiters]
-
-  @locking.ssynchronized(_LOCK, shared=1)
   def JobWaiting(self, job):
     """Checks if a job is waiting.
 
diff --git a/test/py/ganeti.jqueue_unittest.py 
b/test/py/ganeti.jqueue_unittest.py
index 4080662..c13749d 100755
--- a/test/py/ganeti.jqueue_unittest.py
+++ b/test/py/ganeti.jqueue_unittest.py
@@ -1865,9 +1865,6 @@ class TestJobDependencyManager(unittest.TestCase):
     self.assertEqual(self.jdm._waiters, {
       job_id: set([job]),
       })
-    self.assertEqual(self.jdm.GetLockInfo([query.LQ_PENDING]), [
-      ("job/28625", None, None, [("job", [job.id])])
-      ])
 
     self._status.append((job_id, constants.JOB_STATUS_CANCELED))
     (result, _) = self.jdm.CheckAndRegister(job, job_id, [])
@@ -1875,7 +1872,6 @@ class TestJobDependencyManager(unittest.TestCase):
     self.assertFalse(self._status)
     self.assertFalse(self._queue)
     self.assertFalse(self.jdm.JobWaiting(job))
-    self.assertFalse(self.jdm.GetLockInfo([query.LQ_PENDING]))
 
   def testNotFinalizedThenQueued(self):
     # This can happen on a queue shutdown
@@ -1895,9 +1891,6 @@ class TestJobDependencyManager(unittest.TestCase):
       self.assertEqual(self.jdm._waiters, {
         job_id: set([job]),
         })
-      self.assertEqual(self.jdm.GetLockInfo([query.LQ_PENDING]), [
-        ("job/22971", None, None, [("job", [job.id])])
-        ])
 
   def testRequireCancel(self):
     job = _IdOnlyFakeJob(5278)
@@ -1913,9 +1906,6 @@ class TestJobDependencyManager(unittest.TestCase):
     self.assertEqual(self.jdm._waiters, {
       job_id: set([job]),
       })
-    self.assertEqual(self.jdm.GetLockInfo([query.LQ_PENDING]), [
-      ("job/9610", None, None, [("job", [job.id])])
-      ])
 
     self._status.append((job_id, constants.JOB_STATUS_CANCELED))
     (result, _) = self.jdm.CheckAndRegister(job, job_id, dep_status)
@@ -1923,7 +1913,6 @@ class TestJobDependencyManager(unittest.TestCase):
     self.assertFalse(self._status)
     self.assertFalse(self._queue)
     self.assertFalse(self.jdm.JobWaiting(job))
-    self.assertFalse(self.jdm.GetLockInfo([query.LQ_PENDING]))
 
   def testRequireError(self):
     job = _IdOnlyFakeJob(21459)
@@ -1946,7 +1935,6 @@ class TestJobDependencyManager(unittest.TestCase):
     self.assertFalse(self._status)
     self.assertFalse(self._queue)
     self.assertFalse(self.jdm.JobWaiting(job))
-    self.assertFalse(self.jdm.GetLockInfo([query.LQ_PENDING]))
 
   def testRequireMultiple(self):
     dep_status = list(constants.JOBS_FINALIZED)
@@ -1964,9 +1952,6 @@ class TestJobDependencyManager(unittest.TestCase):
       self.assertEqual(self.jdm._waiters, {
         job_id: set([job]),
         })
-      self.assertEqual(self.jdm.GetLockInfo([query.LQ_PENDING]), [
-        ("job/14609", None, None, [("job", [job.id])])
-        ])
 
       self._status.append((job_id, end_status))
       (result, _) = self.jdm.CheckAndRegister(job, job_id, dep_status)
@@ -1974,7 +1959,6 @@ class TestJobDependencyManager(unittest.TestCase):
       self.assertFalse(self._status)
       self.assertFalse(self._queue)
       self.assertFalse(self.jdm.JobWaiting(job))
-      self.assertFalse(self.jdm.GetLockInfo([query.LQ_PENDING]))
 
   def testWrongStatus(self):
     job = _IdOnlyFakeJob(10102)
@@ -2055,7 +2039,6 @@ class TestJobDependencyManager(unittest.TestCase):
     (result, _) = jdm.CheckAndRegister(job, job_id, [])
     self.assertEqual(result, self.jdm.ERROR)
     self.assertFalse(jdm.JobWaiting(job))
-    self.assertFalse(jdm.GetLockInfo([query.LQ_PENDING]))
 
 
 if __name__ == "__main__":
-- 
2.2.0.rc0.207.ga3a616c