gsh-digital-services/seaweedFS
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

filer.sync: include last error in stall diagnostics

Browse Source
This commit is contained in:
Chris Lu
2026-04-02 12:18:56 -07:00
parent 2d4ea8c665
commit b5cdd71600
3 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
weed/command/filer_sync.go
View File

@@ -375,8 +375,13 @@ func doSubscribeFilerMetaChanges(clientId int32, clientEpoch int32, sourceGrpcDi
lastLogTsNs = now lastLogTsNs = now
if offsetTsNs == lastProgressedTsNs { if offsetTsNs == lastProgressedTsNs {
for _, t := range filerSink.ActiveTransfers() { for _, t := range filerSink.ActiveTransfers() {
glog.V(0).Infof(" %s %s: %d bytes received, %s", if t.LastErr != "" {
t.ChunkFileId, t.Path, t.BytesReceived, t.Status) glog.V(0).Infof(" %s %s: %d bytes received, %s, last error: %s",
t.ChunkFileId, t.Path, t.BytesReceived, t.Status, t.LastErr)
} else {
glog.V(0).Infof(" %s %s: %d bytes received, %s",
t.ChunkFileId, t.Path, t.BytesReceived, t.Status)
}
} }
} }
lastProgressedTsNs = offsetTsNs lastProgressedTsNs = offsetTsNs

1
weed/replication/sink/filersink/fetch_write.go
View File

@@ -335,6 +335,7 @@ func (fs *FilerSink) fetchAndWrite(sourceChunk *filer_pb.FileChunk, path string,
glog.V(1).Infof("skip retrying stale source %s for %s: %v", sourceChunk.GetFileIdString(), path, retryErr) glog.V(1).Infof("skip retrying stale source %s for %s: %v", sourceChunk.GetFileIdString(), path, retryErr)
return false return false
} }
transferStatus.LastErr = retryErr.Error()
if isEofError(retryErr) { if isEofError(retryErr) {
eofBackoff = nextEofBackoff(eofBackoff) eofBackoff = nextEofBackoff(eofBackoff)
transferStatus.BytesReceived = int64(len(partialData)) transferStatus.BytesReceived = int64(len(partialData))

1
weed/replication/sink/filersink/filer_sink.go
View File

@@ -27,6 +27,7 @@ type ChunkTransferStatus struct {
Path string Path string
BytesReceived int64 BytesReceived int64
Status string // "downloading", "uploading", or "waiting 10s" etc. Status string // "downloading", "uploading", or "waiting 10s" etc.
LastErr string
} }
type FilerSink struct { type FilerSink struct {