Keep invalid container states from dropping host heartbeats

static/agent/ec-agent.py

@@ -32,7 +32,7 @@ import urllib.parse
 import urllib.request
 import uuid
 
-VERSION = "1.4.11"
+VERSION = "1.4.12"
 LABEL = "io.electric-cherry"
 MAX_FILE = 32 * 1024 * 1024
 MANIFEST_MAX_ENTRIES = 10000
@@ -1054,7 +1054,7 @@ class Agent:
             raise AgentError("Container ownership or generation does not match")
         state = info.get("State", {})
         status = state.get("Status", "unknown")
-        healthy = state.get("Running") is True and state.get("Health", {}).get("Status", "healthy") == "healthy"
+        healthy = state.get("Status") == "running" and state.get("Running") is True and state.get("Health", {}).get("Status", "healthy") == "healthy"
         if status == "running" and not healthy:
             status = state.get("Health", {}).get("Status", "unknown")
         return {"exists": True, "running": state.get("Running") is True, "healthy": healthy, "state": status, "containerId": info.get("Id"), "instanceId": instance_id, "generation": generation, "startedAt": state.get("StartedAt"), "creationOperation": labels.get(LABEL + ".operation"), "specSha256": labels.get(LABEL + ".spec-sha256")}
@@ -1152,7 +1152,7 @@ class Agent:
                 if not any(mount.get("Type") == "bind" and mount.get("Source") == expected and mount.get("Destination") == "/home/plutainer/app" for mount in info.get("Mounts", [])):
                     continue
                 state = info.get("State", {})
-                healthy = state.get("Running") is True and state.get("Health", {}).get("Status", "healthy") == "healthy"
+                healthy = state.get("Status") == "running" and state.get("Running") is True and state.get("Health", {}).get("Status", "healthy") == "healthy"
                 status = state.get("Status", "unknown")
                 if status == "running" and not healthy:
                     status = state.get("Health", {}).get("Status", "unknown")

static/agent/manifest.json

@@ -1,8 +1,8 @@
 {
-  "version": "1.4.11",
+  "version": "1.4.12",
   "protocolVersion": 1,
   "platform": "debian-amd64",
-  "sha256": "4c6cc180f3c45a436878a0278d62b6840526150e039fdf51bafadef63759b131",
+  "sha256": "1e1bf2f04c02f0c8d0db8e4dbf39fadddc39c8bd04db5b8db753b6fe9e04c315",
   "updaterProtocolVersion": 1,
   "updaterSha256": "066bb896726600ece9ce72697ce523c9a707cc9a621505931ba0892dec59d3c8"
 }