diff --git a/weed/server/filer_server_handlers_read.go b/weed/server/filer_server_handlers_read.go index ac6aea056..43b58a94a 100644 --- a/weed/server/filer_server_handlers_read.go +++ b/weed/server/filer_server_handlers_read.go @@ -162,6 +162,7 @@ func (fs *FilerServer) GetOrHeadHandler(w http.ResponseWriter, r *http.Request) if offset+size <= int64(len(entry.Content)) { _, err := writer.Write(entry.Content[offset : offset+size]) if err != nil { + stats.FilerRequestCounter.WithLabelValues("write.entry.failed").Inc() glog.Errorf("failed to write entry content: %v", err) } return err @@ -173,6 +174,7 @@ func (fs *FilerServer) GetOrHeadHandler(w http.ResponseWriter, r *http.Request) Directory: dir, Name: name, }); err != nil { + stats.FilerRequestCounter.WithLabelValues("read.cache.failed").Inc() glog.Errorf("CacheRemoteObjectToLocalCluster %s: %v", entry.FullPath, err) return fmt.Errorf("cache %s: %v", entry.FullPath, err) } else { @@ -182,6 +184,7 @@ func (fs *FilerServer) GetOrHeadHandler(w http.ResponseWriter, r *http.Request) err = filer.StreamContent(fs.filer.MasterClient, writer, chunks, offset, size) if err != nil { + stats.FilerRequestCounter.WithLabelValues("read.stream.failed").Inc() glog.Errorf("failed to stream content %s: %v", r.URL, err) } return err diff --git a/weed/storage/needle/needle_read_write.go b/weed/storage/needle/needle_read_write.go index 4f9e7f661..7557702e1 100644 --- a/weed/storage/needle/needle_read_write.go +++ b/weed/storage/needle/needle_read_write.go @@ -5,6 +5,7 @@ import ( "errors" "fmt" "github.com/chrislusf/seaweedfs/weed/glog" + "github.com/chrislusf/seaweedfs/weed/stats" "github.com/chrislusf/seaweedfs/weed/storage/backend" . "github.com/chrislusf/seaweedfs/weed/storage/types" "github.com/chrislusf/seaweedfs/weed/util" @@ -217,9 +218,11 @@ func (n *Needle) ReadBytes(bytes []byte, offset int64, size Size, version Versio if n.Size != size { // cookie is not always passed in for this API. Use size to do preliminary checking. if OffsetSize == 4 && offset < int64(MaxPossibleVolumeSize) { + stats.VolumeServerRequestCounter.WithLabelValues("errorSizeMismatchOffsetSize").Inc() glog.Errorf("entry not found1: offset %d found id %x size %d, expected size %d", offset, n.Id, n.Size, size) return ErrorSizeMismatch } + stats.VolumeServerRequestCounter.WithLabelValues("errorSizeMismatch").Inc() return fmt.Errorf("entry not found: offset %d found id %x size %d, expected size %d", offset, n.Id, n.Size, size) } switch version { @@ -235,6 +238,7 @@ func (n *Needle) ReadBytes(bytes []byte, offset int64, size Size, version Versio checksum := util.BytesToUint32(bytes[NeedleHeaderSize+size : NeedleHeaderSize+size+NeedleChecksumSize]) newChecksum := NewCRC(n.Data) if checksum != newChecksum.Value() { + stats.VolumeServerRequestCounter.WithLabelValues("errorCRC").Inc() return errors.New("CRC error! Data On Disk Corrupted") } n.Checksum = newChecksum @@ -267,6 +271,7 @@ func (n *Needle) readNeedleDataVersion2(bytes []byte) (err error) { n.DataSize = util.BytesToUint32(bytes[index : index+4]) index = index + 4 if int(n.DataSize)+index > lenBytes { + stats.VolumeServerRequestCounter.WithLabelValues("errorIndexOutOfRange").Inc() return fmt.Errorf("index out of range %d", 1) } n.Data = bytes[index : index+int(n.DataSize)] @@ -278,6 +283,7 @@ func (n *Needle) readNeedleDataVersion2(bytes []byte) (err error) { n.NameSize = uint8(bytes[index]) index = index + 1 if int(n.NameSize)+index > lenBytes { + stats.VolumeServerRequestCounter.WithLabelValues("errorIndexOutOfRange").Inc() return fmt.Errorf("index out of range %d", 2) } n.Name = bytes[index : index+int(n.NameSize)] @@ -287,6 +293,7 @@ func (n *Needle) readNeedleDataVersion2(bytes []byte) (err error) { n.MimeSize = uint8(bytes[index]) index = index + 1 if int(n.MimeSize)+index > lenBytes { + stats.VolumeServerRequestCounter.WithLabelValues("errorIndexOutOfRange").Inc() return fmt.Errorf("index out of range %d", 3) } n.Mime = bytes[index : index+int(n.MimeSize)] @@ -294,6 +301,7 @@ func (n *Needle) readNeedleDataVersion2(bytes []byte) (err error) { } if index < lenBytes && n.HasLastModifiedDate() { if LastModifiedBytesLength+index > lenBytes { + stats.VolumeServerRequestCounter.WithLabelValues("errorIndexOutOfRange").Inc() return fmt.Errorf("index out of range %d", 4) } n.LastModified = util.BytesToUint64(bytes[index : index+LastModifiedBytesLength]) @@ -301,6 +309,7 @@ func (n *Needle) readNeedleDataVersion2(bytes []byte) (err error) { } if index < lenBytes && n.HasTtl() { if TtlBytesLength+index > lenBytes { + stats.VolumeServerRequestCounter.WithLabelValues("errorIndexOutOfRange").Inc() return fmt.Errorf("index out of range %d", 5) } n.Ttl = LoadTTLFromBytes(bytes[index : index+TtlBytesLength]) @@ -308,11 +317,13 @@ func (n *Needle) readNeedleDataVersion2(bytes []byte) (err error) { } if index < lenBytes && n.HasPairs() { if 2+index > lenBytes { + stats.VolumeServerRequestCounter.WithLabelValues("errorIndexOutOfRange").Inc() return fmt.Errorf("index out of range %d", 6) } n.PairsSize = util.BytesToUint16(bytes[index : index+2]) index += 2 if int(n.PairsSize)+index > lenBytes { + stats.VolumeServerRequestCounter.WithLabelValues("errorIndexOutOfRange").Inc() return fmt.Errorf("index out of range %d", 7) } end := index + int(n.PairsSize) diff --git a/weed/topology/store_replicate.go b/weed/topology/store_replicate.go index 85c3a48ab..0efbf9ab5 100644 --- a/weed/topology/store_replicate.go +++ b/weed/topology/store_replicate.go @@ -13,6 +13,7 @@ import ( "github.com/chrislusf/seaweedfs/weed/glog" "github.com/chrislusf/seaweedfs/weed/operation" "github.com/chrislusf/seaweedfs/weed/security" + "github.com/chrislusf/seaweedfs/weed/stats" "github.com/chrislusf/seaweedfs/weed/storage" "github.com/chrislusf/seaweedfs/weed/storage/needle" "github.com/chrislusf/seaweedfs/weed/storage/types" @@ -44,6 +45,7 @@ func ReplicatedWrite(masterFn operation.GetMasterFn, grpcDialOption grpc.DialOpt if s.GetVolume(volumeId) != nil { isUnchanged, err = s.WriteVolumeNeedle(volumeId, n, true, fsync) if err != nil { + stats.VolumeServerRequestCounter.WithLabelValues("errorWriteToLocalDisk").Inc() err = fmt.Errorf("failed to write to local disk: %v", err) glog.V(0).Infoln(err) return @@ -74,6 +76,7 @@ func ReplicatedWrite(masterFn operation.GetMasterFn, grpcDialOption grpc.DialOpt tmpMap := make(map[string]string) err := json.Unmarshal(n.Pairs, &tmpMap) if err != nil { + stats.VolumeServerRequestCounter.WithLabelValues("errorUnmarshalPairs").Inc() glog.V(0).Infoln("Unmarshal pairs error:", err) } for k, v := range tmpMap { @@ -95,6 +98,7 @@ func ReplicatedWrite(masterFn operation.GetMasterFn, grpcDialOption grpc.DialOpt _, err := operation.UploadData(n.Data, uploadOption) return err }); err != nil { + stats.VolumeServerRequestCounter.WithLabelValues("errorWriteToReplicas").Inc() err = fmt.Errorf("failed to write to replicas for volume %d: %v", volumeId, err) glog.V(0).Infoln(err) }