Skip to content

Commit

Permalink
Return errors on vhostmd disk writes on failed file close
Browse files Browse the repository at this point in the history
Signed-off-by: Roman Mohr <rmohr@redhat.com>
  • Loading branch information
rmohr committed May 18, 2021
1 parent 8b9bf8c commit b165197
Showing 1 changed file with 16 additions and 5 deletions.
21 changes: 16 additions & 5 deletions pkg/downwardmetrics/vhostmd/disk.go
Original file line number Diff line number Diff line change
Expand Up @@ -81,12 +81,18 @@ func (v *vhostmd) Read() (*api.Metrics, error) {
return disk.Metrics()
}

func (v *vhostmd) Write(metrics *api.Metrics) error {
func (v *vhostmd) Write(metrics *api.Metrics) (err error) {
f, err := os.OpenFile(v.filePath, os.O_RDWR, 0)
if err != nil {
return fmt.Errorf("failed to open vhostmd disk: %v", err)
}
defer f.Close()
defer func() {
if fileErr := f.Close(); fileErr != nil {
if err == nil {
err = fileErr
}
}
}()
if err := writeDisk(f, metrics); err != nil {
return fmt.Errorf("failed to write metrics: %v", err)
}
Expand Down Expand Up @@ -120,14 +126,19 @@ func readDisk(filePath string) (*Disk, error) {
return d, err
}

func createDisk(filePath string) error {
func createDisk(filePath string) (err error) {
var f *os.File
var err error

if f, err = os.OpenFile(filePath, os.O_CREATE|os.O_RDWR, 0755); err != nil {
return fmt.Errorf("failed getting vhostmd disk filestats: %v", err)
}
defer f.Close()
defer func() {
if fileErr := f.Close(); fileErr != nil {
if err == nil {
err = fileErr
}
}
}()

_, err = f.Seek(fileSize-1, 0)
if err != nil {
Expand Down

0 comments on commit b165197

Please sign in to comment.