diff options
Diffstat (limited to 'go/weed/volume.go')
| -rw-r--r-- | go/weed/volume.go | 54 |
1 files changed, 35 insertions, 19 deletions
diff --git a/go/weed/volume.go b/go/weed/volume.go index 759200927..ecd547860 100644 --- a/go/weed/volume.go +++ b/go/weed/volume.go @@ -29,17 +29,17 @@ var cmdVolume = &Command{ } var ( - vport = cmdVolume.Flag.Int("port", 8080, "http listen port") - volumeFolder = cmdVolume.Flag.String("dir", "/tmp", "directory to store data files") - ip = cmdVolume.Flag.String("ip", "localhost", "ip or server name") - publicUrl = cmdVolume.Flag.String("publicUrl", "", "Publicly accessible <ip|server_name>:<port>") - masterNode = cmdVolume.Flag.String("mserver", "localhost:9333", "master server location") - vpulse = cmdVolume.Flag.Int("pulseSeconds", 5, "number of seconds between heartbeats, must be smaller than the master's setting") - maxVolumeCount = cmdVolume.Flag.Int("max", 7, "maximum number of volumes") - vReadTimeout = cmdVolume.Flag.Int("readTimeout", 3, "connection read timeout in seconds") - vMaxCpu = cmdVolume.Flag.Int("maxCpu", 0, "maximum number of CPUs. 0 means all available CPUs") - dataCenter = cmdVolume.Flag.String("dataCenter", "", "current volume server's data center name") - rack = cmdVolume.Flag.String("rack", "", "current volume server's rack name") + vport = cmdVolume.Flag.Int("port", 8080, "http listen port") + volumeFolders = cmdVolume.Flag.String("dir", "/tmp", "directories to store data files. dir[,dir]...") + maxVolumeCounts = cmdVolume.Flag.String("max", "7", "maximum numbers of volumes, count[,count]...") + ip = cmdVolume.Flag.String("ip", "localhost", "ip or server name") + publicUrl = cmdVolume.Flag.String("publicUrl", "", "Publicly accessible <ip|server_name>:<port>") + masterNode = cmdVolume.Flag.String("mserver", "localhost:9333", "master server location") + vpulse = cmdVolume.Flag.Int("pulseSeconds", 5, "number of seconds between heartbeats, must be smaller than the master's setting") + vReadTimeout = cmdVolume.Flag.Int("readTimeout", 3, "connection read timeout in seconds") + vMaxCpu = cmdVolume.Flag.Int("maxCpu", 0, "maximum number of CPUs. 0 means all available CPUs") + dataCenter = cmdVolume.Flag.String("dataCenter", "", "current volume server's data center name") + rack = cmdVolume.Flag.String("rack", "", "current volume server's rack name") store *storage.Store ) @@ -295,21 +295,37 @@ func runVolume(cmd *Command, args []string) bool { *vMaxCpu = runtime.NumCPU() } runtime.GOMAXPROCS(*vMaxCpu) - fileInfo, err := os.Stat(*volumeFolder) - if err != nil { - log.Fatalf("No Existing Folder:%s", *volumeFolder) + folders := strings.Split(*volumeFolders, ",") + maxCountStrings := strings.Split(*maxVolumeCounts, ",") + maxCounts := make([]int, 0) + for _, maxString := range maxCountStrings { + if max, e := strconv.Atoi(maxString); e == nil { + maxCounts = append(maxCounts, max) + } else { + log.Fatalf("The max specified in -max not a valid number %s", max) + } } - if !fileInfo.IsDir() { - log.Fatalf("Volume Folder should not be a file:%s", *volumeFolder) + if len(folders) != len(maxCounts) { + log.Fatalf("%d directories by -dir, but only %d max is set by -max", len(folders), len(maxCounts)) + } + for _, folder := range folders { + fileInfo, err := os.Stat(folder) + if err != nil { + log.Fatalf("No Existing Folder:%s", folder) + } + if !fileInfo.IsDir() { + log.Fatalf("Volume Folder should not be a file:%s", folder) + } + perm := fileInfo.Mode().Perm() + log.Println("Volume Folder", folder) + log.Println("Permission:", perm) } - perm := fileInfo.Mode().Perm() - log.Println("Volume Folder permission:", perm) if *publicUrl == "" { *publicUrl = *ip + ":" + strconv.Itoa(*vport) } - store = storage.NewStore(*vport, *ip, *publicUrl, *volumeFolder, *maxVolumeCount) + store = storage.NewStore(*vport, *ip, *publicUrl, folders, maxCounts) defer store.Close() http.HandleFunc("/", storeHandler) http.HandleFunc("/status", statusHandler) |