ben/podlaunch
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Refactor pod control methods

Browse source
This commit is contained in:
Benedikt Ziemons 2020-11-15 00:09:45 +01:00
parent 8e35b24857
commit 20f289dd4b
Signed by: ben
GPG key ID: 0F54A7ED232D3319
1 changed files with 29 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
main.py
View file

@ -5,7 +5,7 @@ import sys
import threading import threading
import traceback import traceback
from datetime import datetime from datetime import datetime
from signal import signal, SIGCHLD, SIGHUP, SIGINT, SIGTERM, setitimer, SIGALRM, ITIMER_REAL from signal import signal, SIGHUP, SIGINT, SIGTERM, setitimer, SIGALRM, ITIMER_REAL
import click import click
import sh import sh
@ -22,7 +22,7 @@ class PodKeeper:
self.podnet_args = ("--network", network) if network else () self.podnet_args = ("--network", network) if network else ()
identifier_path = pathlib.PurePath(identifier) identifier_path = pathlib.PurePath(identifier)
if len(identifier_path.parts) != 1: if len(identifier_path.parts) != 1:
raise ValueError(f"identifier has too many parts: {identifier_path}") raise ValueError(f"identifier has path parts: {identifier_path}")
self.podhome = pathlib.Path(SERVICES_BASE_PATH) / identifier_path self.podhome = pathlib.Path(SERVICES_BASE_PATH) / identifier_path
if not self.podhome.exists(): if not self.podhome.exists():
raise NotADirectoryError(f"pod home does not exist: {self.podhome}") raise NotADirectoryError(f"pod home does not exist: {self.podhome}")
@ -35,6 +35,7 @@ class PodKeeper:
self.reloading = threading.Event() self.reloading = threading.Event()
self.checking = threading.Event() self.checking = threading.Event()
self.waiter = threading.Event() self.waiter = threading.Event()
self.last_check = datetime.utcnow()
def destroy(self, signum, stackframe): def destroy(self, signum, stackframe):
print("Destroy signal", signum, file=sys.stderr, flush=True) print("Destroy signal", signum, file=sys.stderr, flush=True)
@ -52,8 +53,7 @@ class PodKeeper:
def run(self): def run(self):
os.chdir(self.podhome) os.chdir(self.podhome)
last_check = datetime.utcnow() print(f"Starting pod {self.podname} at {self.last_check}", file=sys.stderr, flush=True)
print(f"Starting pod {self.podname} at {last_check}", file=sys.stderr, flush=True)
podman.play.kube(self.podyaml, *self.podnet_args) podman.play.kube(self.podyaml, *self.podnet_args)
try: try:
if 'NOTIFY_SOCKET' in os.environ: if 'NOTIFY_SOCKET' in os.environ:
@ -62,21 +62,19 @@ class PodKeeper:
while not self.stopping.is_set(): while not self.stopping.is_set():
self.waiter.wait() self.waiter.wait()
self.waiter.clear() self.waiter.clear()
if self.checking.is_set(): if self.checking.is_set():
self.checking.clear() self.checking.clear()
new_timestamp = datetime.utcnow() self.check_pod()
inspect_command = podman.pod.inspect(self.podname)
pod_description = json.loads(inspect_command.stdout)
for container in pod_description["Containers"]:
if container["State"] != "running":
print(f"Container {container['Name']} exited", file=sys.stderr, flush=True)
logs = podman.logs('--since', last_check.isoformat(), container['Name'])
print(f"Log since last check:\n{logs}", file=sys.stderr, flush=True)
self.stopping.set()
last_check = new_timestamp
if self.reloading.is_set(): if self.reloading.is_set():
self.reloading.clear() self.reloading.clear()
self.reload_pod()
finally:
self.stop_pod()
def reload_pod(self):
print("Reloading pod", self.podname, file=sys.stderr, flush=True) print("Reloading pod", self.podname, file=sys.stderr, flush=True)
try: try:
podman.pod.kill("--signal", "HUP", self.podname) podman.pod.kill("--signal", "HUP", self.podname)
@ -84,10 +82,19 @@ class PodKeeper:
print("Error reloading pod", file=sys.stderr, flush=True) print("Error reloading pod", file=sys.stderr, flush=True)
traceback.print_exc() traceback.print_exc()
finally: def check_pod(self):
self.stop_sequence() new_timestamp = datetime.utcnow()
inspect_command = podman.pod.inspect(self.podname)
pod_description = json.loads(inspect_command.stdout)
for container in pod_description["Containers"]:
if container["State"] != "running":
print(f"Container {container['Name']} exited", file=sys.stderr, flush=True)
logs = podman.logs('--since', self.last_check.isoformat(), container['Name'])
print(f"Log since last check:\n{logs}", file=sys.stderr, flush=True)
self.stopping.set()
self.last_check = new_timestamp
def stop_sequence(self): def stop_pod(self):
print("Stopping pod", self.podname, file=sys.stderr, flush=True) print("Stopping pod", self.podname, file=sys.stderr, flush=True)
try: try:
podman.pod.stop("-t", "19", self.podname) podman.pod.stop("-t", "19", self.podname)