opensource/galaxy
3
0
Fork 0
mirror of https://github.com/galaxyproject/galaxy.git synced 2026-10-16 15:45:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

Write the hgweb.config that was modified, not the shared one

Browse Source 
add_entry and change_entry re-read hgweb.config, add their entry and
then wrote self._in_memory_config. get_entry replaces that shared
object without the lock when a lookup misses, so a lookup between the
re-read and the write made add_entry write the older copy and drop the
new repository. The forced re-read in get_entry now also takes the lock,
so it never parses a file that is being rewritten.

In tool shed tests with an embedded Galaxy, the update checker polls the
shed every few seconds, and 88 tests on one worker failed with "Entry
for repository ... missing in hgweb config file".
This commit is contained in:
mvdbeek
2026-10-15 11:38:27 +02:00
parent d12097c35c
commit 394964bf94
1 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/tool_shed/util/hgweb_config.py
+13 -7
View File
@@ -33,7 +33,7 @@ class HgWebConfigManager:
# Add the new entry into memory.
in_memory_config.set("paths", lhs, rhs)
# Persist our in-memory configuration.
self.write_config()
self.write_config(in_memory_config)
except Exception:
log.exception("Exception in HgWebConfigManager.add_entry()")
finally:
@@ -50,7 +50,7 @@ class HgWebConfigManager:
# Add the new entry.
in_memory_config.set("paths", new_lhs, new_rhs)
# Persist our in-memory configuration.
self.write_config()
self.write_config(in_memory_config)
except Exception:
log.exception("Exception in HgWebConfigManager.change_entry()")
finally:
@@ -64,7 +64,9 @@ class HgWebConfigManager:
except configparser.NoOptionError:
try:
# We have a multi-threaded front-end, so one of the threads may not have the latest version of the hgweb.config file.
in_memory_config = self.read_config(force_read=True)
# Re-read under the lock so we never parse a file that add_entry or change_entry is rewriting.
with self.lock:
in_memory_config = self.read_config(force_read=True)
entry = in_memory_config.get("paths", lhs)
except configparser.NoOptionError:
raise Exception(f"Entry for repository {lhs} missing in file {self.hgweb_config}.")
@@ -99,11 +101,15 @@ class HgWebConfigManager:
self._in_memory_config = config
return self._in_memory_config
def write_config(self) -> None:
"""Writing the in-memory configuration to the hgweb.config file on disk."""
assert self._in_memory_config is not None
def write_config(self, config: configparser.ConfigParser) -> None:
"""Write the configuration to the hgweb.config file on disk and use it as the in-memory configuration.
Callers pass the configuration they modified: a concurrent get_entry may have replaced
the shared in-memory configuration with an older copy of the file in the meantime.
"""
with open(self.hgweb_config, "w") as config_file:
self._in_memory_config.write(config_file)
config.write(config_file)
self._in_memory_config = config
hgweb_config_manager = HgWebConfigManager()