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

adding VolumeId type

Browse Source
This commit is contained in:
Chris Lu
2012-08-23 22:46:54 -07:00
parent 03f4c0b832
commit 5e3ecc1b82
3 changed files with 154 additions and 147 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,177 +1,176 @@
package main package main
import ( import (
"log" "log"
"math/rand" "math/rand"
"mime" "mime"
"net/http" "net/http"
"pkg/storage" "pkg/storage"
"strconv" "strconv"
"strings" "strings"
"time" "time"
) )
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") IsDebug = cmdVolume.Flag.Bool("debug", false, "enable debug mode")
port = cmdVolume.Flag.Int("port", 8080, "http listen port") port = cmdVolume.Flag.Int("port", 8080, "http listen port")
} }
var cmdVolume = &Command{ var cmdVolume = &Command{
UsageLine: "volume -port=8080 -dir=/tmp -volumes=0-99 -publicUrl=server_name:8080 -mserver=localhost:9333", UsageLine: "volume -port=8080 -dir=/tmp -volumes=0-99 -publicUrl=server_name:8080 -mserver=localhost:9333",
Short: "start a volume server", Short: "start a volume server",
Long: `start a volume server to provide storage spaces Long: `start a volume server to provide storage spaces
`, `,
} }
var ( var (
chunkFolder = cmdVolume.Flag.String("dir", "/tmp", "data directory to store files") chunkFolder = cmdVolume.Flag.String("dir", "/tmp", "data directory to store files")
volumes = cmdVolume.Flag.String("volumes", "0,1-3,4", "comma-separated list of volume ids or range of ids") volumes = cmdVolume.Flag.String("volumes", "0,1-3,4", "comma-separated list of volume ids or range of ids")
publicUrl = cmdVolume.Flag.String("publicUrl", "localhost:8080", "public url to serve data read") publicUrl = cmdVolume.Flag.String("publicUrl", "localhost:8080", "public url to serve data read")
metaServer = cmdVolume.Flag.String("mserver", "localhost:9333", "master directory server to store mappings") metaServer = cmdVolume.Flag.String("mserver", "localhost:9333", "master directory server to store mappings")
pulse = cmdVolume.Flag.Int("pulseSeconds", 5, "number of seconds between heartbeats") pulse = cmdVolume.Flag.Int("pulseSeconds", 5, "number of seconds between heartbeats")
store *storage.Store
store *storage.Store
) )
func statusHandler(w http.ResponseWriter, r *http.Request) { func statusHandler(w http.ResponseWriter, r *http.Request) {
writeJson(w, r, store.Status()) writeJson(w, r, store.Status())
} }
func addVolumeHandler(w http.ResponseWriter, r *http.Request) { func addVolumeHandler(w http.ResponseWriter, r *http.Request) {
store.AddVolume(r.FormValue("volume")) store.AddVolume(r.FormValue("volume"))
writeJson(w, r, store.Status()) writeJson(w, r, store.Status())
} }
func storeHandler(w http.ResponseWriter, r *http.Request) { func storeHandler(w http.ResponseWriter, r *http.Request) {
switch r.Method { switch r.Method {
case "GET": case "GET":
GetHandler(w, r) GetHandler(w, r)
case "DELETE": case "DELETE":
DeleteHandler(w, r) DeleteHandler(w, r)
case "POST": case "POST":
PostHandler(w, r) PostHandler(w, r)
} }
} }
func GetHandler(w http.ResponseWriter, r *http.Request) { func GetHandler(w http.ResponseWriter, r *http.Request) {
n := new(storage.Needle) n := new(storage.Needle)
vid, fid, ext := parseURLPath(r.URL.Path) vid, fid, ext := parseURLPath(r.URL.Path)
volumeId, _ := strconv.ParseUint(vid, 10, 64) volumeId, _ := storage.NewVolumeId(vid)
n.ParsePath(fid) n.ParsePath(fid)
if *IsDebug { if *IsDebug {
log.Println("volume", volumeId, "reading", n) log.Println("volume", volumeId, "reading", n)
} }
cookie := n.Cookie cookie := n.Cookie
count, e := store.Read(volumeId, n) count, e := store.Read(volumeId, n)
if *IsDebug { if *IsDebug {
log.Println("read bytes", count, "error", e) log.Println("read bytes", count, "error", e)
} }
if n.Cookie != cookie { if n.Cookie != cookie {
log.Println("request with unmaching cookie from ", r.RemoteAddr, "agent", r.UserAgent()) log.Println("request with unmaching cookie from ", r.RemoteAddr, "agent", r.UserAgent())
return return
} }
if ext != "" { if ext != "" {
mtype := mime.TypeByExtension(ext) mtype := mime.TypeByExtension(ext)
w.Header().Set("Content-Type", mtype) w.Header().Set("Content-Type", mtype)
if storage.IsCompressable(ext, mtype){ if storage.IsCompressable(ext, mtype) {
if strings.Contains(r.Header.Get("Accept-Encoding"), "gzip"){ if strings.Contains(r.Header.Get("Accept-Encoding"), "gzip") {
w.Header().Set("Content-Encoding", "gzip") w.Header().Set("Content-Encoding", "gzip")
}else{ } else {
n.Data = storage.UnGzipData(n.Data) n.Data = storage.UnGzipData(n.Data)
} }
} }
} }
w.Write(n.Data) w.Write(n.Data)
} }
func PostHandler(w http.ResponseWriter, r *http.Request) { func PostHandler(w http.ResponseWriter, r *http.Request) {
vid, _, _ := parseURLPath(r.URL.Path) vid, _, _ := parseURLPath(r.URL.Path)
volumeId, e := strconv.ParseUint(vid, 10, 64) volumeId, e := storage.NewVolumeId(vid)
if e != nil { if e != nil {
writeJson(w, r, e) writeJson(w, r, e)
} else { } else {
needle, ne := storage.NewNeedle(r) needle, ne := storage.NewNeedle(r)
if ne != nil { if ne != nil {
writeJson(w, r, ne) writeJson(w, r, ne)
} else { } else {
ret := store.Write(volumeId, needle) ret := store.Write(volumeId, needle)
m := make(map[string]uint32) m := make(map[string]uint32)
m["size"] = ret m["size"] = ret
writeJson(w, r, m) writeJson(w, r, m)
} }
} }
} }
func DeleteHandler(w http.ResponseWriter, r *http.Request) { func DeleteHandler(w http.ResponseWriter, r *http.Request) {
n := new(storage.Needle) n := new(storage.Needle)
vid, fid, _ := parseURLPath(r.URL.Path) vid, fid, _ := parseURLPath(r.URL.Path)
volumeId, _ := strconv.ParseUint(vid, 10, 64) volumeId, _ := storage.NewVolumeId(vid)
n.ParsePath(fid) n.ParsePath(fid)
if *IsDebug { if *IsDebug {
log.Println("deleting", n) log.Println("deleting", n)
} }
cookie := n.Cookie cookie := n.Cookie
count, ok := store.Read(volumeId, n) count, ok := store.Read(volumeId, n)
if ok != nil { if ok != nil {
m := make(map[string]uint32) m := make(map[string]uint32)
m["size"] = 0 m["size"] = 0
writeJson(w, r, m) writeJson(w, r, m)
return return
} }
if n.Cookie != cookie { if n.Cookie != cookie {
log.Println("delete with unmaching cookie from ", r.RemoteAddr, "agent", r.UserAgent()) log.Println("delete with unmaching cookie from ", r.RemoteAddr, "agent", r.UserAgent())
return return
} }
n.Size = 0 n.Size = 0
store.Delete(volumeId, n) store.Delete(volumeId, n)
m := make(map[string]uint32) m := make(map[string]uint32)
m["size"] = uint32(count) m["size"] = uint32(count)
writeJson(w, r, m) writeJson(w, r, m)
} }
func parseURLPath(path string) (vid, fid, ext string) { func parseURLPath(path string) (vid, fid, ext string) {
sepIndex := strings.LastIndex(path, "/") sepIndex := strings.LastIndex(path, "/")
commaIndex := strings.LastIndex(path[sepIndex:], ",") commaIndex := strings.LastIndex(path[sepIndex:], ",")
if commaIndex <= 0 { if commaIndex <= 0 {
if "favicon.ico" != path[sepIndex+1:] { if "favicon.ico" != path[sepIndex+1:] {
log.Println("unknown file id", path[sepIndex+1:]) log.Println("unknown file id", path[sepIndex+1:])
} }
return return
} }
dotIndex := strings.LastIndex(path[sepIndex:], ".") dotIndex := strings.LastIndex(path[sepIndex:], ".")
vid = path[sepIndex+1 : commaIndex] vid = path[sepIndex+1 : commaIndex]
fid = path[commaIndex+1:] fid = path[commaIndex+1:]
ext = "" ext = ""
if dotIndex > 0 { if dotIndex > 0 {
fid = path[commaIndex+1 : dotIndex] fid = path[commaIndex+1 : dotIndex]
ext = path[dotIndex:] ext = path[dotIndex:]
} }
return return
} }
func runVolume(cmd *Command, args []string) bool { func runVolume(cmd *Command, args []string) bool {
//TODO: now default to 1G, this value should come from server? //TODO: now default to 1G, this value should come from server?
store = storage.NewStore(*port, *publicUrl, *chunkFolder, *volumes) store = storage.NewStore(*port, *publicUrl, *chunkFolder, *volumes)
defer store.Close() defer store.Close()
http.HandleFunc("/", storeHandler) http.HandleFunc("/", storeHandler)
http.HandleFunc("/status", statusHandler) http.HandleFunc("/status", statusHandler)
http.HandleFunc("/add_volume", addVolumeHandler) http.HandleFunc("/add_volume", addVolumeHandler)
go func() { go func() {
for { for {
store.Join(*metaServer) store.Join(*metaServer)
time.Sleep(time.Duration(float32(*pulse*1e3)*(1+rand.Float32())) * time.Millisecond) time.Sleep(time.Duration(float32(*pulse*1e3)*(1+rand.Float32())) * time.Millisecond)
} }
}() }()
log.Println("store joined at", *metaServer) log.Println("store joined at", *metaServer)
log.Println("Start storage service at http://127.0.0.1:"+strconv.Itoa(*port), "public url", *publicUrl) log.Println("Start storage service at http://127.0.0.1:"+strconv.Itoa(*port), "public url", *publicUrl)
e := http.ListenAndServe(":"+strconv.Itoa(*port), nil) e := http.ListenAndServe(":"+strconv.Itoa(*port), nil)
if e != nil { if e != nil {
log.Fatalf("Fail to start:", e) log.Fatalf("Fail to start:", e)
} }
return true return true
} }

