extern/zrepl
1
0
Fork 0
mirror of https://github.com/zrepl/zrepl.git synced 2024-11-28 19:34:58 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

replication/driver: fs.debug() helper that automatically prefixes with fs name

Browse Source
This commit is contained in:
Christian Schwarz 2020-04-07 23:43:06 +02:00
parent 3cc0acd7ec
commit 0ea8f96db6
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
replication/driver/replication_driver.go
View File

@ -370,6 +370,10 @@ func (a *attempt) do(ctx context.Context, prev *attempt) {
a.finishedAt = time.Now() a.finishedAt = time.Now()
} }
func (f *fs) debug(format string, args ...interface{}) {
debugPrefix("fs=%s", f.fs.ReportInfo().Name)(format, args...)
}
func (f *fs) do(ctx context.Context, pq *stepQueue, prev *fs) { func (f *fs) do(ctx context.Context, pq *stepQueue, prev *fs) {
defer f.l.Lock().Unlock() defer f.l.Lock().Unlock()
@ -386,7 +390,6 @@ func (f *fs) do(ctx context.Context, pq *stepQueue, prev *fs) {
psteps, err = f.fs.PlanFS(ctx) // no shadow psteps, err = f.fs.PlanFS(ctx) // no shadow
errTime = time.Now() // no shadow errTime = time.Now() // no shadow
}) })
debug := debugPrefix("fs=%s", f.fs.ReportInfo().Name)
f.planning.done = true f.planning.done = true
if err != nil { if err != nil {
f.planning.err = newTimedError(err, errTime) f.planning.err = newTimedError(err, errTime)
@ -399,25 +402,25 @@ func (f *fs) do(ctx context.Context, pq *stepQueue, prev *fs) {
} }
f.planned.steps = append(f.planned.steps, step) f.planned.steps = append(f.planned.steps, step)
} }
debug("initial len(fs.planned.steps) = %d", len(f.planned.steps)) f.debug("initial len(fs.planned.steps) = %d", len(f.planned.steps))
// for not-first attempts, only allow fs.planned.steps // for not-first attempts, only allow fs.planned.steps
// up to including the originally planned target snapshot // up to including the originally planned target snapshot
if prev != nil && prev.planning.done && prev.planning.err == nil { if prev != nil && prev.planning.done && prev.planning.err == nil {
prevUncompleted := prev.planned.steps[prev.planned.step:] prevUncompleted := prev.planned.steps[prev.planned.step:]
if len(prevUncompleted) == 0 { if len(prevUncompleted) == 0 {
debug("prevUncompleted is empty") f.debug("prevUncompleted is empty")
return return
} }
if len(f.planned.steps) == 0 { if len(f.planned.steps) == 0 {
debug("fs.planned.steps is empty") f.debug("fs.planned.steps is empty")
return return
} }
prevFailed := prevUncompleted[0] prevFailed := prevUncompleted[0]
curFirst := f.planned.steps[0] curFirst := f.planned.steps[0]
// we assume that PlanFS retries prevFailed (using curFirst) // we assume that PlanFS retries prevFailed (using curFirst)
if !prevFailed.step.TargetEquals(curFirst.step) { if !prevFailed.step.TargetEquals(curFirst.step) {
debug("Targets don't match") f.debug("Targets don't match")
// Two options: // Two options:
// A: planning algorithm is broken // A: planning algorithm is broken
// B: manual user intervention inbetween // B: manual user intervention inbetween
@ -443,15 +446,15 @@ func (f *fs) do(ctx context.Context, pq *stepQueue, prev *fs) {
} }
diverge := 0 diverge := 0
for ; diverge < min; diverge++ { for ; diverge < min; diverge++ {
debug("diverge compare iteration %d", diverge) f.debug("diverge compare iteration %d", diverge)
if !f.planned.steps[diverge].step.TargetEquals(prevUncompleted[diverge].step) { if !f.planned.steps[diverge].step.TargetEquals(prevUncompleted[diverge].step) {
break break
} }
} }
debug("diverge is %d", diverge) f.debug("diverge is %d", diverge)
f.planned.steps = f.planned.steps[0:diverge] f.planned.steps = f.planned.steps[0:diverge]
} }
debug("post-prev-merge len(fs.planned.steps) = %d", len(f.planned.steps)) f.debug("post-prev-merge len(fs.planned.steps) = %d", len(f.planned.steps))
for i, s := range f.planned.steps { for i, s := range f.planned.steps {
var ( var (