admin343/run
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Recover managed process log sessions

Browse Source
This commit is contained in:
npc0-hue
2026-08-31 12:16:44 +08:00
parent d5f4d34e07
commit 4277791cb7
6 changed files with 165 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
runtime/worker.go
+30 -4
View File
@@ -1185,14 +1185,19 @@ type durableLogClient interface {
IngestLogBatch(context.Context, protocol.LogBatchIngestRequest) (protocol.LogBatchIngestResponse, error)
}
type durableLogProgressClient interface {
GetRunLogStreamProgress(context.Context, protocol.RunLogStreamProgressRequest) (protocol.RunLogStreamProgressResponse, error)
}
type durableArtifactClient interface {
UploadArtifactChunk(context.Context, protocol.ArtifactChunkUploadRequest) (protocol.ArtifactChunkUploadResponse, error)
}
type sessionLogBatchClient struct {
client durableLogClient
runEndpointID string
sessionToken string
client durableLogClient
progressClient durableLogProgressClient
runEndpointID string
sessionToken string
}
type sessionLogStreamProgressClient struct {
@@ -1250,6 +1255,26 @@ func (client sessionLogBatchClient) IngestLogBatch(ctx context.Context, batch pr
return response, err
}
func (client sessionLogBatchClient) LogStreamLatestSeq(ctx context.Context, batch protocol.LogBatchIngestRequest) (uint64, error) {
if client.progressClient == nil {
return 0, fmt.Errorf("platform log progress client is unavailable")
}
response, err := client.progressClient.GetRunLogStreamProgress(ctx, protocol.RunLogStreamProgressRequest{
RunEndpointID: client.runEndpointID,
SessionToken: client.sessionToken,
ServerInstanceID: batch.ServerInstanceID,
LogStreamID: batch.LogStreamID,
})
if err != nil {
return 0, err
}
if !response.Accepted || response.LogStreamID != batch.LogStreamID {
return 0, fmt.Errorf("platform log stream progress response is invalid")
}
log.Printf("RUN phase=durable_uploaders.logs status=sequence_recover stream=%s localFirstSeq=%d platformLatestSeq=%d", safeOptional(batch.LogStreamID), batch.FirstSeq, response.LatestSeq)
return response.LatestSeq, nil
}
func logBatchNotFoundError(err error) bool {
var httpErr interface{ HTTPStatus() int }
return errors.As(err, &httpErr) && httpErr.HTTPStatus() == http.StatusNotFound
@@ -1305,6 +1330,7 @@ func (worker *Worker) runDurableUploaders(ctx context.Context, done chan<- struc
logSink, hasLogSink := worker.executor.logSink.(*SpoolLogSink)
artifactHook, hasArtifactHook := worker.executor.artifactHook.(*QueueArtifactHook)
logClient, hasLogClient := worker.client.(durableLogClient)
progressClient, _ := worker.client.(durableLogProgressClient)
artifactClient, hasArtifactClient := worker.client.(durableArtifactClient)
if (!hasLogSink || !hasLogClient) && (!hasArtifactHook || !hasArtifactClient) {
log.Printf("RUN phase=durable_uploaders status=disabled logs=%t artifacts=%t", hasLogSink && hasLogClient, hasArtifactHook && hasArtifactClient)
@@ -1328,7 +1354,7 @@ func (worker *Worker) runDurableUploaders(ctx context.Context, done chan<- struc
startedAt := time.Now()
log.Printf("RUN phase=durable_uploaders.logs status=flush_start timeoutMs=%d", durableUploaderFlushTimeout.Milliseconds())
flushCtx, cancel := context.WithTimeout(ctx, durableUploaderFlushTimeout)
client := sessionLogBatchClient{client: logClient, runEndpointID: state.RunEndpointID, sessionToken: state.SessionToken}
client := sessionLogBatchClient{client: logClient, progressClient: progressClient, runEndpointID: state.RunEndpointID, sessionToken: state.SessionToken}
flushed, err := logSink.Spool.Flush(flushCtx, client)
if err != nil {
log.Printf("RUN phase=durable_uploaders.logs status=flush_failed flushed=%d durationMs=%d error=%s", flushed, time.Since(startedAt).Milliseconds(), RedactText(err.Error()))