Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

deployer: remove METS Server path and url from their resp. caches on … #1287

Merged
merged 2 commits into from
Oct 10, 2024
Merged

deployer: remove METS Server path and url from their resp. caches on … #1287

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e1b9784
deployer: remove METS Server path and url from their resp. caches on …
kba Oct 9, 2024
47c9acf
Merge branch 'fix_mets_server_zombies' into deployer-mets-caching
kba Oct 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions src/ocrd_network/runtime_data/deployer.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@ def start_uds_mets_server(self, ws_dir_path: str) -> Path:
"Removing to avoid any weird behavior before starting the server.")
Path(mets_server_url).unlink()
self.log.info(f"Starting UDS mets server: {mets_server_url}")
pid = OcrdMetsServer.create_process(mets_server_url=mets_server_url, ws_dir_path=ws_dir_path, log_file=log_file)
pid = OcrdMetsServer.create_process(mets_server_url=str(mets_server_url), ws_dir_path=str(ws_dir_path), log_file=str(log_file))
self.mets_servers[str(mets_server_url)] = pid
self.mets_servers_paths[str(ws_dir_path)] = str(mets_server_url)
return mets_server_url
Expand All @@ -164,13 +164,17 @@ def stop_uds_mets_server(self, mets_server_url: str, path_to_mets: str) -> None:
self.log.info(f"Path to the mets file: {path_to_mets}")
self.log.debug(f"mets_server: {self.mets_servers}")
self.log.debug(f"mets_server_paths: {self.mets_servers_paths}")
mets_server_pid = self.mets_servers[str(self.mets_servers_paths[str(Path(path_to_mets).parent)])]
workspace_path = str(Path(path_to_mets).parent)
mets_server_url_uds = self.mets_servers_paths[workspace_path]
mets_server_pid = self.mets_servers[mets_server_url_uds]
self.log.info(f"Terminating mets server with pid: {mets_server_pid}")
p = psutil.Process(mets_server_pid)
stop_mets_server(self.log, mets_server_url=mets_server_url, ws_dir_path=str(Path(path_to_mets).parent))
stop_mets_server(self.log, mets_server_url=mets_server_url, ws_dir_path=workspace_path)
if p.is_running():
p.wait()
self.log.info(f"Terminated mets server with pid: {mets_server_pid}")
else:
self.log.info(f"Mets server with pid: {mets_server_pid} has already terminated.")
del self.mets_servers_paths[workspace_path]
del self.mets_servers[mets_server_url_uds]
return