aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan Engelbrecht <[email protected]>2026-04-15 19:34:36 +0200
committerGitHub Enterprise <[email protected]>2026-04-15 19:34:36 +0200
commitcf83d2d58423f31abb9eb48dd23829d65fff346d (patch)
treed075a9351630247377af9b01a5561ecccdfeada7
parentadd sessions to hub and proxy (#960) (diff)
downloadarchived-zen-cf83d2d58423f31abb9eb48dd23829d65fff346d.tar.xz
archived-zen-cf83d2d58423f31abb9eb48dd23829d65fff346d.zip
hub reset inactivity timer (#961)
* update last activity time for hub instances that are asked to be provisioned but are already provisioned
-rw-r--r--CHANGELOG.md3
-rw-r--r--src/zenserver/hub/hub.cpp2
2 files changed, 4 insertions, 1 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index ae1546bf5..8e47dd74a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,9 +1,10 @@
##
- Improvement: Session service and endpoint moved from storage server to base server class; now available in hub, compute, and proxy modes
-- Bugfix: OAuth client credentials token request now sends correct `application/x-www-form-urlencoded` content type
- Improvement: HTTP client Content-Type in additional headers now overrides the payload content type
+- Bugfix: OAuth client credentials token request now sends correct `application/x-www-form-urlencoded` content type
- Bugfix: `builds download` with cache upload enabled no longer holds downloaded blobs in memory when boost-worker-memory is active; blobs are written to disk before upload
- Bugfix: Removed obsolete `--cache-prime-only` flag from `builds download`
+- Bugfix: Hub provision requests for already-provisioned instances now reset the inactivity timer
## 5.8.4
- Feature: Hub bulk deprovision endpoint (`POST /hub/deprovision`) tears down all provisioned and hibernated modules in a single request
diff --git a/src/zenserver/hub/hub.cpp b/src/zenserver/hub/hub.cpp
index 0cb25fdd6..128d3ed35 100644
--- a/src/zenserver/hub/hub.cpp
+++ b/src/zenserver/hub/hub.cpp
@@ -395,6 +395,7 @@ Hub::Provision(std::string_view ModuleId, HubProvisionedInstanceInfo& OutInfo)
case HubInstanceState::Unprovisioned:
break;
case HubInstanceState::Provisioned:
+ m_ActiveInstances[ActiveInstanceIndex].LastActivityTime.store(std::chrono::system_clock::now());
return Response{EResponseCode::Completed};
case HubInstanceState::Hibernated:
_.ReleaseNow();
@@ -415,6 +416,7 @@ Hub::Provision(std::string_view ModuleId, HubProvisionedInstanceInfo& OutInfo)
Instance = {};
if (ActualState == HubInstanceState::Provisioned)
{
+ m_ActiveInstances[ActiveInstanceIndex].LastActivityTime.store(std::chrono::system_clock::now());
return Response{EResponseCode::Completed};
}
if (ActualState == HubInstanceState::Provisioning)