Back to basics - lets fix it on the filewriter

Author: André Costa

dashboard/generate.py

@@ -141,86 +141,37 @@ def efu_get_version(self, ipaddr, port):
             self.dprint("connection reset (by peer?)")
             return "connection reset (by peer?)"
 
+   
     def check_fw_pipeline(self, ipaddr, port):
         if self.test:
             return 5
-        
-        retry_attempts = 3
-        retry_delay = 2 
-        last_exception = None
-
-        for attempt in range(retry_attempts):
-            s = None
-            try:
-                s = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
-                
-                s.settimeout(3.0)
-                s.connect((ipaddr, port))
-                
-                s.settimeout(20.0)
-                s.shutdown(socket.SHUT_WR)
-
-                buffer = ""
-                while True:
-                    try:
-                        chunk = s.recv(4096).decode('utf-8', errors='ignore')
-                        if not chunk:
-                            break
-                        buffer += chunk
-                    except socket.timeout:
-                        break
-                
-                buffer = buffer.strip()
-                if not buffer:
-                    raise ConnectionError("No data received from socket")
-
-                all_objects = []
-                decoder = json.JSONDecoder()
-                pos = 0
-                while pos < len(buffer):
-                    try:
-                        obj, pos = decoder.raw_decode(buffer, pos)
-                        all_objects.append(obj)
-                    except json.JSONDecodeError:
-                        break
-                
-                if not all_objects:
-                    raise ValueError("Could not parse any JSON objects from received data")
-
-                found_val = None
-                def find_in_obj(target):
-                    nonlocal found_val
-                    if isinstance(target, list):
-                        for item in reversed(target):
-                            find_in_obj(item)
-                            if found_val is not None: return
-                    elif isinstance(target, dict):
-                        for key, value in target.items():
-                            if key.endswith(".worker_state"):
-                                found_val = int(value)
-                                return
-                
-                find_in_obj(all_objects)
-                
-                if found_val is not None:
-                    return found_val
-
-                print(f"worker_state not found for {ipaddr}:{port}. No further retries for this cycle.")
-                return -1
-
-            except (OSError, ConnectionError, ValueError) as e:
-                last_exception = e
-                print(f"Attempt {attempt + 1}/{retry_attempts} for {ipaddr}:{port} failed: {e}")
-                if attempt < retry_attempts - 1:
-                    print(f"Retrying in {retry_delay} seconds...")
-                    time.sleep(retry_delay)
-
-            finally:
-                if s:
-                    s.close()
-        
-        print(f"All {retry_attempts} attempts failed for {ipaddr}:{port}. Last error: {last_exception}")
-        return -1
+        try:
+            s = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
+            s.settimeout(3.0)
+            s.connect((ipaddr, port))
+            
+            s.settimeout(20.0)
+            s.shutdown(socket.SHUT_WR)
+            
+            data = b""
+            while True:
+                chunk = s.recv(4096)
+                if not chunk:
+                    break
+                data += chunk
+            lines = data.decode("utf-8", errors="ignore").strip().splitlines()
+            for line in lines:
+                try:
+                    obj = json.loads(line)
+                    for key, value in obj.items():
+                        if key.endswith(".worker_state"):
+                            return int(value)
+                except Exception as e:
+                    self.dprint(f"JSON parse error: {e}")
+            return -1
+        except OSError as e:
+            self.dprint(f"Socket error: {e}")
+            return -1
 
     def check_efu_pipeline(self, ipaddr, port):
         if self.test:
@@ -262,12 +213,13 @@ def check_service(self, idx, type, ipaddr, port):
                 self.lab.servers[idx][9] = self.efu_get_version(ipaddr, port)
             elif type == type_fw:
                 status = self.check_fw_pipeline(ipaddr, port)
-                if status == -1 or status == 0:
+                if status:
                     self.lab.clearstatus(
                         idx, self.s_stage1 | self.s_stage2 | self.s_stage3
                     )
                 else:
-                    self.lab.setstatus(idx, status)
+                    # If there is no status we change it to "server running"
+                    self.lab.setstatus(idx, 0)
             else:
                 self.lab.setstatus(idx, self.s_stage1 | self.s_stage2 | self.s_stage3)
         else: