extern/zrepl
1
0
Fork 0
mirror of https://github.com/zrepl/zrepl.git synced 2024-11-22 08:23:50 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

platformtest: retry zpool export if 'pool is busy'

Browse Source 
On Ubuntu, something seems to be holding on to the pool for too long.
This commit is contained in:
Christian Schwarz 2021-12-18 15:55:50 +01:00
parent 2e2a8a1d5d
commit 04e03f4d06
2 changed files with 23 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
platformtest/harness/harness.go
View File

@ -37,6 +37,7 @@ func main() {
flag.StringVar(&args.CreateArgs.Mountpoint, "mountpoint", "", "") flag.StringVar(&args.CreateArgs.Mountpoint, "mountpoint", "", "")
flag.BoolVar(&args.StopAndKeepPoolOnFail, "failure.stop-and-keep-pool", false, "if a test case fails, stop test execution and keep pool as it was when the test failed") flag.BoolVar(&args.StopAndKeepPoolOnFail, "failure.stop-and-keep-pool", false, "if a test case fails, stop test execution and keep pool as it was when the test failed")
flag.StringVar(&args.Run, "run", "", "") flag.StringVar(&args.Run, "run", "", "")
flag.DurationVar(&platformtest.ZpoolExportTimeout, "zfs.zpool-export-timeout", platformtest.ZpoolExportTimeout, "")
flag.Parse() flag.Parse()
if err := HarnessRun(args); err != nil { if err := HarnessRun(args); err != nil {

22
platformtest/platformtest_zpool.go
View File

@ -5,12 +5,17 @@ import (
"fmt" "fmt"
"os" "os"
"path/filepath" "path/filepath"
"runtime"
"strings"
"time"
"github.com/pkg/errors" "github.com/pkg/errors"
"github.com/zrepl/zrepl/zfs" "github.com/zrepl/zrepl/zfs"
) )
var ZpoolExportTimeout time.Duration = 500 * time.Millisecond
type Zpool struct { type Zpool struct {
args ZpoolCreateArgs args ZpoolCreateArgs
} }
@ -93,9 +98,24 @@ func (p *Zpool) Name() string { return p.args.PoolName }
func (p *Zpool) Destroy(ctx context.Context, e Execer) error { func (p *Zpool) Destroy(ctx context.Context, e Execer) error {
if err := e.RunExpectSuccessNoOutput(ctx, "zpool", "export", p.args.PoolName); err != nil { exportDeadline := time.Now().Add(ZpoolExportTimeout)
for {
if time.Now().After(exportDeadline) {
return errors.Errorf("could not zpool export (got 'pool is busy'): %s", p.args.PoolName)
}
err := e.RunExpectSuccessNoOutput(ctx, "zpool", "export", p.args.PoolName)
if err == nil {
break
}
if strings.Contains(err.Error(), "pool is busy") {
runtime.Gosched()
continue
}
if err != nil {
return errors.Wrapf(err, "export pool %q", p.args.PoolName) return errors.Wrapf(err, "export pool %q", p.args.PoolName)
} }
}
if err := os.Remove(p.args.ImagePath); err != nil { if err := os.Remove(p.args.ImagePath); err != nil {
return errors.Wrapf(err, "remove pool image") return errors.Wrapf(err, "remove pool image")