Skip to contentSkip to conversation

cooker: Use hash client to ping upstream server

PATCH In review Joshua Watt 1 participant 2 messages May 2, 2024

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 cooker: Use hash client to ping upstream server

The cooker attempts to connect to the upstream hash equivalent server to warn the user early if it is misconfigured. However, this was making the assumption that it was a raw TCP connection and failed when attempting to use a websocket upstream server. Fix this by creating an hash client and using the ping API to check the server instead of using a raw socket.

---
 bitbake/lib/bb/cooker.py | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)
bitbake/lib/bb/cooker.py +3 -4
index c5bfef55d67..25b614f1e44 100644
@@ -315,11 +315,10 @@ class BBCooker:
                 dbfile = (self.data.getVar("PERSISTENT_DIR") or self.data.getVar("CACHE")) + "/hashserv.db"
                 upstream = self.data.getVar("BB_HASHSERVE_UPSTREAM") or None
                 if upstream:
-                    import socket
                     try:
-                        sock = socket.create_connection(upstream.split(":"), 5)
-                        sock.close()
-                    except socket.error as e:
+                        with hashserv.create_client(upstream) as client:
+                            client.ping()
+                    except ConnectionError as e:
                         bb.warn("BB_HASHSERVE_UPSTREAM is not valid, unable to connect hash equivalence server at '%s': %s"
                                  % (upstream, repr(e)))
 
Signature · 1 line
2.34.1
#1 lore raw

Disregard. Wrong mailing list

Quoted 35 lines · Joshua Watt

The cooker attempts to connect to the upstream hash equivalent server to warn the user early if it is misconfigured. However, this was making the assumption that it was a raw TCP connection and failed when attempting to use a websocket upstream server. Fix this by creating an hash client and using the ping API to check the server instead of using a raw socket.

---
 bitbake/lib/bb/cooker.py | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)
bitbake/lib/bb/cooker.py +3 -5
index c5bfef55d67..25b614f1e44 100644
@@ -315,11 +315,10 @@ class BBCooker:
                 dbfile = (self.data.getVar("PERSISTENT_DIR") or self.data.getVar("CACHE")) + "/hashserv.db"
                 upstream = self.data.getVar("BB_HASHSERVE_UPSTREAM") or None
                 if upstream:
-                    import socket
                     try:
-                        sock = socket.create_connection(upstream.split(":"), 5)
-                        sock.close()
-                    except socket.error as e:
+                        with hashserv.create_client(upstream) as client:
+                            client.ping()
+                    except ConnectionError as e:
                         bb.warn("BB_HASHSERVE_UPSTREAM is not valid, unable to connect hash equivalence server at '%s': %s"
                                  % (upstream, repr(e)))
 
--

2.34.1