|
|
|
@ -5,7 +5,9 @@ import ( |
|
|
|
"log" |
|
|
|
"net/http" |
|
|
|
"pkg/directory" |
|
|
|
"pkg/replication" |
|
|
|
"pkg/storage" |
|
|
|
"pkg/topology" |
|
|
|
"strconv" |
|
|
|
"strings" |
|
|
|
"time" |
|
|
|
@ -29,11 +31,14 @@ var ( |
|
|
|
mport = cmdMaster.Flag.Int("port", 9333, "http listen port") |
|
|
|
metaFolder = cmdMaster.Flag.String("mdir", "/tmp", "data directory to store mappings") |
|
|
|
capacity = cmdMaster.Flag.Int("capacity", 100, "maximum number of volumes to hold") |
|
|
|
mapper *directory.Mapper |
|
|
|
volumeSizeLimitMB = cmdMaster.Flag.Uint("volumeSizeLimitMB", 32*1024, "Default Volume Size in MegaBytes") |
|
|
|
mpulse = cmdMaster.Flag.Int("pulseSeconds", 5, "number of seconds between heartbeats") |
|
|
|
) |
|
|
|
|
|
|
|
var mapper *directory.Mapper |
|
|
|
var topo *topology.Topology |
|
|
|
var vg *replication.VolumeGrowth |
|
|
|
|
|
|
|
func dirLookupHandler(w http.ResponseWriter, r *http.Request) { |
|
|
|
vid := r.FormValue("volumeId") |
|
|
|
commaSep := strings.Index(vid, ",") |
|
|
|
@ -43,10 +48,10 @@ func dirLookupHandler(w http.ResponseWriter, r *http.Request) { |
|
|
|
volumeId, _ := storage.NewVolumeId(vid) |
|
|
|
machines, e := mapper.Get(volumeId) |
|
|
|
if e == nil { |
|
|
|
ret:= []map[string]string{} |
|
|
|
for _, machine := range machines { |
|
|
|
ret = append(ret,map[string]string{"url": machine.Url, "publicUrl": machine.PublicUrl}) |
|
|
|
} |
|
|
|
ret := []map[string]string{} |
|
|
|
for _, machine := range machines { |
|
|
|
ret = append(ret, map[string]string{"url": machine.Url, "publicUrl": machine.PublicUrl}) |
|
|
|
} |
|
|
|
writeJson(w, r, ret) |
|
|
|
} else { |
|
|
|
log.Println("Invalid volume id", volumeId) |
|
|
|
@ -62,7 +67,27 @@ func dirAssignHandler(w http.ResponseWriter, r *http.Request) { |
|
|
|
writeJson(w, r, map[string]string{"error": err.Error()}) |
|
|
|
} |
|
|
|
} |
|
|
|
func dirAssign2Handler(w http.ResponseWriter, r *http.Request) { |
|
|
|
c, _ := strconv.Atoi(r.FormValue("count")) |
|
|
|
rt := storage.NewReplicationType(r.FormValue("replication")) |
|
|
|
if topo.GetVolumeLayout(rt).GetActiveVolumeCount() <= 0 { |
|
|
|
if topo.FreeSpace() <= 0 { |
|
|
|
writeJson(w, r, map[string]string{"error": "No free volumes left!"}) |
|
|
|
} else { |
|
|
|
vg.GrowByType(rt, topo) |
|
|
|
} |
|
|
|
} |
|
|
|
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}) |
|
|
|
} 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, ":")] |
|
|
|
port, _ := strconv.Atoi(r.FormValue("port")) |
|
|
|
maxVolumeCount, _ := strconv.Atoi(r.FormValue("maxVolumeCount")) |
|
|
|
s := r.RemoteAddr[0:strings.Index(r.RemoteAddr, ":")+1] + r.FormValue("port") |
|
|
|
publicUrl := r.FormValue("publicUrl") |
|
|
|
volumes := new([]storage.VolumeInfo) |
|
|
|
@ -71,20 +96,40 @@ func dirJoinHandler(w http.ResponseWriter, r *http.Request) { |
|
|
|
log.Println(s, "volumes", r.FormValue("volumes")) |
|
|
|
} |
|
|
|
mapper.Add(directory.NewMachine(s, publicUrl, *volumes, time.Now().Unix())) |
|
|
|
|
|
|
|
//new ways
|
|
|
|
topo.RegisterVolumes(*volumes, ip, port, publicUrl, maxVolumeCount) |
|
|
|
} |
|
|
|
func dirStatusHandler(w http.ResponseWriter, r *http.Request) { |
|
|
|
func dirOldStatusHandler(w http.ResponseWriter, r *http.Request) { |
|
|
|
writeJson(w, r, mapper) |
|
|
|
} |
|
|
|
func dirNewStatusHandler(w http.ResponseWriter, r *http.Request) { |
|
|
|
writeJson(w, r, topo.ToMap()) |
|
|
|
} |
|
|
|
func volumeGrowHandler(w http.ResponseWriter, r *http.Request) { |
|
|
|
rt := storage.NewReplicationType(r.FormValue("replication")) |
|
|
|
count, err := strconv.Atoi(r.FormValue("count")) |
|
|
|
if err != nil { |
|
|
|
vg.GrowByType(rt, topo) |
|
|
|
} else { |
|
|
|
vg.GrowByCountAndType(count, rt, topo) |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
func runMaster(cmd *Command, args []string) bool { |
|
|
|
topo = topology.NewTopology("topo", *metaFolder, "toposequence", uint64(*volumeSizeLimitMB)*1024*1024, *mpulse) |
|
|
|
vg = replication.NewDefaultVolumeGrowth() |
|
|
|
log.Println("Volume Size Limit is", *volumeSizeLimitMB, "MB") |
|
|
|
mapper = directory.NewMapper(*metaFolder, "directory", uint64(*volumeSizeLimitMB)*1024*1024, *mpulse) |
|
|
|
http.HandleFunc("/dir/assign", dirAssignHandler) |
|
|
|
http.HandleFunc("/dir/assign2", dirAssign2Handler) |
|
|
|
http.HandleFunc("/dir/lookup", dirLookupHandler) |
|
|
|
http.HandleFunc("/dir/join", dirJoinHandler) |
|
|
|
http.HandleFunc("/dir/status", dirStatusHandler) |
|
|
|
http.HandleFunc("/dir/status", dirOldStatusHandler) |
|
|
|
http.HandleFunc("/dir/status2", dirNewStatusHandler) //temporary
|
|
|
|
http.HandleFunc("/vol/grow", volumeGrowHandler) |
|
|
|
|
|
|
|
mapper.StartRefreshWritableVolumes() |
|
|
|
mapper.StartRefreshWritableVolumes() |
|
|
|
|
|
|
|
log.Println("Start directory service at http://127.0.0.1:" + strconv.Itoa(*mport)) |
|
|
|
e := http.ListenAndServe(":"+strconv.Itoa(*mport), nil) |
|
|
|
|
Chris Lu
12 years ago