Merge pull request #1339 from jcechace/PBM-1712-restore-cleanup

jcechace · web-flow · commit 96cfea3bcbf0 · 2026-06-30T15:12:15.000+02:00
PBM-1712 Stop regular heartbeat before cleanup wait
diff --git a/pbm/restore/physical.go b/pbm/restore/physical.go
@@ -254,6 +254,10 @@ func (r *PhysRestore) close(noerr bool, progress nodeStatus) (err error) {
 		}
 	}
 
+	if r.stopHB != nil {
+		close(r.stopHB)
+	}
+
 	r.log.Debug("wait for cluster status")
 	cStatus, err := r.waitClusterStatus()
 	if err != nil {
@@ -274,9 +278,6 @@ func (r *PhysRestore) close(noerr bool, progress nodeStatus) (err error) {
 		if r.stopCleanupHB != nil {
 			close(r.stopCleanupHB)
 		}
-		if r.stopHB != nil {
-			close(r.stopHB)
-		}
 	}()
 
 	// resolve and exec cleanup

Original file line number	Diff line number	Diff line change
`@@ -254,6 +254,10 @@ func (r *PhysRestore) close(noerr bool, progress nodeStatus) (err error) {`
`254`	`254`	`}`
`255`	`255`	`}`
`256`	`256`
	`257`	`+ if r.stopHB != nil {`
	`258`	`+ close(r.stopHB)`
	`259`	`+ }`
	`260`	`+`
`257`	`261`	`r.log.Debug("wait for cluster status")`
`258`	`262`	`cStatus, err := r.waitClusterStatus()`
`259`	`263`	`if err != nil {`
`@@ -274,9 +278,6 @@ func (r *PhysRestore) close(noerr bool, progress nodeStatus) (err error) {`
`274`	`278`	`if r.stopCleanupHB != nil {`
`275`	`279`	`close(r.stopCleanupHB)`
`276`	`280`	`}`
`277`		`- if r.stopHB != nil {`
`278`		`- close(r.stopHB)`
`279`		`- }`
`280`	`281`	`}()`
`281`	`282`
`282`	`283`	`// resolve and exec cleanup`