mirror of
https://github.com/seaweedfs/seaweedfs.git
synced 2024-01-19 02:48:24 +00:00
ssue 59: Multi Ip Enviromment support + publicUrl is disregarded by
master
This commit is contained in:
parent
e449a4a517
commit
eeeccf2f78
|
@ -18,7 +18,7 @@ func AllocateVolume(dn *topology.DataNode, vid storage.VolumeId, collection stri
|
|||
values.Add("volume", vid.String())
|
||||
values.Add("collection", collection)
|
||||
values.Add("replicationType", repType.String())
|
||||
jsonBlob, err := util.Post("http://"+dn.Url()+"/admin/assign_volume", values)
|
||||
jsonBlob, err := util.Post("http://"+dn.PublicUrl+"/admin/assign_volume", values)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
|
|
@ -27,6 +27,7 @@ var cmdMaster = &Command{
|
|||
|
||||
var (
|
||||
mport = cmdMaster.Flag.Int("port", 9333, "http listen port")
|
||||
mip = cmdMaster.Flag.String("ip", "localhost", "http listen port")
|
||||
metaFolder = cmdMaster.Flag.String("mdir", os.TempDir(), "data directory to store mappings")
|
||||
volumeSizeLimitMB = cmdMaster.Flag.Uint("volumeSizeLimitMB", 32*1024, "Default Volume Size in MegaBytes")
|
||||
mpulse = cmdMaster.Flag.Int("pulseSeconds", 5, "number of seconds between heartbeats")
|
||||
|
@ -55,9 +56,9 @@ func runMaster(cmd *Command, args []string) bool {
|
|||
*volumeSizeLimitMB, *mpulse, *confFile, *defaultRepType, *garbageThreshold, masterWhiteList,
|
||||
)
|
||||
|
||||
glog.V(0).Infoln("Start Weed Master", VERSION, "at port", strconv.Itoa(*mport))
|
||||
glog.V(0).Infoln("Start Weed Master", VERSION, "at port", *mip+":"+strconv.Itoa(*mport))
|
||||
srv := &http.Server{
|
||||
Addr: ":" + strconv.Itoa(*mport),
|
||||
Addr: *mip+":" + strconv.Itoa(*mport),
|
||||
Handler: r,
|
||||
ReadTimeout: time.Duration(*mReadTimeout) * time.Second,
|
||||
}
|
||||
|
|
|
@ -87,7 +87,7 @@ func runVolume(cmd *Command, args []string) bool {
|
|||
|
||||
glog.V(0).Infoln("Start Weed volume server", VERSION, "at http://"+*ip+":"+strconv.Itoa(*vport))
|
||||
srv := &http.Server{
|
||||
Addr: ":" + strconv.Itoa(*vport),
|
||||
Addr: *ip + ":" + strconv.Itoa(*vport),
|
||||
Handler: r,
|
||||
ReadTimeout: (time.Duration(*vReadTimeout) * time.Second),
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue