From f103cae799229233715f287ac24203c283cb01d1 Mon Sep 17 00:00:00 2001
From: Jeffrey Wigger <jeffrey.wigger@epfl.ch>
Date: Mon, 13 Jun 2022 14:37:43 +0200
Subject: [PATCH] neighbor fixes 2
---
eval/run_xtimes_reddit_rws.sh | 2 +-
.../communication/TCPRandomWalkRouting.py | 26 +++++++++----------
2 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/eval/run_xtimes_reddit_rws.sh b/eval/run_xtimes_reddit_rws.sh
index 4f6d684..b6024de 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 0557b95..fd5f638 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])
--
GitLab