Skip to content

Hotfix: install releases carry writer locks before services restart #3889

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

Merged
trissim merged 1 commit into from
Nov 2, 2026
+12 −10
Merged

Hotfix: install releases carry writer locks before services restart #3889

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
22 changes: 12 additions & 10 deletions src/agent_comms/installer/upgrade.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1145,10 +1145,13 @@ def live(self, rehearsal: RehearsedFiles, report: InstallReport) -> CarriedRun:
sum(path.stat().st_size for path in selected if path.exists()),
), self.root.parent)
restore.require()
with self.staged.borrowing(
Carry.writer_declarations(pending), files,
) as staged, staged.services_stopped(self.installed) as stopped:
with self.staged.services_stopped(self.installed) as stopped, ExitStack() as borrowed:
# The install's start holds the root and stopped its owners (owners_stopped).
# The carried stores' writer locks span carry, publish and input retirement only:
# services restart after they are released, on success and on restore alike,
# because a restarted connector's serving probe reads those stores.
staged = borrowed.enter_context(self.staged.borrowing(
Carry.writer_declarations(pending), files))
maintenance = MaintenanceBarrier(RegistryStore.at(self.root).path)
holder = ExitStack()
try:
Expand Down Expand Up @@ -1188,6 +1191,11 @@ def live(self, rehearsal: RehearsedFiles, report: InstallReport) -> CarriedRun:
passed = migration.carry(pending, staged, rehearsal.reconcile_arguments())
passed.files.require_rehearsal(rehearsal.files)
self.publish(backup, selected_route)
retirement = tuple(replace(
step, spill_dir=backup.spill_directory(self.spill_dir),
) for step in self.pending)
passed = passed.after_acceptance(retirement, staged)
borrowed.close()
with ClearMaintenancePhase().running(self.staged.commands.clock):
report.owners.release()
restarted_services = stopped.start_on(self.staged)
Expand Down Expand Up @@ -1229,13 +1237,7 @@ def rehold(hold: MaintenanceState) -> None:
runtime=self.installed.runtime) from error
# Owner startup is reported per owner and never rolls the install back.
report.writer = RuntimeWriter(self.root, self.staged)
try:
retirement = tuple(replace(
step, spill_dir=backup.spill_directory(self.spill_dir),
) for step in self.pending)
passed = passed.after_acceptance(retirement, staged)
finally:
started = report.owners.published_on(self.staged, self.root)
started = report.owners.published_on(self.staged, self.root)
with BackupRetirePhase().running(self.staged.commands.clock):
retired_backups = backup.retain(self.spill_dir)
return passed.extended(
Expand Down
Loading