JakeHillion/storj
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Send number of files as part of durability stats (#2030)

Browse Source
This commit is contained in:
Maximillian von Briesen 2019-05-22 18:50:43 -04:00 committed by GitHub
parent 24787adb5b
commit b4f18226db
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkg/datarepair/checker/checker.go
View File

@ -46,6 +46,7 @@ type Checker struct {
} }
type durabilityStats struct { type durabilityStats struct {
remoteFilesChecked int64
remoteSegmentsChecked int64 remoteSegmentsChecked int64
remoteSegmentsNeedingRepair int64 remoteSegmentsNeedingRepair int64
remoteSegmentsLost int64 remoteSegmentsLost int64
@ -104,12 +105,14 @@ func (checker *Checker) IdentifyInjuredSegments(ctx context.Context) (err error)
checker.lastChecked = "" checker.lastChecked = ""
// send durability stats // send durability stats
mon.IntVal("remote_files_checked").Observe(checker.durabilityStats.remoteFilesChecked)
mon.IntVal("remote_segments_checked").Observe(checker.durabilityStats.remoteSegmentsChecked) mon.IntVal("remote_segments_checked").Observe(checker.durabilityStats.remoteSegmentsChecked)
mon.IntVal("remote_segments_needing_repair").Observe(checker.durabilityStats.remoteSegmentsNeedingRepair) mon.IntVal("remote_segments_needing_repair").Observe(checker.durabilityStats.remoteSegmentsNeedingRepair)
mon.IntVal("remote_segments_lost").Observe(checker.durabilityStats.remoteSegmentsLost) mon.IntVal("remote_segments_lost").Observe(checker.durabilityStats.remoteSegmentsLost)
mon.IntVal("remote_files_lost").Observe(int64(len(checker.durabilityStats.remoteSegmentInfo))) mon.IntVal("remote_files_lost").Observe(int64(len(checker.durabilityStats.remoteSegmentInfo)))
// reset durability stats // reset durability stats
checker.durabilityStats.remoteFilesChecked = 0
checker.durabilityStats.remoteSegmentsChecked = 0 checker.durabilityStats.remoteSegmentsChecked = 0
checker.durabilityStats.remoteSegmentsNeedingRepair = 0 checker.durabilityStats.remoteSegmentsNeedingRepair = 0
checker.durabilityStats.remoteSegmentsLost = 0 checker.durabilityStats.remoteSegmentsLost = 0
@ -142,6 +145,11 @@ func (checker *Checker) IdentifyInjuredSegments(ctx context.Context) (err error)
} }
checker.durabilityStats.remoteSegmentsChecked++ checker.durabilityStats.remoteSegmentsChecked++
pathElements := storj.SplitPath(storj.Path(item.Key))
if len(pathElements) >= 2 && pathElements[1] == "l" {
checker.durabilityStats.remoteFilesChecked++
}
numHealthy := int32(len(pieces) - len(missingPieces)) numHealthy := int32(len(pieces) - len(missingPieces))
redundancy := pointer.Remote.Redundancy redundancy := pointer.Remote.Redundancy
// we repair when the number of healthy files is less than or equal to the repair threshold // we repair when the number of healthy files is less than or equal to the repair threshold
@ -160,7 +168,6 @@ func (checker *Checker) IdentifyInjuredSegments(ctx context.Context) (err error)
return Error.New("error adding injured segment to queue %s", err) return Error.New("error adding injured segment to queue %s", err)
} }
} else if numHealthy < redundancy.MinReq { } else if numHealthy < redundancy.MinReq {
pathElements := storj.SplitPath(storj.Path(item.Key))
// check to make sure there are at least *4* path elements. the first three // check to make sure there are at least *4* path elements. the first three
// are project, segment, and bucket name, but we want to make sure we're talking // are project, segment, and bucket name, but we want to make sure we're talking
// about an actual object, and that there's an object name specified // about an actual object, and that there's an object name specified