adminer/zrepl_patched
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

propert locking on FSReplication

Browse Source
This commit is contained in:
Christian Schwarz
2018-08-16 12:01:51 +02:00
parent 5479463783
commit 93929b61e4
3 changed files with 103 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cmd/replication.v2/report.go
+3 -3
View File
@@ -46,7 +46,7 @@ func filesystemReplicationReportFromQueueItem(qitem *replicationQueueItem) *File
}
if fsr.state&FSPermanentError != 0 {
rep.Problem = fsr.permanentError.Error()
rep.Problem = fsr.err.Error()
return &rep
}
@@ -54,8 +54,8 @@ func filesystemReplicationReportFromQueueItem(qitem *replicationQueueItem) *File
for _, step := range fsr.completed {
rep.Steps = append(rep.Steps, stepReportFromStep(step))
}
if fsr.active != nil {
rep.Steps = append(rep.Steps, stepReportFromStep(fsr.active))
if fsr.current != nil {
rep.Steps = append(rep.Steps, stepReportFromStep(fsr.current))
}
for _, step := range fsr.pending {
rep.Steps = append(rep.Steps, stepReportFromStep(step))