feat(chunk-server): make chunk-server port configurable (closes #19)

menuka94 · Sep 29, 2021 · f3fe963 · f3fe963
1 parent 18f92ae
commit f3fe963
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 13 deletions.
diff --git a/src/main/java/cs555/hw1/node/chunkServer/ChunkServer.java b/src/main/java/cs555/hw1/node/chunkServer/ChunkServer.java
@@ -63,7 +63,7 @@ public class ChunkServer implements Node {
 
     private String hostName;
 
-    public ChunkServer(Socket controllerSocket) throws IOException {
+    public ChunkServer(Socket controllerSocket, int port) throws IOException {
         log.info("Initializing ChunkServer on {}", System.getenv("HOSTNAME"));
         controllerConnection = new TCPConnection(controllerSocket, this);
         filesMap = new HashMap<>();
@@ -75,7 +75,7 @@ public ChunkServer(Socket controllerSocket) throws IOException {
         hostName = controllerSocket.getLocalAddress().getHostName();
 
         tcpConnectionsCache = new TCPConnectionsCache();
-        tcpServerThread = new TCPServerThread(0, this, tcpConnectionsCache);
+        tcpServerThread = new TCPServerThread(port, this, tcpConnectionsCache);
         commandParser = new InteractiveCommandParser(this);
         sendRegistrationRequestToController();
     }
@@ -154,18 +154,19 @@ private void ReadFilesFromDisk() {
     }
 
     public static void main(String[] args) throws IOException {
-        if (args.length < 2) {
+        if (args.length < 3) {
             System.out.println("Not enough arguments to start ChunkServer. " +
-                    "Enter <controller-host> and <controller-port>");
+                    "Enter <controller-host> and <controller-port> <chunk-server-port>");
             System.exit(1);
-        } else if (args.length > 2) {
-            System.out.println("Invalid number of arguments. Provide <controller-host> and <controller-port>");
+        } else if (args.length > 3) {
+            System.out.println("Invalid number of arguments. Provide <controller-host> <controller-port> <chunk-server-port>");
         }
 
         String controllerHost = args[0];
         int controllerPort = Integer.parseInt(args[1]);
+        int chunkServerPort = Integer.parseInt(args[2]);
         Socket controllerSocket = new Socket(controllerHost, controllerPort);
-        ChunkServer chunkServer = new ChunkServer(controllerSocket);
+        ChunkServer chunkServer = new ChunkServer(controllerSocket, chunkServerPort);
         chunkServer.initialize();
         TCPConnection tcpConnection;
         if (chunkServer.tcpConnectionsCache.containsConnection(controllerSocket)) {
@@ -305,11 +306,11 @@ private synchronized void handleRetrieveChunkRequest(Event event) {
             //if(request.getSocket().getInetAddress().getHostName().contains("pollock")){
             if (corrupted | corruptedChunk) {
                 //notify Controller
-                ReportChunkCorruption reportCorChunk = new ReportChunkCorruption();
-                reportCorChunk.setChunkName(chunkName);
+                ReportChunkCorruption reportChunkCorruption = new ReportChunkCorruption();
+                reportChunkCorruption.setChunkName(chunkName);
                 try {
                     log.info("ChunkServer {} is notifying controller about chunk corruption", hostName);
-                    controllerConnection.sendData(reportCorChunk.getBytes());
+                    controllerConnection.sendData(reportChunkCorruption.getBytes());
                 } catch (IOException e) {
                     log.error(e.getLocalizedMessage());
                     e.printStackTrace();
@@ -331,6 +332,7 @@ private synchronized void handleRetrieveChunkRequest(Event event) {
             if (tcpConnectionsCache.containsConnection(clientSocket)) {
                 clientConnection = tcpConnectionsCache.getConnection(clientSocket);
             } else {
+                log.warn("Connection does not exist in cache");
                 clientConnection = new TCPConnection(clientSocket, this);
             }
 

diff --git a/start-chunk-server.sh b/start-chunk-server.sh
@@ -4,4 +4,4 @@ JAR_FILE=../../../libs/cs555-hw1-1.0.jar
 CLASSES_DIR=build/classes/java/main
 
 # Start Client on boston
-cd ${CLASSES_DIR} && java -cp ${JAR_FILE} cs555.hw1.node.chunkServer.ChunkServer arkansas 9000
+cd ${CLASSES_DIR} && java -cp ${JAR_FILE} cs555.hw1.node.chunkServer.ChunkServer arkansas 9000 9001
diff --git a/start-chunk-servers.sh b/start-chunk-servers.sh
@@ -21,10 +21,9 @@ declare -a CHUNK_SERVERS=(
   "berlin"
   "cairo"
   "lima"
-  "london"
 )
 
 for CHUNK_SERVER in "${CHUNK_SERVERS[@]}"
 do
-  xterm -hold -title "ChunkServer: ${CHUNK_SERVER}"  -e "ssh -t ${CHUNK_SERVER} \"cd ${CLASSES_DIR} && java -cp ${JAR_FILE} cs555.hw1.node.chunkServer.ChunkServer arkansas 9000\"" &
+  xterm -hold -title "ChunkServer: ${CHUNK_SERVER}"  -e "ssh -t ${CHUNK_SERVER} \"cd ${CLASSES_DIR} && java -cp ${JAR_FILE} cs555.hw1.node.chunkServer.ChunkServer arkansas 9000 9001\"" &
 done