correctly report volume with input/output error to master (#6790)
* correctly capture io error and report to master * code fix * check io error by error.Is --------- Co-authored-by: dongxu_feng <dongxu_feng@intsig.net>
This commit is contained in:
@@ -3,12 +3,13 @@ package needle
|
|||||||
import (
|
import (
|
||||||
"bytes"
|
"bytes"
|
||||||
"fmt"
|
"fmt"
|
||||||
|
"math"
|
||||||
|
|
||||||
"github.com/seaweedfs/seaweedfs/weed/glog"
|
"github.com/seaweedfs/seaweedfs/weed/glog"
|
||||||
"github.com/seaweedfs/seaweedfs/weed/storage/backend"
|
"github.com/seaweedfs/seaweedfs/weed/storage/backend"
|
||||||
. "github.com/seaweedfs/seaweedfs/weed/storage/types"
|
. "github.com/seaweedfs/seaweedfs/weed/storage/types"
|
||||||
"github.com/seaweedfs/seaweedfs/weed/util"
|
"github.com/seaweedfs/seaweedfs/weed/util"
|
||||||
"github.com/seaweedfs/seaweedfs/weed/util/buffer_pool"
|
"github.com/seaweedfs/seaweedfs/weed/util/buffer_pool"
|
||||||
"math"
|
|
||||||
)
|
)
|
||||||
|
|
||||||
func (n *Needle) prepareWriteBuffer(version Version, writeBytes *bytes.Buffer) (Size, int64, error) {
|
func (n *Needle) prepareWriteBuffer(version Version, writeBytes *bytes.Buffer) (Size, int64, error) {
|
||||||
@@ -118,7 +119,7 @@ func (n *Needle) Append(w backend.BackendStorageFile, version Version) (offset u
|
|||||||
}(w, end)
|
}(w, end)
|
||||||
offset = uint64(end)
|
offset = uint64(end)
|
||||||
} else {
|
} else {
|
||||||
err = fmt.Errorf("Cannot Read Current Volume Position: %v", e)
|
err = fmt.Errorf("Cannot Read Current Volume Position: %w", e)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
if offset >= MaxPossibleVolumeSize && len(n.Data) != 0 {
|
if offset >= MaxPossibleVolumeSize && len(n.Data) != 0 {
|
||||||
@@ -134,7 +135,7 @@ func (n *Needle) Append(w backend.BackendStorageFile, version Version) (offset u
|
|||||||
if err == nil {
|
if err == nil {
|
||||||
_, err = w.WriteAt(bytesBuffer.Bytes(), int64(offset))
|
_, err = w.WriteAt(bytesBuffer.Bytes(), int64(offset))
|
||||||
if err != nil {
|
if err != nil {
|
||||||
err = fmt.Errorf("failed to write %d bytes to %s at offset %d: %v", actualSize, w.Name(), offset, err)
|
err = fmt.Errorf("failed to write %d bytes to %s at offset %d: %w", actualSize, w.Name(), offset, err)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -269,19 +269,23 @@ func (s *Store) CollectHeartbeat() *master_pb.Heartbeat {
|
|||||||
maxFileKey = curMaxFileKey
|
maxFileKey = curMaxFileKey
|
||||||
}
|
}
|
||||||
shouldDeleteVolume := false
|
shouldDeleteVolume := false
|
||||||
if !v.expired(volumeMessage.Size, s.GetVolumeSizeLimit()) {
|
|
||||||
volumeMessages = append(volumeMessages, volumeMessage)
|
if v.lastIoError != nil {
|
||||||
|
deleteVids = append(deleteVids, v.Id)
|
||||||
|
shouldDeleteVolume = true
|
||||||
|
glog.Warningf("volume %d has IO error: %v", v.Id, v.lastIoError)
|
||||||
} else {
|
} else {
|
||||||
if v.expiredLongEnough(MAX_TTL_VOLUME_REMOVAL_DELAY) {
|
if !v.expired(volumeMessage.Size, s.GetVolumeSizeLimit()) {
|
||||||
deleteVids = append(deleteVids, v.Id)
|
volumeMessages = append(volumeMessages, volumeMessage)
|
||||||
shouldDeleteVolume = true
|
|
||||||
} else {
|
} else {
|
||||||
glog.V(0).Infof("volume %d is expired", v.Id)
|
if v.expiredLongEnough(MAX_TTL_VOLUME_REMOVAL_DELAY) {
|
||||||
}
|
if !shouldDeleteVolume {
|
||||||
if v.lastIoError != nil {
|
deleteVids = append(deleteVids, v.Id)
|
||||||
deleteVids = append(deleteVids, v.Id)
|
shouldDeleteVolume = true
|
||||||
shouldDeleteVolume = true
|
}
|
||||||
glog.Warningf("volume %d has IO error: %v", v.Id, v.lastIoError)
|
} else {
|
||||||
|
glog.V(0).Infof("volume %d is expired", v.Id)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -5,6 +5,7 @@ import (
|
|||||||
"errors"
|
"errors"
|
||||||
"fmt"
|
"fmt"
|
||||||
"os"
|
"os"
|
||||||
|
"syscall"
|
||||||
|
|
||||||
"github.com/seaweedfs/seaweedfs/weed/glog"
|
"github.com/seaweedfs/seaweedfs/weed/glog"
|
||||||
"github.com/seaweedfs/seaweedfs/weed/storage/backend"
|
"github.com/seaweedfs/seaweedfs/weed/storage/backend"
|
||||||
@@ -23,7 +24,7 @@ func (v *Volume) checkReadWriteError(err error) {
|
|||||||
}
|
}
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
if err.Error() == "input/output error" {
|
if errors.Is(err, syscall.EIO) {
|
||||||
v.lastIoError = err
|
v.lastIoError = err
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user