From dd36d82914365048b9dfacfe68c6f0b7099c8864 Mon Sep 17 00:00:00 2001
From: Iustin Pop <iustin@google.com>
Date: Sat, 2 May 2009 22:17:01 +0200
Subject: [PATCH] Fix luxi serialization in ganeti-masterd
Currently, lib/luxi.py used lib/serializer.py for encoding/decoding
messages, but the master daemon uses directly the simplejson module.
This is wrong as any non-trivial change to serializer.py will break the
master daemon.
The patch changes masterd to use exactly the same functions as luxi.py
for encoding/decoding of messages.
Signed-off-by: Iustin Pop <iustin@google.com>
Reviewed-by: Guido Trotter <ultrotter@google.com>
---
daemons/ganeti-masterd | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/daemons/ganeti-masterd b/daemons/ganeti-masterd
index 4c6a9681c..6a73e4e23 100755
--- a/daemons/ganeti-masterd
+++ b/daemons/ganeti-masterd
@@ -36,7 +36,6 @@ import collections
import Queue
import random
import signal
-import simplejson
import logging
from cStringIO import StringIO
@@ -55,6 +54,7 @@ from ganeti import ssconf
from ganeti import workerpool
from ganeti import rpc
from ganeti import bootstrap
+from ganeti import serializer
CLIENT_REQUEST_WORKERS = 16
@@ -152,7 +152,7 @@ class ClientRqHandler(SocketServer.BaseRequestHandler):
logging.debug("client closed connection")
break
- request = simplejson.loads(msg)
+ request = serializer.LoadJson(msg)
logging.debug("request: %s", request)
if not isinstance(request, dict):
logging.error("wrong request received: %s", msg)
@@ -181,7 +181,7 @@ class ClientRqHandler(SocketServer.BaseRequestHandler):
luxi.KEY_RESULT: result,
}
logging.debug("response: %s", response)
- self.send_message(simplejson.dumps(response))
+ self.send_message(serializer.DumpJson(response))
def read_message(self):
while not self._msgs:
--
GitLab