Convert rpc module to RpcRunner

[ganeti-local] / daemons / ganeti-masterd

diff --git a/daemons/ganeti-masterd b/daemons/ganeti-masterd
index 1c884bb..06886f3 100755 (executable)
--- a/daemons/ganeti-masterd
+++ b/daemons/ganeti-masterd
@@ -216,6 +216,10 @@ class ClientOps:
       job_id = args
       return queue.ArchiveJob(job_id)
 
+    elif method == luxi.REQ_AUTOARCHIVE_JOBS:
+      age = args
+      return queue.AutoArchiveJobs(age)
+
     elif method == luxi.REQ_WAIT_FOR_JOB_CHANGE:
       (job_id, fields, prev_job_info, prev_log_serial, timeout) = args
       return queue.WaitForJobChanges(job_id, fields, prev_job_info,
@@ -257,7 +261,7 @@ class ClientOps:
     """
     proc = mcpu.Processor(self.server.context)
     # TODO: Where should log messages go?
-    return proc.ExecOpCode(op, self._DummyLog)
+    return proc.ExecOpCode(op, self._DummyLog, None)
 
 
 class GanetiContext(object):
@@ -377,7 +381,7 @@ def CheckAgreement():
     # either single node cluster, or a misconfiguration, but I won't
     # break any other node, so I can proceed
     return True
-  results = rpc.call_master_info(node_list)
+  results = rpc.RpcRunner.call_master_info(node_list)
   if not isinstance(results, dict):
     # this should not happen (unless internal error in rpc)
     logging.critical("Can't complete rpc call, aborting master startup")
@@ -441,7 +445,7 @@ def main():
 
   # activate ip
   master_node = ssconf.SimpleConfigReader().GetMasterNode()
-  if not rpc.call_node_start_master(master_node, False):
+  if not rpc.RpcRunner.call_node_start_master(master_node, False):
     logging.error("Can't activate master IP address")
 
   master.setup_queue()