gsh-digital-services/seaweedFS
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add option to set server's ip address

Browse Source
This commit is contained in:
Chris Lu
2012-09-26 01:55:56 -07:00
parent 019173b1cc
commit 7ee12f14a8
7 changed files with 35 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
weed-fs/src/cmd/weed/master.go
View File

@@ -32,7 +32,7 @@ var (
capacity = cmdMaster.Flag.Int("capacity", 100, "maximum number of volumes to hold")
volumeSizeLimitMB = cmdMaster.Flag.Uint("volumeSizeLimitMB", 32*1024, "Default Volume Size in MegaBytes")
mpulse = cmdMaster.Flag.Int("pulseSeconds", 5, "number of seconds between heartbeats")
confFile = cmdMaster.Flag.String("conf", "/etc/weed.conf", "xml configuration file")
confFile = cmdMaster.Flag.String("conf", "/etc/weedfs/weedfs.conf", "xml configuration file")
defaultRepType = cmdMaster.Flag.String("defaultReplicationType", "00", "Default replication type if not specified.")
)
@@ -51,7 +51,7 @@ func dirLookupHandler(w http.ResponseWriter, r *http.Request) {
if machines != nil {
ret := []map[string]string{}
for _, dn := range *machines {
ret = append(ret, map[string]string{"url": dn.Ip + strconv.Itoa(dn.Port), "publicUrl": dn.PublicUrl})
ret = append(ret, map[string]string{"url": dn.Url(), "publicUrl":dn.PublicUrl})
}
writeJson(w, r, map[string]interface{}{"locations": ret})
} else {
@@ -83,14 +83,17 @@ func dirAssignHandler(w http.ResponseWriter, r *http.Request) {
}
fid, count, dn, err := topo.PickForWrite(rt, c)
if err == nil {
writeJson(w, r, map[string]interface{}{"fid": fid, "url": dn.Ip + ":" + strconv.Itoa(dn.Port), "publicUrl": dn.PublicUrl, "count": count})
writeJson(w, r, map[string]interface{}{"fid": fid, "url": dn.Url(), "count": count})
} else {
writeJson(w, r, map[string]string{"error": err.Error()})
}
}
func dirJoinHandler(w http.ResponseWriter, r *http.Request) {
ip := r.RemoteAddr[0:strings.Index(r.RemoteAddr, ":")]
ip := r.FormValue("ip")
if ip == ""{
ip = r.RemoteAddr[0:strings.Index(r.RemoteAddr, ":")]
}
port, _ := strconv.Atoi(r.FormValue("port"))
maxVolumeCount, _ := strconv.Atoi(r.FormValue("maxVolumeCount"))
s := r.RemoteAddr[0:strings.Index(r.RemoteAddr, ":")+1] + r.FormValue("port")

13
weed-fs/src/cmd/weed/volume.go
View File

@@ -20,7 +20,7 @@ func init() {
}
var cmdVolume = &Command{
UsageLine: "volume -port=8080 -dir=/tmp -max=5 -publicUrl=server_name:8080 -mserver=localhost:9333",
UsageLine: "volume -port=8080 -dir=/tmp -max=5 -ip=server_name -mserver=localhost:9333",
Short: "start a volume server",
Long: `start a volume server to provide storage spaces
@@ -30,7 +30,8 @@ var cmdVolume = &Command{
var (
vport = cmdVolume.Flag.Int("port", 8080, "http listen port")
volumeFolder = cmdVolume.Flag.String("dir", "/tmp", "directory to store data files")
publicUrl = cmdVolume.Flag.String("publicUrl", "localhost:8080", "public url to serve data read")
ip = cmdVolume.Flag.String("ip", "", "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")
maxVolumeCount = cmdVolume.Flag.Int("max", 5, "maximum number of volumes")
@@ -137,11 +138,11 @@ func PostHandler(w http.ResponseWriter, r *http.Request) {
if lookupResult, lookupErr := operation.Lookup(*server, volumeId); lookupErr == nil {
sendFunc := func(background bool) {
postContentFunc := func(location operation.Location) bool {
operation.Upload("http://"+location.PublicUrl+r.URL.Path+"?type=standard", filename, bytes.NewReader(needle.Data))
operation.Upload("http://"+location.Url+r.URL.Path+"?type=standard", filename, bytes.NewReader(needle.Data))
return true
}
for _, location := range lookupResult.Locations {
if location.PublicUrl != *publicUrl {
if location.Url != (*ip+":"+strconv.Itoa(*vport)) {
if background {
go postContentFunc(location)
} else {
@@ -228,7 +229,7 @@ func runVolume(cmd *Command, args []string) bool {
perm := fileInfo.Mode().Perm()
log.Println("Volume Folder permission:", perm)
store = storage.NewStore(*vport, *publicUrl, *volumeFolder, *maxVolumeCount)
store = storage.NewStore(*vport, *ip, *publicUrl, *volumeFolder, *maxVolumeCount)
defer store.Close()
http.HandleFunc("/", storeHandler)
http.HandleFunc("/status", statusHandler)
@@ -242,7 +243,7 @@ func runVolume(cmd *Command, args []string) bool {
}()
log.Println("store joined at", *masterNode)
log.Println("Start storage service at http://127.0.0.1:"+strconv.Itoa(*vport), "public url", *publicUrl)
log.Println("Start storage service at http://"+*ip+":"+strconv.Itoa(*vport))
e := http.ListenAndServe(":"+strconv.Itoa(*vport), nil)
if e != nil {
log.Fatalf("Fail to start:%s", e.Error())