diff --git a/Local-Without-Prediction/docker-compose.yml b/Local-Without-Prediction/docker-compose.yml index 5d5ffc793d2fbb0f32c532e4f115f7d7175dcc81..e3eff020e2a77ae2ddfe2a05f2174a7b2f93a26d 100644 --- a/Local-Without-Prediction/docker-compose.yml +++ b/Local-Without-Prediction/docker-compose.yml @@ -2,7 +2,7 @@ version: '3.8' services: node0: - image: comlocal:1.0 + image: local-comm container_name: node0 environment: - RANK=0 @@ -13,8 +13,9 @@ services: networks: - my_network + node1: - image: comlocal:1.0 + image: local-comm container_name: node1 environment: - RANK=1 @@ -25,8 +26,9 @@ services: networks: - my_network + node2: - image: comlocal:1.0 + image: local-comm container_name: node2 environment: - RANK=2 @@ -39,7 +41,7 @@ services: node3: - image: comlocal:1.0 + image: local-comm container_name: node3 environment: - RANK=3 diff --git a/Local-Without-Prediction/generate-docker-compose.py b/Local-Without-Prediction/generate-docker-compose.py index c3e0c5cd9522f17e3a52b35197fcd7eb410900ac..817bd1626ed31655f8bb90e5711390e578f18212 100644 --- a/Local-Without-Prediction/generate-docker-compose.py +++ b/Local-Without-Prediction/generate-docker-compose.py @@ -1,6 +1,6 @@ import sys -image = 'mohamadmoussa/' +image = 'local-comm' def generate_docker_compose(num_nodes): docker_compose_template = """\ diff --git a/Local-Without-Prediction/sock.py b/Local-Without-Prediction/sock.py index 12266d791d680b71f6592970d222f860ca227b2c..63e011744d6d4891e59151f123d17dce3cb39290 100644 --- a/Local-Without-Prediction/sock.py +++ b/Local-Without-Prediction/sock.py @@ -11,10 +11,13 @@ logging.basicConfig(level=logging.INFO, format='%(asctime)s %(levelname)s %(mess logger = logging.getLogger(__name__) -def send_Message(sock,src,dest,msg): - sock.connect((dest, base_port)) +def send_Message(src,dest,msg): + client_socket = socket.socket(socket.AF_INET, socket.SOCK_STREAM) + client_socket.connect((dest, base_port)) data = json.dumps((msg, src)) - sock.send(data.encode()) + client_socket.send(data.encode()) + time.sleep (3) + client_socket.close() def mainProg(neighbors, rank, base_port, ip_address): c = 0 @@ -32,11 +35,8 @@ def mainProg(neighbors, rank, base_port, ip_address): for neighbor in neighbors: try: neighbor_ip = f"node{neighbor}" - client_socket = socket.socket(socket.AF_INET, socket.SOCK_STREAM) - send_Message(client_socket,rank,neighbor_ip,"REQUEST_WEIGHT") - logger.info(f"Rank {rank} sent REQUEST_WEIGHT to {neighbor} at iteration {iteration}") - time.sleep(3) - client_socket.close() + send_Message(rank,neighbor_ip,"REQUEST_WEIGHT") + #logger.info(f"Rank {rank} sent REQUEST_WEIGHT to {neighbor} at iteration {iteration}") except ConnectionRefusedError as e: logger.error(f"Exception {e}\nConnection refused when {rank} tried to connect to {neighbor}'s service {neighbor_ip}.") continue @@ -53,11 +53,8 @@ def mainProg(neighbors, rank, base_port, ip_address): if message_rcvd == "REQUEST_WEIGHT": try: - sender_ip = f"node{sender}" - cl_socket = socket.socket(socket.AF_INET, socket.SOCK_STREAM) - send_Message(cl_socket,rank,sender_ip,"WEIGHTS") - time.sleep(3) - cl_socket.close() + sender = f"node{sender}" + send_Message(rank,sender,"WEIGHTS") except ConnectionRefusedError as e: logger.error(f"Exception {e}\nConnection refused when {rank} tried to send WEIGHTS to {sender}'s service {sender_ip}.") continue