diff options
Diffstat (limited to 'src')
2 files changed, 38 insertions, 10 deletions
diff --git a/src/com.gluster.storage.management.server.scripts/src/nodes/PeerAgent.py b/src/com.gluster.storage.management.server.scripts/src/nodes/PeerAgent.py index a09e055a..6218e921 100755 --- a/src/com.gluster.storage.management.server.scripts/src/nodes/PeerAgent.py +++ b/src/com.gluster.storage.management.server.scripts/src/nodes/PeerAgent.py @@ -181,12 +181,27 @@ def main(): try: requestString = Socket.readPacket(clientInputStream) Utils.log('__DEBUG__ Received %s' % repr(requestString)) - responseString = executeCommand(requestString) - if responseString: - Socket.writePacket(clientOutputStream, responseString) + requestParts = requestString.split(None, 3) + + if "get_file" == requestParts[0]: + if len(requestParts) != 2: + rs = ResponseXml() + rs.appendTagRoute("status.code", "-1") + rs.appendTagRoute("status.message", "File path not passed") + Socket.writePacket(clientOutputStream, rs.toprettyxml()) + else: + filePath = requestParts[1] + fp = open(filePath) + clientSocket.sendall(fp.read()) + fp.close() clientOutputStream.flush() else: - Utils.log('__DEBUG__ empty response string') + responseString = executeCommand(requestString) + if responseString: + Socket.writePacket(clientOutputStream, responseString) + clientOutputStream.flush() + else: + Utils.log('__DEBUG__ empty response string') Utils.log('__DEBUG__ Closing client %s' % str(clientAddress)) clientSocket.close() except socket.error, e: diff --git a/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/utils/ServerUtil.java b/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/utils/ServerUtil.java index 59dc36c2..20f5252d 100644 --- a/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/utils/ServerUtil.java +++ b/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/utils/ServerUtil.java @@ -106,17 +106,30 @@ public class ServerUtil { Socket connection = new Socket(address, 50000); PrintWriter writer = new PrintWriter(connection.getOutputStream(), true); - InputStream inputStream = connection.getInputStream(); - writer.println(commandWithArgs); writer.println(); // empty line means end of request + InputStream inputStream = connection.getInputStream(); int available = inputStream.available(); - byte[] responseData = new byte[available]; - inputStream.read(responseData); + + StringBuffer output = new StringBuffer(); + if( available > 0 ) { + // This happens when PeerAgent sends complete file + byte[] responseData = new byte[available]; + inputStream.read(responseData); + output.append(new String(responseData, "UTF-8")); + } else { + // This happens in case of normal XML response from PeerAgent + BufferedReader reader = new BufferedReader(new InputStreamReader(inputStream, "UTF-8")); + + String line; + while (!(line = reader.readLine()).trim().isEmpty()) { + output.append(line + CoreConstants.NEWLINE); + } + } connection.close(); - return new String(responseData, "UTF-8"); + return output.toString(); } catch (Exception e) { throw new GlusterRuntimeException("Error during remote execution: [" + e.getMessage() + "]"); } @@ -170,4 +183,4 @@ public class ServerUtil { public Status getDiskForDir(String serverName, String brickDir) { return (Status) executeOnServer(true, serverName, REMOTE_SCRIPT_GET_DISK_FOR_DIR + " " + brickDir, Status.class); } -}
\ No newline at end of file +} |