20
weed-fs/src/pkg/storage/store.go
View File

@@ -12,7 +12,7 @@ import (
) )
type Store struct { type Store struct {
volumes map[uint64]*Volume volumes map[VolumeId]*Volume
dir string dir string
Port int Port int
PublicUrl string PublicUrl string
@@ -20,7 +20,7 @@ type Store struct {
func NewStore(port int, publicUrl, dirname string, volumeListString string) (s *Store) { func NewStore(port int, publicUrl, dirname string, volumeListString string) (s *Store) {
s = &Store{Port: port, PublicUrl: publicUrl, dir: dirname} s = &Store{Port: port, PublicUrl: publicUrl, dir: dirname}
s.volumes = make(map[uint64]*Volume) s.volumes = make(map[VolumeId]*Volume)
s.AddVolume(volumeListString) s.AddVolume(volumeListString)
@@ -35,7 +35,7 @@ func (s *Store) AddVolume(volumeListString string) error {
if err != nil { if err != nil {
return errors.New("Volume Id " + id_string + " is not a valid unsigned integer!") return errors.New("Volume Id " + id_string + " is not a valid unsigned integer!")
} }
s.addVolume(id) s.addVolume(VolumeId(id))
} else { } else {
pair := strings.Split(range_string, "-") pair := strings.Split(range_string, "-")
start, start_err := strconv.ParseUint(pair[0], 10, 64) start, start_err := strconv.ParseUint(pair[0], 10, 64)
@@ -47,17 +47,17 @@ func (s *Store) AddVolume(volumeListString string) error {
return errors.New("Volume End Id" + pair[1] + " is not a valid unsigned integer!") return errors.New("Volume End Id" + pair[1] + " is not a valid unsigned integer!")
} }
for id := start; id <= end; id++ { for id := start; id <= end; id++ {
s.addVolume(id) s.addVolume(VolumeId(id))
} }
} }
} }
return nil return nil
} }
func (s *Store) addVolume(vid uint64) error { func (s *Store) addVolume(vid VolumeId) error {
if s.volumes[vid] != nil { if s.volumes[vid] != nil {
return errors.New("Volume Id " + strconv.FormatUint(vid, 10) + " already exists!") return errors.New("Volume Id " + vid.String() + " already exists!")
} }
s.volumes[vid] = NewVolume(s.dir, uint32(vid)) s.volumes[vid] = NewVolume(s.dir, vid)
return nil return nil
} }
func (s *Store) Status() *[]*topology.VolumeInfo { func (s *Store) Status() *[]*topology.VolumeInfo {
@@ -88,12 +88,12 @@ func (s *Store) Close() {
v.Close() v.Close()
} }
} }
func (s *Store) Write(i uint64, n *Needle) uint32 { func (s *Store) Write(i VolumeId, n *Needle) uint32 {
return s.volumes[i].write(n) return s.volumes[i].write(n)
} }
func (s *Store) Delete(i uint64, n *Needle) uint32 { func (s *Store) Delete(i VolumeId, n *Needle) uint32 {
return s.volumes[i].delete(n) return s.volumes[i].delete(n)
} }
func (s *Store) Read(i uint64, n *Needle) (int, error) { func (s *Store) Read(i VolumeId, n *Needle) (int, error) {
return s.volumes[i].read(n) return s.volumes[i].read(n)
} }

12
weed-fs/src/pkg/storage/volume.go
View File

@@ -13,8 +13,16 @@ const (
SuperBlockSize = 8 SuperBlockSize = 8
) )
type VolumeId uint32
func NewVolumeId(vid string) (VolumeId,error) {
volumeId, err := strconv.ParseUint(vid, 10, 64)
return VolumeId(volumeId), err
}
func (vid *VolumeId) String() string{
return strconv.FormatUint(uint64(*vid), 10)
}
type Volume struct { type Volume struct {
Id uint32 Id VolumeId
dir string dir string
dataFile *os.File dataFile *os.File
nm *NeedleMap nm *NeedleMap
@@ -22,7 +30,7 @@ type Volume struct {
accessLock sync.Mutex accessLock sync.Mutex
} }
func NewVolume(dirname string, id uint32) (v *Volume) { func NewVolume(dirname string, id VolumeId) (v *Volume) {
var e error var e error
v = &Volume{dir: dirname, Id: id} v = &Volume{dir: dirname, Id: id}
fileName := strconv.FormatUint(uint64(v.Id), 10) fileName := strconv.FormatUint(uint64(v.Id), 10)