From ca52cdebe428ca0d44e429523d698f7bff05cc7c Mon Sep 17 00:00:00 2001
From: Michael Hanselmann <hansmi@google.com>
Date: Fri, 8 Aug 2008 10:01:28 +0000
Subject: [PATCH] Add job queue RPC functions
jobqueue_update: Uploads a job queue file's content to a node. The
most common operation is to upload something that we already have
in a string. Unlike in the upload_file function, the file is not
read again when distributing changes, but content has to be passed
as a string.
jobqueue_purge: Removes all queue related files from a node.
Reviewed-by: iustinp
---
daemons/ganeti-noded | 15 +++++++++++++++
lib/backend.py | 16 ++++++++++++++++
lib/rpc.py | 25 +++++++++++++++++++++++++
3 files changed, 56 insertions(+)
diff --git a/daemons/ganeti-noded b/daemons/ganeti-noded
index 50cd34c87..794afe7ba 100755
--- a/daemons/ganeti-noded
+++ b/daemons/ganeti-noded
@@ -529,6 +529,21 @@ class NodeDaemonRequestHandler(http.HTTPRequestHandler):
return backend.RenameFileStorageDir(old_file_storage_dir,
new_file_storage_dir)
+ @staticmethod
+ def perspective_jobqueue_update(params):
+ """Update job queue.
+
+ """
+ (file_name, content) = params
+ return backend.JobQueueUpdate(file_name, content)
+
+ @staticmethod
+ def perspective_jobqueue_purge(params):
+ """Purge job queue.
+
+ """
+ return backend.JobQueuePurge()
+
class NodeDaemonHttpServer(http.HTTPServer):
def __init__(self, server_address):
diff --git a/lib/backend.py b/lib/backend.py
index 47570c0e0..b61f6cc1c 100644
--- a/lib/backend.py
+++ b/lib/backend.py
@@ -1658,6 +1658,22 @@ def RenameFileStorageDir(old_file_storage_dir, new_file_storage_dir):
return result
+def JobQueueUpdate(file_name, content):
+ """Updates a file in the queue directory.
+
+ """
+ queue_dir = os.path.normpath(constants.QUEUE_DIR)
+ if os.path.commonprefix([queue_dir, file_name]) != queue_dir:
+ logging.error("'%s' is not a file in the queue directory",
+ file_name)
+ return False
+
+ # Write and replace the file atomically
+ utils.WriteFile(file_name, data=content)
+
+ return True
+
+
def JobQueuePurge():
"""Removes job queue files and archived jobs
diff --git a/lib/rpc.py b/lib/rpc.py
index 68ac0bc70..368d1f713 100644
--- a/lib/rpc.py
+++ b/lib/rpc.py
@@ -801,3 +801,28 @@ def call_file_storage_dir_rename(node, old_file_storage_dir,
c.connect(node)
c.run()
return c.getresult().get(node, False)
+
+
+def call_jobqueue_update(node_list, file_name, content):
+ """Update job queue.
+
+ This is a multi-node call.
+
+ """
+ c = Client("jobqueue_update", [file_name, content])
+ c.connect_list(node_list)
+ c.run()
+ result = c.getresult()
+ return result
+
+
+def call_jobqueue_purge(node):
+ """Purge job queue.
+
+ This is a single-node call.
+
+ """
+ c = Client("jobqueue_purge", [])
+ c.connect(node)
+ c.run()
+ return c.getresult().get(node, False)
--
GitLab