MyFavMirrors
/
minio
mirror of https://github.com/minio/minio.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Load IO error count for posix atomically (#4448) 

* Load error count atomically in order to check for maximum allowed number of IO errors.

* Remove unused (previously atomic) network IO error count
This commit is contained in:
Frank Wessels 2017-05-31 09:22:53 -07:00 committed by Harshavardhana
parent a0e02f43e1
commit 0f0758aece
2 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
cmd/posix.go
View File

@ -251,7 +251,7 @@ func (s *posix) MakeVol(volume string) (err error) {
}
}()
if s.ioErrCount > maxAllowedIOError {
if atomic.LoadInt32(&s.ioErrCount) > maxAllowedIOError {
return errFaultyDisk
}
@ -285,7 +285,7 @@ func (s *posix) ListVols() (volsInfo []VolInfo, err error) {
}
}()
if s.ioErrCount > maxAllowedIOError {
if atomic.LoadInt32(&s.ioErrCount) > maxAllowedIOError {
return nil, errFaultyDisk
}
@ -349,7 +349,7 @@ func (s *posix) StatVol(volume string) (volInfo VolInfo, err error) {
}
}()
if s.ioErrCount > maxAllowedIOError {
if atomic.LoadInt32(&s.ioErrCount) > maxAllowedIOError {
return VolInfo{}, errFaultyDisk
}
@ -388,7 +388,7 @@ func (s *posix) DeleteVol(volume string) (err error) {
}
}()
if s.ioErrCount > maxAllowedIOError {
if atomic.LoadInt32(&s.ioErrCount) > maxAllowedIOError {
return errFaultyDisk
}
@ -422,7 +422,7 @@ func (s *posix) ListDir(volume, dirPath string) (entries []string, err error) {
}
}()
if s.ioErrCount > maxAllowedIOError {
if atomic.LoadInt32(&s.ioErrCount) > maxAllowedIOError {
return nil, errFaultyDisk
}
@ -459,7 +459,7 @@ func (s *posix) ReadAll(volume, path string) (buf []byte, err error) {
}
}()
if s.ioErrCount > maxAllowedIOError {
if atomic.LoadInt32(&s.ioErrCount) > maxAllowedIOError {
return nil, errFaultyDisk
}
@ -544,7 +544,7 @@ func (s *posix) ReadFileWithVerify(volume, path string, offset int64, buf []byte
}
}()
if s.ioErrCount > maxAllowedIOError {
if atomic.LoadInt32(&s.ioErrCount) > maxAllowedIOError {
return 0, errFaultyDisk
}
@ -664,7 +664,7 @@ func (s *posix) createFile(volume, path string) (f *os.File, err error) {
}
}()
if s.ioErrCount > maxAllowedIOError {
if atomic.LoadInt32(&s.ioErrCount) > maxAllowedIOError {
return nil, errFaultyDisk
}
@ -737,7 +737,7 @@ func (s *posix) PrepareFile(volume, path string, fileSize int64) (err error) {
}
}()
if s.ioErrCount > maxAllowedIOError {
if atomic.LoadInt32(&s.ioErrCount) > maxAllowedIOError {
return errFaultyDisk
}
@ -784,7 +784,7 @@ func (s *posix) AppendFile(volume, path string, buf []byte) (err error) {
}
}()
if s.ioErrCount > maxAllowedIOError {
if atomic.LoadInt32(&s.ioErrCount) > maxAllowedIOError {
return errFaultyDisk
}
@ -815,7 +815,7 @@ func (s *posix) StatFile(volume, path string) (file FileInfo, err error) {
}
}()
if s.ioErrCount > maxAllowedIOError {
if atomic.LoadInt32(&s.ioErrCount) > maxAllowedIOError {
return FileInfo{}, errFaultyDisk
}
@ -911,7 +911,7 @@ func (s *posix) DeleteFile(volume, path string) (err error) {
}
}()
if s.ioErrCount > maxAllowedIOError {
if atomic.LoadInt32(&s.ioErrCount) > maxAllowedIOError {
return errFaultyDisk
}
@ -951,7 +951,7 @@ func (s *posix) RenameFile(srcVolume, srcPath, dstVolume, dstPath string) (err e
}
}()
if s.ioErrCount > maxAllowedIOError {
if atomic.LoadInt32(&s.ioErrCount) > maxAllowedIOError {
return errFaultyDisk
}

1
cmd/storage-rpc-client.go
View File

@ -28,7 +28,6 @@ import (
)
type networkStorage struct {
networkIOErrCount int32 // ref: https://golang.org/pkg/sync/atomic/#pkg-note-BUG
rpcClient *AuthRPCClient
}