X-Git-Url: https://code.grnet.gr/git/ganeti-local/blobdiff_plain/25d6d12a220380c9614dc76bbacba744f6a7c50b..4e071d3b89793af09f2f84304b182257221cb6b5:/daemons/ganeti-noded

diff --git a/daemons/ganeti-noded b/daemons/ganeti-noded
index 79116ff..3de30d3 100755
--- a/daemons/ganeti-noded
+++ b/daemons/ganeti-noded
@@ -48,6 +48,21 @@ from ganeti import utils
 queue_lock = None
 
 
+def _RequireJobQueueLock(fn):
+  """Decorator for job queue manipulating functions.
+
+  """
+  def wrapper(*args, **kwargs):
+    # Locking in exclusive, blocking mode because there could be several
+    # children running at the same time. Waiting up to 10 seconds.
+    queue_lock.Exclusive(blocking=True, timeout=10)
+    try:
+      return fn(*args, **kwargs)
+    finally:
+      queue_lock.Unlock()
+  return wrapper
+
+
 class NodeDaemonRequestHandler(http.HTTPRequestHandler):
   """The server implementation.
 
@@ -457,6 +472,12 @@ class NodeDaemonRequestHandler(http.HTTPRequestHandler):
     """
     return backend.UploadFile(*params)
 
+  @staticmethod
+  def perspective_master_info(params):
+    """Query master information.
+
+    """
+    return backend.GetMasterInfo()
 
   # os -----------------------
 
@@ -511,6 +532,8 @@ class NodeDaemonRequestHandler(http.HTTPRequestHandler):
     duration = params[0]
     return utils.TestDelay(duration)
 
+  # file storage ---------------
+
   @staticmethod
   def perspective_file_storage_dir_create(params):
     """Create the file storage directory.
@@ -537,29 +560,35 @@ class NodeDaemonRequestHandler(http.HTTPRequestHandler):
     return backend.RenameFileStorageDir(old_file_storage_dir,
                                         new_file_storage_dir)
 
+  # jobs ------------------------
+
   @staticmethod
+  @_RequireJobQueueLock
   def perspective_jobqueue_update(params):
     """Update job queue.
 
     """
     (file_name, content) = params
-
-    # Locking in exclusive, blocking mode because there could be several
-    # children running at the same time.
-    # TODO: Implement nonblocking locking with retries?
-    queue_lock.Exclusive(blocking=True)
-    try:
-      return backend.JobQueueUpdate(file_name, content)
-    finally:
-      queue_lock.Unlock()
+    return backend.JobQueueUpdate(file_name, content)
 
   @staticmethod
+  @_RequireJobQueueLock
   def perspective_jobqueue_purge(params):
     """Purge job queue.
 
     """
     return backend.JobQueuePurge()
 
+  @staticmethod
+  @_RequireJobQueueLock
+  def perspective_jobqueue_rename(params):
+    """Rename a job queue file.
+
+    """
+    (old, new) = params
+
+    return backend.JobQueueRename(old, new)
+
 
 class NodeDaemonHttpServer(http.HTTPServer):
   def __init__(self, server_address):