gitlab-com-seaweedfs/seaweedfs
1
0
Fork 0
mirror of https://github.com/seaweedfs/seaweedfs.git synced 2024-01-19 02:48:24 +00:00
Code Issues Projects Releases Wiki Activity

better output format

Browse source
This commit is contained in:
Chris Lu 2020-03-24 02:34:28 -07:00
parent 0820935290
commit 00d3f01876
1 changed files with 11 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
weed/shell/command_volume_fsck.go
View file

@ -59,7 +59,7 @@ func (c *commandVolumeFsck) Do(args []string, commandEnv *CommandEnv, writer io.
if err != nil { if err != nil {
return fmt.Errorf("failed to create temp folder: %v", err) return fmt.Errorf("failed to create temp folder: %v", err)
} }
fmt.Fprintf(writer, "working directory: %s\n", tempFolder) // fmt.Fprintf(writer, "working directory: %s\n", tempFolder)
// collect each volume file ids // collect each volume file ids
for volumeId, vinfo := range volumeIdToServer { for volumeId, vinfo := range volumeIdToServer {
@ -77,7 +77,7 @@ func (c *commandVolumeFsck) Do(args []string, commandEnv *CommandEnv, writer io.
// volume file ids substract filer file ids // volume file ids substract filer file ids
var totalOrphanChunkCount, totalOrphanDataSize uint64 var totalOrphanChunkCount, totalOrphanDataSize uint64
for volumeId, server := range volumeIdToServer { for volumeId, server := range volumeIdToServer {
orphanChunkCount, orphanDataSize, checkErr := c.oneVolumeFileIdsSubtractFilerFileIds(tempFolder, volumeId) orphanChunkCount, orphanDataSize, checkErr := c.oneVolumeFileIdsSubtractFilerFileIds(tempFolder, volumeId, writer)
if checkErr != nil { if checkErr != nil {
return fmt.Errorf("failed to collect file ids from volume %d on %s: %v", volumeId, server, checkErr) return fmt.Errorf("failed to collect file ids from volume %d on %s: %v", volumeId, server, checkErr)
} }
@ -86,7 +86,9 @@ func (c *commandVolumeFsck) Do(args []string, commandEnv *CommandEnv, writer io.
} }
if totalOrphanChunkCount > 0 { if totalOrphanChunkCount > 0 {
fmt.Fprintf(writer, "total %d orphan chunks, %d bytes\n", totalOrphanChunkCount, totalOrphanDataSize) fmt.Fprintf(writer, "\ntotal\t%d orphan entries\t%d bytes not used by filer http://%s:%d/\n",
totalOrphanChunkCount, totalOrphanDataSize, c.env.option.FilerHost, c.env.option.FilerPort)
fmt.Fprintf(writer, "This could be normal if multiple filers or no filers are used.\n")
} else { } else {
fmt.Fprintf(writer, "no orphan data\n") fmt.Fprintf(writer, "no orphan data\n")
} }
@ -162,7 +164,7 @@ func (c *commandVolumeFsck) collectFilerFileIds(tempFolder string, volumeIdToSer
}) })
} }
func (c *commandVolumeFsck) oneVolumeFileIdsSubtractFilerFileIds(tempFolder string, volumeId uint32) (orphanChunkCount, orphanDataSize uint64, err error) { func (c *commandVolumeFsck) oneVolumeFileIdsSubtractFilerFileIds(tempFolder string, volumeId uint32, writer io.Writer) (orphanChunkCount, orphanDataSize uint64, err error) {
db := needle_map.NewMemDb() db := needle_map.NewMemDb()
defer db.Close() defer db.Close()
@ -187,12 +189,16 @@ func (c *commandVolumeFsck) oneVolumeFileIdsSubtractFilerFileIds(tempFolder stri
} }
db.AscendingVisit(func(n needle_map.NeedleValue) error { db.AscendingVisit(func(n needle_map.NeedleValue) error {
fmt.Printf("%d,%x\n", volumeId, n.Key) // fmt.Printf("%d,%x\n", volumeId, n.Key)
orphanChunkCount++ orphanChunkCount++
orphanDataSize += uint64(n.Size) orphanDataSize += uint64(n.Size)
return nil return nil
}) })
if orphanChunkCount > 0 {
fmt.Fprintf(writer, "volume %d\t%d orphan entries\t%d bytes\n", volumeId, orphanChunkCount, orphanDataSize)
}
return return
} }