Skip to content

Commit 984ab6f

Browse files
committed
ci debug
1 parent 0299439 commit 984ab6f

File tree

3 files changed

+23
-10
lines changed

3 files changed

+23
-10
lines changed

chia/_tests/farmer_harvester/test_third_party_harvesters.py

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -92,9 +92,9 @@ async def test_harvester_receive_source_signing_data(
9292
UnresolvedPeerInfo(str(full_node_service_1.self_hostname), full_node_service_1._server.get_port())
9393
)
9494

95-
await wait_until_node_type_connected(farmer.server, NodeType.FULL_NODE)
96-
await wait_until_node_type_connected(farmer.server, NodeType.HARVESTER) # Should already be connected
97-
await wait_until_node_type_connected(full_node_1.server, NodeType.FULL_NODE)
95+
await time_out_assert(60, node_type_connected, True, farmer.server, NodeType.FULL_NODE)
96+
await time_out_assert(60, node_type_connected, True, farmer.server, NodeType.HARVESTER)
97+
await time_out_assert(60, node_type_connected, True, full_node_1.server, NodeType.FULL_NODE)
9898

9999
# Prepare test data
100100
blocks: list[FullBlock]
@@ -429,12 +429,11 @@ def log_has_new_text() -> bool:
429429
return False
430430

431431

432-
async def wait_until_node_type_connected(server: ChiaServer, node_type: NodeType) -> WSChiaConnection:
433-
while True:
434-
for peer in server.all_connections.values():
435-
if peer.connection_type == node_type.value:
436-
return peer
437-
await asyncio.sleep(1)
432+
def node_type_connected(server: ChiaServer, node_type: NodeType) -> bool:
433+
for peer in server.all_connections.values():
434+
if peer.connection_type == node_type.value:
435+
return True
436+
return False
438437

439438

440439
def decode_sp(

chia/server/server.py

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -425,6 +425,7 @@ async def start_client(
425425
"""
426426
if self.is_duplicate_or_self_connection(target_node):
427427
self.log.warning(f"cannot connect to {target_node.host}, duplicate/self connection")
428+
print(f"cannot connect to {target_node.host}, duplicate/self connection")
428429
return False
429430

430431
if target_node.host in self.banned_peers and time.time() < self.banned_peers[target_node.host]:
@@ -452,15 +453,19 @@ async def start_client(
452453
)
453454
except ServerDisconnectedError:
454455
self.log.debug(f"Server disconnected error connecting to {url}. Perhaps we are banned by the peer.")
456+
print(f"Server disconnected error connecting to {url}. Perhaps we are banned by the peer.")
455457
return False
456458
except ClientResponseError as e:
457459
self.log.warning(f"Connection failed to {url}. Error: {e}")
460+
print(f"Connection failed to {url}. Error: {e}")
458461
return False
459462
except asyncio.TimeoutError:
460463
self.log.debug(f"Timeout error connecting to {url}")
464+
print(f"Timeout error connecting to {url}")
461465
return False
462466
if ws is None:
463467
self.log.warning(f"Connection failed to {url}. ws was None")
468+
print(f"Connection failed to {url}. ws was None")
464469
return False
465470

466471
ssl_object = ws.get_extra_info("ssl_object")

chia/server/start_service.py

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -149,28 +149,35 @@ def __init__(
149149
async def _connect_peers_task_handler(self) -> None:
150150
resolved_peers: dict[UnresolvedPeerInfo, PeerInfo] = {}
151151
prefer_ipv6 = self.config.get("prefer_ipv6", False)
152+
print(f"connect peers task started {self._connect_peers}")
152153
while True:
153154
for unresolved in self._connect_peers:
155+
print(f"connect peers task started {self._connect_peers}")
156+
print(f"try peer {unresolved}")
154157
resolved = resolved_peers.get(unresolved)
155158
if resolved is None:
156159
try:
157160
resolved = PeerInfo(await resolve(unresolved.host, prefer_ipv6=prefer_ipv6), unresolved.port)
158161
except Exception as e:
162+
print(f"Failed to resolve {unresolved.host}: {e}")
159163
self._log.warning(f"Failed to resolve {unresolved.host}: {e}")
160164
continue
161165
self._log.info(f"Add resolved {resolved}")
162166
resolved_peers[unresolved] = resolved
163167

164168
if any(connection.peer_info == resolved for connection in self._server.all_connections.values()):
169+
print(f"step 1. {resolved} {self._server.all_connections.values()}")
165170
continue
166171
if any(
167172
connection.peer_info.host == resolved.host and connection.peer_server_port == resolved.port
168173
for connection in self._server.all_connections.values()
169174
):
175+
print("step 2")
170176
continue
171-
177+
print(f"connect to {resolved}")
172178
if not await self._server.start_client(resolved, None):
173179
self._log.info(f"Failed to connect to {resolved}")
180+
print(f"Failed to connect to {resolved}")
174181
# Re-resolve to make sure the IP didn't change, this helps for example to keep dyndns hostnames
175182
# up to date.
176183
try:
@@ -179,9 +186,11 @@ async def _connect_peers_task_handler(self) -> None:
179186
)
180187
except Exception as e:
181188
self._log.warning(f"Failed to resolve after connection failure {unresolved.host}: {e}")
189+
print(f"Failed to resolve after connection failure {unresolved.host}: {e}")
182190
continue
183191
if resolved_new != resolved:
184192
self._log.info(f"Host {unresolved.host} changed from {resolved} to {resolved_new}")
193+
print(f"Host {unresolved.host} changed from {resolved} to {resolved_new}")
185194
resolved_peers[unresolved] = resolved_new
186195
await asyncio.sleep(self.reconnect_retry_seconds)
187196

0 commit comments

Comments
 (0)