diff --git a/eval/run_xtimes_reddit_rws.sh b/eval/run_xtimes_reddit_rws.sh index 4f6d6841e7ec123af6e347e821bf0fb58fd238fb..b6024de69738a067bd3937eda0c22f599b17d733 100755 --- a/eval/run_xtimes_reddit_rws.sh +++ b/eval/run_xtimes_reddit_rws.sh @@ -44,7 +44,7 @@ procs_per_machine=16 machines=6 global_epochs=160 eval_file=testing.py -log_level=INFO +log_level=DEBUG ip_machines=$nfs_home/configs/$machine_file # ip_addr_6Machines.json diff --git a/src/decentralizepy/communication/TCPRandomWalkRouting.py b/src/decentralizepy/communication/TCPRandomWalkRouting.py index 0557b954b09ff377341422622d7efc08514b379c..fd5f6385ec86eb1c27bb4c1bb0ff0ff56f4be47e 100644 --- a/src/decentralizepy/communication/TCPRandomWalkRouting.py +++ b/src/decentralizepy/communication/TCPRandomWalkRouting.py @@ -413,20 +413,20 @@ class TCPRandomWalkRoutingInternal(TCPRandomWalkBase): src, data = self.decrypt(sender, recv) if type(data) == tuple and data[0] == HELLO: logging.debug("Received {} from {}".format(HELLO, src)) + if data[1] == "fw at neighbor": # TODO: this is wrong + # logging.critical( + # "{} wants to connect when already connected!".format(HELLO, src) + # ) + # raise RuntimeError( + # "{} wants to connect when already connected!".format(HELLO, src) + # ) + # can happen if neighbor is + print("reconnect request from neighbor") + logging.info("reconnect request from neighbor") + return if src in self.current_neighbors: - if data[1] == "fw at neighbor": # TODO: this is wrong - # logging.critical( - # "{} wants to connect when already connected!".format(HELLO, src) - # ) - # raise RuntimeError( - # "{} wants to connect when already connected!".format(HELLO, src) - # ) - # can happen if neighbor is - print("reconnect request from neighbor") - logging.info("reconnect request from neighbor") - return - else: - logging.info("fw arrived at a neighbour") + logging.info("fw arrived at a neighbour") + print("fw arrived at a neighbour") else: logging.debug("Received {} from {}".format(data, src)) self.add_neighbors(src, data[1])