tdology/zfs_exporter
1
0
Fork 0
forked from github/zfs_exporter
Code Pull Requests Activity

fix(log): Improve command execution error output

Browse Source
This commit is contained in:
zhangzhiqiangcs 2024-04-14 07:28:19 +08:00 committed by GitHub
parent 30f2d5a069
commit 2277832fc2
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 23 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
zfs/pool.go
View File

@ -2,6 +2,8 @@ package zfs
import (
"bufio"
"fmt"
"io"
"os/exec"
"strings"
)
@ -68,17 +70,23 @@ func poolNames() ([]string, error) {
if err != nil {
return nil, err
}
stderr, err := cmd.StderrPipe()
if err != nil {
return nil, err
}
scanner := bufio.NewScanner(out)
if err = cmd.Start(); err != nil {
return nil, err
return nil, fmt.Errorf("Failed to start command '%s': %w", cmd.String(), err)
}
for scanner.Scan() {
pools = append(pools, scanner.Text())
}
stde, _ := io.ReadAll(stderr)
if err = cmd.Wait(); err != nil {
return nil, err
return nil, fmt.Errorf("Failed to execute command '%s'; output: '%s' (%w)", cmd.String(), strings.TrimSpace(string(stde)), err)
}
return pools, nil

15
zfs/zfs.go
View File

@ -3,8 +3,10 @@ package zfs
import (
"encoding/csv"
"errors"
"fmt"
"io"
"os/exec"
"strings"
)
var (
@ -69,6 +71,11 @@ func execute(pool string, h handler, cmd string, args ...string) error {
return err
}
stderr, err := c.StderrPipe()
if err != nil {
return err
}
r := csv.NewReader(out)
r.Comma = '\t'
r.LazyQuotes = true
@ -76,7 +83,7 @@ func execute(pool string, h handler, cmd string, args ...string) error {
r.FieldsPerRecord = 3
if err = c.Start(); err != nil {
return err
return fmt.Errorf("Failed to start command '%s': %w", c.String(), err)
}
for {
@ -92,7 +99,11 @@ func execute(pool string, h handler, cmd string, args ...string) error {
}
}
return c.Wait()
stde, _ := io.ReadAll(stderr)
if err = c.Wait(); err != nil {
return fmt.Errorf("Failed to execute command '%s'; output: '%s' (%w)", c.String(), strings.TrimSpace(string(stde)), err)
}
return nil
}
// New instantiates a ZFS Client