Fix configuration issues. Fix shutdown hangs

Always turn on compression
This commit is contained in:
2026-01-15 11:34:06 +01:00
parent d59aa2e855
commit cb219b3c74
3 changed files with 55 additions and 32 deletions

View File

@@ -271,6 +271,7 @@ func initSubsystems() error {
// Initialize job archive
archiveCfg := ccconf.GetPackageConfig("archive")
if archiveCfg == nil {
cclog.Debug("Archive configuration not found, using default archive configuration")
archiveCfg = json.RawMessage(defaultArchiveConfig)
}
if err := archive.Init(archiveCfg, config.Keys.DisableArchive); err != nil {
@@ -375,22 +376,32 @@ func runServer(ctx context.Context) error {
}
runtime.SystemdNotify(true, "running")
// Wait for completion or error
waitDone := make(chan struct{})
go func() {
wg.Wait()
close(waitDone)
}()
go func() {
<-waitDone
close(errChan)
}()
// Check for server startup errors
select {
case err := <-errChan:
if err != nil {
return err
}
case <-time.After(100 * time.Millisecond):
// Server started successfully, wait for completion
if err := <-errChan; err != nil {
return err
select {
case err := <-errChan:
if err != nil {
return err
}
case <-waitDone:
case <-time.After(45 * time.Second):
cclog.Error("Shutdown timeout after 45 seconds - forcing exit")
return fmt.Errorf("shutdown timeout exceeded")
}
}