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

fix debug message displaying

Browse source
This commit is contained in:
Chris Lu 2013-01-19 19:49:57 -08:00
parent b0c7df0c3b
commit 921f1c626a
6 changed files with 14 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
weed-fs/src/cmd/weed/command.go
View file

@ -24,6 +24,8 @@ type Command struct {
// Flag is a set of flags specific to this command. // Flag is a set of flags specific to this command.
Flag flag.FlagSet Flag flag.FlagSet
IsDebug *bool
} }
// Name returns the command's name: the first word in the usage line. // Name returns the command's name: the first word in the usage line.

16
weed-fs/src/cmd/weed/fix.go
View file

@ -10,11 +10,11 @@ import (
func init() { func init() {
cmdFix.Run = runFix // break init cycle cmdFix.Run = runFix // break init cycle
IsDebug = cmdFix.Flag.Bool("debug", false, "enable debug mode") cmdFix.IsDebug = cmdFix.Flag.Bool("debug", false, "enable debug mode")
} }
var cmdFix = &Command{ var cmdFix = &Command{
UsageLine: "fix -dir=/tmp -volumeId=234 -debug=1", UsageLine: "fix -dir=/tmp -volumeId=234",
Short: "run weed tool fix on index file if corrupted", Short: "run weed tool fix on index file if corrupted",
Long: `Fix runs the WeedFS fix command to re-create the index .idx file. Long: `Fix runs the WeedFS fix command to re-create the index .idx file.
@ -22,23 +22,23 @@ var cmdFix = &Command{
} }
var ( var (
dir = cmdFix.Flag.String("dir", "/tmp", "data directory to store files") fixVolumePath = cmdFix.Flag.String("dir", "/tmp", "data directory to store files")
volumeId = cmdFix.Flag.Int("volumeId", -1, "a non-negative volume id. The volume should already exist in the dir. The volume index file should not exist.") fixVolumeId = cmdFix.Flag.Int("volumeId", -1, "a volume id. The volume should already exist in the dir. The volume index file should not exist.")
) )
func runFix(cmd *Command, args []string) bool { func runFix(cmd *Command, args []string) bool {
if *volumeId == -1 { if *fixVolumeId == -1 {
return false return false
} }
fileName := strconv.Itoa(*volumeId) fileName := strconv.Itoa(*fixVolumeId)
dataFile, e := os.OpenFile(path.Join(*dir, fileName+".dat"), os.O_RDONLY, 0644) dataFile, e := os.OpenFile(path.Join(*fixVolumePath, fileName+".dat"), os.O_RDONLY, 0644)
if e != nil { if e != nil {
log.Fatalf("Read Volume [ERROR] %s\n", e) log.Fatalf("Read Volume [ERROR] %s\n", e)
} }
defer dataFile.Close() defer dataFile.Close()
indexFile, ie := os.OpenFile(path.Join(*dir, fileName+".idx"), os.O_WRONLY|os.O_CREATE, 0644) indexFile, ie := os.OpenFile(path.Join(*fixVolumePath, fileName+".idx"), os.O_WRONLY|os.O_CREATE, 0644)
if ie != nil { if ie != nil {
log.Fatalf("Create Volume Index [ERROR] %s\n", ie) log.Fatalf("Create Volume Index [ERROR] %s\n", ie)
} }

2
weed-fs/src/cmd/weed/master.go
View file

@ -16,7 +16,7 @@ import (
func init() { func init() {
cmdMaster.Run = runMaster // break init cycle cmdMaster.Run = runMaster // break init cycle
IsDebug = cmdMaster.Flag.Bool("debug", false, "enable debug mode") cmdMaster.IsDebug = cmdMaster.Flag.Bool("debug", false, "enable debug mode")
} }
var cmdMaster = &Command{ var cmdMaster = &Command{

2
weed-fs/src/cmd/weed/upload.go
View file

@ -15,7 +15,7 @@ var uploadReplication *string
func init() { func init() {
cmdUpload.Run = runUpload // break init cycle cmdUpload.Run = runUpload // break init cycle
IsDebug = cmdUpload.Flag.Bool("debug", false, "verbose debug information") cmdUpload.IsDebug = cmdUpload.Flag.Bool("debug", false, "verbose debug information")
server = cmdUpload.Flag.String("server", "localhost:9333", "weedfs master location") server = cmdUpload.Flag.String("server", "localhost:9333", "weedfs master location")
uploadReplication = cmdUpload.Flag.String("replication", "000", "replication type(000,001,010,100,110,200)") uploadReplication = cmdUpload.Flag.String("replication", "000", "replication type(000,001,010,100,110,200)")
} }

2
weed-fs/src/cmd/weed/volume.go
View file

@ -17,7 +17,7 @@ import (
func init() { func init() {
cmdVolume.Run = runVolume // break init cycle cmdVolume.Run = runVolume // break init cycle
IsDebug = cmdVolume.Flag.Bool("debug", false, "enable debug mode") cmdVolume.IsDebug = cmdVolume.Flag.Bool("debug", false, "enable debug mode")
} }
var cmdVolume = &Command{ var cmdVolume = &Command{

1
weed-fs/src/cmd/weed/weed.go
View file

@ -65,6 +65,7 @@ func main() {
cmd.Flag.Usage = func() { cmd.Usage() } cmd.Flag.Usage = func() { cmd.Usage() }
cmd.Flag.Parse(args[1:]) cmd.Flag.Parse(args[1:])
args = cmd.Flag.Args() args = cmd.Flag.Args()
*IsDebug = *cmd.IsDebug
if !cmd.Run(cmd, args) { if !cmd.Run(cmd, args) {
fmt.Fprintf(os.Stderr, "\n") fmt.Fprintf(os.Stderr, "\n")
cmd.Flag.Usage() cmd.Flag.Usage()