lsm/seaweedfs
1
0
Fork 0
mirror of https://github.com/seaweedfs/seaweedfs.git synced 2025-09-20 00:49:24 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

format output

Browse Source
This commit is contained in:
Chris Lu
2020-03-25 00:56:47 -07:00
parent d9b56ed88b
commit d79f0a76b1
1 changed files with 26 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
weed/shell/command_volume_fsck.go
View File

@@ -57,12 +57,6 @@ func (c *commandVolumeFsck) Do(args []string, commandEnv *CommandEnv, writer io.
c.env = commandEnv c.env = commandEnv
// collect all volume id locations
volumeIdToServer, err := c.collectVolumeIds(*verbose)
if err != nil {
return fmt.Errorf("failed to collect all volume locations: %v", err)
}
// create a temp folder // create a temp folder
tempFolder, err := ioutil.TempDir("", "sw_fsck") tempFolder, err := ioutil.TempDir("", "sw_fsck")
if err != nil { if err != nil {
@@ -73,16 +67,22 @@ func (c *commandVolumeFsck) Do(args []string, commandEnv *CommandEnv, writer io.
} }
defer os.RemoveAll(tempFolder) defer os.RemoveAll(tempFolder)
// collect all volume id locations
volumeIdToServer, err := c.collectVolumeIds(*verbose, writer)
if err != nil {
return fmt.Errorf("failed to collect all volume locations: %v", err)
}
// collect each volume file ids // collect each volume file ids
for volumeId, vinfo := range volumeIdToServer { for volumeId, vinfo := range volumeIdToServer {
err = c.collectOneVolumeFileIds(tempFolder, volumeId, vinfo, *verbose) err = c.collectOneVolumeFileIds(tempFolder, volumeId, vinfo, *verbose, writer)
if err != nil { if err != nil {
return fmt.Errorf("failed to collect file ids from volume %d on %s: %v", volumeId, vinfo.server, err) return fmt.Errorf("failed to collect file ids from volume %d on %s: %v", volumeId, vinfo.server, err)
} }
} }
// collect all filer file ids // collect all filer file ids
if err = c.collectFilerFileIds(tempFolder, volumeIdToServer, *verbose); err != nil { if err = c.collectFilerFileIds(tempFolder, volumeIdToServer, *verbose, writer); err != nil {
return fmt.Errorf("failed to collect file ids from filer: %v", err) return fmt.Errorf("failed to collect file ids from filer: %v", err)
} }
@@ -117,7 +117,11 @@ func (c *commandVolumeFsck) Do(args []string, commandEnv *CommandEnv, writer io.
return nil return nil
} }
func (c *commandVolumeFsck) collectOneVolumeFileIds(tempFolder string, volumeId uint32, vinfo VInfo, verbose bool) error { func (c *commandVolumeFsck) collectOneVolumeFileIds(tempFolder string, volumeId uint32, vinfo VInfo, verbose bool, writer io.Writer) error {
if verbose {
fmt.Fprintf(writer, "collecting volume %d file ids from %s ...\n", volumeId, vinfo.server)
}
return operation.WithVolumeServerClient(vinfo.server, c.env.option.GrpcDialOption, func(volumeServerClient volume_server_pb.VolumeServerClient) error { return operation.WithVolumeServerClient(vinfo.server, c.env.option.GrpcDialOption, func(volumeServerClient volume_server_pb.VolumeServerClient) error {
@@ -145,7 +149,11 @@ func (c *commandVolumeFsck) collectOneVolumeFileIds(tempFolder string, volumeId
} }
func (c *commandVolumeFsck) collectFilerFileIds(tempFolder string, volumeIdToServer map[uint32]VInfo, verbose bool) error { func (c *commandVolumeFsck) collectFilerFileIds(tempFolder string, volumeIdToServer map[uint32]VInfo, verbose bool, writer io.Writer) error {
if verbose {
fmt.Fprintf(writer, "collecting file ids from filer ...\n")
}
files := make(map[uint32]*os.File) files := make(map[uint32]*os.File)
for vid := range volumeIdToServer { for vid := range volumeIdToServer {
@@ -231,7 +239,11 @@ type VInfo struct {
isEcVolume bool isEcVolume bool
} }
func (c *commandVolumeFsck) collectVolumeIds(verbose bool) (volumeIdToServer map[uint32]VInfo, err error) { func (c *commandVolumeFsck) collectVolumeIds(verbose bool, writer io.Writer) (volumeIdToServer map[uint32]VInfo, err error) {
if verbose {
fmt.Fprintf(writer, "collecting volume id and locations from master ...\n")
}
volumeIdToServer = make(map[uint32]VInfo) volumeIdToServer = make(map[uint32]VInfo)
var resp *master_pb.VolumeListResponse var resp *master_pb.VolumeListResponse
@@ -260,6 +272,9 @@ func (c *commandVolumeFsck) collectVolumeIds(verbose bool) (volumeIdToServer map
} }
}) })
if verbose {
fmt.Fprintf(writer, "collected %d volumes and locations.\n", len(volumeIdToServer))
}
return return
} }