From df78466a12d9eea524cb31d32f17b127bcc76b0b Mon Sep 17 00:00:00 2001 From: Chris Lu Date: Tue, 5 Aug 2014 18:14:12 -0700 Subject: [PATCH 01/27] remove uploading stated from volume server. --- go/weed/weed_server/volume_server.go | 1 - go/weed/weed_server/volume_server_handlers_admin.go | 4 ---- 2 files changed, 5 deletions(-) diff --git a/go/weed/weed_server/volume_server.go b/go/weed/weed_server/volume_server.go index b118e8c35..9cada91ac 100644 --- a/go/weed/weed_server/volume_server.go +++ b/go/weed/weed_server/volume_server.go @@ -35,7 +35,6 @@ func NewVolumeServer(r *http.ServeMux, ip string, port int, publicIp string, fol } vs.store = storage.NewStore(port, ip, publicUrl, folders, maxCounts) - r.HandleFunc("/submit", secure(vs.whiteList, vs.submitFromVolumeServerHandler)) r.HandleFunc("/status", secure(vs.whiteList, vs.statusHandler)) r.HandleFunc("/admin/assign_volume", secure(vs.whiteList, vs.assignVolumeHandler)) r.HandleFunc("/admin/vacuum_volume_check", secure(vs.whiteList, vs.vacuumVolumeCheckHandler)) diff --git a/go/weed/weed_server/volume_server_handlers_admin.go b/go/weed/weed_server/volume_server_handlers_admin.go index 5921a3b96..6d285524a 100644 --- a/go/weed/weed_server/volume_server_handlers_admin.go +++ b/go/weed/weed_server/volume_server_handlers_admin.go @@ -50,10 +50,6 @@ func (vs *VolumeServer) freezeVolumeHandler(w http.ResponseWriter, r *http.Reque glog.V(2).Infoln("freeze volume =", r.FormValue("volume"), ", error =", err) } -func (vs *VolumeServer) submitFromVolumeServerHandler(w http.ResponseWriter, r *http.Request) { - submitForClientHandler(w, r, vs.masterNode) -} - func (vs *VolumeServer) statsDiskHandler(w http.ResponseWriter, r *http.Request) { m := make(map[string]interface{}) m["Version"] = util.VERSION From aac5fa49de28504f12e283f5fb22f22a1044c676 Mon Sep 17 00:00:00 2001 From: Chris Lu Date: Mon, 11 Aug 2014 07:41:00 -0700 Subject: [PATCH 02/27] remove the submit via volume server api. --- docs/api.rst | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/docs/api.rst b/docs/api.rst index 4f3806be9..cb66d5627 100644 --- a/docs/api.rst +++ b/docs/api.rst @@ -69,17 +69,6 @@ One volume servers one write a time. If you need to increase concurrency, you ca This generates 4 empty volumes. -Upload File Directly -*********************************** - -.. code-block:: bash - - curl -F file=@/home/chris/myphoto.jpg http://localhost:9333/submit - {"fid":"3,01fbe0dc6f1f38","fileName":"myphoto.jpg", - "fileUrl":"localhost:8080/3,01fbe0dc6f1f38","size":68231} - -This API is a little convenient. The master server would contact itself via HTTP to get an file id and store it to the right volume server. It is a convenient API and does not support different parameters when assigning file id. - Check System Status *********************************** From 4c58cef24aa81c08f3df0b3d8bbaede9e54bfa0c Mon Sep 17 00:00:00 2001 From: Chris Lu Date: Mon, 25 Aug 2014 11:37:00 -0700 Subject: [PATCH 03/27] a bit refactoring to prepare for volume format change and backward compatibility. --- go/storage/volume.go | 56 +-------------------------- go/storage/volume_super_block.go | 65 ++++++++++++++++++++++++++++++++ go/weed/export.go | 4 +- 3 files changed, 68 insertions(+), 57 deletions(-) create mode 100644 go/storage/volume_super_block.go diff --git a/go/storage/volume.go b/go/storage/volume.go index 7bd8e7467..dec560545 100644 --- a/go/storage/volume.go +++ b/go/storage/volume.go @@ -12,22 +12,6 @@ import ( "time" ) -const ( - SuperBlockSize = 8 -) - -type SuperBlock struct { - Version Version - ReplicaPlacement *ReplicaPlacement -} - -func (s *SuperBlock) Bytes() []byte { - header := make([]byte, SuperBlockSize) - header[0] = byte(s.Version) - header[1] = s.ReplicaPlacement.Byte() - return header -} - type Volume struct { Id VolumeId dir string @@ -122,7 +106,7 @@ func (v *Volume) load(alsoLoadIndex bool, createDatIfMissing bool) error { return e } func (v *Volume) Version() Version { - return v.SuperBlock.Version + return v.SuperBlock.Version() } func (v *Volume) Size() int64 { stat, e := v.dataFile.Stat() @@ -138,44 +122,6 @@ func (v *Volume) Close() { v.nm.Close() _ = v.dataFile.Close() } -func (v *Volume) maybeWriteSuperBlock() error { - stat, e := v.dataFile.Stat() - if e != nil { - glog.V(0).Infof("failed to stat datafile %s: %s", v.dataFile, e.Error()) - return e - } - if stat.Size() == 0 { - v.SuperBlock.Version = CurrentVersion - _, e = v.dataFile.Write(v.SuperBlock.Bytes()) - if e != nil && os.IsPermission(e) { - //read-only, but zero length - recreate it! - if v.dataFile, e = os.Create(v.dataFile.Name()); e == nil { - if _, e = v.dataFile.Write(v.SuperBlock.Bytes()); e == nil { - v.readOnly = false - } - } - } - } - return e -} -func (v *Volume) readSuperBlock() (err error) { - if _, err = v.dataFile.Seek(0, 0); err != nil { - return fmt.Errorf("cannot seek to the beginning of %s: %s", v.dataFile.Name(), err.Error()) - } - header := make([]byte, SuperBlockSize) - if _, e := v.dataFile.Read(header); e != nil { - return fmt.Errorf("cannot read superblock: %s", e.Error()) - } - v.SuperBlock, err = ParseSuperBlock(header) - return err -} -func ParseSuperBlock(header []byte) (superBlock SuperBlock, err error) { - superBlock.Version = Version(header[0]) - if superBlock.ReplicaPlacement, err = NewReplicaPlacementFromByte(header[1]); err != nil { - err = fmt.Errorf("cannot read replica type: %s", err.Error()) - } - return -} func (v *Volume) NeedToReplicate() bool { return v.ReplicaPlacement.GetCopyCount() > 1 } diff --git a/go/storage/volume_super_block.go b/go/storage/volume_super_block.go new file mode 100644 index 000000000..95f7c30bb --- /dev/null +++ b/go/storage/volume_super_block.go @@ -0,0 +1,65 @@ +package storage + +import ( + "code.google.com/p/weed-fs/go/glog" + "fmt" + "os" +) + +const ( + SuperBlockSize = 8 +) + +type SuperBlock struct { + version Version + ReplicaPlacement *ReplicaPlacement +} + +func (s *SuperBlock) Version() Version { + return s.version +} +func (s *SuperBlock) Bytes() []byte { + header := make([]byte, SuperBlockSize) + header[0] = byte(s.version) + header[1] = s.ReplicaPlacement.Byte() + return header +} + +func (v *Volume) maybeWriteSuperBlock() error { + stat, e := v.dataFile.Stat() + if e != nil { + glog.V(0).Infof("failed to stat datafile %s: %s", v.dataFile, e.Error()) + return e + } + if stat.Size() == 0 { + v.SuperBlock.version = CurrentVersion + _, e = v.dataFile.Write(v.SuperBlock.Bytes()) + if e != nil && os.IsPermission(e) { + //read-only, but zero length - recreate it! + if v.dataFile, e = os.Create(v.dataFile.Name()); e == nil { + if _, e = v.dataFile.Write(v.SuperBlock.Bytes()); e == nil { + v.readOnly = false + } + } + } + } + return e +} +func (v *Volume) readSuperBlock() (err error) { + if _, err = v.dataFile.Seek(0, 0); err != nil { + return fmt.Errorf("cannot seek to the beginning of %s: %s", v.dataFile.Name(), err.Error()) + } + header := make([]byte, SuperBlockSize) + if _, e := v.dataFile.Read(header); e != nil { + return fmt.Errorf("cannot read superblock: %s", e.Error()) + } + v.SuperBlock, err = ParseSuperBlock(header) + return err +} +func ParseSuperBlock(header []byte) (superBlock SuperBlock, err error) { + superBlock.version = Version(header[0]) + if superBlock.ReplicaPlacement, err = NewReplicaPlacementFromByte(header[1]); err != nil { + err = fmt.Errorf("cannot read replica type: %s", err.Error()) + } + return +} diff --git a/go/weed/export.go b/go/weed/export.go index 3f8ff85bb..f79ab1a5f 100644 --- a/go/weed/export.go +++ b/go/weed/export.go @@ -27,7 +27,7 @@ var cmdExport = &Command{ UsageLine: "export -dir=/tmp -volumeId=234 -o=/dir/name.tar -fileNameFormat={{.Name}}", Short: "list or export files from one volume data file", Long: `List all files in a volume, or Export all files in a volume to a tar file if the output is specified. - + The format of file name in the tar file can be customized. Default is {{.Mime}}/{{.Id}}:{{.Name}}. Also available is {{.Key}}. `, @@ -100,7 +100,7 @@ func runExport(cmd *Command, args []string) bool { var version storage.Version err = storage.ScanVolumeFile(*exportVolumePath, *exportCollection, vid, func(superBlock storage.SuperBlock) error { - version = superBlock.Version + version = superBlock.Version() return nil }, true, func(n *storage.Needle, offset int64) error { nv, ok := nm.Get(n.Id) From ce4acecaa8fa9461cbfae1fadea5b320161d2acd Mon Sep 17 00:00:00 2001 From: Chris Lu Date: Mon, 25 Aug 2014 12:02:04 -0700 Subject: [PATCH 04/27] Fix filer proxing http status code Double quote etag value. --- go/weed/weed_server/filer_server_handlers.go | 1 + go/weed/weed_server/volume_server_handlers.go | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/go/weed/weed_server/filer_server_handlers.go b/go/weed/weed_server/filer_server_handlers.go index ab30aaaed..0f83352a9 100644 --- a/go/weed/weed_server/filer_server_handlers.go +++ b/go/weed/weed_server/filer_server_handlers.go @@ -103,6 +103,7 @@ func (fs *FilerServer) GetOrHeadHandler(w http.ResponseWriter, r *http.Request, for k, v := range resp.Header { w.Header()[k] = v } + w.WriteHeader(resp.StatusCode) io.Copy(w, resp.Body) } diff --git a/go/weed/weed_server/volume_server_handlers.go b/go/weed/weed_server/volume_server_handlers.go index eed198e4a..e7571ccc7 100644 --- a/go/weed/weed_server/volume_server_handlers.go +++ b/go/weed/weed_server/volume_server_handlers.go @@ -95,7 +95,7 @@ func (vs *VolumeServer) GetOrHeadHandler(w http.ResponseWriter, r *http.Request) w.WriteHeader(http.StatusNotModified) return } - w.Header().Set("Etag", etag) + w.Header().Set("Etag", "\""+etag+"\"") if n.NameSize > 0 && filename == "" { filename = string(n.Name) dotIndex := strings.LastIndex(filename, ".") From 57a4549d8678bb08f4ecbdede1939830471e3091 Mon Sep 17 00:00:00 2001 From: Chris Lu Date: Tue, 26 Aug 2014 10:15:12 -0700 Subject: [PATCH 05/27] wrap etag value with double quotes --- go/storage/crc.go | 2 +- go/weed/weed_server/volume_server_handlers.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/go/storage/crc.go b/go/storage/crc.go index 41f7f6d00..43e65757a 100644 --- a/go/storage/crc.go +++ b/go/storage/crc.go @@ -25,5 +25,5 @@ func (c CRC) Value() uint32 { func (n *Needle) Etag() string { bits := make([]byte, 4) util.Uint32toBytes(bits, uint32(n.Checksum)) - return fmt.Sprintf("%x", bits) + return fmt.Sprintf("\"%x\"", bits) } diff --git a/go/weed/weed_server/volume_server_handlers.go b/go/weed/weed_server/volume_server_handlers.go index e7571ccc7..eed198e4a 100644 --- a/go/weed/weed_server/volume_server_handlers.go +++ b/go/weed/weed_server/volume_server_handlers.go @@ -95,7 +95,7 @@ func (vs *VolumeServer) GetOrHeadHandler(w http.ResponseWriter, r *http.Request) w.WriteHeader(http.StatusNotModified) return } - w.Header().Set("Etag", "\""+etag+"\"") + w.Header().Set("Etag", etag) if n.NameSize > 0 && filename == "" { filename = string(n.Name) dotIndex := strings.LastIndex(filename, ".") From 69343c5951a7e6a6e272393c1946c12d635b51b8 Mon Sep 17 00:00:00 2001 From: Chris Lu Date: Sun, 31 Aug 2014 23:25:54 -0700 Subject: [PATCH 06/27] adding ttl field to volume super block --- go/storage/volume_super_block.go | 10 ++++++++++ go/storage/volume_super_block_test.go | 22 ++++++++++++++++++++++ go/util/bytes.go | 12 ++++++++++++ go/util/constants.go | 2 +- 4 files changed, 45 insertions(+), 1 deletion(-) create mode 100644 go/storage/volume_super_block_test.go diff --git a/go/storage/volume_super_block.go b/go/storage/volume_super_block.go index 95f7c30bb..35030b93e 100644 --- a/go/storage/volume_super_block.go +++ b/go/storage/volume_super_block.go @@ -2,6 +2,7 @@ package storage import ( "code.google.com/p/weed-fs/go/glog" + "code.google.com/p/weed-fs/go/util" "fmt" "os" ) @@ -10,9 +11,16 @@ const ( SuperBlockSize = 8 ) +/* +* Super block currently has 8 bytes allocated for each volume. +* Byte 0: version, 1 or 2 +* Byte 1: Replica Placement strategy, 000, 001, 002, 010, etc +* Byte 2 and byte 3: Time to live in minutes + */ type SuperBlock struct { version Version ReplicaPlacement *ReplicaPlacement + Ttl uint16 } func (s *SuperBlock) Version() Version { @@ -22,6 +30,7 @@ func (s *SuperBlock) Bytes() []byte { header := make([]byte, SuperBlockSize) header[0] = byte(s.version) header[1] = s.ReplicaPlacement.Byte() + util.Uint16toBytes(header[2:4], s.Ttl) return header } @@ -61,5 +70,6 @@ func ParseSuperBlock(header []byte) (superBlock SuperBlock, err error) { if superBlock.ReplicaPlacement, err = NewReplicaPlacementFromByte(header[1]); err != nil { err = fmt.Errorf("cannot read replica type: %s", err.Error()) } + superBlock.Ttl = util.BytesToUint16(header[2:4]) return } diff --git a/go/storage/volume_super_block_test.go b/go/storage/volume_super_block_test.go new file mode 100644 index 000000000..19a1bb757 --- /dev/null +++ b/go/storage/volume_super_block_test.go @@ -0,0 +1,22 @@ +package storage + +import ( + "testing" +) + +func TestSuperBlockReadWrite(t *testing.T) { + rp, _ := NewReplicaPlacementFromByte(byte(001)) + s := &SuperBlock{ + version: CurrentVersion, + ReplicaPlacement: rp, + Ttl: uint16(35), + } + + bytes := s.Bytes() + + if !(bytes[2] == 0 && bytes[3] == 35) { + println("byte[2]:", bytes[2], "byte[3]:", bytes[3]) + t.Fail() + } + +} diff --git a/go/util/bytes.go b/go/util/bytes.go index 6cc3d7018..dfa4ae665 100644 --- a/go/util/bytes.go +++ b/go/util/bytes.go @@ -1,5 +1,7 @@ package util +// big endian + func BytesToUint64(b []byte) (v uint64) { length := uint(len(b)) for i := uint(0); i < length-1; i++ { @@ -18,6 +20,12 @@ func BytesToUint32(b []byte) (v uint32) { v += uint32(b[length-1]) return } +func BytesToUint16(b []byte) (v uint16) { + v += uint16(b[0]) + v <<= 8 + v += uint16(b[1]) + return +} func Uint64toBytes(b []byte, v uint64) { for i := uint(0); i < 8; i++ { b[7-i] = byte(v >> (i * 8)) @@ -28,6 +36,10 @@ func Uint32toBytes(b []byte, v uint32) { b[3-i] = byte(v >> (i * 8)) } } +func Uint16toBytes(b []byte, v uint16) { + b[0] = byte(v >> 8) + b[1] = byte(v) +} func Uint8toBytes(b []byte, v uint8) { b[0] = byte(v) } diff --git a/go/util/constants.go b/go/util/constants.go index 196b4a405..f66930d62 100644 --- a/go/util/constants.go +++ b/go/util/constants.go @@ -3,5 +3,5 @@ package util import () const ( - VERSION = "0.63 beta" + VERSION = "0.63" ) From 4be5ccd0c85b82f0faae2905dd51340b2d84f98b Mon Sep 17 00:00:00 2001 From: Chris Lu Date: Thu, 4 Sep 2014 19:26:31 -0700 Subject: [PATCH 07/27] resolve directory log file error avoid possible race condition --- go/filer/directory_in_map.go | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/go/filer/directory_in_map.go b/go/filer/directory_in_map.go index 9c2ecdf80..051ff31fe 100644 --- a/go/filer/directory_in_map.go +++ b/go/filer/directory_in_map.go @@ -9,8 +9,11 @@ import ( "path/filepath" "strconv" "strings" + "sync" ) +var writeLock sync.Mutex //serialize changes to dir.log + type DirectoryEntryInMap struct { Name string Parent *DirectoryEntryInMap @@ -26,9 +29,9 @@ type DirectoryManagerInMap struct { } func (dm *DirectoryManagerInMap) NewDirectoryEntryInMap(parent *DirectoryEntryInMap, name string) (d *DirectoryEntryInMap) { + writeLock.Lock() + defer writeLock.Unlock() d = &DirectoryEntryInMap{Name: name, Parent: parent, SubDirectories: make(map[string]*DirectoryEntryInMap)} - dm.max++ - d.Id = dm.max parts := make([]string, 0) for p := d; p != nil && p.Name != ""; p = p.Parent { parts = append(parts, p.Name) @@ -40,6 +43,8 @@ func (dm *DirectoryManagerInMap) NewDirectoryEntryInMap(parent *DirectoryEntryIn for i := 0; i < n/2; i++ { parts[i], parts[n-1-i] = parts[n-1-i], parts[i] } + dm.max++ + d.Id = dm.max dm.log("add", "/"+strings.Join(parts, "/"), strconv.Itoa(int(d.Id))) return d } @@ -193,6 +198,8 @@ func (dm *DirectoryManagerInMap) MakeDirectory(dirPath string) (DirectoryId, err } func (dm *DirectoryManagerInMap) MoveUnderDirectory(oldDirPath string, newParentDirPath string, newName string) error { + writeLock.Lock() + defer writeLock.Unlock() oldDir, oe := dm.findDirectory(oldDirPath) if oe != nil { return oe @@ -223,6 +230,8 @@ func (dm *DirectoryManagerInMap) ListDirectories(dirPath string) (dirNames []Dir return dirNames, nil } func (dm *DirectoryManagerInMap) DeleteDirectory(dirPath string) error { + writeLock.Lock() + defer writeLock.Unlock() if dirPath == "/" { return fmt.Errorf("Can not delete %s", dirPath) } From a092794804b2f7cbd656e439305d29bfa96ad2b9 Mon Sep 17 00:00:00 2001 From: Chris Lu Date: Thu, 4 Sep 2014 19:34:43 -0700 Subject: [PATCH 08/27] use error to report error --- go/filer/directory_in_map.go | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/go/filer/directory_in_map.go b/go/filer/directory_in_map.go index 051ff31fe..46a626f77 100644 --- a/go/filer/directory_in_map.go +++ b/go/filer/directory_in_map.go @@ -28,7 +28,7 @@ type DirectoryManagerInMap struct { isLoading bool } -func (dm *DirectoryManagerInMap) NewDirectoryEntryInMap(parent *DirectoryEntryInMap, name string) (d *DirectoryEntryInMap) { +func (dm *DirectoryManagerInMap) NewDirectoryEntryInMap(parent *DirectoryEntryInMap, name string) (d *DirectoryEntryInMap, err error) { writeLock.Lock() defer writeLock.Unlock() d = &DirectoryEntryInMap{Name: name, Parent: parent, SubDirectories: make(map[string]*DirectoryEntryInMap)} @@ -38,7 +38,7 @@ func (dm *DirectoryManagerInMap) NewDirectoryEntryInMap(parent *DirectoryEntryIn } n := len(parts) if n <= 0 { - return d + return nil, fmt.Errorf("Failed to create folder %s/%s", parent.Name, name) } for i := 0; i < n/2; i++ { parts[i], parts[n-1-i] = parts[n-1-i], parts[i] @@ -46,7 +46,7 @@ func (dm *DirectoryManagerInMap) NewDirectoryEntryInMap(parent *DirectoryEntryIn dm.max++ d.Id = dm.max dm.log("add", "/"+strings.Join(parts, "/"), strconv.Itoa(int(d.Id))) - return d + return d, nil } func (dm *DirectoryManagerInMap) log(words ...string) { @@ -162,7 +162,11 @@ func (dm *DirectoryManagerInMap) loadDirectory(dirPath string, dirId DirectoryId if i != len(parts)-1 { return fmt.Errorf("%s should be created after parent %s!", dirPath, parts[i]) } - sub = dm.NewDirectoryEntryInMap(dir, parts[i]) + var err error + sub, err = dm.NewDirectoryEntryInMap(dir, parts[i]) + if err != nil { + return err + } if sub.Id != dirId { return fmt.Errorf("%s should be have id %v instead of %v!", dirPath, sub.Id, dirId) } @@ -183,7 +187,11 @@ func (dm *DirectoryManagerInMap) makeDirectory(dirPath string) (dir *DirectoryEn for i := 1; i < len(parts); i++ { sub, ok := dir.SubDirectories[parts[i]] if !ok { - sub = dm.NewDirectoryEntryInMap(dir, parts[i]) + var err error + sub, err = dm.NewDirectoryEntryInMap(dir, parts[i]) + if err != nil { + return nil, false + } dir.SubDirectories[parts[i]] = sub created = true } From b9aee2defbc2f5aafbc3ea049fbe2ab5f3320999 Mon Sep 17 00:00:00 2001 From: Chris Lu Date: Sat, 20 Sep 2014 12:38:59 -0700 Subject: [PATCH 09/27] add TTL support The volume TTL and file TTL are not necessarily the same. as long as file TTL is smaller than volume TTL, it'll be fine. volume TTL is used when assigning file id, e.g. http://.../dir/assign?ttl=3h file TTL is used when uploading --- go/filer/directory_in_map.go | 4 +- go/operation/assign_file_id.go | 5 +- go/operation/submit.go | 11 +- go/operation/system_message.pb.go | 12 +- go/proto/system_message.proto | 1 + go/storage/needle.go | 9 +- go/storage/needle_read_write.go | 21 +++ go/storage/replica_placement.go | 8 - go/storage/store.go | 67 +++++--- go/storage/volume.go | 74 ++++++++- go/storage/volume_info.go | 2 + go/storage/volume_super_block.go | 10 +- go/storage/volume_super_block_test.go | 7 +- go/storage/volume_ttl.go | 147 ++++++++++++++++++ go/storage/volume_vacuum.go | 14 +- go/topology/allocate_volume.go | 7 +- go/topology/collection.go | 23 +-- go/topology/data_node.go | 6 +- go/topology/topology.go | 21 ++- go/topology/topology_event_handling.go | 6 +- go/topology/topology_map.go | 2 +- go/topology/topology_vacuum.go | 2 +- go/topology/volume_growth.go | 12 +- go/topology/volume_layout.go | 13 +- go/weed/benchmark.go | 2 +- go/weed/compact.go | 2 +- go/weed/upload.go | 6 +- go/weed/weed_server/common.go | 4 +- go/weed/weed_server/filer_server_handlers.go | 12 +- .../master_server_handlers_admin.go | 9 +- .../volume_server_handlers_admin.go | 2 +- 31 files changed, 416 insertions(+), 105 deletions(-) create mode 100644 go/storage/volume_ttl.go diff --git a/go/filer/directory_in_map.go b/go/filer/directory_in_map.go index 46a626f77..35b4e53c1 100644 --- a/go/filer/directory_in_map.go +++ b/go/filer/directory_in_map.go @@ -187,10 +187,10 @@ func (dm *DirectoryManagerInMap) makeDirectory(dirPath string) (dir *DirectoryEn for i := 1; i < len(parts); i++ { sub, ok := dir.SubDirectories[parts[i]] if !ok { - var err error + var err error sub, err = dm.NewDirectoryEntryInMap(dir, parts[i]) if err != nil { - return nil, false + return nil, false } dir.SubDirectories[parts[i]] = sub created = true diff --git a/go/operation/assign_file_id.go b/go/operation/assign_file_id.go index 018e1d763..34d371f37 100644 --- a/go/operation/assign_file_id.go +++ b/go/operation/assign_file_id.go @@ -17,7 +17,7 @@ type AssignResult struct { Error string `json:"error,omitempty"` } -func Assign(server string, count int, replication string, collection string) (*AssignResult, error) { +func Assign(server string, count int, replication string, collection string, ttl string) (*AssignResult, error) { values := make(url.Values) values.Add("count", strconv.Itoa(count)) if replication != "" { @@ -26,6 +26,9 @@ func Assign(server string, count int, replication string, collection string) (*A if collection != "" { values.Add("collection", collection) } + if ttl != "" { + values.Add("ttl", ttl) + } jsonBlob, err := util.Post("http://"+server+"/dir/assign", values) glog.V(2).Info("assign result :", string(jsonBlob)) if err != nil { diff --git a/go/operation/submit.go b/go/operation/submit.go index 9191f7d9a..ec45cc320 100644 --- a/go/operation/submit.go +++ b/go/operation/submit.go @@ -20,6 +20,7 @@ type FilePart struct { ModTime int64 //in seconds Replication string Collection string + Ttl string Server string //this comes from assign result Fid string //this comes from assign result, but customizable } @@ -32,12 +33,12 @@ type SubmitResult struct { Error string `json:"error,omitempty"` } -func SubmitFiles(master string, files []FilePart, replication string, collection string, maxMB int) ([]SubmitResult, error) { +func SubmitFiles(master string, files []FilePart, replication string, collection string, ttl string, maxMB int) ([]SubmitResult, error) { results := make([]SubmitResult, len(files)) for index, file := range files { results[index].FileName = file.FileName } - ret, err := Assign(master, len(files), replication, collection) + ret, err := Assign(master, len(files), replication, collection, ttl) if err != nil { for index, _ := range files { results[index].Error = err.Error() @@ -112,7 +113,7 @@ func (fi FilePart) Upload(maxMB int, master string) (retSize uint32, err error) chunks := fi.FileSize/chunkSize + 1 fids := make([]string, 0) for i := int64(0); i < chunks; i++ { - id, count, e := upload_one_chunk(fi.FileName+"-"+strconv.FormatInt(i+1, 10), io.LimitReader(fi.Reader, chunkSize), master, fi.Replication, fi.Collection) + id, count, e := upload_one_chunk(fi.FileName+"-"+strconv.FormatInt(i+1, 10), io.LimitReader(fi.Reader, chunkSize), master, fi.Replication, fi.Collection, fi.Ttl) if e != nil { return 0, e } @@ -130,8 +131,8 @@ func (fi FilePart) Upload(maxMB int, master string) (retSize uint32, err error) return } -func upload_one_chunk(filename string, reader io.Reader, master, replication string, collection string) (fid string, size uint32, e error) { - ret, err := Assign(master, 1, replication, collection) +func upload_one_chunk(filename string, reader io.Reader, master, replication string, collection string, ttl string) (fid string, size uint32, e error) { + ret, err := Assign(master, 1, replication, collection, ttl) if err != nil { return "", 0, err } diff --git a/go/operation/system_message.pb.go b/go/operation/system_message.pb.go index 45ae8a648..9f00dd74d 100644 --- a/go/operation/system_message.pb.go +++ b/go/operation/system_message.pb.go @@ -15,12 +15,10 @@ It has these top-level messages: package operation import proto "code.google.com/p/goprotobuf/proto" -import json "encoding/json" import math "math" -// Reference proto, json, and math imports to suppress error if they are not otherwise used. +// Reference imports to suppress errors if they are not otherwise used. var _ = proto.Marshal -var _ = &json.SyntaxError{} var _ = math.Inf type VolumeInformationMessage struct { @@ -33,6 +31,7 @@ type VolumeInformationMessage struct { ReadOnly *bool `protobuf:"varint,7,opt,name=read_only" json:"read_only,omitempty"` ReplicaPlacement *uint32 `protobuf:"varint,8,req,name=replica_placement" json:"replica_placement,omitempty"` Version *uint32 `protobuf:"varint,9,opt,name=version,def=2" json:"version,omitempty"` + Ttl *uint32 `protobuf:"varint,10,opt,name=ttl" json:"ttl,omitempty"` XXX_unrecognized []byte `json:"-"` } @@ -105,6 +104,13 @@ func (m *VolumeInformationMessage) GetVersion() uint32 { return Default_VolumeInformationMessage_Version } +func (m *VolumeInformationMessage) GetTtl() uint32 { + if m != nil && m.Ttl != nil { + return *m.Ttl + } + return 0 +} + type JoinMessage struct { IsInit *bool `protobuf:"varint,1,opt,name=is_init" json:"is_init,omitempty"` Ip *string `protobuf:"bytes,2,req,name=ip" json:"ip,omitempty"` diff --git a/go/proto/system_message.proto b/go/proto/system_message.proto index 15574ad56..ecd4973f7 100644 --- a/go/proto/system_message.proto +++ b/go/proto/system_message.proto @@ -10,6 +10,7 @@ message VolumeInformationMessage { optional bool read_only = 7; required uint32 replica_placement = 8; optional uint32 version = 9 [default=2]; + optional uint32 ttl = 10; } message JoinMessage { diff --git a/go/storage/needle.go b/go/storage/needle.go index 77aa70169..3bf627141 100644 --- a/go/storage/needle.go +++ b/go/storage/needle.go @@ -38,12 +38,13 @@ type Needle struct { MimeSize uint8 //version2 Mime []byte `comment:"maximum 256 characters"` //version2 LastModified uint64 //only store LastModifiedBytesLength bytes, which is 5 bytes to disk + Ttl *TTL Checksum CRC `comment:"CRC32 to check integrity"` Padding []byte `comment:"Aligned to 8 bytes"` } -func ParseUpload(r *http.Request) (fileName string, data []byte, mimeType string, isGzipped bool, modifiedTime uint64, e error) { +func ParseUpload(r *http.Request) (fileName string, data []byte, mimeType string, isGzipped bool, modifiedTime uint64, ttl *TTL, e error) { form, fe := r.MultipartReader() if fe != nil { glog.V(0).Infoln("MultipartReader [ERROR]", fe) @@ -92,12 +93,13 @@ func ParseUpload(r *http.Request) (fileName string, data []byte, mimeType string fileName = fileName[:len(fileName)-3] } modifiedTime, _ = strconv.ParseUint(r.FormValue("ts"), 10, 64) + ttl, _ = ReadTTL(r.FormValue("ttl")) return } func NewNeedle(r *http.Request, fixJpgOrientation bool) (n *Needle, e error) { fname, mimeType, isGzipped := "", "", false n = new(Needle) - fname, n.Data, mimeType, isGzipped, n.LastModified, e = ParseUpload(r) + fname, n.Data, mimeType, isGzipped, n.LastModified, n.Ttl, e = ParseUpload(r) if e != nil { return } @@ -116,6 +118,9 @@ func NewNeedle(r *http.Request, fixJpgOrientation bool) (n *Needle, e error) { n.LastModified = uint64(time.Now().Unix()) } n.SetHasLastModifiedDate() + if n.Ttl != nil { + n.SetHasTtl() + } if fixJpgOrientation { loweredName := strings.ToLower(fname) diff --git a/go/storage/needle_read_write.go b/go/storage/needle_read_write.go index 835d7c270..848121ff2 100644 --- a/go/storage/needle_read_write.go +++ b/go/storage/needle_read_write.go @@ -14,7 +14,9 @@ const ( FlagHasName = 0x02 FlagHasMime = 0x04 FlagHasLastModifiedDate = 0x08 + FlagHasTtl = 0x10 LastModifiedBytesLength = 5 + TtlBytesLength = 2 ) func (n *Needle) DiskSize() int64 { @@ -70,6 +72,9 @@ func (n *Needle) Append(w io.Writer, version Version) (size uint32, err error) { if n.HasLastModifiedDate() { n.Size = n.Size + LastModifiedBytesLength } + if n.HasTtl() { + n.Size = n.Size + TtlBytesLength + } } size = n.DataSize util.Uint32toBytes(header[12:16], n.Size) @@ -112,6 +117,12 @@ func (n *Needle) Append(w io.Writer, version Version) (size uint32, err error) { return } } + if n.HasTtl() { + n.Ttl.ToBytes(header[0:TtlBytesLength]) + if _, err = w.Write(header[0:TtlBytesLength]); err != nil { + return + } + } } padding := NeedlePaddingSize - ((NeedleHeaderSize + n.Size + NeedleChecksumSize) % NeedlePaddingSize) util.Uint32toBytes(header[0:NeedleChecksumSize], n.Checksum.Value()) @@ -194,6 +205,10 @@ func (n *Needle) readNeedleDataVersion2(bytes []byte) { n.LastModified = util.BytesToUint64(bytes[index : index+LastModifiedBytesLength]) index = index + LastModifiedBytesLength } + if index < lenBytes && n.HasTtl() { + n.Ttl = LoadTTLFromBytes(bytes[index : index+TtlBytesLength]) + index = index + TtlBytesLength + } } func ReadNeedleHeader(r *os.File, version Version, offset int64) (n *Needle, bodyLength uint32, err error) { @@ -263,3 +278,9 @@ func (n *Needle) HasLastModifiedDate() bool { func (n *Needle) SetHasLastModifiedDate() { n.Flags = n.Flags | FlagHasLastModifiedDate } +func (n *Needle) HasTtl() bool { + return n.Flags&FlagHasTtl > 0 +} +func (n *Needle) SetHasTtl() { + n.Flags = n.Flags | FlagHasTtl +} diff --git a/go/storage/replica_placement.go b/go/storage/replica_placement.go index 696888cd8..c1aca52eb 100644 --- a/go/storage/replica_placement.go +++ b/go/storage/replica_placement.go @@ -5,10 +5,6 @@ import ( "fmt" ) -const ( - ReplicaPlacementCount = 9 -) - type ReplicaPlacement struct { SameRackCount int DiffRackCount int @@ -55,7 +51,3 @@ func (rp *ReplicaPlacement) String() string { func (rp *ReplicaPlacement) GetCopyCount() int { return rp.DiffDataCenterCount + rp.DiffRackCount + rp.SameRackCount + 1 } - -func (rp *ReplicaPlacement) GetReplicationLevelIndex() int { - return rp.DiffDataCenterCount*3 + rp.DiffRackCount*3 + rp.SameRackCount -} diff --git a/go/storage/store.go b/go/storage/store.go index a6a4f399e..ef38ade98 100644 --- a/go/storage/store.go +++ b/go/storage/store.go @@ -14,6 +14,10 @@ import ( "strings" ) +const ( + MAX_TTL_VOLUME_REMOVAL_DELAY = 10 // 10 minutes +) + type DiskLocation struct { Directory string MaxVolumeCount int @@ -83,11 +87,15 @@ func NewStore(port int, ip, publicUrl string, dirnames []string, maxVolumeCounts } return } -func (s *Store) AddVolume(volumeListString string, collection string, replicaPlacement string) error { +func (s *Store) AddVolume(volumeListString string, collection string, replicaPlacement string, ttlString string) error { rt, e := NewReplicaPlacementFromString(replicaPlacement) if e != nil { return e } + ttl, e := ReadTTL(ttlString) + if e != nil { + return e + } for _, range_string := range strings.Split(volumeListString, ",") { if strings.Index(range_string, "-") < 0 { id_string := range_string @@ -95,7 +103,7 @@ func (s *Store) AddVolume(volumeListString string, collection string, replicaPla if err != nil { return fmt.Errorf("Volume Id %s is not a valid unsigned integer!", id_string) } - e = s.addVolume(VolumeId(id), collection, rt) + e = s.addVolume(VolumeId(id), collection, rt, ttl) } else { pair := strings.Split(range_string, "-") start, start_err := strconv.ParseUint(pair[0], 10, 64) @@ -107,7 +115,7 @@ func (s *Store) AddVolume(volumeListString string, collection string, replicaPla return fmt.Errorf("Volume End Id %s is not a valid unsigned integer!", pair[1]) } for id := start; id <= end; id++ { - if err := s.addVolume(VolumeId(id), collection, rt); err != nil { + if err := s.addVolume(VolumeId(id), collection, rt, ttl); err != nil { e = err } } @@ -129,6 +137,14 @@ func (s *Store) DeleteCollection(collection string) (e error) { } return } +func (s *Store) DeleteVolume(volumes map[VolumeId]*Volume, v *Volume) (e error) { + e = v.Destroy() + if e != nil { + return + } + delete(volumes, v.Id) + return +} func (s *Store) findVolume(vid VolumeId) *Volume { for _, location := range s.Locations { if v, found := location.volumes[vid]; found { @@ -148,13 +164,14 @@ func (s *Store) findFreeLocation() (ret *DiskLocation) { } return ret } -func (s *Store) addVolume(vid VolumeId, collection string, replicaPlacement *ReplicaPlacement) error { +func (s *Store) addVolume(vid VolumeId, collection string, replicaPlacement *ReplicaPlacement, ttl *TTL) error { if s.findVolume(vid) != nil { return fmt.Errorf("Volume Id %d already exists!", vid) } if location := s.findFreeLocation(); location != nil { - glog.V(0).Infoln("In dir", location.Directory, "adds volume =", vid, ", collection =", collection, ", replicaPlacement =", replicaPlacement) - if volume, err := NewVolume(location.Directory, collection, vid, replicaPlacement); err == nil { + glog.V(0).Infof("In dir %s adds volume:%v collection:%s replicaPlacement:%v ttl:%v", + location.Directory, vid, collection, replicaPlacement, ttl) + if volume, err := NewVolume(location.Directory, collection, vid, replicaPlacement, ttl); err == nil { location.volumes[vid] = volume return nil } else { @@ -190,9 +207,9 @@ func (l *DiskLocation) loadExistingVolumes() { } if vid, err := NewVolumeId(base); err == nil { if l.volumes[vid] == nil { - if v, e := NewVolume(l.Directory, collection, vid, nil); e == nil { + if v, e := NewVolume(l.Directory, collection, vid, nil, nil); e == nil { l.volumes[vid] = v - glog.V(0).Infoln("data file", l.Directory+"/"+name, "replicaPlacement =", v.ReplicaPlacement, "version =", v.Version(), "size =", v.Size()) + glog.V(0).Infof("data file %s, replicaPlacement=%s v=%d size=%d ttl=%s", l.Directory+"/"+name, v.ReplicaPlacement, v.Version(), v.Size(), v.Ttl.String()) } } } @@ -240,21 +257,31 @@ func (s *Store) Join() (masterNode string, e error) { for _, location := range s.Locations { maxVolumeCount = maxVolumeCount + location.MaxVolumeCount for k, v := range location.volumes { - volumeMessage := &operation.VolumeInformationMessage{ - Id: proto.Uint32(uint32(k)), - Size: proto.Uint64(uint64(v.Size())), - Collection: proto.String(v.Collection), - FileCount: proto.Uint64(uint64(v.nm.FileCount())), - DeleteCount: proto.Uint64(uint64(v.nm.DeletedCount())), - DeletedByteCount: proto.Uint64(v.nm.DeletedSize()), - ReadOnly: proto.Bool(v.readOnly), - ReplicaPlacement: proto.Uint32(uint32(v.ReplicaPlacement.Byte())), - Version: proto.Uint32(uint32(v.Version())), - } - volumeMessages = append(volumeMessages, volumeMessage) if maxFileKey < v.nm.MaxFileKey() { maxFileKey = v.nm.MaxFileKey() } + if !v.expired(s.volumeSizeLimit) { + volumeMessage := &operation.VolumeInformationMessage{ + Id: proto.Uint32(uint32(k)), + Size: proto.Uint64(uint64(v.Size())), + Collection: proto.String(v.Collection), + FileCount: proto.Uint64(uint64(v.nm.FileCount())), + DeleteCount: proto.Uint64(uint64(v.nm.DeletedCount())), + DeletedByteCount: proto.Uint64(v.nm.DeletedSize()), + ReadOnly: proto.Bool(v.readOnly), + ReplicaPlacement: proto.Uint32(uint32(v.ReplicaPlacement.Byte())), + Version: proto.Uint32(uint32(v.Version())), + Ttl: proto.Uint32(v.Ttl.ToUint32()), + } + volumeMessages = append(volumeMessages, volumeMessage) + } else { + if v.exiredLongEnough(MAX_TTL_VOLUME_REMOVAL_DELAY) { + s.DeleteVolume(location.volumes, v) + glog.V(0).Infoln("volume", v.Id, "is deleted.") + } else { + glog.V(0).Infoln("volume", v.Id, "is expired.") + } + } } } diff --git a/go/storage/volume.go b/go/storage/volume.go index dec560545..34ae7e386 100644 --- a/go/storage/volume.go +++ b/go/storage/volume.go @@ -22,12 +22,13 @@ type Volume struct { SuperBlock - accessLock sync.Mutex + accessLock sync.Mutex + lastModifiedTime uint64 //unix time in seconds } -func NewVolume(dirname string, collection string, id VolumeId, replicaPlacement *ReplicaPlacement) (v *Volume, e error) { +func NewVolume(dirname string, collection string, id VolumeId, replicaPlacement *ReplicaPlacement, ttl *TTL) (v *Volume, e error) { v = &Volume{dir: dirname, Collection: collection, Id: id} - v.SuperBlock = SuperBlock{ReplicaPlacement: replicaPlacement} + v.SuperBlock = SuperBlock{ReplicaPlacement: replicaPlacement, Ttl: ttl} e = v.load(true, true) return } @@ -49,12 +50,13 @@ func (v *Volume) load(alsoLoadIndex bool, createDatIfMissing bool) error { var e error fileName := v.FileName() - if exists, canRead, canWrite, _ := checkFile(fileName + ".dat"); exists { + if exists, canRead, canWrite, modifiedTime := checkFile(fileName + ".dat"); exists { if !canRead { return fmt.Errorf("cannot read Volume Data file %s.dat", fileName) } if canWrite { v.dataFile, e = os.OpenFile(fileName+".dat", os.O_RDWR|os.O_CREATE, 0644) + v.lastModifiedTime = uint64(modifiedTime.Unix()) } else { glog.V(0).Infoln("opening " + fileName + ".dat in READONLY mode") v.dataFile, e = os.Open(fileName + ".dat") @@ -192,6 +194,9 @@ func (v *Volume) write(n *Needle) (size uint32, err error) { glog.V(4).Infof("failed to save in needle map %d: %s", n.Id, err.Error()) } } + if v.lastModifiedTime < n.LastModified { + v.lastModifiedTime = n.LastModified + } return } @@ -221,8 +226,25 @@ func (v *Volume) delete(n *Needle) (uint32, error) { func (v *Volume) read(n *Needle) (int, error) { nv, ok := v.nm.Get(n.Id) - if ok && nv.Offset > 0 { - return n.Read(v.dataFile, int64(nv.Offset)*NeedlePaddingSize, nv.Size, v.Version()) + if !ok || nv.Offset == 0 { + return -1, errors.New("Not Found") + } + bytesRead, err := n.Read(v.dataFile, int64(nv.Offset)*NeedlePaddingSize, nv.Size, v.Version()) + if err != nil { + return bytesRead, err + } + if !n.HasTtl() { + return bytesRead, err + } + ttlMinutes := n.Ttl.Minutes() + if ttlMinutes == 0 { + return bytesRead, nil + } + if !n.HasLastModifiedDate() { + return bytesRead, nil + } + if uint64(time.Now().Unix()) < n.LastModified+uint64(ttlMinutes*60) { + return bytesRead, nil } return -1, errors.New("Not Found") } @@ -343,3 +365,43 @@ func (v *Volume) ensureConvertIdxToCdb(fileName string) (cdbCanRead bool) { } return true } + +// volume is expired if modified time + volume ttl < now +// except when volume is empty +// or when the volume does not have a ttl +// or when volumeSizeLimit is 0 when server just starts +func (v *Volume) expired(volumeSizeLimit uint64) bool { + if volumeSizeLimit == 0 { + //skip if we don't know size limit + return false + } + if v.ContentSize() == 0 { + return false + } + if v.Ttl == nil || v.Ttl.Minutes() == 0 { + return false + } + glog.V(0).Infof("now:%v lastModified:%v", time.Now().Unix(), v.lastModifiedTime) + livedMinutes := (time.Now().Unix() - int64(v.lastModifiedTime)) / 60 + glog.V(0).Infof("ttl:%v lived:%v", v.Ttl, livedMinutes) + if int64(v.Ttl.Minutes()) < livedMinutes { + return true + } + return false +} + +// wait either maxDelayMinutes or 10% of ttl minutes +func (v *Volume) exiredLongEnough(maxDelayMinutes uint32) bool { + if v.Ttl == nil || v.Ttl.Minutes() == 0 { + return false + } + removalDelay := v.Ttl.Minutes() / 10 + if removalDelay > maxDelayMinutes { + removalDelay = maxDelayMinutes + } + + if uint64(v.Ttl.Minutes()+removalDelay)*60+v.lastModifiedTime < uint64(time.Now().Unix()) { + return true + } + return false +} diff --git a/go/storage/volume_info.go b/go/storage/volume_info.go index 165af1a19..6a954f743 100644 --- a/go/storage/volume_info.go +++ b/go/storage/volume_info.go @@ -8,6 +8,7 @@ type VolumeInfo struct { Id VolumeId Size uint64 ReplicaPlacement *ReplicaPlacement + Ttl *TTL Collection string Version Version FileCount int @@ -32,5 +33,6 @@ func NewVolumeInfo(m *operation.VolumeInformationMessage) (vi VolumeInfo, err er return vi, e } vi.ReplicaPlacement = rp + vi.Ttl = LoadTTLFromUint32(*m.Ttl) return vi, nil } diff --git a/go/storage/volume_super_block.go b/go/storage/volume_super_block.go index 35030b93e..3fbef44d6 100644 --- a/go/storage/volume_super_block.go +++ b/go/storage/volume_super_block.go @@ -2,7 +2,6 @@ package storage import ( "code.google.com/p/weed-fs/go/glog" - "code.google.com/p/weed-fs/go/util" "fmt" "os" ) @@ -15,12 +14,13 @@ const ( * Super block currently has 8 bytes allocated for each volume. * Byte 0: version, 1 or 2 * Byte 1: Replica Placement strategy, 000, 001, 002, 010, etc -* Byte 2 and byte 3: Time to live in minutes +* Byte 2 and byte 3: Time to live. See TTL for definition +* Rest bytes: Reserved */ type SuperBlock struct { version Version ReplicaPlacement *ReplicaPlacement - Ttl uint16 + Ttl *TTL } func (s *SuperBlock) Version() Version { @@ -30,7 +30,7 @@ func (s *SuperBlock) Bytes() []byte { header := make([]byte, SuperBlockSize) header[0] = byte(s.version) header[1] = s.ReplicaPlacement.Byte() - util.Uint16toBytes(header[2:4], s.Ttl) + s.Ttl.ToBytes(header[2:4]) return header } @@ -70,6 +70,6 @@ func ParseSuperBlock(header []byte) (superBlock SuperBlock, err error) { if superBlock.ReplicaPlacement, err = NewReplicaPlacementFromByte(header[1]); err != nil { err = fmt.Errorf("cannot read replica type: %s", err.Error()) } - superBlock.Ttl = util.BytesToUint16(header[2:4]) + superBlock.Ttl = LoadTTLFromBytes(header[2:4]) return } diff --git a/go/storage/volume_super_block_test.go b/go/storage/volume_super_block_test.go index 19a1bb757..13db4b194 100644 --- a/go/storage/volume_super_block_test.go +++ b/go/storage/volume_super_block_test.go @@ -6,16 +6,17 @@ import ( func TestSuperBlockReadWrite(t *testing.T) { rp, _ := NewReplicaPlacementFromByte(byte(001)) + ttl, _ := ReadTTL("15d") s := &SuperBlock{ version: CurrentVersion, ReplicaPlacement: rp, - Ttl: uint16(35), + Ttl: ttl, } bytes := s.Bytes() - if !(bytes[2] == 0 && bytes[3] == 35) { - println("byte[2]:", bytes[2], "byte[3]:", bytes[3]) + if !(bytes[2] == 15 && bytes[3] == Day) { + println("byte[2]:", bytes[2], "byte[3]:", bytes[3]) t.Fail() } diff --git a/go/storage/volume_ttl.go b/go/storage/volume_ttl.go new file mode 100644 index 000000000..5ff43e24e --- /dev/null +++ b/go/storage/volume_ttl.go @@ -0,0 +1,147 @@ +package storage + +import ( + "strconv" +) + +var ( + TtlRange []uint16 +) + +const ( + //stored unit types + Empty byte = iota + Minute + Hour + Day + Week + Month + Year +) + +func init() { + TtlRange = []uint16{3, 10, 30, + 60 /*1 hour*/, 60 * 3, 60 * 6, 60 * 12, + 1440 /*1 day*/, 1440 * 3, 1440 * 7, 1440 * 15, 1440 * 31, + 44888 /*1 month*/, 65535, + } +} + +type TTL struct { + count byte + unit byte +} + +var EMPTY_TTL = &TTL{} + +// translate a readable ttl to internal ttl +// Supports format example: +// 3m: 3 minutes +// 4h: 4 hours +// 5d: 5 days +// 6w: 6 weeks +// 7M: 7 months +// 8y: 8 years +func ReadTTL(ttlString string) (*TTL, error) { + if ttlString == "" { + return EMPTY_TTL, nil + } + ttlBytes := []byte(ttlString) + unitByte := ttlBytes[len(ttlBytes)-1] + countBytes := ttlBytes[0 : len(ttlBytes)-1] + if '0' <= unitByte && unitByte <= '9' { + countBytes = ttlBytes + unitByte = 'm' + } + count, err := strconv.Atoi(string(countBytes)) + unit := toStoredByte(unitByte) + return &TTL{count: byte(count), unit: unit}, err +} + +// read stored bytes to a ttl +func LoadTTLFromBytes(input []byte) (t *TTL) { + return &TTL{count: input[0], unit: input[1]} +} + +// read stored bytes to a ttl +func LoadTTLFromUint32(ttl uint32) (t *TTL) { + input := make([]byte, 2) + input[1] = byte(ttl) + input[0] = byte(ttl >> 8) + return LoadTTLFromBytes(input) +} + +// save stored bytes to an output with 2 bytes +func (t TTL) ToBytes(output []byte) { + output[0] = t.count + output[1] = t.unit +} + +func (t TTL) ToUint32() (output uint32) { + output = uint32(t.count) << 8 + output += uint32(t.unit) + return output +} + +func (t TTL) String() string { + if t.count == 0 { + return "" + } + if t.unit == Empty { + return "" + } + countString := strconv.Itoa(int(t.count)) + switch t.unit { + case Minute: + return countString + "m" + case Hour: + return countString + "h" + case Day: + return countString + "d" + case Week: + return countString + "w" + case Month: + return countString + "M" + case Year: + return countString + "y" + } + return "" +} + +func toStoredByte(readableUnitByte byte) byte { + switch readableUnitByte { + case 'm': + return Minute + case 'h': + return Hour + case 'd': + return Day + case 'w': + return Week + case 'M': + return Month + case 'Y': + return Year + } + return 0 +} + +func (t TTL) Minutes() uint32 { + switch t.unit { + case Empty: + return 0 + case Minute: + return uint32(t.count) + case Hour: + return uint32(t.count) * 60 + case Day: + return uint32(t.count) * 60 * 24 + case Week: + return uint32(t.count) * 60 * 24 * 7 + case Month: + return uint32(t.count) * 60 * 24 * 31 + case Year: + return uint32(t.count) * 60 * 24 * 31 * 365 + } + return 0 +} diff --git a/go/storage/volume_vacuum.go b/go/storage/volume_vacuum.go index 7d2a38cb8..706a1f951 100644 --- a/go/storage/volume_vacuum.go +++ b/go/storage/volume_vacuum.go @@ -4,7 +4,7 @@ import ( "code.google.com/p/weed-fs/go/glog" "fmt" "os" - _ "time" + "time" ) func (v *Volume) garbageLevel() float64 { @@ -13,9 +13,10 @@ func (v *Volume) garbageLevel() float64 { func (v *Volume) Compact() error { glog.V(3).Infof("Compacting ...") - v.accessLock.Lock() - defer v.accessLock.Unlock() - glog.V(3).Infof("Got Compaction lock...") + //no need to lock for copy on write + //v.accessLock.Lock() + //defer v.accessLock.Unlock() + //glog.V(3).Infof("Got Compaction lock...") filePath := v.FileName() glog.V(3).Infof("creating copies for volume %d ...", v.Id) @@ -59,10 +60,15 @@ func (v *Volume) copyDataAndGenerateIndexFile(dstName, idxName string) (err erro nm := NewNeedleMap(idx) new_offset := int64(SuperBlockSize) + now := uint64(time.Now().Unix()) + err = ScanVolumeFile(v.dir, v.Collection, v.Id, func(superBlock SuperBlock) error { _, err = dst.Write(superBlock.Bytes()) return err }, true, func(n *Needle, offset int64) error { + if n.HasTtl() && now >= n.LastModified+uint64(v.Ttl.Minutes()*60) { + return nil + } nv, ok := v.nm.Get(n.Id) glog.V(4).Infoln("needle expected offset ", offset, "ok", ok, "nv", nv) if ok && int64(nv.Offset)*NeedlePaddingSize == offset && nv.Size > 0 { diff --git a/go/topology/allocate_volume.go b/go/topology/allocate_volume.go index 77b4ac508..4aeef35f7 100644 --- a/go/topology/allocate_volume.go +++ b/go/topology/allocate_volume.go @@ -12,11 +12,12 @@ type AllocateVolumeResult struct { Error string } -func AllocateVolume(dn *DataNode, vid storage.VolumeId, collection string, rp *storage.ReplicaPlacement) error { +func AllocateVolume(dn *DataNode, vid storage.VolumeId, option *VolumeGrowOption) error { values := make(url.Values) values.Add("volume", vid.String()) - values.Add("collection", collection) - values.Add("replication", rp.String()) + values.Add("collection", option.Collection) + values.Add("replication", option.ReplicaPlacement.String()) + values.Add("ttl", option.Ttl.String()) jsonBlob, err := util.Post("http://"+dn.PublicUrl+"/admin/assign_volume", values) if err != nil { return err diff --git a/go/topology/collection.go b/go/topology/collection.go index b21122d22..c014231af 100644 --- a/go/topology/collection.go +++ b/go/topology/collection.go @@ -1,33 +1,34 @@ package topology import ( - "code.google.com/p/weed-fs/go/glog" "code.google.com/p/weed-fs/go/storage" ) type Collection struct { Name string volumeSizeLimit uint64 - replicaType2VolumeLayout []*VolumeLayout + storageType2VolumeLayout map[string]*VolumeLayout } func NewCollection(name string, volumeSizeLimit uint64) *Collection { c := &Collection{Name: name, volumeSizeLimit: volumeSizeLimit} - c.replicaType2VolumeLayout = make([]*VolumeLayout, storage.ReplicaPlacementCount) + c.storageType2VolumeLayout = make(map[string]*VolumeLayout) return c } -func (c *Collection) GetOrCreateVolumeLayout(rp *storage.ReplicaPlacement) *VolumeLayout { - replicaPlacementIndex := rp.GetReplicationLevelIndex() - if c.replicaType2VolumeLayout[replicaPlacementIndex] == nil { - glog.V(0).Infoln("collection", c.Name, "adding replication type", rp) - c.replicaType2VolumeLayout[replicaPlacementIndex] = NewVolumeLayout(rp, c.volumeSizeLimit) +func (c *Collection) GetOrCreateVolumeLayout(rp *storage.ReplicaPlacement, ttl *storage.TTL) *VolumeLayout { + keyString := rp.String() + if ttl != nil { + keyString += ttl.String() } - return c.replicaType2VolumeLayout[replicaPlacementIndex] + if c.storageType2VolumeLayout[keyString] == nil { + c.storageType2VolumeLayout[keyString] = NewVolumeLayout(rp, ttl, c.volumeSizeLimit) + } + return c.storageType2VolumeLayout[keyString] } func (c *Collection) Lookup(vid storage.VolumeId) []*DataNode { - for _, vl := range c.replicaType2VolumeLayout { + for _, vl := range c.storageType2VolumeLayout { if vl != nil { if list := vl.Lookup(vid); list != nil { return list @@ -38,7 +39,7 @@ func (c *Collection) Lookup(vid storage.VolumeId) []*DataNode { } func (c *Collection) ListVolumeServers() (nodes []*DataNode) { - for _, vl := range c.replicaType2VolumeLayout { + for _, vl := range c.storageType2VolumeLayout { if vl != nil { if list := vl.ListVolumeServers(); list != nil { nodes = append(nodes, list...) diff --git a/go/topology/data_node.go b/go/topology/data_node.go index ae80e08bb..c67c5c1c1 100644 --- a/go/topology/data_node.go +++ b/go/topology/data_node.go @@ -38,15 +38,16 @@ func (dn *DataNode) AddOrUpdateVolume(v storage.VolumeInfo) { } } -func (dn *DataNode) UpdateVolumes(actualVolumes []storage.VolumeInfo) { +func (dn *DataNode) UpdateVolumes(actualVolumes []storage.VolumeInfo) (deletedVolumes []storage.VolumeInfo) { actualVolumeMap := make(map[storage.VolumeId]storage.VolumeInfo) for _, v := range actualVolumes { actualVolumeMap[v.Id] = v } - for vid, _ := range dn.volumes { + for vid, v := range dn.volumes { if _, ok := actualVolumeMap[vid]; !ok { glog.V(0).Infoln("Deleting volume id:", vid) delete(dn.volumes, vid) + deletedVolumes = append(deletedVolumes, v) dn.UpAdjustVolumeCountDelta(-1) dn.UpAdjustActiveVolumeCountDelta(-1) } @@ -54,6 +55,7 @@ func (dn *DataNode) UpdateVolumes(actualVolumes []storage.VolumeInfo) { for _, v := range actualVolumes { dn.AddOrUpdateVolume(v) } + return } func (dn *DataNode) GetDataCenter() *DataCenter { diff --git a/go/topology/topology.go b/go/topology/topology.go index f1daffb53..acdef5e36 100644 --- a/go/topology/topology.go +++ b/go/topology/topology.go @@ -110,12 +110,12 @@ func (t *Topology) NextVolumeId() storage.VolumeId { } func (t *Topology) HasWriableVolume(option *VolumeGrowOption) bool { - vl := t.GetVolumeLayout(option.Collection, option.ReplicaPlacement) + vl := t.GetVolumeLayout(option.Collection, option.ReplicaPlacement, option.Ttl) return vl.GetActiveVolumeCount(option) > 0 } func (t *Topology) PickForWrite(count int, option *VolumeGrowOption) (string, int, *DataNode, error) { - vid, count, datanodes, err := t.GetVolumeLayout(option.Collection, option.ReplicaPlacement).PickForWrite(count, option) + vid, count, datanodes, err := t.GetVolumeLayout(option.Collection, option.ReplicaPlacement, option.Ttl).PickForWrite(count, option) if err != nil || datanodes.Length() == 0 { return "", 0, nil, errors.New("No writable volumes avalable!") } @@ -123,12 +123,12 @@ func (t *Topology) PickForWrite(count int, option *VolumeGrowOption) (string, in return storage.NewFileId(*vid, fileId, rand.Uint32()).String(), count, datanodes.Head(), nil } -func (t *Topology) GetVolumeLayout(collectionName string, rp *storage.ReplicaPlacement) *VolumeLayout { +func (t *Topology) GetVolumeLayout(collectionName string, rp *storage.ReplicaPlacement, ttl *storage.TTL) *VolumeLayout { _, ok := t.collectionMap[collectionName] if !ok { t.collectionMap[collectionName] = NewCollection(collectionName, t.volumeSizeLimit) } - return t.collectionMap[collectionName].GetOrCreateVolumeLayout(rp) + return t.collectionMap[collectionName].GetOrCreateVolumeLayout(rp, ttl) } func (t *Topology) GetCollection(collectionName string) (collection *Collection, ok bool) { @@ -141,10 +141,14 @@ func (t *Topology) DeleteCollection(collectionName string) { } func (t *Topology) RegisterVolumeLayout(v storage.VolumeInfo, dn *DataNode) { - t.GetVolumeLayout(v.Collection, v.ReplicaPlacement).RegisterVolume(&v, dn) + t.GetVolumeLayout(v.Collection, v.ReplicaPlacement, v.Ttl).RegisterVolume(&v, dn) +} +func (t *Topology) UnRegisterVolumeLayout(v storage.VolumeInfo, dn *DataNode) { + glog.Infof("removing volume info:%+v", v) + t.GetVolumeLayout(v.Collection, v.ReplicaPlacement, v.Ttl).UnRegisterVolume(&v, dn) } -func (t *Topology) RegisterVolumes(joinMessage *operation.JoinMessage) { +func (t *Topology) ProcessJoinMessage(joinMessage *operation.JoinMessage) { t.Sequence.SetMax(*joinMessage.MaxFileKey) dcName, rackName := t.configuration.Locate(*joinMessage.Ip, *joinMessage.DataCenter, *joinMessage.Rack) dc := t.GetOrCreateDataCenter(dcName) @@ -162,10 +166,13 @@ func (t *Topology) RegisterVolumes(joinMessage *operation.JoinMessage) { glog.V(0).Infoln("Fail to convert joined volume information:", err.Error()) } } - dn.UpdateVolumes(volumeInfos) + deletedVolumes := dn.UpdateVolumes(volumeInfos) for _, v := range volumeInfos { t.RegisterVolumeLayout(v, dn) } + for _, v := range deletedVolumes { + t.UnRegisterVolumeLayout(v, dn) + } } func (t *Topology) GetOrCreateDataCenter(dcName string) *DataCenter { diff --git a/go/topology/topology_event_handling.go b/go/topology/topology_event_handling.go index 7398ff9bf..1e630e149 100644 --- a/go/topology/topology_event_handling.go +++ b/go/topology/topology_event_handling.go @@ -41,7 +41,7 @@ func (t *Topology) StartRefreshWritableVolumes(garbageThreshold string) { }() } func (t *Topology) SetVolumeCapacityFull(volumeInfo storage.VolumeInfo) bool { - vl := t.GetVolumeLayout(volumeInfo.Collection, volumeInfo.ReplicaPlacement) + vl := t.GetVolumeLayout(volumeInfo.Collection, volumeInfo.ReplicaPlacement, volumeInfo.Ttl) if !vl.SetVolumeCapacityFull(volumeInfo.Id) { return false } @@ -55,7 +55,7 @@ func (t *Topology) SetVolumeCapacityFull(volumeInfo storage.VolumeInfo) bool { func (t *Topology) UnRegisterDataNode(dn *DataNode) { for _, v := range dn.volumes { glog.V(0).Infoln("Removing Volume", v.Id, "from the dead volume server", dn) - vl := t.GetVolumeLayout(v.Collection, v.ReplicaPlacement) + vl := t.GetVolumeLayout(v.Collection, v.ReplicaPlacement, v.Ttl) vl.SetVolumeUnavailable(dn, v.Id) } dn.UpAdjustVolumeCountDelta(-dn.GetVolumeCount()) @@ -65,7 +65,7 @@ func (t *Topology) UnRegisterDataNode(dn *DataNode) { } func (t *Topology) RegisterRecoveredDataNode(dn *DataNode) { for _, v := range dn.volumes { - vl := t.GetVolumeLayout(v.Collection, v.ReplicaPlacement) + vl := t.GetVolumeLayout(v.Collection, v.ReplicaPlacement, v.Ttl) if vl.isWritable(&v) { vl.SetVolumeAvailable(dn, v.Id) } diff --git a/go/topology/topology_map.go b/go/topology/topology_map.go index f66d4c251..d6400c988 100644 --- a/go/topology/topology_map.go +++ b/go/topology/topology_map.go @@ -14,7 +14,7 @@ func (t *Topology) ToMap() interface{} { m["DataCenters"] = dcs var layouts []interface{} for _, c := range t.collectionMap { - for _, layout := range c.replicaType2VolumeLayout { + for _, layout := range c.storageType2VolumeLayout { if layout != nil { tmp := layout.ToMap() tmp["collection"] = c.Name diff --git a/go/topology/topology_vacuum.go b/go/topology/topology_vacuum.go index a1d6d2564..9eaca37d4 100644 --- a/go/topology/topology_vacuum.go +++ b/go/topology/topology_vacuum.go @@ -80,7 +80,7 @@ func batchVacuumVolumeCommit(vl *VolumeLayout, vid storage.VolumeId, locationlis } func (t *Topology) Vacuum(garbageThreshold string) int { for _, c := range t.collectionMap { - for _, vl := range c.replicaType2VolumeLayout { + for _, vl := range c.storageType2VolumeLayout { if vl != nil { for vid, locationlist := range vl.vid2location { if batchVacuumVolumeCheck(vl, vid, locationlist, garbageThreshold) { diff --git a/go/topology/volume_growth.go b/go/topology/volume_growth.go index 4965e3ba0..778aa038a 100644 --- a/go/topology/volume_growth.go +++ b/go/topology/volume_growth.go @@ -19,6 +19,7 @@ This package is created to resolve these replica placement issues: type VolumeGrowOption struct { Collection string ReplicaPlacement *storage.ReplicaPlacement + Ttl *storage.TTL DataCenter string Rack string DataNode string @@ -184,8 +185,15 @@ func (vg *VolumeGrowth) findEmptySlotsForOneVolume(topo *Topology, option *Volum func (vg *VolumeGrowth) grow(topo *Topology, vid storage.VolumeId, option *VolumeGrowOption, servers ...*DataNode) error { for _, server := range servers { - if err := AllocateVolume(server, vid, option.Collection, option.ReplicaPlacement); err == nil { - vi := storage.VolumeInfo{Id: vid, Size: 0, Collection: option.Collection, ReplicaPlacement: option.ReplicaPlacement, Version: storage.CurrentVersion} + if err := AllocateVolume(server, vid, option); err == nil { + vi := storage.VolumeInfo{ + Id: vid, + Size: 0, + Collection: option.Collection, + ReplicaPlacement: option.ReplicaPlacement, + Ttl: option.Ttl, + Version: storage.CurrentVersion, + } server.AddOrUpdateVolume(vi) topo.RegisterVolumeLayout(vi, server) glog.V(0).Infoln("Created Volume", vid, "on", server) diff --git a/go/topology/volume_layout.go b/go/topology/volume_layout.go index 538acb54c..1e55072a3 100644 --- a/go/topology/volume_layout.go +++ b/go/topology/volume_layout.go @@ -11,15 +11,17 @@ import ( // mapping from volume to its locations, inverted from server to volume type VolumeLayout struct { rp *storage.ReplicaPlacement + ttl *storage.TTL vid2location map[storage.VolumeId]*VolumeLocationList writables []storage.VolumeId // transient array of writable volume id volumeSizeLimit uint64 accessLock sync.Mutex } -func NewVolumeLayout(rp *storage.ReplicaPlacement, volumeSizeLimit uint64) *VolumeLayout { +func NewVolumeLayout(rp *storage.ReplicaPlacement, ttl *storage.TTL, volumeSizeLimit uint64) *VolumeLayout { return &VolumeLayout{ rp: rp, + ttl: ttl, vid2location: make(map[storage.VolumeId]*VolumeLocationList), writables: *new([]storage.VolumeId), volumeSizeLimit: volumeSizeLimit, @@ -42,6 +44,14 @@ func (vl *VolumeLayout) RegisterVolume(v *storage.VolumeInfo, dn *DataNode) { } } +func (vl *VolumeLayout) UnRegisterVolume(v *storage.VolumeInfo, dn *DataNode) { + vl.accessLock.Lock() + defer vl.accessLock.Unlock() + + vl.removeFromWritable(v.Id) + delete(vl.vid2location, v.Id) +} + func (vl *VolumeLayout) AddToWritable(vid storage.VolumeId) { for _, id := range vl.writables { if vid == id { @@ -192,6 +202,7 @@ func (vl *VolumeLayout) SetVolumeCapacityFull(vid storage.VolumeId) bool { func (vl *VolumeLayout) ToMap() map[string]interface{} { m := make(map[string]interface{}) m["replication"] = vl.rp.String() + m["ttl"] = vl.ttl.String() m["writables"] = vl.writables //m["locations"] = vl.vid2location return m diff --git a/go/weed/benchmark.go b/go/weed/benchmark.go index eab923751..27aebaef0 100644 --- a/go/weed/benchmark.go +++ b/go/weed/benchmark.go @@ -201,7 +201,7 @@ func writeFiles(idChan chan int, fileIdLineChan chan string, s *stats) { start := time.Now() fileSize := int64(*b.fileSize + rand.Intn(64)) fp := &operation.FilePart{Reader: &FakeReader{id: uint64(id), size: fileSize}, FileSize: fileSize} - if assignResult, err := operation.Assign(*b.server, 1, "", *b.collection); err == nil { + if assignResult, err := operation.Assign(*b.server, 1, "", *b.collection, ""); err == nil { fp.Server, fp.Fid, fp.Collection = assignResult.PublicUrl, assignResult.Fid, *b.collection if _, ok := serverLimitChan[fp.Server]; !ok { serverLimitChan[fp.Server] = make(chan bool, 7) diff --git a/go/weed/compact.go b/go/weed/compact.go index 580f3f98d..57a02261f 100644 --- a/go/weed/compact.go +++ b/go/weed/compact.go @@ -33,7 +33,7 @@ func runCompact(cmd *Command, args []string) bool { } vid := storage.VolumeId(*compactVolumeId) - v, err := storage.NewVolume(*compactVolumePath, *compactVolumeCollection, vid, nil) + v, err := storage.NewVolume(*compactVolumePath, *compactVolumeCollection, vid, nil, nil) if err != nil { glog.Fatalf("Load Volume [ERROR] %s\n", err) } diff --git a/go/weed/upload.go b/go/weed/upload.go index b59313a2a..c21499dd0 100644 --- a/go/weed/upload.go +++ b/go/weed/upload.go @@ -12,6 +12,7 @@ var ( uploadReplication *string uploadCollection *string uploadDir *string + uploadTtl *string include *string maxMB *int ) @@ -24,6 +25,7 @@ func init() { include = cmdUpload.Flag.String("include", "", "pattens of files to upload, e.g., *.pdf, *.html, ab?d.txt, works together with -dir") uploadReplication = cmdUpload.Flag.String("replication", "", "replication type") uploadCollection = cmdUpload.Flag.String("collection", "", "optional collection name") + uploadTtl = cmdUpload.Flag.String("ttl", "", "time to live, e.g.: 1m, 1h, 1d, 1M, 1y") maxMB = cmdUpload.Flag.Int("maxMB", 0, "split files larger than the limit") } @@ -67,7 +69,7 @@ func runUpload(cmd *Command, args []string) bool { if e != nil { return e } - results, e := operation.SubmitFiles(*server, parts, *uploadReplication, *uploadCollection, *maxMB) + results, e := operation.SubmitFiles(*server, parts, *uploadReplication, *uploadCollection, *uploadTtl, *maxMB) bytes, _ := json.Marshal(results) fmt.Println(string(bytes)) if e != nil { @@ -84,7 +86,7 @@ func runUpload(cmd *Command, args []string) bool { if e != nil { fmt.Println(e.Error()) } - results, _ := operation.SubmitFiles(*server, parts, *uploadReplication, *uploadCollection, *maxMB) + results, _ := operation.SubmitFiles(*server, parts, *uploadReplication, *uploadCollection, *uploadTtl, *maxMB) bytes, _ := json.Marshal(results) fmt.Println(string(bytes)) } diff --git a/go/weed/weed_server/common.go b/go/weed/weed_server/common.go index a547d7462..49e84378c 100644 --- a/go/weed/weed_server/common.go +++ b/go/weed/weed_server/common.go @@ -99,14 +99,14 @@ func submitForClientHandler(w http.ResponseWriter, r *http.Request, masterUrl st } debug("parsing upload file...") - fname, data, mimeType, isGzipped, lastModified, pe := storage.ParseUpload(r) + fname, data, mimeType, isGzipped, lastModified, _, pe := storage.ParseUpload(r) if pe != nil { writeJsonError(w, r, pe) return } debug("assigning file id for", fname) - assignResult, ae := operation.Assign(masterUrl, 1, r.FormValue("replication"), r.FormValue("collection")) + assignResult, ae := operation.Assign(masterUrl, 1, r.FormValue("replication"), r.FormValue("collection"), r.FormValue("ttl")) if ae != nil { writeJsonError(w, r, ae) return diff --git a/go/weed/weed_server/filer_server_handlers.go b/go/weed/weed_server/filer_server_handlers.go index 0f83352a9..f760030f3 100644 --- a/go/weed/weed_server/filer_server_handlers.go +++ b/go/weed/weed_server/filer_server_handlers.go @@ -109,7 +109,7 @@ func (fs *FilerServer) GetOrHeadHandler(w http.ResponseWriter, r *http.Request, func (fs *FilerServer) PostHandler(w http.ResponseWriter, r *http.Request) { query := r.URL.Query() - assignResult, ae := operation.Assign(fs.master, 1, query.Get("replication"), fs.collection) + assignResult, ae := operation.Assign(fs.master, 1, query.Get("replication"), fs.collection, query.Get("ttl")) if ae != nil { glog.V(0).Infoln("failing to assign a file id", ae.Error()) writeJsonError(w, r, ae) @@ -131,14 +131,14 @@ func (fs *FilerServer) PostHandler(w http.ResponseWriter, r *http.Request) { } resp, do_err := util.Do(request) if do_err != nil { - glog.V(0).Infoln("failing to connect to volume server", do_err.Error()) + glog.V(0).Infoln("failing to connect to volume server", r.RequestURI, do_err.Error()) writeJsonError(w, r, do_err) return } defer resp.Body.Close() resp_body, ra_err := ioutil.ReadAll(resp.Body) if ra_err != nil { - glog.V(0).Infoln("failing to upload to volume server", ra_err.Error()) + glog.V(0).Infoln("failing to upload to volume server", r.RequestURI, ra_err.Error()) writeJsonError(w, r, ra_err) return } @@ -146,12 +146,12 @@ func (fs *FilerServer) PostHandler(w http.ResponseWriter, r *http.Request) { var ret operation.UploadResult unmarshal_err := json.Unmarshal(resp_body, &ret) if unmarshal_err != nil { - glog.V(0).Infoln("failing to read upload resonse", string(resp_body)) + glog.V(0).Infoln("failing to read upload resonse", r.RequestURI, string(resp_body)) writeJsonError(w, r, unmarshal_err) return } if ret.Error != "" { - glog.V(0).Infoln("failing to post to volume server", ret.Error) + glog.V(0).Infoln("failing to post to volume server", r.RequestURI, ret.Error) writeJsonError(w, r, errors.New(ret.Error)) return } @@ -169,7 +169,7 @@ func (fs *FilerServer) PostHandler(w http.ResponseWriter, r *http.Request) { glog.V(4).Infoln("saving", path, "=>", assignResult.Fid) if db_err := fs.filer.CreateFile(path, assignResult.Fid); db_err != nil { operation.DeleteFile(fs.master, assignResult.Fid) //clean up - glog.V(0).Infoln("failing to write to filer server", db_err.Error()) + glog.V(0).Infoln("failing to write to filer server", r.RequestURI, db_err.Error()) writeJsonError(w, r, db_err) return } diff --git a/go/weed/weed_server/master_server_handlers_admin.go b/go/weed/weed_server/master_server_handlers_admin.go index d50075fd5..1458bf3e6 100644 --- a/go/weed/weed_server/master_server_handlers_admin.go +++ b/go/weed/weed_server/master_server_handlers_admin.go @@ -55,7 +55,7 @@ func (ms *MasterServer) dirJoinHandler(w http.ResponseWriter, r *http.Request) { } } - ms.Topo.RegisterVolumes(joinMessage) + ms.Topo.ProcessJoinMessage(joinMessage) writeJsonQuiet(w, r, operation.JoinResult{VolumeSizeLimit: uint64(ms.volumeSizeLimitMB) * 1024 * 1024}) } @@ -144,7 +144,7 @@ func (ms *MasterServer) deleteFromMasterServerHandler(w http.ResponseWriter, r * } func (ms *MasterServer) hasWriableVolume(option *topology.VolumeGrowOption) bool { - vl := ms.Topo.GetVolumeLayout(option.Collection, option.ReplicaPlacement) + vl := ms.Topo.GetVolumeLayout(option.Collection, option.ReplicaPlacement, option.Ttl) return vl.GetActiveVolumeCount(option) > 0 } @@ -157,9 +157,14 @@ func (ms *MasterServer) getVolumeGrowOption(r *http.Request) (*topology.VolumeGr if err != nil { return nil, err } + ttl, err := storage.ReadTTL(r.FormValue("ttl")) + if err != nil { + return nil, err + } volumeGrowOption := &topology.VolumeGrowOption{ Collection: r.FormValue("collection"), ReplicaPlacement: replicaPlacement, + Ttl: ttl, DataCenter: r.FormValue("dataCenter"), Rack: r.FormValue("rack"), DataNode: r.FormValue("dataNode"), diff --git a/go/weed/weed_server/volume_server_handlers_admin.go b/go/weed/weed_server/volume_server_handlers_admin.go index 6d285524a..1c01fdfd0 100644 --- a/go/weed/weed_server/volume_server_handlers_admin.go +++ b/go/weed/weed_server/volume_server_handlers_admin.go @@ -16,7 +16,7 @@ func (vs *VolumeServer) statusHandler(w http.ResponseWriter, r *http.Request) { } func (vs *VolumeServer) assignVolumeHandler(w http.ResponseWriter, r *http.Request) { - err := vs.store.AddVolume(r.FormValue("volume"), r.FormValue("collection"), r.FormValue("replication")) + err := vs.store.AddVolume(r.FormValue("volume"), r.FormValue("collection"), r.FormValue("replication"), r.FormValue("ttl")) if err == nil { writeJsonQuiet(w, r, map[string]string{"error": ""}) } else { From f7094d7a99f73db855f59afafbf6e1dd276ba394 Mon Sep 17 00:00:00 2001 From: Chris Lu Date: Sat, 20 Sep 2014 12:39:42 -0700 Subject: [PATCH 10/27] version 0.64 --- go/util/constants.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/go/util/constants.go b/go/util/constants.go index f66930d62..db1ca38e5 100644 --- a/go/util/constants.go +++ b/go/util/constants.go @@ -3,5 +3,5 @@ package util import () const ( - VERSION = "0.63" + VERSION = "0.64" ) From 7920b4685e41407c3bcc64fd22579cfe0f27bda8 Mon Sep 17 00:00:00 2001 From: Chris Lu Date: Sat, 20 Sep 2014 20:51:24 -0700 Subject: [PATCH 11/27] Adding unit tests for volume ttl. --- go/storage/needle.go | 2 +- go/storage/volume_ttl.go | 16 ++-------- go/storage/volume_ttl_test.go | 60 +++++++++++++++++++++++++++++++++++ 3 files changed, 63 insertions(+), 15 deletions(-) create mode 100644 go/storage/volume_ttl_test.go diff --git a/go/storage/needle.go b/go/storage/needle.go index 3bf627141..51079376a 100644 --- a/go/storage/needle.go +++ b/go/storage/needle.go @@ -118,7 +118,7 @@ func NewNeedle(r *http.Request, fixJpgOrientation bool) (n *Needle, e error) { n.LastModified = uint64(time.Now().Unix()) } n.SetHasLastModifiedDate() - if n.Ttl != nil { + if n.Ttl != EMPTY_TTL { n.SetHasTtl() } diff --git a/go/storage/volume_ttl.go b/go/storage/volume_ttl.go index 5ff43e24e..459ee55ba 100644 --- a/go/storage/volume_ttl.go +++ b/go/storage/volume_ttl.go @@ -4,10 +4,6 @@ import ( "strconv" ) -var ( - TtlRange []uint16 -) - const ( //stored unit types Empty byte = iota @@ -19,14 +15,6 @@ const ( Year ) -func init() { - TtlRange = []uint16{3, 10, 30, - 60 /*1 hour*/, 60 * 3, 60 * 6, 60 * 12, - 1440 /*1 day*/, 1440 * 3, 1440 * 7, 1440 * 15, 1440 * 31, - 44888 /*1 month*/, 65535, - } -} - type TTL struct { count byte unit byte @@ -120,7 +108,7 @@ func toStoredByte(readableUnitByte byte) byte { return Week case 'M': return Month - case 'Y': + case 'y': return Year } return 0 @@ -141,7 +129,7 @@ func (t TTL) Minutes() uint32 { case Month: return uint32(t.count) * 60 * 24 * 31 case Year: - return uint32(t.count) * 60 * 24 * 31 * 365 + return uint32(t.count) * 60 * 24 * 365 } return 0 } diff --git a/go/storage/volume_ttl_test.go b/go/storage/volume_ttl_test.go new file mode 100644 index 000000000..216469a4c --- /dev/null +++ b/go/storage/volume_ttl_test.go @@ -0,0 +1,60 @@ +package storage + +import ( + "testing" +) + +func TestTTLReadWrite(t *testing.T) { + ttl, _ := ReadTTL("") + if ttl.Minutes() != 0 { + t.Errorf("empty ttl:%v", ttl) + } + + ttl, _ = ReadTTL("9") + if ttl.Minutes() != 9 { + t.Errorf("9 ttl:%v", ttl) + } + + ttl, _ = ReadTTL("8m") + if ttl.Minutes() != 8 { + t.Errorf("8m ttl:%v", ttl) + } + + ttl, _ = ReadTTL("5h") + if ttl.Minutes() != 300 { + t.Errorf("5h ttl:%v", ttl) + } + + ttl, _ = ReadTTL("5d") + if ttl.Minutes() != 5*24*60 { + t.Errorf("5d ttl:%v", ttl) + } + + ttl, _ = ReadTTL("5w") + if ttl.Minutes() != 5*7*24*60 { + t.Errorf("5w ttl:%v", ttl) + } + + ttl, _ = ReadTTL("5M") + if ttl.Minutes() != 5*31*24*60 { + t.Errorf("5M ttl:%v", ttl) + } + + ttl, _ = ReadTTL("5y") + if ttl.Minutes() != 5*365*24*60 { + t.Errorf("5y ttl:%v", ttl) + } + + output := make([]byte, 2) + ttl.ToBytes(output) + ttl2 := LoadTTLFromBytes(output) + if ttl.Minutes() != ttl2.Minutes() { + t.Errorf("ttl:%v ttl2:%v", ttl, ttl2) + } + + ttl3 := LoadTTLFromUint32(ttl.ToUint32()) + if ttl.Minutes() != ttl3.Minutes() { + t.Errorf("ttl:%v ttl3:%v", ttl, ttl3) + } + +} From 794b755f1d6b26e044627135d91f0d49388a36d5 Mon Sep 17 00:00:00 2001 From: Chris Lu Date: Sat, 20 Sep 2014 21:18:26 -0700 Subject: [PATCH 12/27] rename to Seaweed File System --- go/weed/benchmark.go | 2 +- go/weed/filer.go | 2 +- go/weed/mount_std.go | 2 +- go/weed/server.go | 2 +- go/weed/version.go | 4 ++-- go/weed/weed.go | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/go/weed/benchmark.go b/go/weed/benchmark.go index 27aebaef0..7e98fd177 100644 --- a/go/weed/benchmark.go +++ b/go/weed/benchmark.go @@ -98,7 +98,7 @@ func init() { } func runbenchmark(cmd *Command, args []string) bool { - fmt.Printf("This is Weed File System version %s %s %s\n", util.VERSION, runtime.GOOS, runtime.GOARCH) + fmt.Printf("This is Seaweed File System version %s %s %s\n", util.VERSION, runtime.GOOS, runtime.GOARCH) if *b.cpuprofile != "" { f, err := os.Create(*b.cpuprofile) if err != nil { diff --git a/go/weed/filer.go b/go/weed/filer.go index d7d028d50..da54a91fb 100644 --- a/go/weed/filer.go +++ b/go/weed/filer.go @@ -63,7 +63,7 @@ func runFiler(cmd *Command, args []string) bool { if nfs_err != nil { glog.Fatalf(nfs_err.Error()) } - glog.V(0).Infoln("Start Weed Filer", util.VERSION, "at port", strconv.Itoa(*f.port)) + glog.V(0).Infoln("Start Seaweed Filer", util.VERSION, "at port", strconv.Itoa(*f.port)) filerListener, e := util.NewListener( ":"+strconv.Itoa(*f.port), time.Duration(10)*time.Second, diff --git a/go/weed/mount_std.go b/go/weed/mount_std.go index 9376b3f2e..5b058fe89 100644 --- a/go/weed/mount_std.go +++ b/go/weed/mount_std.go @@ -15,7 +15,7 @@ import ( ) func runMount(cmd *Command, args []string) bool { - fmt.Printf("This is Weed File System version %s %s %s\n", util.VERSION, runtime.GOOS, runtime.GOARCH) + fmt.Printf("This is Seaweed File System version %s %s %s\n", util.VERSION, runtime.GOOS, runtime.GOARCH) if *mountOptions.dir == "" { fmt.Printf("Please specify the mount directory via \"-dir\"") return false diff --git a/go/weed/server.go b/go/weed/server.go index 8b0372159..66fbaa120 100644 --- a/go/weed/server.go +++ b/go/weed/server.go @@ -152,7 +152,7 @@ func runServer(cmd *Command, args []string) bool { if nfs_err != nil { glog.Fatalf(nfs_err.Error()) } - glog.V(0).Infoln("Start Weed Filer", util.VERSION, "at port", strconv.Itoa(*filerOptions.port)) + glog.V(0).Infoln("Start Seaweed Filer", util.VERSION, "at port", strconv.Itoa(*filerOptions.port)) filerListener, e := util.NewListener( ":"+strconv.Itoa(*filerOptions.port), time.Duration(10)*time.Second, diff --git a/go/weed/version.go b/go/weed/version.go index 2e0a59822..a7c24ea3b 100644 --- a/go/weed/version.go +++ b/go/weed/version.go @@ -9,8 +9,8 @@ import ( var cmdVersion = &Command{ Run: runVersion, UsageLine: "version", - Short: "print Weed File System version", - Long: `Version prints the Weed File System version`, + Short: "print Seaweed File System version", + Long: `Version prints the Seaweed File System version`, } func runVersion(cmd *Command, args []string) bool { diff --git a/go/weed/weed.go b/go/weed/weed.go index c739d8e93..03cf29179 100644 --- a/go/weed/weed.go +++ b/go/weed/weed.go @@ -90,7 +90,7 @@ func main() { } var usageTemplate = ` -Weed File System : store billions of files and serve them fast! +Seaweed File System : store billions of files and serve them fast! Usage: From ca16cfa14715b80a6a41e8bf047eea41fabe7818 Mon Sep 17 00:00:00 2001 From: Chris Lu Date: Sat, 20 Sep 2014 22:10:58 -0700 Subject: [PATCH 13/27] adjust for external API changes --- go/images/orientation.go | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/go/images/orientation.go b/go/images/orientation.go index a7c126fc1..41ed3f0af 100644 --- a/go/images/orientation.go +++ b/go/images/orientation.go @@ -21,7 +21,10 @@ func FixJpgOrientation(data []byte) (oriented []byte) { } angle := 0 flipMode := FlipDirection(0) - orient := tag.Int(0) + orient, err := tag.Int(0) + if err != nil { + return data + } switch orient { case topLeftSide: // do nothing From ba179b154259ef2790e30f068c4368658de7c512 Mon Sep 17 00:00:00 2001 From: Chris Lu Date: Sat, 20 Sep 2014 23:30:35 -0700 Subject: [PATCH 14/27] Add "-ip.bind" option when starting volume servers. Also some Weed->Seaweed changes. --- go/weed/master.go | 2 +- go/weed/server.go | 9 +++++---- go/weed/volume.go | 5 +++-- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/go/weed/master.go b/go/weed/master.go index b95ca5cb1..ef2c062b5 100644 --- a/go/weed/master.go +++ b/go/weed/master.go @@ -63,7 +63,7 @@ func runMaster(cmd *Command, args []string) bool { listeningAddress := *masterIp + ":" + strconv.Itoa(*mport) - glog.V(0).Infoln("Start Weed Master", util.VERSION, "at", listeningAddress) + glog.V(0).Infoln("Start Seaweed Master", util.VERSION, "at", listeningAddress) listener, e := util.NewListener(listeningAddress, time.Duration(*mTimeout)*time.Second) if e != nil { diff --git a/go/weed/server.go b/go/weed/server.go index 66fbaa120..32bad976a 100644 --- a/go/weed/server.go +++ b/go/weed/server.go @@ -48,6 +48,7 @@ var cmdServer = &Command{ var ( serverIp = cmdServer.Flag.String("ip", "", "ip or server name") serverPublicIp = cmdServer.Flag.String("publicIp", "", "ip or server name") + serverBindIp = cmdVolume.Flag.String("ip.bind", "0.0.0.0", "ip address to bind to") serverMaxCpu = cmdServer.Flag.Int("maxCpu", 0, "maximum number of CPUs. 0 means all available CPUs") serverTimeout = cmdServer.Flag.Int("idleTimeout", 10, "connection idle seconds") serverDataCenter = cmdServer.Flag.String("dataCenter", "", "current volume server's data center name") @@ -178,8 +179,8 @@ func runServer(cmd *Command, args []string) bool { *masterVolumeSizeLimitMB, *volumePulse, *masterConfFile, *masterDefaultReplicaPlacement, *serverGarbageThreshold, serverWhiteList, ) - glog.V(0).Infoln("Start Weed Master", util.VERSION, "at", *serverIp+":"+strconv.Itoa(*masterPort)) - masterListener, e := util.NewListener(*serverIp+":"+strconv.Itoa(*masterPort), time.Duration(*serverTimeout)*time.Second) + glog.V(0).Infoln("Start Seaweed Master", util.VERSION, "at", *serverIp+":"+strconv.Itoa(*masterPort)) + masterListener, e := util.NewListener(*serverBindIp+":"+strconv.Itoa(*masterPort), time.Duration(*serverTimeout)*time.Second) if e != nil { glog.Fatalf(e.Error()) } @@ -211,9 +212,9 @@ func runServer(cmd *Command, args []string) bool { *volumeFixJpgOrientation, ) - glog.V(0).Infoln("Start Weed volume server", util.VERSION, "at", *serverIp+":"+strconv.Itoa(*volumePort)) + glog.V(0).Infoln("Start Seaweed volume server", util.VERSION, "at", *serverIp+":"+strconv.Itoa(*volumePort)) volumeListener, e := util.NewListener( - *serverIp+":"+strconv.Itoa(*volumePort), + *serverBindIp+":"+strconv.Itoa(*volumePort), time.Duration(*serverTimeout)*time.Second, ) if e != nil { diff --git a/go/weed/volume.go b/go/weed/volume.go index 8aa52c43d..7a57730cd 100644 --- a/go/weed/volume.go +++ b/go/weed/volume.go @@ -30,6 +30,7 @@ var ( maxVolumeCounts = cmdVolume.Flag.String("max", "7", "maximum numbers of volumes, count[,count]...") ip = cmdVolume.Flag.String("ip", "", "ip or server name") publicIp = cmdVolume.Flag.String("publicIp", "", "Publicly accessible ") + bindIp = cmdVolume.Flag.String("ip.bind", "0.0.0.0", "ip address to bind to") 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 or equal to the master's setting") vTimeout = cmdVolume.Flag.Int("idleTimeout", 10, "connection idle seconds") @@ -84,9 +85,9 @@ func runVolume(cmd *Command, args []string) bool { *fixJpgOrientation, ) - listeningAddress := *ip + ":" + strconv.Itoa(*vport) + listeningAddress := *bindIp + ":" + strconv.Itoa(*vport) - glog.V(0).Infoln("Start Weed volume server", util.VERSION, "at", listeningAddress) + glog.V(0).Infoln("Start Seaweed volume server", util.VERSION, "at", listeningAddress) listener, e := util.NewListener(listeningAddress, time.Duration(*vTimeout)*time.Second) if e != nil { From a2f8d985fbcddf9722015dfafe8a9ddffcf55fc0 Mon Sep 17 00:00:00 2001 From: Chris Lu Date: Sat, 20 Sep 2014 23:34:13 -0700 Subject: [PATCH 15/27] Fix typo. --- go/weed/server.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/go/weed/server.go b/go/weed/server.go index 32bad976a..57fde6757 100644 --- a/go/weed/server.go +++ b/go/weed/server.go @@ -48,7 +48,7 @@ var cmdServer = &Command{ var ( serverIp = cmdServer.Flag.String("ip", "", "ip or server name") serverPublicIp = cmdServer.Flag.String("publicIp", "", "ip or server name") - serverBindIp = cmdVolume.Flag.String("ip.bind", "0.0.0.0", "ip address to bind to") + serverBindIp = cmdServer.Flag.String("ip.bind", "0.0.0.0", "ip address to bind to") serverMaxCpu = cmdServer.Flag.Int("maxCpu", 0, "maximum number of CPUs. 0 means all available CPUs") serverTimeout = cmdServer.Flag.Int("idleTimeout", 10, "connection idle seconds") serverDataCenter = cmdServer.Flag.String("dataCenter", "", "current volume server's data center name") From 1cd19447e328b01427ad5b4d5d29b3323432c4af Mon Sep 17 00:00:00 2001 From: wyy Date: Thu, 25 Sep 2014 00:47:09 +0800 Subject: [PATCH 16/27] use github.com/aszxqw instead of code.google.com/p --- go/filer/client_operations.go | 2 +- go/filer/directory_in_map.go | 2 +- go/filer/filer_embedded.go | 2 +- go/filer/files_in_leveldb.go | 2 +- go/operation/assign_file_id.go | 4 ++-- go/operation/delete_content.go | 2 +- go/operation/list_masters.go | 4 ++-- go/operation/lookup.go | 2 +- go/operation/submit.go | 2 +- go/operation/upload_content.go | 2 +- go/storage/cdb_map.go | 2 +- go/storage/cdb_map_test.go | 2 +- go/storage/compact_map_perf_test.go | 4 ++-- go/storage/compress.go | 2 +- go/storage/crc.go | 2 +- go/storage/file_id.go | 4 ++-- go/storage/needle.go | 6 +++--- go/storage/needle_map.go | 4 ++-- go/storage/needle_read_write.go | 4 ++-- go/storage/store.go | 6 +++--- go/storage/store_vacuum.go | 2 +- go/storage/volume.go | 2 +- go/storage/volume_info.go | 2 +- go/storage/volume_super_block.go | 2 +- go/storage/volume_vacuum.go | 2 +- go/tools/read_index.go | 2 +- go/topology/allocate_volume.go | 4 ++-- go/topology/cluster_commands.go | 4 ++-- go/topology/collection.go | 2 +- go/topology/data_node.go | 4 ++-- go/topology/node.go | 4 ++-- go/topology/store_replicate.go | 8 ++++---- go/topology/topology.go | 8 ++++---- go/topology/topology_event_handling.go | 4 ++-- go/topology/topology_vacuum.go | 6 +++--- go/topology/volume_growth.go | 4 ++-- go/topology/volume_growth_test.go | 4 ++-- go/topology/volume_layout.go | 4 ++-- go/util/config.go | 2 +- go/util/file_util.go | 2 +- go/util/net_timeout.go | 2 +- go/weed/benchmark.go | 6 +++--- go/weed/compact.go | 4 ++-- go/weed/download.go | 4 ++-- go/weed/export.go | 4 ++-- go/weed/filer.go | 6 +++--- go/weed/fix.go | 4 ++-- go/weed/master.go | 6 +++--- go/weed/mount_std.go | 8 ++++---- go/weed/server.go | 6 +++--- go/weed/shell.go | 2 +- go/weed/upload.go | 2 +- go/weed/version.go | 2 +- go/weed/volume.go | 6 +++--- go/weed/volume_test.go | 2 +- go/weed/weed.go | 2 +- go/weed/weed_server/common.go | 10 +++++----- go/weed/weed_server/filer_server.go | 4 ++-- go/weed/weed_server/filer_server_handlers.go | 6 +++--- go/weed/weed_server/filer_server_handlers_admin.go | 2 +- go/weed/weed_server/master_server.go | 8 ++++---- go/weed/weed_server/master_server_handlers.go | 6 +++--- go/weed/weed_server/master_server_handlers_admin.go | 10 +++++----- go/weed/weed_server/raft_server.go | 4 ++-- go/weed/weed_server/raft_server_handlers.go | 4 ++-- go/weed/weed_server/volume_server.go | 4 ++-- go/weed/weed_server/volume_server_handlers.go | 12 ++++++------ go/weed/weed_server/volume_server_handlers_admin.go | 6 +++--- go/weed/weed_server/volume_server_handlers_vacuum.go | 2 +- 69 files changed, 138 insertions(+), 138 deletions(-) diff --git a/go/filer/client_operations.go b/go/filer/client_operations.go index 5d89fc865..d9a9501a5 100644 --- a/go/filer/client_operations.go +++ b/go/filer/client_operations.go @@ -3,7 +3,7 @@ package filer import () import ( - "code.google.com/p/weed-fs/go/util" + "github.com/aszxqw/weed-fs/go/util" "encoding/json" "errors" "fmt" diff --git a/go/filer/directory_in_map.go b/go/filer/directory_in_map.go index 35b4e53c1..85cde765d 100644 --- a/go/filer/directory_in_map.go +++ b/go/filer/directory_in_map.go @@ -2,7 +2,7 @@ package filer import ( "bufio" - "code.google.com/p/weed-fs/go/util" + "github.com/aszxqw/weed-fs/go/util" "fmt" "io" "os" diff --git a/go/filer/filer_embedded.go b/go/filer/filer_embedded.go index a3b64d37b..d716802ac 100644 --- a/go/filer/filer_embedded.go +++ b/go/filer/filer_embedded.go @@ -1,7 +1,7 @@ package filer import ( - "code.google.com/p/weed-fs/go/operation" + "github.com/aszxqw/weed-fs/go/operation" "errors" "fmt" "path/filepath" diff --git a/go/filer/files_in_leveldb.go b/go/filer/files_in_leveldb.go index dbf2e6c52..17d726dd7 100644 --- a/go/filer/files_in_leveldb.go +++ b/go/filer/files_in_leveldb.go @@ -2,7 +2,7 @@ package filer import ( "bytes" - "code.google.com/p/weed-fs/go/glog" + "github.com/aszxqw/weed-fs/go/glog" "github.com/syndtr/goleveldb/leveldb" "github.com/syndtr/goleveldb/leveldb/util" ) diff --git a/go/operation/assign_file_id.go b/go/operation/assign_file_id.go index 34d371f37..891653278 100644 --- a/go/operation/assign_file_id.go +++ b/go/operation/assign_file_id.go @@ -1,8 +1,8 @@ package operation import ( - "code.google.com/p/weed-fs/go/glog" - "code.google.com/p/weed-fs/go/util" + "github.com/aszxqw/weed-fs/go/glog" + "github.com/aszxqw/weed-fs/go/util" "encoding/json" "errors" "net/url" diff --git a/go/operation/delete_content.go b/go/operation/delete_content.go index e4f9d39bb..a1485a2db 100644 --- a/go/operation/delete_content.go +++ b/go/operation/delete_content.go @@ -1,7 +1,7 @@ package operation import ( - "code.google.com/p/weed-fs/go/util" + "github.com/aszxqw/weed-fs/go/util" "encoding/json" "errors" "net/url" diff --git a/go/operation/list_masters.go b/go/operation/list_masters.go index 491c79f20..120ba58a1 100644 --- a/go/operation/list_masters.go +++ b/go/operation/list_masters.go @@ -1,8 +1,8 @@ package operation import ( - "code.google.com/p/weed-fs/go/glog" - "code.google.com/p/weed-fs/go/util" + "github.com/aszxqw/weed-fs/go/glog" + "github.com/aszxqw/weed-fs/go/util" "encoding/json" ) diff --git a/go/operation/lookup.go b/go/operation/lookup.go index f191bfdbf..1b5d57e2f 100644 --- a/go/operation/lookup.go +++ b/go/operation/lookup.go @@ -1,7 +1,7 @@ package operation import ( - "code.google.com/p/weed-fs/go/util" + "github.com/aszxqw/weed-fs/go/util" "encoding/json" "errors" _ "fmt" diff --git a/go/operation/submit.go b/go/operation/submit.go index ec45cc320..18bc593a3 100644 --- a/go/operation/submit.go +++ b/go/operation/submit.go @@ -2,7 +2,7 @@ package operation import ( "bytes" - "code.google.com/p/weed-fs/go/glog" + "github.com/aszxqw/weed-fs/go/glog" "io" "mime" "os" diff --git a/go/operation/upload_content.go b/go/operation/upload_content.go index b89e65ce8..3812a7d86 100644 --- a/go/operation/upload_content.go +++ b/go/operation/upload_content.go @@ -2,7 +2,7 @@ package operation import ( "bytes" - "code.google.com/p/weed-fs/go/glog" + "github.com/aszxqw/weed-fs/go/glog" "encoding/json" "errors" "fmt" diff --git a/go/storage/cdb_map.go b/go/storage/cdb_map.go index d09a87e2a..07cbca1a9 100644 --- a/go/storage/cdb_map.go +++ b/go/storage/cdb_map.go @@ -1,7 +1,7 @@ package storage import ( - "code.google.com/p/weed-fs/go/util" + "github.com/aszxqw/weed-fs/go/util" "encoding/json" "errors" "fmt" diff --git a/go/storage/cdb_map_test.go b/go/storage/cdb_map_test.go index f6a7d42ad..25f6067cb 100644 --- a/go/storage/cdb_map_test.go +++ b/go/storage/cdb_map_test.go @@ -1,7 +1,7 @@ package storage import ( - "code.google.com/p/weed-fs/go/glog" + "github.com/aszxqw/weed-fs/go/glog" "math/rand" "os" "runtime" diff --git a/go/storage/compact_map_perf_test.go b/go/storage/compact_map_perf_test.go index 37b23a59f..4795ead5a 100644 --- a/go/storage/compact_map_perf_test.go +++ b/go/storage/compact_map_perf_test.go @@ -1,8 +1,8 @@ package storage import ( - "code.google.com/p/weed-fs/go/glog" - "code.google.com/p/weed-fs/go/util" + "github.com/aszxqw/weed-fs/go/glog" + "github.com/aszxqw/weed-fs/go/util" "log" "os" "testing" diff --git a/go/storage/compress.go b/go/storage/compress.go index 846fd0714..7390b85dd 100644 --- a/go/storage/compress.go +++ b/go/storage/compress.go @@ -2,7 +2,7 @@ package storage import ( "bytes" - "code.google.com/p/weed-fs/go/glog" + "github.com/aszxqw/weed-fs/go/glog" "compress/flate" "compress/gzip" "io/ioutil" diff --git a/go/storage/crc.go b/go/storage/crc.go index 43e65757a..9b77c30c6 100644 --- a/go/storage/crc.go +++ b/go/storage/crc.go @@ -1,7 +1,7 @@ package storage import ( - "code.google.com/p/weed-fs/go/util" + "github.com/aszxqw/weed-fs/go/util" "fmt" "hash/crc32" ) diff --git a/go/storage/file_id.go b/go/storage/file_id.go index 5fcd8c387..435a54202 100644 --- a/go/storage/file_id.go +++ b/go/storage/file_id.go @@ -1,8 +1,8 @@ package storage import ( - "code.google.com/p/weed-fs/go/glog" - "code.google.com/p/weed-fs/go/util" + "github.com/aszxqw/weed-fs/go/glog" + "github.com/aszxqw/weed-fs/go/util" "encoding/hex" "errors" "strings" diff --git a/go/storage/needle.go b/go/storage/needle.go index 51079376a..803bc624e 100644 --- a/go/storage/needle.go +++ b/go/storage/needle.go @@ -1,9 +1,9 @@ package storage import ( - "code.google.com/p/weed-fs/go/glog" - "code.google.com/p/weed-fs/go/images" - "code.google.com/p/weed-fs/go/util" + "github.com/aszxqw/weed-fs/go/glog" + "github.com/aszxqw/weed-fs/go/images" + "github.com/aszxqw/weed-fs/go/util" "encoding/hex" "errors" "io/ioutil" diff --git a/go/storage/needle_map.go b/go/storage/needle_map.go index 6d94ee1ca..90f3eff7d 100644 --- a/go/storage/needle_map.go +++ b/go/storage/needle_map.go @@ -1,8 +1,8 @@ package storage import ( - "code.google.com/p/weed-fs/go/glog" - "code.google.com/p/weed-fs/go/util" + "github.com/aszxqw/weed-fs/go/glog" + "github.com/aszxqw/weed-fs/go/util" "fmt" "io" "os" diff --git a/go/storage/needle_read_write.go b/go/storage/needle_read_write.go index 848121ff2..d298c806b 100644 --- a/go/storage/needle_read_write.go +++ b/go/storage/needle_read_write.go @@ -1,8 +1,8 @@ package storage import ( - "code.google.com/p/weed-fs/go/glog" - "code.google.com/p/weed-fs/go/util" + "github.com/aszxqw/weed-fs/go/glog" + "github.com/aszxqw/weed-fs/go/util" "errors" "fmt" "io" diff --git a/go/storage/store.go b/go/storage/store.go index ef38ade98..f5b252ad3 100644 --- a/go/storage/store.go +++ b/go/storage/store.go @@ -2,9 +2,9 @@ package storage import ( proto "code.google.com/p/goprotobuf/proto" - "code.google.com/p/weed-fs/go/glog" - "code.google.com/p/weed-fs/go/operation" - "code.google.com/p/weed-fs/go/util" + "github.com/aszxqw/weed-fs/go/glog" + "github.com/aszxqw/weed-fs/go/operation" + "github.com/aszxqw/weed-fs/go/util" "encoding/json" "errors" "fmt" diff --git a/go/storage/store_vacuum.go b/go/storage/store_vacuum.go index 5adaa7561..b3f13fd2d 100644 --- a/go/storage/store_vacuum.go +++ b/go/storage/store_vacuum.go @@ -1,7 +1,7 @@ package storage import ( - "code.google.com/p/weed-fs/go/glog" + "github.com/aszxqw/weed-fs/go/glog" "fmt" "strconv" ) diff --git a/go/storage/volume.go b/go/storage/volume.go index 34ae7e386..10fd145e9 100644 --- a/go/storage/volume.go +++ b/go/storage/volume.go @@ -2,7 +2,7 @@ package storage import ( "bytes" - "code.google.com/p/weed-fs/go/glog" + "github.com/aszxqw/weed-fs/go/glog" "errors" "fmt" "io" diff --git a/go/storage/volume_info.go b/go/storage/volume_info.go index 6a954f743..81dff4a11 100644 --- a/go/storage/volume_info.go +++ b/go/storage/volume_info.go @@ -1,7 +1,7 @@ package storage import ( - "code.google.com/p/weed-fs/go/operation" + "github.com/aszxqw/weed-fs/go/operation" ) type VolumeInfo struct { diff --git a/go/storage/volume_super_block.go b/go/storage/volume_super_block.go index 3fbef44d6..da510ee30 100644 --- a/go/storage/volume_super_block.go +++ b/go/storage/volume_super_block.go @@ -1,7 +1,7 @@ package storage import ( - "code.google.com/p/weed-fs/go/glog" + "github.com/aszxqw/weed-fs/go/glog" "fmt" "os" ) diff --git a/go/storage/volume_vacuum.go b/go/storage/volume_vacuum.go index 706a1f951..7feb1c256 100644 --- a/go/storage/volume_vacuum.go +++ b/go/storage/volume_vacuum.go @@ -1,7 +1,7 @@ package storage import ( - "code.google.com/p/weed-fs/go/glog" + "github.com/aszxqw/weed-fs/go/glog" "fmt" "os" "time" diff --git a/go/tools/read_index.go b/go/tools/read_index.go index a958de410..36d39a381 100644 --- a/go/tools/read_index.go +++ b/go/tools/read_index.go @@ -1,7 +1,7 @@ package main import ( - "code.google.com/p/weed-fs/go/storage" + "github.com/aszxqw/weed-fs/go/storage" "flag" "fmt" "log" diff --git a/go/topology/allocate_volume.go b/go/topology/allocate_volume.go index 4aeef35f7..eaeae4427 100644 --- a/go/topology/allocate_volume.go +++ b/go/topology/allocate_volume.go @@ -1,8 +1,8 @@ package topology import ( - "code.google.com/p/weed-fs/go/storage" - "code.google.com/p/weed-fs/go/util" + "github.com/aszxqw/weed-fs/go/storage" + "github.com/aszxqw/weed-fs/go/util" "encoding/json" "errors" "net/url" diff --git a/go/topology/cluster_commands.go b/go/topology/cluster_commands.go index 703435173..369c0b9b9 100644 --- a/go/topology/cluster_commands.go +++ b/go/topology/cluster_commands.go @@ -1,8 +1,8 @@ package topology import ( - "code.google.com/p/weed-fs/go/glog" - "code.google.com/p/weed-fs/go/storage" + "github.com/aszxqw/weed-fs/go/glog" + "github.com/aszxqw/weed-fs/go/storage" "github.com/goraft/raft" ) diff --git a/go/topology/collection.go b/go/topology/collection.go index c014231af..72ac86522 100644 --- a/go/topology/collection.go +++ b/go/topology/collection.go @@ -1,7 +1,7 @@ package topology import ( - "code.google.com/p/weed-fs/go/storage" + "github.com/aszxqw/weed-fs/go/storage" ) type Collection struct { diff --git a/go/topology/data_node.go b/go/topology/data_node.go index c67c5c1c1..5c16cf85d 100644 --- a/go/topology/data_node.go +++ b/go/topology/data_node.go @@ -1,8 +1,8 @@ package topology import ( - "code.google.com/p/weed-fs/go/glog" - "code.google.com/p/weed-fs/go/storage" + "github.com/aszxqw/weed-fs/go/glog" + "github.com/aszxqw/weed-fs/go/storage" "strconv" ) diff --git a/go/topology/node.go b/go/topology/node.go index c52414008..12e9a709a 100644 --- a/go/topology/node.go +++ b/go/topology/node.go @@ -1,8 +1,8 @@ package topology import ( - "code.google.com/p/weed-fs/go/glog" - "code.google.com/p/weed-fs/go/storage" + "github.com/aszxqw/weed-fs/go/glog" + "github.com/aszxqw/weed-fs/go/storage" "errors" "math/rand" "strings" diff --git a/go/topology/store_replicate.go b/go/topology/store_replicate.go index a982cebe5..fefaea8a6 100644 --- a/go/topology/store_replicate.go +++ b/go/topology/store_replicate.go @@ -2,10 +2,10 @@ package topology import ( "bytes" - "code.google.com/p/weed-fs/go/glog" - "code.google.com/p/weed-fs/go/operation" - "code.google.com/p/weed-fs/go/storage" - "code.google.com/p/weed-fs/go/util" + "github.com/aszxqw/weed-fs/go/glog" + "github.com/aszxqw/weed-fs/go/operation" + "github.com/aszxqw/weed-fs/go/storage" + "github.com/aszxqw/weed-fs/go/util" "net/http" "strconv" ) diff --git a/go/topology/topology.go b/go/topology/topology.go index acdef5e36..77c9558bb 100644 --- a/go/topology/topology.go +++ b/go/topology/topology.go @@ -1,10 +1,10 @@ package topology import ( - "code.google.com/p/weed-fs/go/glog" - "code.google.com/p/weed-fs/go/operation" - "code.google.com/p/weed-fs/go/sequence" - "code.google.com/p/weed-fs/go/storage" + "github.com/aszxqw/weed-fs/go/glog" + "github.com/aszxqw/weed-fs/go/operation" + "github.com/aszxqw/weed-fs/go/sequence" + "github.com/aszxqw/weed-fs/go/storage" "errors" "github.com/goraft/raft" "io/ioutil" diff --git a/go/topology/topology_event_handling.go b/go/topology/topology_event_handling.go index 1e630e149..61e6f5ffa 100644 --- a/go/topology/topology_event_handling.go +++ b/go/topology/topology_event_handling.go @@ -1,8 +1,8 @@ package topology import ( - "code.google.com/p/weed-fs/go/glog" - "code.google.com/p/weed-fs/go/storage" + "github.com/aszxqw/weed-fs/go/glog" + "github.com/aszxqw/weed-fs/go/storage" "math/rand" "time" ) diff --git a/go/topology/topology_vacuum.go b/go/topology/topology_vacuum.go index 9eaca37d4..bdc0c38f9 100644 --- a/go/topology/topology_vacuum.go +++ b/go/topology/topology_vacuum.go @@ -1,9 +1,9 @@ package topology import ( - "code.google.com/p/weed-fs/go/glog" - "code.google.com/p/weed-fs/go/storage" - "code.google.com/p/weed-fs/go/util" + "github.com/aszxqw/weed-fs/go/glog" + "github.com/aszxqw/weed-fs/go/storage" + "github.com/aszxqw/weed-fs/go/util" "encoding/json" "errors" "net/url" diff --git a/go/topology/volume_growth.go b/go/topology/volume_growth.go index 778aa038a..e083a8531 100644 --- a/go/topology/volume_growth.go +++ b/go/topology/volume_growth.go @@ -1,8 +1,8 @@ package topology import ( - "code.google.com/p/weed-fs/go/glog" - "code.google.com/p/weed-fs/go/storage" + "github.com/aszxqw/weed-fs/go/glog" + "github.com/aszxqw/weed-fs/go/storage" "fmt" "math/rand" "sync" diff --git a/go/topology/volume_growth_test.go b/go/topology/volume_growth_test.go index d2913ef5c..ba1e43ff2 100644 --- a/go/topology/volume_growth_test.go +++ b/go/topology/volume_growth_test.go @@ -1,8 +1,8 @@ package topology import ( - "code.google.com/p/weed-fs/go/sequence" - "code.google.com/p/weed-fs/go/storage" + "github.com/aszxqw/weed-fs/go/sequence" + "github.com/aszxqw/weed-fs/go/storage" "encoding/json" "fmt" "testing" diff --git a/go/topology/volume_layout.go b/go/topology/volume_layout.go index 1e55072a3..35f45c08d 100644 --- a/go/topology/volume_layout.go +++ b/go/topology/volume_layout.go @@ -1,8 +1,8 @@ package topology import ( - "code.google.com/p/weed-fs/go/glog" - "code.google.com/p/weed-fs/go/storage" + "github.com/aszxqw/weed-fs/go/glog" + "github.com/aszxqw/weed-fs/go/storage" "errors" "math/rand" "sync" diff --git a/go/util/config.go b/go/util/config.go index 9a1ac680b..1287ed881 100644 --- a/go/util/config.go +++ b/go/util/config.go @@ -10,7 +10,7 @@ package util import ( "bytes" - "code.google.com/p/weed-fs/go/glog" + "github.com/aszxqw/weed-fs/go/glog" "encoding/json" "os" ) diff --git a/go/util/file_util.go b/go/util/file_util.go index 9f3354011..82f6bffe3 100644 --- a/go/util/file_util.go +++ b/go/util/file_util.go @@ -2,7 +2,7 @@ package util import ( "bufio" - "code.google.com/p/weed-fs/go/glog" + "github.com/aszxqw/weed-fs/go/glog" "errors" "os" ) diff --git a/go/util/net_timeout.go b/go/util/net_timeout.go index a6cc81c99..ec9796e63 100644 --- a/go/util/net_timeout.go +++ b/go/util/net_timeout.go @@ -1,7 +1,7 @@ package util import ( - "code.google.com/p/weed-fs/go/stats" + "github.com/aszxqw/weed-fs/go/stats" "net" "time" ) diff --git a/go/weed/benchmark.go b/go/weed/benchmark.go index 7e98fd177..e33d37816 100644 --- a/go/weed/benchmark.go +++ b/go/weed/benchmark.go @@ -2,9 +2,9 @@ package main import ( "bufio" - "code.google.com/p/weed-fs/go/glog" - "code.google.com/p/weed-fs/go/operation" - "code.google.com/p/weed-fs/go/util" + "github.com/aszxqw/weed-fs/go/glog" + "github.com/aszxqw/weed-fs/go/operation" + "github.com/aszxqw/weed-fs/go/util" "fmt" "io" "math" diff --git a/go/weed/compact.go b/go/weed/compact.go index 57a02261f..1006701aa 100644 --- a/go/weed/compact.go +++ b/go/weed/compact.go @@ -1,8 +1,8 @@ package main import ( - "code.google.com/p/weed-fs/go/glog" - "code.google.com/p/weed-fs/go/storage" + "github.com/aszxqw/weed-fs/go/glog" + "github.com/aszxqw/weed-fs/go/storage" ) func init() { diff --git a/go/weed/download.go b/go/weed/download.go index 4309fe5e0..3b3df6d61 100644 --- a/go/weed/download.go +++ b/go/weed/download.go @@ -1,8 +1,8 @@ package main import ( - "code.google.com/p/weed-fs/go/operation" - "code.google.com/p/weed-fs/go/util" + "github.com/aszxqw/weed-fs/go/operation" + "github.com/aszxqw/weed-fs/go/util" "fmt" "io" "io/ioutil" diff --git a/go/weed/export.go b/go/weed/export.go index f79ab1a5f..e24108220 100644 --- a/go/weed/export.go +++ b/go/weed/export.go @@ -3,8 +3,8 @@ package main import ( "archive/tar" "bytes" - "code.google.com/p/weed-fs/go/glog" - "code.google.com/p/weed-fs/go/storage" + "github.com/aszxqw/weed-fs/go/glog" + "github.com/aszxqw/weed-fs/go/storage" "fmt" "os" "path" diff --git a/go/weed/filer.go b/go/weed/filer.go index da54a91fb..0301d1e5c 100644 --- a/go/weed/filer.go +++ b/go/weed/filer.go @@ -1,9 +1,9 @@ package main import ( - "code.google.com/p/weed-fs/go/glog" - "code.google.com/p/weed-fs/go/util" - "code.google.com/p/weed-fs/go/weed/weed_server" + "github.com/aszxqw/weed-fs/go/glog" + "github.com/aszxqw/weed-fs/go/util" + "github.com/aszxqw/weed-fs/go/weed/weed_server" "net/http" "os" "strconv" diff --git a/go/weed/fix.go b/go/weed/fix.go index 02147d796..f07d9269f 100644 --- a/go/weed/fix.go +++ b/go/weed/fix.go @@ -1,8 +1,8 @@ package main import ( - "code.google.com/p/weed-fs/go/glog" - "code.google.com/p/weed-fs/go/storage" + "github.com/aszxqw/weed-fs/go/glog" + "github.com/aszxqw/weed-fs/go/storage" "os" "path" "strconv" diff --git a/go/weed/master.go b/go/weed/master.go index ef2c062b5..046cbff74 100644 --- a/go/weed/master.go +++ b/go/weed/master.go @@ -1,9 +1,9 @@ package main import ( - "code.google.com/p/weed-fs/go/glog" - "code.google.com/p/weed-fs/go/util" - "code.google.com/p/weed-fs/go/weed/weed_server" + "github.com/aszxqw/weed-fs/go/glog" + "github.com/aszxqw/weed-fs/go/util" + "github.com/aszxqw/weed-fs/go/weed/weed_server" "github.com/gorilla/mux" "net/http" "os" diff --git a/go/weed/mount_std.go b/go/weed/mount_std.go index 5b058fe89..2df47ad62 100644 --- a/go/weed/mount_std.go +++ b/go/weed/mount_std.go @@ -5,10 +5,10 @@ package main import ( "bazil.org/fuse" "bazil.org/fuse/fs" - "code.google.com/p/weed-fs/go/filer" - "code.google.com/p/weed-fs/go/glog" - "code.google.com/p/weed-fs/go/storage" - "code.google.com/p/weed-fs/go/util" + "github.com/aszxqw/weed-fs/go/filer" + "github.com/aszxqw/weed-fs/go/glog" + "github.com/aszxqw/weed-fs/go/storage" + "github.com/aszxqw/weed-fs/go/util" "fmt" "os" "runtime" diff --git a/go/weed/server.go b/go/weed/server.go index 57fde6757..624c1ca84 100644 --- a/go/weed/server.go +++ b/go/weed/server.go @@ -1,9 +1,9 @@ package main import ( - "code.google.com/p/weed-fs/go/glog" - "code.google.com/p/weed-fs/go/util" - "code.google.com/p/weed-fs/go/weed/weed_server" + "github.com/aszxqw/weed-fs/go/glog" + "github.com/aszxqw/weed-fs/go/util" + "github.com/aszxqw/weed-fs/go/weed/weed_server" "github.com/gorilla/mux" "net/http" "os" diff --git a/go/weed/shell.go b/go/weed/shell.go index 6a3331284..16a414deb 100644 --- a/go/weed/shell.go +++ b/go/weed/shell.go @@ -2,7 +2,7 @@ package main import ( "bufio" - "code.google.com/p/weed-fs/go/glog" + "github.com/aszxqw/weed-fs/go/glog" "fmt" "os" ) diff --git a/go/weed/upload.go b/go/weed/upload.go index c21499dd0..dee013645 100644 --- a/go/weed/upload.go +++ b/go/weed/upload.go @@ -1,7 +1,7 @@ package main import ( - "code.google.com/p/weed-fs/go/operation" + "github.com/aszxqw/weed-fs/go/operation" "encoding/json" "fmt" "os" diff --git a/go/weed/version.go b/go/weed/version.go index a7c24ea3b..92eb4548d 100644 --- a/go/weed/version.go +++ b/go/weed/version.go @@ -1,7 +1,7 @@ package main import ( - "code.google.com/p/weed-fs/go/util" + "github.com/aszxqw/weed-fs/go/util" "fmt" "runtime" ) diff --git a/go/weed/volume.go b/go/weed/volume.go index 7a57730cd..ba6df265b 100644 --- a/go/weed/volume.go +++ b/go/weed/volume.go @@ -1,9 +1,9 @@ package main import ( - "code.google.com/p/weed-fs/go/glog" - "code.google.com/p/weed-fs/go/util" - "code.google.com/p/weed-fs/go/weed/weed_server" + "github.com/aszxqw/weed-fs/go/glog" + "github.com/aszxqw/weed-fs/go/util" + "github.com/aszxqw/weed-fs/go/weed/weed_server" "net/http" "os" "runtime" diff --git a/go/weed/volume_test.go b/go/weed/volume_test.go index 2499d8543..c5231cf5f 100644 --- a/go/weed/volume_test.go +++ b/go/weed/volume_test.go @@ -1,7 +1,7 @@ package main import ( - "code.google.com/p/weed-fs/go/glog" + "github.com/aszxqw/weed-fs/go/glog" "net/http" "testing" "time" diff --git a/go/weed/weed.go b/go/weed/weed.go index 03cf29179..642de6b4a 100644 --- a/go/weed/weed.go +++ b/go/weed/weed.go @@ -1,7 +1,7 @@ package main import ( - "code.google.com/p/weed-fs/go/glog" + "github.com/aszxqw/weed-fs/go/glog" "flag" "fmt" "io" diff --git a/go/weed/weed_server/common.go b/go/weed/weed_server/common.go index 49e84378c..4af150225 100644 --- a/go/weed/weed_server/common.go +++ b/go/weed/weed_server/common.go @@ -2,11 +2,11 @@ package weed_server import ( "bytes" - "code.google.com/p/weed-fs/go/glog" - "code.google.com/p/weed-fs/go/operation" - "code.google.com/p/weed-fs/go/stats" - "code.google.com/p/weed-fs/go/storage" - "code.google.com/p/weed-fs/go/util" + "github.com/aszxqw/weed-fs/go/glog" + "github.com/aszxqw/weed-fs/go/operation" + "github.com/aszxqw/weed-fs/go/stats" + "github.com/aszxqw/weed-fs/go/storage" + "github.com/aszxqw/weed-fs/go/util" "encoding/json" "fmt" "net" diff --git a/go/weed/weed_server/filer_server.go b/go/weed/weed_server/filer_server.go index e56cb5964..0e889fe9a 100644 --- a/go/weed/weed_server/filer_server.go +++ b/go/weed/weed_server/filer_server.go @@ -1,8 +1,8 @@ package weed_server import ( - "code.google.com/p/weed-fs/go/filer" - "code.google.com/p/weed-fs/go/glog" + "github.com/aszxqw/weed-fs/go/filer" + "github.com/aszxqw/weed-fs/go/glog" "net/http" "strconv" ) diff --git a/go/weed/weed_server/filer_server_handlers.go b/go/weed/weed_server/filer_server_handlers.go index f760030f3..af667666e 100644 --- a/go/weed/weed_server/filer_server_handlers.go +++ b/go/weed/weed_server/filer_server_handlers.go @@ -1,9 +1,9 @@ package weed_server import ( - "code.google.com/p/weed-fs/go/glog" - "code.google.com/p/weed-fs/go/operation" - "code.google.com/p/weed-fs/go/util" + "github.com/aszxqw/weed-fs/go/glog" + "github.com/aszxqw/weed-fs/go/operation" + "github.com/aszxqw/weed-fs/go/util" "encoding/json" "errors" "github.com/syndtr/goleveldb/leveldb" diff --git a/go/weed/weed_server/filer_server_handlers_admin.go b/go/weed/weed_server/filer_server_handlers_admin.go index b4b8b7221..d693769f2 100644 --- a/go/weed/weed_server/filer_server_handlers_admin.go +++ b/go/weed/weed_server/filer_server_handlers_admin.go @@ -1,7 +1,7 @@ package weed_server import ( - "code.google.com/p/weed-fs/go/glog" + "github.com/aszxqw/weed-fs/go/glog" "net/http" ) diff --git a/go/weed/weed_server/master_server.go b/go/weed/weed_server/master_server.go index a89959fa4..b3dbe2045 100644 --- a/go/weed/weed_server/master_server.go +++ b/go/weed/weed_server/master_server.go @@ -1,10 +1,10 @@ package weed_server import ( - "code.google.com/p/weed-fs/go/glog" - "code.google.com/p/weed-fs/go/sequence" - "code.google.com/p/weed-fs/go/topology" - "code.google.com/p/weed-fs/go/util" + "github.com/aszxqw/weed-fs/go/glog" + "github.com/aszxqw/weed-fs/go/sequence" + "github.com/aszxqw/weed-fs/go/topology" + "github.com/aszxqw/weed-fs/go/util" "github.com/goraft/raft" "github.com/gorilla/mux" "net/http" diff --git a/go/weed/weed_server/master_server_handlers.go b/go/weed/weed_server/master_server_handlers.go index 1b58e6e73..5a5ebc225 100644 --- a/go/weed/weed_server/master_server_handlers.go +++ b/go/weed/weed_server/master_server_handlers.go @@ -1,9 +1,9 @@ package weed_server import ( - "code.google.com/p/weed-fs/go/operation" - "code.google.com/p/weed-fs/go/stats" - "code.google.com/p/weed-fs/go/storage" + "github.com/aszxqw/weed-fs/go/operation" + "github.com/aszxqw/weed-fs/go/stats" + "github.com/aszxqw/weed-fs/go/storage" "net/http" "strconv" "strings" diff --git a/go/weed/weed_server/master_server_handlers_admin.go b/go/weed/weed_server/master_server_handlers_admin.go index 1458bf3e6..80cabf093 100644 --- a/go/weed/weed_server/master_server_handlers_admin.go +++ b/go/weed/weed_server/master_server_handlers_admin.go @@ -2,11 +2,11 @@ package weed_server import ( proto "code.google.com/p/goprotobuf/proto" - "code.google.com/p/weed-fs/go/glog" - "code.google.com/p/weed-fs/go/operation" - "code.google.com/p/weed-fs/go/storage" - "code.google.com/p/weed-fs/go/topology" - "code.google.com/p/weed-fs/go/util" + "github.com/aszxqw/weed-fs/go/glog" + "github.com/aszxqw/weed-fs/go/operation" + "github.com/aszxqw/weed-fs/go/storage" + "github.com/aszxqw/weed-fs/go/topology" + "github.com/aszxqw/weed-fs/go/util" "encoding/json" "errors" "io/ioutil" diff --git a/go/weed/weed_server/raft_server.go b/go/weed/weed_server/raft_server.go index f67caaebd..83c55c333 100644 --- a/go/weed/weed_server/raft_server.go +++ b/go/weed/weed_server/raft_server.go @@ -2,8 +2,8 @@ package weed_server import ( "bytes" - "code.google.com/p/weed-fs/go/glog" - "code.google.com/p/weed-fs/go/topology" + "github.com/aszxqw/weed-fs/go/glog" + "github.com/aszxqw/weed-fs/go/topology" "encoding/json" "errors" "fmt" diff --git a/go/weed/weed_server/raft_server_handlers.go b/go/weed/weed_server/raft_server_handlers.go index 1ce24a963..6eba0cb62 100644 --- a/go/weed/weed_server/raft_server_handlers.go +++ b/go/weed/weed_server/raft_server_handlers.go @@ -1,8 +1,8 @@ package weed_server import ( - "code.google.com/p/weed-fs/go/glog" - "code.google.com/p/weed-fs/go/operation" + "github.com/aszxqw/weed-fs/go/glog" + "github.com/aszxqw/weed-fs/go/operation" "encoding/json" "github.com/goraft/raft" "io/ioutil" diff --git a/go/weed/weed_server/volume_server.go b/go/weed/weed_server/volume_server.go index 9cada91ac..b480e0742 100644 --- a/go/weed/weed_server/volume_server.go +++ b/go/weed/weed_server/volume_server.go @@ -1,8 +1,8 @@ package weed_server import ( - "code.google.com/p/weed-fs/go/glog" - "code.google.com/p/weed-fs/go/storage" + "github.com/aszxqw/weed-fs/go/glog" + "github.com/aszxqw/weed-fs/go/storage" "math/rand" "net/http" "strconv" diff --git a/go/weed/weed_server/volume_server_handlers.go b/go/weed/weed_server/volume_server_handlers.go index eed198e4a..0f0e8012d 100644 --- a/go/weed/weed_server/volume_server_handlers.go +++ b/go/weed/weed_server/volume_server_handlers.go @@ -1,12 +1,12 @@ package weed_server import ( - "code.google.com/p/weed-fs/go/glog" - "code.google.com/p/weed-fs/go/images" - "code.google.com/p/weed-fs/go/operation" - "code.google.com/p/weed-fs/go/stats" - "code.google.com/p/weed-fs/go/storage" - "code.google.com/p/weed-fs/go/topology" + "github.com/aszxqw/weed-fs/go/glog" + "github.com/aszxqw/weed-fs/go/images" + "github.com/aszxqw/weed-fs/go/operation" + "github.com/aszxqw/weed-fs/go/stats" + "github.com/aszxqw/weed-fs/go/storage" + "github.com/aszxqw/weed-fs/go/topology" "io" "mime" "mime/multipart" diff --git a/go/weed/weed_server/volume_server_handlers_admin.go b/go/weed/weed_server/volume_server_handlers_admin.go index 1c01fdfd0..181de6017 100644 --- a/go/weed/weed_server/volume_server_handlers_admin.go +++ b/go/weed/weed_server/volume_server_handlers_admin.go @@ -1,9 +1,9 @@ package weed_server import ( - "code.google.com/p/weed-fs/go/glog" - "code.google.com/p/weed-fs/go/stats" - "code.google.com/p/weed-fs/go/util" + "github.com/aszxqw/weed-fs/go/glog" + "github.com/aszxqw/weed-fs/go/stats" + "github.com/aszxqw/weed-fs/go/util" "net/http" "path/filepath" ) diff --git a/go/weed/weed_server/volume_server_handlers_vacuum.go b/go/weed/weed_server/volume_server_handlers_vacuum.go index 60a5e9742..4cbb1ba11 100644 --- a/go/weed/weed_server/volume_server_handlers_vacuum.go +++ b/go/weed/weed_server/volume_server_handlers_vacuum.go @@ -1,7 +1,7 @@ package weed_server import ( - "code.google.com/p/weed-fs/go/glog" + "github.com/aszxqw/weed-fs/go/glog" "net/http" ) From 2f1cf164b92f29db4dd0452572a948ae37b28add Mon Sep 17 00:00:00 2001 From: wyy Date: Thu, 25 Sep 2014 16:28:32 +0800 Subject: [PATCH 17/27] update readme.md --- README.md | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/README.md b/README.md index 1808a0277..75fb07b36 100644 --- a/README.md +++ b/README.md @@ -5,10 +5,19 @@ weed-fs [![GoDoc](https://godoc.org/github.com/chrislusf/weed-fs/go?status.svg)](https://godoc.org/github.com/chrislusf/weed-fs/go) [![RTD](https://readthedocs.org/projects/weed-fs/badge/?version=latest)](http://weed-fs.readthedocs.org/en/latest/) +## Introduction + An official mirror of code.google.com/p/weed-fs. Moving to github.com to make cooperations easier. This repo and the google code repo will be kept synchronized. +## Usage + +``` +go get github.com/aszxqw/weed-fs/go/weed +``` + +## Reference For documents and bug reporting, Please visit http://weed-fs.googlecode.com From d39c62bbed9b56164ab92101cf7ec46d4a1bfeee Mon Sep 17 00:00:00 2001 From: wyy Date: Thu, 25 Sep 2014 16:34:26 +0800 Subject: [PATCH 18/27] add .gitignore --- .gitignore | 1 + 1 file changed, 1 insertion(+) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 000000000..46f3c0430 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +weed From 4126280d5559a364c6e0f31ab7a57bc3b1d15d56 Mon Sep 17 00:00:00 2001 From: wyy Date: Thu, 25 Sep 2014 16:57:22 +0800 Subject: [PATCH 19/27] use github.com/chrislusf instead of github.com/aszxqw --- go/filer/client_operations.go | 2 +- go/filer/directory_in_map.go | 2 +- go/filer/filer_embedded.go | 2 +- go/filer/files_in_leveldb.go | 2 +- go/operation/assign_file_id.go | 4 ++-- go/operation/delete_content.go | 2 +- go/operation/list_masters.go | 4 ++-- go/operation/lookup.go | 2 +- go/operation/submit.go | 2 +- go/operation/upload_content.go | 2 +- go/storage/cdb_map.go | 2 +- go/storage/cdb_map_test.go | 2 +- go/storage/compact_map_perf_test.go | 4 ++-- go/storage/compress.go | 2 +- go/storage/crc.go | 2 +- go/storage/file_id.go | 4 ++-- go/storage/needle.go | 6 +++--- go/storage/needle_map.go | 4 ++-- go/storage/needle_read_write.go | 4 ++-- go/storage/store.go | 6 +++--- go/storage/store_vacuum.go | 2 +- go/storage/volume.go | 2 +- go/storage/volume_info.go | 2 +- go/storage/volume_super_block.go | 2 +- go/storage/volume_vacuum.go | 2 +- go/tools/read_index.go | 2 +- go/topology/allocate_volume.go | 4 ++-- go/topology/cluster_commands.go | 4 ++-- go/topology/collection.go | 2 +- go/topology/data_node.go | 4 ++-- go/topology/node.go | 4 ++-- go/topology/store_replicate.go | 8 ++++---- go/topology/topology.go | 8 ++++---- go/topology/topology_event_handling.go | 4 ++-- go/topology/topology_vacuum.go | 6 +++--- go/topology/volume_growth.go | 4 ++-- go/topology/volume_growth_test.go | 4 ++-- go/topology/volume_layout.go | 4 ++-- go/util/config.go | 2 +- go/util/file_util.go | 2 +- go/util/net_timeout.go | 2 +- go/weed/benchmark.go | 6 +++--- go/weed/compact.go | 4 ++-- go/weed/download.go | 4 ++-- go/weed/export.go | 4 ++-- go/weed/filer.go | 6 +++--- go/weed/fix.go | 4 ++-- go/weed/master.go | 6 +++--- go/weed/mount_std.go | 8 ++++---- go/weed/server.go | 6 +++--- go/weed/shell.go | 2 +- go/weed/upload.go | 2 +- go/weed/version.go | 2 +- go/weed/volume.go | 6 +++--- go/weed/volume_test.go | 2 +- go/weed/weed.go | 2 +- go/weed/weed_server/common.go | 10 +++++----- go/weed/weed_server/filer_server.go | 4 ++-- go/weed/weed_server/filer_server_handlers.go | 6 +++--- go/weed/weed_server/filer_server_handlers_admin.go | 2 +- go/weed/weed_server/master_server.go | 8 ++++---- go/weed/weed_server/master_server_handlers.go | 6 +++--- go/weed/weed_server/master_server_handlers_admin.go | 10 +++++----- go/weed/weed_server/raft_server.go | 4 ++-- go/weed/weed_server/raft_server_handlers.go | 4 ++-- go/weed/weed_server/volume_server.go | 4 ++-- go/weed/weed_server/volume_server_handlers.go | 12 ++++++------ go/weed/weed_server/volume_server_handlers_admin.go | 6 +++--- go/weed/weed_server/volume_server_handlers_vacuum.go | 2 +- 69 files changed, 138 insertions(+), 138 deletions(-) diff --git a/go/filer/client_operations.go b/go/filer/client_operations.go index d9a9501a5..0b006289f 100644 --- a/go/filer/client_operations.go +++ b/go/filer/client_operations.go @@ -3,7 +3,7 @@ package filer import () import ( - "github.com/aszxqw/weed-fs/go/util" + "github.com/chrislusf/weed-fs/go/util" "encoding/json" "errors" "fmt" diff --git a/go/filer/directory_in_map.go b/go/filer/directory_in_map.go index 85cde765d..1d88a78be 100644 --- a/go/filer/directory_in_map.go +++ b/go/filer/directory_in_map.go @@ -2,7 +2,7 @@ package filer import ( "bufio" - "github.com/aszxqw/weed-fs/go/util" + "github.com/chrislusf/weed-fs/go/util" "fmt" "io" "os" diff --git a/go/filer/filer_embedded.go b/go/filer/filer_embedded.go index d716802ac..3d3dac941 100644 --- a/go/filer/filer_embedded.go +++ b/go/filer/filer_embedded.go @@ -1,7 +1,7 @@ package filer import ( - "github.com/aszxqw/weed-fs/go/operation" + "github.com/chrislusf/weed-fs/go/operation" "errors" "fmt" "path/filepath" diff --git a/go/filer/files_in_leveldb.go b/go/filer/files_in_leveldb.go index 17d726dd7..41fbc74bd 100644 --- a/go/filer/files_in_leveldb.go +++ b/go/filer/files_in_leveldb.go @@ -2,7 +2,7 @@ package filer import ( "bytes" - "github.com/aszxqw/weed-fs/go/glog" + "github.com/chrislusf/weed-fs/go/glog" "github.com/syndtr/goleveldb/leveldb" "github.com/syndtr/goleveldb/leveldb/util" ) diff --git a/go/operation/assign_file_id.go b/go/operation/assign_file_id.go index 891653278..4e72ad939 100644 --- a/go/operation/assign_file_id.go +++ b/go/operation/assign_file_id.go @@ -1,8 +1,8 @@ package operation import ( - "github.com/aszxqw/weed-fs/go/glog" - "github.com/aszxqw/weed-fs/go/util" + "github.com/chrislusf/weed-fs/go/glog" + "github.com/chrislusf/weed-fs/go/util" "encoding/json" "errors" "net/url" diff --git a/go/operation/delete_content.go b/go/operation/delete_content.go index a1485a2db..84391b634 100644 --- a/go/operation/delete_content.go +++ b/go/operation/delete_content.go @@ -1,7 +1,7 @@ package operation import ( - "github.com/aszxqw/weed-fs/go/util" + "github.com/chrislusf/weed-fs/go/util" "encoding/json" "errors" "net/url" diff --git a/go/operation/list_masters.go b/go/operation/list_masters.go index 120ba58a1..7d46a9ebc 100644 --- a/go/operation/list_masters.go +++ b/go/operation/list_masters.go @@ -1,8 +1,8 @@ package operation import ( - "github.com/aszxqw/weed-fs/go/glog" - "github.com/aszxqw/weed-fs/go/util" + "github.com/chrislusf/weed-fs/go/glog" + "github.com/chrislusf/weed-fs/go/util" "encoding/json" ) diff --git a/go/operation/lookup.go b/go/operation/lookup.go index 1b5d57e2f..ebf153d27 100644 --- a/go/operation/lookup.go +++ b/go/operation/lookup.go @@ -1,7 +1,7 @@ package operation import ( - "github.com/aszxqw/weed-fs/go/util" + "github.com/chrislusf/weed-fs/go/util" "encoding/json" "errors" _ "fmt" diff --git a/go/operation/submit.go b/go/operation/submit.go index 18bc593a3..3e09c2edf 100644 --- a/go/operation/submit.go +++ b/go/operation/submit.go @@ -2,7 +2,7 @@ package operation import ( "bytes" - "github.com/aszxqw/weed-fs/go/glog" + "github.com/chrislusf/weed-fs/go/glog" "io" "mime" "os" diff --git a/go/operation/upload_content.go b/go/operation/upload_content.go index 3812a7d86..38737702d 100644 --- a/go/operation/upload_content.go +++ b/go/operation/upload_content.go @@ -2,7 +2,7 @@ package operation import ( "bytes" - "github.com/aszxqw/weed-fs/go/glog" + "github.com/chrislusf/weed-fs/go/glog" "encoding/json" "errors" "fmt" diff --git a/go/storage/cdb_map.go b/go/storage/cdb_map.go index 07cbca1a9..1869a563e 100644 --- a/go/storage/cdb_map.go +++ b/go/storage/cdb_map.go @@ -1,7 +1,7 @@ package storage import ( - "github.com/aszxqw/weed-fs/go/util" + "github.com/chrislusf/weed-fs/go/util" "encoding/json" "errors" "fmt" diff --git a/go/storage/cdb_map_test.go b/go/storage/cdb_map_test.go index 25f6067cb..cff7dfa61 100644 --- a/go/storage/cdb_map_test.go +++ b/go/storage/cdb_map_test.go @@ -1,7 +1,7 @@ package storage import ( - "github.com/aszxqw/weed-fs/go/glog" + "github.com/chrislusf/weed-fs/go/glog" "math/rand" "os" "runtime" diff --git a/go/storage/compact_map_perf_test.go b/go/storage/compact_map_perf_test.go index 4795ead5a..ef43de25b 100644 --- a/go/storage/compact_map_perf_test.go +++ b/go/storage/compact_map_perf_test.go @@ -1,8 +1,8 @@ package storage import ( - "github.com/aszxqw/weed-fs/go/glog" - "github.com/aszxqw/weed-fs/go/util" + "github.com/chrislusf/weed-fs/go/glog" + "github.com/chrislusf/weed-fs/go/util" "log" "os" "testing" diff --git a/go/storage/compress.go b/go/storage/compress.go index 7390b85dd..a353c9d3a 100644 --- a/go/storage/compress.go +++ b/go/storage/compress.go @@ -2,7 +2,7 @@ package storage import ( "bytes" - "github.com/aszxqw/weed-fs/go/glog" + "github.com/chrislusf/weed-fs/go/glog" "compress/flate" "compress/gzip" "io/ioutil" diff --git a/go/storage/crc.go b/go/storage/crc.go index 9b77c30c6..7aa400959 100644 --- a/go/storage/crc.go +++ b/go/storage/crc.go @@ -1,7 +1,7 @@ package storage import ( - "github.com/aszxqw/weed-fs/go/util" + "github.com/chrislusf/weed-fs/go/util" "fmt" "hash/crc32" ) diff --git a/go/storage/file_id.go b/go/storage/file_id.go index 435a54202..ec566826c 100644 --- a/go/storage/file_id.go +++ b/go/storage/file_id.go @@ -1,8 +1,8 @@ package storage import ( - "github.com/aszxqw/weed-fs/go/glog" - "github.com/aszxqw/weed-fs/go/util" + "github.com/chrislusf/weed-fs/go/glog" + "github.com/chrislusf/weed-fs/go/util" "encoding/hex" "errors" "strings" diff --git a/go/storage/needle.go b/go/storage/needle.go index 803bc624e..daede321b 100644 --- a/go/storage/needle.go +++ b/go/storage/needle.go @@ -1,9 +1,9 @@ package storage import ( - "github.com/aszxqw/weed-fs/go/glog" - "github.com/aszxqw/weed-fs/go/images" - "github.com/aszxqw/weed-fs/go/util" + "github.com/chrislusf/weed-fs/go/glog" + "github.com/chrislusf/weed-fs/go/images" + "github.com/chrislusf/weed-fs/go/util" "encoding/hex" "errors" "io/ioutil" diff --git a/go/storage/needle_map.go b/go/storage/needle_map.go index 90f3eff7d..dca2e6c5d 100644 --- a/go/storage/needle_map.go +++ b/go/storage/needle_map.go @@ -1,8 +1,8 @@ package storage import ( - "github.com/aszxqw/weed-fs/go/glog" - "github.com/aszxqw/weed-fs/go/util" + "github.com/chrislusf/weed-fs/go/glog" + "github.com/chrislusf/weed-fs/go/util" "fmt" "io" "os" diff --git a/go/storage/needle_read_write.go b/go/storage/needle_read_write.go index d298c806b..bf452ba37 100644 --- a/go/storage/needle_read_write.go +++ b/go/storage/needle_read_write.go @@ -1,8 +1,8 @@ package storage import ( - "github.com/aszxqw/weed-fs/go/glog" - "github.com/aszxqw/weed-fs/go/util" + "github.com/chrislusf/weed-fs/go/glog" + "github.com/chrislusf/weed-fs/go/util" "errors" "fmt" "io" diff --git a/go/storage/store.go b/go/storage/store.go index f5b252ad3..e7a9dac94 100644 --- a/go/storage/store.go +++ b/go/storage/store.go @@ -2,9 +2,9 @@ package storage import ( proto "code.google.com/p/goprotobuf/proto" - "github.com/aszxqw/weed-fs/go/glog" - "github.com/aszxqw/weed-fs/go/operation" - "github.com/aszxqw/weed-fs/go/util" + "github.com/chrislusf/weed-fs/go/glog" + "github.com/chrislusf/weed-fs/go/operation" + "github.com/chrislusf/weed-fs/go/util" "encoding/json" "errors" "fmt" diff --git a/go/storage/store_vacuum.go b/go/storage/store_vacuum.go index b3f13fd2d..3527e4f59 100644 --- a/go/storage/store_vacuum.go +++ b/go/storage/store_vacuum.go @@ -1,7 +1,7 @@ package storage import ( - "github.com/aszxqw/weed-fs/go/glog" + "github.com/chrislusf/weed-fs/go/glog" "fmt" "strconv" ) diff --git a/go/storage/volume.go b/go/storage/volume.go index 10fd145e9..de79e9107 100644 --- a/go/storage/volume.go +++ b/go/storage/volume.go @@ -2,7 +2,7 @@ package storage import ( "bytes" - "github.com/aszxqw/weed-fs/go/glog" + "github.com/chrislusf/weed-fs/go/glog" "errors" "fmt" "io" diff --git a/go/storage/volume_info.go b/go/storage/volume_info.go index 81dff4a11..6410c1784 100644 --- a/go/storage/volume_info.go +++ b/go/storage/volume_info.go @@ -1,7 +1,7 @@ package storage import ( - "github.com/aszxqw/weed-fs/go/operation" + "github.com/chrislusf/weed-fs/go/operation" ) type VolumeInfo struct { diff --git a/go/storage/volume_super_block.go b/go/storage/volume_super_block.go index da510ee30..a7e86b1c3 100644 --- a/go/storage/volume_super_block.go +++ b/go/storage/volume_super_block.go @@ -1,7 +1,7 @@ package storage import ( - "github.com/aszxqw/weed-fs/go/glog" + "github.com/chrislusf/weed-fs/go/glog" "fmt" "os" ) diff --git a/go/storage/volume_vacuum.go b/go/storage/volume_vacuum.go index 7feb1c256..b348434d2 100644 --- a/go/storage/volume_vacuum.go +++ b/go/storage/volume_vacuum.go @@ -1,7 +1,7 @@ package storage import ( - "github.com/aszxqw/weed-fs/go/glog" + "github.com/chrislusf/weed-fs/go/glog" "fmt" "os" "time" diff --git a/go/tools/read_index.go b/go/tools/read_index.go index 36d39a381..b99c5b6b8 100644 --- a/go/tools/read_index.go +++ b/go/tools/read_index.go @@ -1,7 +1,7 @@ package main import ( - "github.com/aszxqw/weed-fs/go/storage" + "github.com/chrislusf/weed-fs/go/storage" "flag" "fmt" "log" diff --git a/go/topology/allocate_volume.go b/go/topology/allocate_volume.go index eaeae4427..6562e9ac5 100644 --- a/go/topology/allocate_volume.go +++ b/go/topology/allocate_volume.go @@ -1,8 +1,8 @@ package topology import ( - "github.com/aszxqw/weed-fs/go/storage" - "github.com/aszxqw/weed-fs/go/util" + "github.com/chrislusf/weed-fs/go/storage" + "github.com/chrislusf/weed-fs/go/util" "encoding/json" "errors" "net/url" diff --git a/go/topology/cluster_commands.go b/go/topology/cluster_commands.go index 369c0b9b9..cafc52c76 100644 --- a/go/topology/cluster_commands.go +++ b/go/topology/cluster_commands.go @@ -1,8 +1,8 @@ package topology import ( - "github.com/aszxqw/weed-fs/go/glog" - "github.com/aszxqw/weed-fs/go/storage" + "github.com/chrislusf/weed-fs/go/glog" + "github.com/chrislusf/weed-fs/go/storage" "github.com/goraft/raft" ) diff --git a/go/topology/collection.go b/go/topology/collection.go index 72ac86522..506f43fbf 100644 --- a/go/topology/collection.go +++ b/go/topology/collection.go @@ -1,7 +1,7 @@ package topology import ( - "github.com/aszxqw/weed-fs/go/storage" + "github.com/chrislusf/weed-fs/go/storage" ) type Collection struct { diff --git a/go/topology/data_node.go b/go/topology/data_node.go index 5c16cf85d..c3b90470f 100644 --- a/go/topology/data_node.go +++ b/go/topology/data_node.go @@ -1,8 +1,8 @@ package topology import ( - "github.com/aszxqw/weed-fs/go/glog" - "github.com/aszxqw/weed-fs/go/storage" + "github.com/chrislusf/weed-fs/go/glog" + "github.com/chrislusf/weed-fs/go/storage" "strconv" ) diff --git a/go/topology/node.go b/go/topology/node.go index 12e9a709a..54118802e 100644 --- a/go/topology/node.go +++ b/go/topology/node.go @@ -1,8 +1,8 @@ package topology import ( - "github.com/aszxqw/weed-fs/go/glog" - "github.com/aszxqw/weed-fs/go/storage" + "github.com/chrislusf/weed-fs/go/glog" + "github.com/chrislusf/weed-fs/go/storage" "errors" "math/rand" "strings" diff --git a/go/topology/store_replicate.go b/go/topology/store_replicate.go index fefaea8a6..6ea019bd8 100644 --- a/go/topology/store_replicate.go +++ b/go/topology/store_replicate.go @@ -2,10 +2,10 @@ package topology import ( "bytes" - "github.com/aszxqw/weed-fs/go/glog" - "github.com/aszxqw/weed-fs/go/operation" - "github.com/aszxqw/weed-fs/go/storage" - "github.com/aszxqw/weed-fs/go/util" + "github.com/chrislusf/weed-fs/go/glog" + "github.com/chrislusf/weed-fs/go/operation" + "github.com/chrislusf/weed-fs/go/storage" + "github.com/chrislusf/weed-fs/go/util" "net/http" "strconv" ) diff --git a/go/topology/topology.go b/go/topology/topology.go index 77c9558bb..c90e8de0b 100644 --- a/go/topology/topology.go +++ b/go/topology/topology.go @@ -1,10 +1,10 @@ package topology import ( - "github.com/aszxqw/weed-fs/go/glog" - "github.com/aszxqw/weed-fs/go/operation" - "github.com/aszxqw/weed-fs/go/sequence" - "github.com/aszxqw/weed-fs/go/storage" + "github.com/chrislusf/weed-fs/go/glog" + "github.com/chrislusf/weed-fs/go/operation" + "github.com/chrislusf/weed-fs/go/sequence" + "github.com/chrislusf/weed-fs/go/storage" "errors" "github.com/goraft/raft" "io/ioutil" diff --git a/go/topology/topology_event_handling.go b/go/topology/topology_event_handling.go index 61e6f5ffa..eb4491484 100644 --- a/go/topology/topology_event_handling.go +++ b/go/topology/topology_event_handling.go @@ -1,8 +1,8 @@ package topology import ( - "github.com/aszxqw/weed-fs/go/glog" - "github.com/aszxqw/weed-fs/go/storage" + "github.com/chrislusf/weed-fs/go/glog" + "github.com/chrislusf/weed-fs/go/storage" "math/rand" "time" ) diff --git a/go/topology/topology_vacuum.go b/go/topology/topology_vacuum.go index bdc0c38f9..72846f20b 100644 --- a/go/topology/topology_vacuum.go +++ b/go/topology/topology_vacuum.go @@ -1,9 +1,9 @@ package topology import ( - "github.com/aszxqw/weed-fs/go/glog" - "github.com/aszxqw/weed-fs/go/storage" - "github.com/aszxqw/weed-fs/go/util" + "github.com/chrislusf/weed-fs/go/glog" + "github.com/chrislusf/weed-fs/go/storage" + "github.com/chrislusf/weed-fs/go/util" "encoding/json" "errors" "net/url" diff --git a/go/topology/volume_growth.go b/go/topology/volume_growth.go index e083a8531..2859d3992 100644 --- a/go/topology/volume_growth.go +++ b/go/topology/volume_growth.go @@ -1,8 +1,8 @@ package topology import ( - "github.com/aszxqw/weed-fs/go/glog" - "github.com/aszxqw/weed-fs/go/storage" + "github.com/chrislusf/weed-fs/go/glog" + "github.com/chrislusf/weed-fs/go/storage" "fmt" "math/rand" "sync" diff --git a/go/topology/volume_growth_test.go b/go/topology/volume_growth_test.go index ba1e43ff2..5581c87ce 100644 --- a/go/topology/volume_growth_test.go +++ b/go/topology/volume_growth_test.go @@ -1,8 +1,8 @@ package topology import ( - "github.com/aszxqw/weed-fs/go/sequence" - "github.com/aszxqw/weed-fs/go/storage" + "github.com/chrislusf/weed-fs/go/sequence" + "github.com/chrislusf/weed-fs/go/storage" "encoding/json" "fmt" "testing" diff --git a/go/topology/volume_layout.go b/go/topology/volume_layout.go index 35f45c08d..7bb0cf7e3 100644 --- a/go/topology/volume_layout.go +++ b/go/topology/volume_layout.go @@ -1,8 +1,8 @@ package topology import ( - "github.com/aszxqw/weed-fs/go/glog" - "github.com/aszxqw/weed-fs/go/storage" + "github.com/chrislusf/weed-fs/go/glog" + "github.com/chrislusf/weed-fs/go/storage" "errors" "math/rand" "sync" diff --git a/go/util/config.go b/go/util/config.go index 1287ed881..050fd0e64 100644 --- a/go/util/config.go +++ b/go/util/config.go @@ -10,7 +10,7 @@ package util import ( "bytes" - "github.com/aszxqw/weed-fs/go/glog" + "github.com/chrislusf/weed-fs/go/glog" "encoding/json" "os" ) diff --git a/go/util/file_util.go b/go/util/file_util.go index 82f6bffe3..412d98458 100644 --- a/go/util/file_util.go +++ b/go/util/file_util.go @@ -2,7 +2,7 @@ package util import ( "bufio" - "github.com/aszxqw/weed-fs/go/glog" + "github.com/chrislusf/weed-fs/go/glog" "errors" "os" ) diff --git a/go/util/net_timeout.go b/go/util/net_timeout.go index ec9796e63..eb80822b5 100644 --- a/go/util/net_timeout.go +++ b/go/util/net_timeout.go @@ -1,7 +1,7 @@ package util import ( - "github.com/aszxqw/weed-fs/go/stats" + "github.com/chrislusf/weed-fs/go/stats" "net" "time" ) diff --git a/go/weed/benchmark.go b/go/weed/benchmark.go index e33d37816..fec8472e5 100644 --- a/go/weed/benchmark.go +++ b/go/weed/benchmark.go @@ -2,9 +2,9 @@ package main import ( "bufio" - "github.com/aszxqw/weed-fs/go/glog" - "github.com/aszxqw/weed-fs/go/operation" - "github.com/aszxqw/weed-fs/go/util" + "github.com/chrislusf/weed-fs/go/glog" + "github.com/chrislusf/weed-fs/go/operation" + "github.com/chrislusf/weed-fs/go/util" "fmt" "io" "math" diff --git a/go/weed/compact.go b/go/weed/compact.go index 1006701aa..a99e6c93e 100644 --- a/go/weed/compact.go +++ b/go/weed/compact.go @@ -1,8 +1,8 @@ package main import ( - "github.com/aszxqw/weed-fs/go/glog" - "github.com/aszxqw/weed-fs/go/storage" + "github.com/chrislusf/weed-fs/go/glog" + "github.com/chrislusf/weed-fs/go/storage" ) func init() { diff --git a/go/weed/download.go b/go/weed/download.go index 3b3df6d61..c30d17915 100644 --- a/go/weed/download.go +++ b/go/weed/download.go @@ -1,8 +1,8 @@ package main import ( - "github.com/aszxqw/weed-fs/go/operation" - "github.com/aszxqw/weed-fs/go/util" + "github.com/chrislusf/weed-fs/go/operation" + "github.com/chrislusf/weed-fs/go/util" "fmt" "io" "io/ioutil" diff --git a/go/weed/export.go b/go/weed/export.go index e24108220..81bc21f6e 100644 --- a/go/weed/export.go +++ b/go/weed/export.go @@ -3,8 +3,8 @@ package main import ( "archive/tar" "bytes" - "github.com/aszxqw/weed-fs/go/glog" - "github.com/aszxqw/weed-fs/go/storage" + "github.com/chrislusf/weed-fs/go/glog" + "github.com/chrislusf/weed-fs/go/storage" "fmt" "os" "path" diff --git a/go/weed/filer.go b/go/weed/filer.go index 0301d1e5c..7dbecb4d0 100644 --- a/go/weed/filer.go +++ b/go/weed/filer.go @@ -1,9 +1,9 @@ package main import ( - "github.com/aszxqw/weed-fs/go/glog" - "github.com/aszxqw/weed-fs/go/util" - "github.com/aszxqw/weed-fs/go/weed/weed_server" + "github.com/chrislusf/weed-fs/go/glog" + "github.com/chrislusf/weed-fs/go/util" + "github.com/chrislusf/weed-fs/go/weed/weed_server" "net/http" "os" "strconv" diff --git a/go/weed/fix.go b/go/weed/fix.go index f07d9269f..ad573875a 100644 --- a/go/weed/fix.go +++ b/go/weed/fix.go @@ -1,8 +1,8 @@ package main import ( - "github.com/aszxqw/weed-fs/go/glog" - "github.com/aszxqw/weed-fs/go/storage" + "github.com/chrislusf/weed-fs/go/glog" + "github.com/chrislusf/weed-fs/go/storage" "os" "path" "strconv" diff --git a/go/weed/master.go b/go/weed/master.go index 046cbff74..6617c8ca6 100644 --- a/go/weed/master.go +++ b/go/weed/master.go @@ -1,9 +1,9 @@ package main import ( - "github.com/aszxqw/weed-fs/go/glog" - "github.com/aszxqw/weed-fs/go/util" - "github.com/aszxqw/weed-fs/go/weed/weed_server" + "github.com/chrislusf/weed-fs/go/glog" + "github.com/chrislusf/weed-fs/go/util" + "github.com/chrislusf/weed-fs/go/weed/weed_server" "github.com/gorilla/mux" "net/http" "os" diff --git a/go/weed/mount_std.go b/go/weed/mount_std.go index 2df47ad62..e5fc0986c 100644 --- a/go/weed/mount_std.go +++ b/go/weed/mount_std.go @@ -5,10 +5,10 @@ package main import ( "bazil.org/fuse" "bazil.org/fuse/fs" - "github.com/aszxqw/weed-fs/go/filer" - "github.com/aszxqw/weed-fs/go/glog" - "github.com/aszxqw/weed-fs/go/storage" - "github.com/aszxqw/weed-fs/go/util" + "github.com/chrislusf/weed-fs/go/filer" + "github.com/chrislusf/weed-fs/go/glog" + "github.com/chrislusf/weed-fs/go/storage" + "github.com/chrislusf/weed-fs/go/util" "fmt" "os" "runtime" diff --git a/go/weed/server.go b/go/weed/server.go index 624c1ca84..1d854d641 100644 --- a/go/weed/server.go +++ b/go/weed/server.go @@ -1,9 +1,9 @@ package main import ( - "github.com/aszxqw/weed-fs/go/glog" - "github.com/aszxqw/weed-fs/go/util" - "github.com/aszxqw/weed-fs/go/weed/weed_server" + "github.com/chrislusf/weed-fs/go/glog" + "github.com/chrislusf/weed-fs/go/util" + "github.com/chrislusf/weed-fs/go/weed/weed_server" "github.com/gorilla/mux" "net/http" "os" diff --git a/go/weed/shell.go b/go/weed/shell.go index 16a414deb..c8043e0dd 100644 --- a/go/weed/shell.go +++ b/go/weed/shell.go @@ -2,7 +2,7 @@ package main import ( "bufio" - "github.com/aszxqw/weed-fs/go/glog" + "github.com/chrislusf/weed-fs/go/glog" "fmt" "os" ) diff --git a/go/weed/upload.go b/go/weed/upload.go index dee013645..4eae4d274 100644 --- a/go/weed/upload.go +++ b/go/weed/upload.go @@ -1,7 +1,7 @@ package main import ( - "github.com/aszxqw/weed-fs/go/operation" + "github.com/chrislusf/weed-fs/go/operation" "encoding/json" "fmt" "os" diff --git a/go/weed/version.go b/go/weed/version.go index 92eb4548d..63441509e 100644 --- a/go/weed/version.go +++ b/go/weed/version.go @@ -1,7 +1,7 @@ package main import ( - "github.com/aszxqw/weed-fs/go/util" + "github.com/chrislusf/weed-fs/go/util" "fmt" "runtime" ) diff --git a/go/weed/volume.go b/go/weed/volume.go index ba6df265b..17d03f0c5 100644 --- a/go/weed/volume.go +++ b/go/weed/volume.go @@ -1,9 +1,9 @@ package main import ( - "github.com/aszxqw/weed-fs/go/glog" - "github.com/aszxqw/weed-fs/go/util" - "github.com/aszxqw/weed-fs/go/weed/weed_server" + "github.com/chrislusf/weed-fs/go/glog" + "github.com/chrislusf/weed-fs/go/util" + "github.com/chrislusf/weed-fs/go/weed/weed_server" "net/http" "os" "runtime" diff --git a/go/weed/volume_test.go b/go/weed/volume_test.go index c5231cf5f..764362a2b 100644 --- a/go/weed/volume_test.go +++ b/go/weed/volume_test.go @@ -1,7 +1,7 @@ package main import ( - "github.com/aszxqw/weed-fs/go/glog" + "github.com/chrislusf/weed-fs/go/glog" "net/http" "testing" "time" diff --git a/go/weed/weed.go b/go/weed/weed.go index 642de6b4a..c1f5a72de 100644 --- a/go/weed/weed.go +++ b/go/weed/weed.go @@ -1,7 +1,7 @@ package main import ( - "github.com/aszxqw/weed-fs/go/glog" + "github.com/chrislusf/weed-fs/go/glog" "flag" "fmt" "io" diff --git a/go/weed/weed_server/common.go b/go/weed/weed_server/common.go index 4af150225..816107dc5 100644 --- a/go/weed/weed_server/common.go +++ b/go/weed/weed_server/common.go @@ -2,11 +2,11 @@ package weed_server import ( "bytes" - "github.com/aszxqw/weed-fs/go/glog" - "github.com/aszxqw/weed-fs/go/operation" - "github.com/aszxqw/weed-fs/go/stats" - "github.com/aszxqw/weed-fs/go/storage" - "github.com/aszxqw/weed-fs/go/util" + "github.com/chrislusf/weed-fs/go/glog" + "github.com/chrislusf/weed-fs/go/operation" + "github.com/chrislusf/weed-fs/go/stats" + "github.com/chrislusf/weed-fs/go/storage" + "github.com/chrislusf/weed-fs/go/util" "encoding/json" "fmt" "net" diff --git a/go/weed/weed_server/filer_server.go b/go/weed/weed_server/filer_server.go index 0e889fe9a..5ff0ed986 100644 --- a/go/weed/weed_server/filer_server.go +++ b/go/weed/weed_server/filer_server.go @@ -1,8 +1,8 @@ package weed_server import ( - "github.com/aszxqw/weed-fs/go/filer" - "github.com/aszxqw/weed-fs/go/glog" + "github.com/chrislusf/weed-fs/go/filer" + "github.com/chrislusf/weed-fs/go/glog" "net/http" "strconv" ) diff --git a/go/weed/weed_server/filer_server_handlers.go b/go/weed/weed_server/filer_server_handlers.go index af667666e..e36e7c310 100644 --- a/go/weed/weed_server/filer_server_handlers.go +++ b/go/weed/weed_server/filer_server_handlers.go @@ -1,9 +1,9 @@ package weed_server import ( - "github.com/aszxqw/weed-fs/go/glog" - "github.com/aszxqw/weed-fs/go/operation" - "github.com/aszxqw/weed-fs/go/util" + "github.com/chrislusf/weed-fs/go/glog" + "github.com/chrislusf/weed-fs/go/operation" + "github.com/chrislusf/weed-fs/go/util" "encoding/json" "errors" "github.com/syndtr/goleveldb/leveldb" diff --git a/go/weed/weed_server/filer_server_handlers_admin.go b/go/weed/weed_server/filer_server_handlers_admin.go index d693769f2..ff52dff24 100644 --- a/go/weed/weed_server/filer_server_handlers_admin.go +++ b/go/weed/weed_server/filer_server_handlers_admin.go @@ -1,7 +1,7 @@ package weed_server import ( - "github.com/aszxqw/weed-fs/go/glog" + "github.com/chrislusf/weed-fs/go/glog" "net/http" ) diff --git a/go/weed/weed_server/master_server.go b/go/weed/weed_server/master_server.go index b3dbe2045..401f6cfdb 100644 --- a/go/weed/weed_server/master_server.go +++ b/go/weed/weed_server/master_server.go @@ -1,10 +1,10 @@ package weed_server import ( - "github.com/aszxqw/weed-fs/go/glog" - "github.com/aszxqw/weed-fs/go/sequence" - "github.com/aszxqw/weed-fs/go/topology" - "github.com/aszxqw/weed-fs/go/util" + "github.com/chrislusf/weed-fs/go/glog" + "github.com/chrislusf/weed-fs/go/sequence" + "github.com/chrislusf/weed-fs/go/topology" + "github.com/chrislusf/weed-fs/go/util" "github.com/goraft/raft" "github.com/gorilla/mux" "net/http" diff --git a/go/weed/weed_server/master_server_handlers.go b/go/weed/weed_server/master_server_handlers.go index 5a5ebc225..93e9e7d9a 100644 --- a/go/weed/weed_server/master_server_handlers.go +++ b/go/weed/weed_server/master_server_handlers.go @@ -1,9 +1,9 @@ package weed_server import ( - "github.com/aszxqw/weed-fs/go/operation" - "github.com/aszxqw/weed-fs/go/stats" - "github.com/aszxqw/weed-fs/go/storage" + "github.com/chrislusf/weed-fs/go/operation" + "github.com/chrislusf/weed-fs/go/stats" + "github.com/chrislusf/weed-fs/go/storage" "net/http" "strconv" "strings" diff --git a/go/weed/weed_server/master_server_handlers_admin.go b/go/weed/weed_server/master_server_handlers_admin.go index 80cabf093..c9a8020c2 100644 --- a/go/weed/weed_server/master_server_handlers_admin.go +++ b/go/weed/weed_server/master_server_handlers_admin.go @@ -2,11 +2,11 @@ package weed_server import ( proto "code.google.com/p/goprotobuf/proto" - "github.com/aszxqw/weed-fs/go/glog" - "github.com/aszxqw/weed-fs/go/operation" - "github.com/aszxqw/weed-fs/go/storage" - "github.com/aszxqw/weed-fs/go/topology" - "github.com/aszxqw/weed-fs/go/util" + "github.com/chrislusf/weed-fs/go/glog" + "github.com/chrislusf/weed-fs/go/operation" + "github.com/chrislusf/weed-fs/go/storage" + "github.com/chrislusf/weed-fs/go/topology" + "github.com/chrislusf/weed-fs/go/util" "encoding/json" "errors" "io/ioutil" diff --git a/go/weed/weed_server/raft_server.go b/go/weed/weed_server/raft_server.go index 83c55c333..e41867076 100644 --- a/go/weed/weed_server/raft_server.go +++ b/go/weed/weed_server/raft_server.go @@ -2,8 +2,8 @@ package weed_server import ( "bytes" - "github.com/aszxqw/weed-fs/go/glog" - "github.com/aszxqw/weed-fs/go/topology" + "github.com/chrislusf/weed-fs/go/glog" + "github.com/chrislusf/weed-fs/go/topology" "encoding/json" "errors" "fmt" diff --git a/go/weed/weed_server/raft_server_handlers.go b/go/weed/weed_server/raft_server_handlers.go index 6eba0cb62..4d51c0767 100644 --- a/go/weed/weed_server/raft_server_handlers.go +++ b/go/weed/weed_server/raft_server_handlers.go @@ -1,8 +1,8 @@ package weed_server import ( - "github.com/aszxqw/weed-fs/go/glog" - "github.com/aszxqw/weed-fs/go/operation" + "github.com/chrislusf/weed-fs/go/glog" + "github.com/chrislusf/weed-fs/go/operation" "encoding/json" "github.com/goraft/raft" "io/ioutil" diff --git a/go/weed/weed_server/volume_server.go b/go/weed/weed_server/volume_server.go index b480e0742..2a9085f3b 100644 --- a/go/weed/weed_server/volume_server.go +++ b/go/weed/weed_server/volume_server.go @@ -1,8 +1,8 @@ package weed_server import ( - "github.com/aszxqw/weed-fs/go/glog" - "github.com/aszxqw/weed-fs/go/storage" + "github.com/chrislusf/weed-fs/go/glog" + "github.com/chrislusf/weed-fs/go/storage" "math/rand" "net/http" "strconv" diff --git a/go/weed/weed_server/volume_server_handlers.go b/go/weed/weed_server/volume_server_handlers.go index 0f0e8012d..ce14f6a87 100644 --- a/go/weed/weed_server/volume_server_handlers.go +++ b/go/weed/weed_server/volume_server_handlers.go @@ -1,12 +1,12 @@ package weed_server import ( - "github.com/aszxqw/weed-fs/go/glog" - "github.com/aszxqw/weed-fs/go/images" - "github.com/aszxqw/weed-fs/go/operation" - "github.com/aszxqw/weed-fs/go/stats" - "github.com/aszxqw/weed-fs/go/storage" - "github.com/aszxqw/weed-fs/go/topology" + "github.com/chrislusf/weed-fs/go/glog" + "github.com/chrislusf/weed-fs/go/images" + "github.com/chrislusf/weed-fs/go/operation" + "github.com/chrislusf/weed-fs/go/stats" + "github.com/chrislusf/weed-fs/go/storage" + "github.com/chrislusf/weed-fs/go/topology" "io" "mime" "mime/multipart" diff --git a/go/weed/weed_server/volume_server_handlers_admin.go b/go/weed/weed_server/volume_server_handlers_admin.go index 181de6017..1118c8017 100644 --- a/go/weed/weed_server/volume_server_handlers_admin.go +++ b/go/weed/weed_server/volume_server_handlers_admin.go @@ -1,9 +1,9 @@ package weed_server import ( - "github.com/aszxqw/weed-fs/go/glog" - "github.com/aszxqw/weed-fs/go/stats" - "github.com/aszxqw/weed-fs/go/util" + "github.com/chrislusf/weed-fs/go/glog" + "github.com/chrislusf/weed-fs/go/stats" + "github.com/chrislusf/weed-fs/go/util" "net/http" "path/filepath" ) diff --git a/go/weed/weed_server/volume_server_handlers_vacuum.go b/go/weed/weed_server/volume_server_handlers_vacuum.go index 4cbb1ba11..b0600d799 100644 --- a/go/weed/weed_server/volume_server_handlers_vacuum.go +++ b/go/weed/weed_server/volume_server_handlers_vacuum.go @@ -1,7 +1,7 @@ package weed_server import ( - "github.com/aszxqw/weed-fs/go/glog" + "github.com/chrislusf/weed-fs/go/glog" "net/http" ) From 620b1244b44aa0f650a7ff5dac53d4c646efa22d Mon Sep 17 00:00:00 2001 From: wyy Date: Thu, 25 Sep 2014 17:07:24 +0800 Subject: [PATCH 20/27] update readme.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 75fb07b36..d58e3792a 100644 --- a/README.md +++ b/README.md @@ -14,7 +14,7 @@ This repo and the google code repo will be kept synchronized. ## Usage ``` -go get github.com/aszxqw/weed-fs/go/weed +go get github.com/chrislusf/weed-fs/go/weed ``` ## Reference From d0229d99ed3b1b430f6de246f7a7b5f9d49d0212 Mon Sep 17 00:00:00 2001 From: Chris Lu Date: Thu, 25 Sep 2014 21:53:32 -0700 Subject: [PATCH 21/27] name change on documents --- docs/api.rst | 2 +- docs/clients.rst | 20 ++++++++++---------- docs/directories.rst | 6 +++--- docs/gettingstarted.rst | 2 +- docs/optimization.rst | 14 +++++++------- docs/replication.rst | 4 ++-- docs/usecases.rst | 2 +- 7 files changed, 25 insertions(+), 25 deletions(-) diff --git a/docs/api.rst b/docs/api.rst index cb66d5627..f26408f5a 100644 --- a/docs/api.rst +++ b/docs/api.rst @@ -180,7 +180,7 @@ Upload File curl -F file=@/home/chris/myphoto.jpg http://127.0.0.1:8080/3,01637037d6 {"size": 43234} -The size returned is the size stored on WeedFS, sometimes the file is automatically gzipped based on the mime type. +The size returned is the size stored on Seaweed-FS, sometimes the file is automatically gzipped based on the mime type. Upload File Directly *********************************** diff --git a/docs/clients.rst b/docs/clients.rst index 66f7bca5f..6c6f09729 100644 --- a/docs/clients.rst +++ b/docs/clients.rst @@ -8,17 +8,17 @@ Clients +---------------------------------------------------------------------------------+--------------+-----------+ | `WeedPHP `_ | Mic Johnson | PHP | +---------------------------------------------------------------------------------+--------------+-----------+ -| `Weed-FS Symfony bundle `_ | Mic Johnson | PHP | +| `Seaweed-FS Symfony bundle `_ | Mic Johnson | PHP | +---------------------------------------------------------------------------------+--------------+-----------+ -| `Weed-FS Node.js client `_ | Aaron Blakely| Javascript| +| `Seaweed-FS Node.js client `_ | Aaron Blakely| Javascript| +---------------------------------------------------------------------------------+--------------+-----------+ -| `Amazon S3 API for weed-fs `_ | Tamás Gulácsi| Go | +| `Amazon S3 API for Seaweed-FS `_ | Tamás Gulácsi| Go | +---------------------------------------------------------------------------------+--------------+-----------+ | `File store upload test `_ | Tamás Gulácsi| Go | +---------------------------------------------------------------------------------+--------------+-----------+ -| `Java Weed-FS client `_ | Xu Zhang | Java | +| `Java Seaweed-FS client `_ | Xu Zhang | Java | +---------------------------------------------------------------------------------+--------------+-----------+ -| `Java Weed-FS client 2 `_ | Zenria | Java | +| `Java Seaweed-FS client 2 `_ | Zenria | Java | +---------------------------------------------------------------------------------+--------------+-----------+ | `Python-weed `_ | Darkdarkfruit| Python | +---------------------------------------------------------------------------------+--------------+-----------+ @@ -26,7 +26,7 @@ Clients +---------------------------------------------------------------------------------+--------------+-----------+ | `Camlistore blobserver Storage `_ | Tamás Gulácsi| Go | +---------------------------------------------------------------------------------+--------------+-----------+ -| `Scala Weed-FS client `_ | Chiradip | Scala | +| `Scala Seaweed-FS client `_ | Chiradip | Scala | +---------------------------------------------------------------------------------+--------------+-----------+ | `Module for kohana `_ | Bububa | PHP | +---------------------------------------------------------------------------------+--------------+-----------+ @@ -35,10 +35,10 @@ Clients | `Django-weed `_ | ProstoKSI | Python | +---------------------------------------------------------------------------------+--------------+-----------+ -Projects using Weed-Fs +Projects using Seaweed-FS ################################### -* An `email River Plugin `_ for Elasticsearch uses weed-fs server to save attachments +* An `email River Plugin `_ for Elasticsearch uses Seaweed-FS server to save attachments -Websites using Weed-Fs +Websites using Seaweed-FS ################################### -* `Email to create Web Pages `_ uses weed-fs to save email attachments. \ No newline at end of file +* `Email to create Web Pages `_ uses Seaweed-FS to save email attachments. \ No newline at end of file diff --git a/docs/directories.rst b/docs/directories.rst index 57d5d246d..787c7a2ab 100644 --- a/docs/directories.rst +++ b/docs/directories.rst @@ -37,7 +37,7 @@ Design A common file system would use inode to store meta data for each folder and file. The folder tree structure are usually linked. And sub folders and files are usually organized as an on-disk b+tree or similar variations. This scales well in terms of storage, but not well for fast file retrieval due to multiple disk access just for the file meta data, before even trying to get the file content. -WeedFS wants to make as small number of disk access as possible, yet still be able to store a lot of file metadata. So we need to think very differently. +Seaweed-FS wants to make as small number of disk access as possible, yet still be able to store a lot of file metadata. So we need to think very differently. From a full file path to get to the file content, there are several steps: @@ -48,7 +48,7 @@ From a full file path to get to the file content, there are several steps: file_id => data_block -Because default WeedFS only provides file_id=>data_block mapping, the first 2 steps need to be implemented. +Because default Seaweed-FS only provides file_id=>data_block mapping, the first 2 steps need to be implemented. There are several data features I noticed: @@ -122,7 +122,7 @@ The LevelDB implementation may be switched underneath to external data storage, Also, a HA feature will be added, so that multiple "weed filer" instance can share the same set of view of files. -Later, FUSE or HCFS plugins will be created, to really integrate WeedFS to existing systems. +Later, FUSE or HCFS plugins will be created, to really integrate Seaweed-FS to existing systems. Helps Wanted ######################## diff --git a/docs/gettingstarted.rst b/docs/gettingstarted.rst index 0b598a2bf..19eb130a7 100644 --- a/docs/gettingstarted.rst +++ b/docs/gettingstarted.rst @@ -3,7 +3,7 @@ Getting started Installing Weed-Fs ################################### -Download a proper version from `WeedFS download page `_. +Download a proper version from `Seaweed-FS download page `_. Decompress the downloaded file. You will only find one executable file, either "weed" on most systems or "weed.exe" on windows. diff --git a/docs/optimization.rst b/docs/optimization.rst index 49f0656c8..9d96de060 100644 --- a/docs/optimization.rst +++ b/docs/optimization.rst @@ -1,14 +1,14 @@ Optimization ============== -Here are the strategies or best ways to optimize WeedFS. +Here are the strategies or best ways to optimize Seaweed-FS. Increase concurrent writes ################################ -By default, WeedFS grows the volumes automatically. For example, for no-replication volumes, there will be concurrently 7 writable volumes allocated. +By default, Seaweed-FS grows the volumes automatically. For example, for no-replication volumes, there will be concurrently 7 writable volumes allocated. -If you want to distribute writes to more volumes, you can do so by instructing WeedFS master via this URL. +If you want to distribute writes to more volumes, you can do so by instructing Seaweed-FS master via this URL. .. code-block:: bash @@ -31,14 +31,14 @@ More hard drives will give you better write/read throughput. Gzip content ################################ -WeedFS determines the file can be gzipped based on the file name extension. So if you submit a textual file, it's better to use an common file name extension, like ".txt", ".html", ".js", ".css", etc. If the name is unknown, like ".go", WeedFS will not gzip the content, but just save the content as is. +Seaweed-FS determines the file can be gzipped based on the file name extension. So if you submit a textual file, it's better to use an common file name extension, like ".txt", ".html", ".js", ".css", etc. If the name is unknown, like ".go", Seaweed-FS will not gzip the content, but just save the content as is. -You can also manually gzip content before submission. If you do so, make sure the submitted file has file name with ends with ".gz". For example, "my.css" can be gzipped to "my.css.gz" and sent to WeedFS. When retrieving the content, if the http client supports "gzip" encoding, the gzipped content would be sent back. Otherwise, the unzipped content would be sent back. +You can also manually gzip content before submission. If you do so, make sure the submitted file has file name with ends with ".gz". For example, "my.css" can be gzipped to "my.css.gz" and sent to Seaweed-FS. When retrieving the content, if the http client supports "gzip" encoding, the gzipped content would be sent back. Otherwise, the unzipped content would be sent back. Memory consumption ################################# -For volume servers, the memory consumption is tightly related to the number of files. For example, one 32G volume can easily have 1.5 million files if each file is only 20KB. To store the 1.5 million entries of meta data in memory, currently WeedFS consumes 36MB memory, about 24bytes per entry in memory. So if you allocate 64 volumes(2TB), you would need 2~3GB memory. However, if the average file size is larger, say 200KB, only 200~300MB memory is needed. +For volume servers, the memory consumption is tightly related to the number of files. For example, one 32G volume can easily have 1.5 million files if each file is only 20KB. To store the 1.5 million entries of meta data in memory, currently Seaweed-FS consumes 36MB memory, about 24bytes per entry in memory. So if you allocate 64 volumes(2TB), you would need 2~3GB memory. However, if the average file size is larger, say 200KB, only 200~300MB memory is needed. Theoretically the memory consumption can go even lower by compacting since the file ids are mostly monotonically increasing. I did not invest time on that yet since the memory consumption, 24bytes/entry(including uncompressed 8bytes file id, 4 bytes file size, plus additional map data structure cost) is already pretty low. But I welcome any one to compact these data in memory even more efficiently. @@ -106,7 +106,7 @@ In case you need to delete them later, you can go to the volume servers and dele Logging ############################## -When going to production, you will want to collect the logs. WeedFS uses glog. Here are some examples: +When going to production, you will want to collect the logs. Seaweed-FS uses glog. Here are some examples: .. code-block:: bash diff --git a/docs/replication.rst b/docs/replication.rst index 136f41b97..54e4b2503 100644 --- a/docs/replication.rst +++ b/docs/replication.rst @@ -1,6 +1,6 @@ Replication =================================== -Weed-FS can support replication. The replication is implemented not on file level, but on volume level. +Seaweed-FS can support replication. The replication is implemented not on file level, but on volume level. How to use ################################### @@ -58,7 +58,7 @@ Each replication type will physically create x+y+z+1 copies of volume data files Example topology configuration ################################### -The WeedFS master server tries to read the default topology configuration file are read from /etc/weedfs/weedfs.conf, if it exists. The topology setting to configure data center and racks file format is as this. +The Seaweed-FS master server tries to read the default topology configuration file are read from /etc/weedfs/weedfs.conf, if it exists. The topology setting to configure data center and racks file format is as this. .. code-block:: xml diff --git a/docs/usecases.rst b/docs/usecases.rst index c3cb8e3af..8a9a6d44a 100644 --- a/docs/usecases.rst +++ b/docs/usecases.rst @@ -41,7 +41,7 @@ The wrong way to send it: curl -H "Content-Type:image/png" -F file=@myImage.png http://127.0.0.1:8080/5,2730a7f18b44 -Securing WeedFS +Securing Seaweed-FS ############################# The simple way is to front all master and volume servers with firewall. From b22579310397e5e14678fddb458903643604a277 Mon Sep 17 00:00:00 2001 From: Chris Lu Date: Thu, 25 Sep 2014 22:25:51 -0700 Subject: [PATCH 22/27] Move introduction page to github. --- README.md | 259 +++++++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 249 insertions(+), 10 deletions(-) diff --git a/README.md b/README.md index d58e3792a..fc89c05e5 100644 --- a/README.md +++ b/README.md @@ -1,16 +1,10 @@ -weed-fs +Seaweed File System ======= [![Build Status](https://travis-ci.org/chrislusf/weed-fs.svg?branch=master)](https://travis-ci.org/chrislusf/weed-fs) [![GoDoc](https://godoc.org/github.com/chrislusf/weed-fs/go?status.svg)](https://godoc.org/github.com/chrislusf/weed-fs/go) [![RTD](https://readthedocs.org/projects/weed-fs/badge/?version=latest)](http://weed-fs.readthedocs.org/en/latest/) -## Introduction - -An official mirror of code.google.com/p/weed-fs. -Moving to github.com to make cooperations easier. -This repo and the google code repo will be kept synchronized. - ## Usage ``` @@ -19,9 +13,254 @@ go get github.com/chrislusf/weed-fs/go/weed ## Reference -For documents and bug reporting, Please visit - http://weed-fs.googlecode.com - For pre-compiled releases, https://bintray.com/chrislusf/Weed-FS/weed +## Introduction + +Seaweed-FS is a simple and highly scalable distributed file system. There are two objectives: + +1. to store billions of files! +2. to serve the files fast! + +Instead of supporting full POSIX file system semantics, Seaweed-FS choose to implement only a key~file mapping. Similar to the word "NoSQL", you can call it as "NoFS". + +Instead of managing all file metadata in a central master, Seaweed-FS choose to manages file volumes in the central master, and let volume servers manage files and the metadata. This relieves concurrency pressure from the central master and spreads file metadata into volume servers' memories, allowing faster file access with just one disk read operation! + +Seaweed-FS models after [Facebook's Haystack design paper](http://www.usenix.org/event/osdi10/tech/full_papers/Beaver.pdf). + +Seaweed-FS costs only 40 bytes disk storage for each file's metadata. It is so simple with O(1) disk read that you are welcome to challenge the performance with your actual use cases. + + +![](https://api.bintray.com/packages/chrislusf/Weed-FS/seaweed/images/download.png) +https://bintray.com/chrislusf/Weed-FS/seaweed Download latest compiled binaries for different platforms here. + +## Additional Features +* Can choose no replication or different replication level, rack and data center aware +* Automatic master servers failover. No single point of failure, SPOF. +* Automatic Gzip compression depending on file mime type +* Automatic compaction to reclaimed disk spaces after deletion or update +* Servers in the same cluster can have different disk spaces, different file systems, different OS +* Adding/Removing servers do not cause any data re-balancing +* Optional [filer server](https://code.google.com/p/weed-fs/wiki/DirectoriesAndFiles) provides "normal" directories and files via http +* For jpeg pictures, optionally fix the orientation. +* Support Etag, Accept-Range, Last-Modified, etc. + +## Example Usage +By default, the master node runs on port 9333, and the volume nodes runs on port 8080. +Here I will start one master node, and two volume nodes on port 8080 and 8081. Ideally, they should be started from different machines. Here I just use localhost as example. + +Seaweed-FS uses HTTP REST operations to write, read, delete. The return results are JSON or JSONP format. + +### Start Master Server + +``` +> ./weed master + +``` + +### Start Volume Servers ### + +``` +> weed volume -dir="/tmp/data1" -max=5 -mserver="localhost:9333" -port=8080 & +> weed volume -dir="/tmp/data2" -max=10 -mserver="localhost:9333" -port=8081 & + +``` + +### Write File ### +Here is a simple usage on how to save a file: + +``` +> curl http://localhost:9333/dir/assign +{"count":1,"fid":"3,01637037d6","url":"127.0.0.1:8080","publicUrl":"localhost:8080"} +``` +First, send a HTTP request to get an fid and a volume server url. + +``` +> curl -F file=@/home/chris/myphoto.jpg http://127.0.0.1:8080/3,01637037d6 +{"size": 43234} +``` +Second, send a HTTP multipart POST request to the volume server url+'/'+fid, to really store the file content. + +For update, send another POST request with updated file content. + +For deletion, send a http DELETE request +``` +> curl -X DELETE http://127.0.0.1:8080/3,01637037d6 +``` +### Save File Id ### +Now you can save the fid, 3,01637037d6 in this case, to some database field. + +The number 3 here, is a volume id. After the comma, it's one file key, 01, and a file cookie, 637037d6. + +The volume id is an unsigned 32 bit integer. The file key is an unsigned 64bit integer. The file cookie is an unsigned 32bit integer, used to prevent URL guessing. + +The file key and file cookie are both coded in hex. You can store the tuple in your own format, or simply store the fid as string. + +If stored as a string, in theory, you would need 8+1+16+8=33 bytes. A char(33) would be enough, if not more than enough, since most usage would not need 2^32 volumes. + +If space is really a concern, you can store the file id in your own format. You would need one 4-byte integer for volume id, 8-byte long number for file key, 4-byte integer for file cookie. So 16 bytes are enough (more than enough). + +### Read File ### +Here is the example on how to render the URL. +``` +> curl http://localhost:9333/dir/lookup?volumeId=3 +{"locations":[{"publicUrl":"localhost:8080","url":"localhost:8080"}]} +``` +First lookup the volume server's URLs by the file's volumeId. However, since usually there are not too many volume servers, and volumes does not move often, you can cache the results most of the time. Depends on the replication type, one volume can have multiple replica locations. Just randomly pick one location to read. + +Now you can take the public url, render the url or directly read from the volume server via url: +``` + http://localhost:8080/3,01637037d6.jpg +``` +Notice we add an file extension ".jpg" here. It's optional and just one way for the client to specify the file content type. + +If you want a nicer URL, you can use one of these alternative URL formats: +``` + http://localhost:8080/3/01637037d6/my_preferred_name.jpg + http://localhost:8080/3/01637037d6.jpg + http://localhost:8080/3,01637037d6.jpg + http://localhost:8080/3/01637037d6 + http://localhost:8080/3,01637037d6 +``` + +### Rack-Aware and Data Center-Aware Replication ### +Seaweed-FS apply the replication strategy on a volume level. So when you are getting a file id, you can specify the replication strategy. For example: +``` +curl http://localhost:9333/dir/assign?replication=001 +``` + +Here is the meaning of the replication parameter +``` +000: no replication +001: replicate once on the same rack +010: replicate once on a different rack, but same data center +100: replicate once on a different data center +200: replicate twice on two different data center +110: replicate once on a different rack, and once on a different data center +``` + +More details about replication can be found here: +https://code.google.com/p/weed-fs/wiki/RackDataCenterAwareReplication + +You can also set the default replication strategy when starting the master server. + +### Allocate File Key on specific data center ### +Volume servers can start with a specific data center name. +``` + weed volume -dir=/tmp/1 -port=8080 -dataCenter=dc1 + weed volume -dir=/tmp/2 -port=8081 -dataCenter=dc2 +``` +Or the master server can determine the data center via volume server's IP address and settings in weed.conf file. + +Now when requesting a file key, an optional "dataCenter" parameter can limit the assigned volume to the specific data center. For example, this specify +``` + http://localhost:9333/dir/assign?dataCenter=dc1 +``` + +### Other Features ### + * [No Single Point of Failure](https://code.google.com/p/weed-fs/wiki/FailoverMasterServer) + * [Insert with your own keys](https://code.google.com/p/weed-fs/wiki/Optimization#Insert_with_your_own_keys) + * [ Chunking large files](https://code.google.com/p/weed-fs/wiki/Optimization#Upload_large_files) + * [Collection as a Simple Name Space](https://code.google.com/p/weed-fs/wiki/Optimization#Collection_as_a_Simple_Name_Space) + +## Architecture ## +Usually distributed file system split each file into chunks, and a central master keeps a mapping of a filename and a chunk index to chunk handles, and also which chunks each chunk server has. + +This has the draw back that the central master can not handle many small files efficiently, and since all read requests need to go through the chunk master, responses would be slow for many concurrent web users. + +Instead of managing chunks, Seaweed-FS choose to manage data volumes in the master server. Each data volume is size 32GB, and can hold a lot of files. And each storage node can has many data volumes. So the master node only needs to store the metadata about the volumes, which is fairly small amount of data and pretty static most of the time. + +The actual file metadata is stored in each volume on volume servers. Since each volume server only manage metadata of files on its own disk, and only 16 bytes for each file, all file access can read file metadata just from memory and only needs one disk operation to actually read file data. + +For comparison, consider that an xfs inode structure in Linux is 536 bytes. + +### Master Server and Volume Server ### +The architecture is fairly simple. The actual data is stored in volumes on storage nodes. One volume server can have multiple volumes, and can both support read and write access with basic authentication. + +All volumes are managed by a master server. The master server contains volume id to volume server mapping. This is fairly static information, and could be cached easily. + +On each write request, the master server also generates a file key, which is a growing 64bit unsigned integer. Since the write requests are not as busy as read requests, one master server should be able to handle the concurrency well. + + +### Write and Read files ### + +When a client sends a write request, the master server returns for the file. The client then contact the volume node and POST the file content via REST. + +When a client needs to read a file based on , it can ask the master server by the for the , or from cache. Then the client can HTTP GET the content via REST, or just render the URL on web pages and let browsers to fetch the content. + +Please see the example for details on write-read process. + +### Storage Size ### +In current implementation, each volume can be size of 8x2^32^=32G bytes. This is because of aligning contents to 8 bytes. We can be easily increased to 64G, or 128G, or more, by changing 2 lines of code, at the cost of some wasted padding space due to alignment. + +There can be 2^32^ volumes. So total system size is 8 x 2^32^ x 2^32^ = 8 x 4G x 4G = 128GG bytes. (Sorry, I don't know the word for giga of giga bytes.) + +Each individual file size is limited to the volume size. + +### Saving memory ### +All file meta information on volume server is readable from memory without disk access. Each file just takes an 16-byte map entry of <64bit key, 32bit offset, 32bit size>. Of course, each map entry has its own the space cost for the map. But usually the disk runs out before the memory does. + + +## Compared to Other File Systems## +Frankly, I don't use other distributed file systems too often. All seems more complicated than necessary. Please correct me if anything here is wrong. + +### Compared to Ceph ### +Ceph can be setup similar to Seaweed-FS as a key~blob store. It is much more complicated, with the need to support layers on top of it. Here is a more detailed comparison. https://code.google.com/p/weed-fs/issues/detail?id=44 + +Seaweed-FS is meant to be fast and simple, both during usage and during setup. If you do not understand how it works when you reach here, we failed! Jokes aside, you should not need any consulting service for it. + +Seaweed-FS has a centralized master to lookup free volumes, while Ceph uses hashing to locate its objects. Having a centralized master makes it easy to code and manage. HDFS/GFS has the single name node for years. Seaweed-FS now support multiple master nodes. + +Ceph hashing avoids SPOF, but makes it complicated when moving or adding servers. + +### Compared to HDFS ### +HDFS uses the chunk approach for each file, and is ideal for streaming large files. + +Seaweed-FS is ideal for serving relatively smaller files quickly and concurrently. + +Seaweed-FS can also store extra large files by splitting them into manageable data chunks, and store the file ids of the data chunks into a meta chunk. This is managed by "weed upload/download" tool, and the weed master or volume servers are agnostic about it. + +### Compared to MogileFS### +Seaweed-FS has 2 components: directory server, storage nodes. + +MogileFS has 3 components: tracers, database, storage nodes. + +One more layer means slower access, more operation complexity, more failure possibility. + +### Compared to GlusterFS ### +Seaweed-FS is not POSIX compliant, and has simple implementation. + +GlusterFS is POSIX compliant, much more complex. + +### Compared to Mongo's GridFS ### +Mongo's GridFS splits files into chunks and manage chunks in the central mongodb. For every read or write request, the database needs to query the metadata. It's OK if this is not a bottleneck yet, but for a lot of concurrent reads this unnecessary query could slow things down. + +Since files are chunked(default to 256KB), there will be multiple metadata readings and multiple chunk readings, linear to the file size. One 2.56MB file would require at least 20 disk read requests. + +On the contrary, Seaweed-FS uses large file volume of 32G size to store lots of files, and only manages file volumes in the master server. Each volume manages file metadata themselves. So all the file metadata is spread onto the volume nodes memories, and just one disk read is needed. + +## Dev plan ## + +More tools and documentation, on how to maintain and scale the system. For example, how to move volumes, automatically balancing data, how to grow volumes, how to check system status, etc. + +This is a super exciting project! And I need helpers! + +## Contributions ## + +To make contributions easier, I have mirrored a repo in github.com +``` + https://github.com/chrislusf/weed-fs.git +``` +## Disk Related topics ## + +### Hard Drive Performance ### +When testing read performance on Seaweed-FS, it basically becomes performance test your hard drive's random read speed. Hard Drive usually get 100MB/s~200MB/s. + +### Solid State Disk + +To modify or delete small files, SSD must delete a whole block at a time, and move content in existing blocks to a new block. SSD is fast when brand new, but will get fragmented over time and you have to garbage collect, compacting blocks. Seaweed-FS is friendly to SSD since it is append-only. Deletion and compaction are done on volume level in the background, not slowing reading and not causing fragmentation. + +## Not Planned + +POSIX support From 599d0ae21b8545a9dd667b42c7d804a2b6cbeb35 Mon Sep 17 00:00:00 2001 From: Chris Lu Date: Thu, 25 Sep 2014 22:32:12 -0700 Subject: [PATCH 23/27] Add benchmark to the introduction page. --- README.md | 57 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 57 insertions(+) diff --git a/README.md b/README.md index fc89c05e5..64c827718 100644 --- a/README.md +++ b/README.md @@ -264,3 +264,60 @@ To modify or delete small files, SSD must delete a whole block at a time, and mo ## Not Planned POSIX support + + +## Benchmark + +My Own Unscientific Single Machine Results on Mac Book with Solid State Disk, CPU: 1 Intel Core i7@2.2GHz. + +Write 1 million 1KB file: +``` +Concurrency Level: 64 +Time taken for tests: 182.456 seconds +Complete requests: 1048576 +Failed requests: 0 +Total transferred: 1073741824 bytes +Requests per second: 5747.01 [#/sec] +Transfer rate: 5747.01 [Kbytes/sec] + +Connection Times (ms) + min avg max std +Total: 0.3 10.9 430.9 5.7 + +Percentage of the requests served within a certain time (ms) + 50% 10.2 ms + 66% 12.0 ms + 75% 12.6 ms + 80% 12.9 ms + 90% 14.0 ms + 95% 14.9 ms + 98% 16.2 ms + 99% 17.3 ms + 100% 430.9 ms +``` + +Randomly read 1 million files: +``` +Concurrency Level: 64 +Time taken for tests: 80.732 seconds +Complete requests: 1048576 +Failed requests: 0 +Total transferred: 1073741824 bytes +Requests per second: 12988.37 [#/sec] +Transfer rate: 12988.37 [Kbytes/sec] + +Connection Times (ms) + min avg max std +Total: 0.0 4.7 254.3 6.3 + +Percentage of the requests served within a certain time (ms) + 50% 2.6 ms + 66% 2.9 ms + 75% 3.7 ms + 80% 4.7 ms + 90% 10.3 ms + 95% 16.6 ms + 98% 26.3 ms + 99% 34.8 ms + 100% 254.3 ms +``` From a09240391f59331b90ae65813a489d7bcb07a240 Mon Sep 17 00:00:00 2001 From: Chris Lu Date: Thu, 25 Sep 2014 22:34:06 -0700 Subject: [PATCH 24/27] Adjust wiki syntax error. --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 64c827718..2575cf4b5 100644 --- a/README.md +++ b/README.md @@ -268,7 +268,7 @@ POSIX support ## Benchmark -My Own Unscientific Single Machine Results on Mac Book with Solid State Disk, CPU: 1 Intel Core i7@2.2GHz. +My Own Unscientific Single Machine Results on Mac Book with Solid State Disk, CPU: 1 Intel Core i7 2.2GHz. Write 1 million 1KB file: ``` From 88e7c98e6eed145a4101e4a18e899e8afee21278 Mon Sep 17 00:00:00 2001 From: Chris Lu Date: Wed, 8 Oct 2014 18:13:23 -0700 Subject: [PATCH 25/27] tweaking the docker file --- Dockerfile | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 1243727a2..7332f660a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,16 @@ -FROM cydev/go -RUN go get code.google.com/p/weed-fs/go/weed +# install docker +# sudo docker build -t seaweed . +# docker run seaweed + +FROM golang + +# Copy the local package files to the container's workspace. +ADD . /go/src/github.com/chrislusf/weed-fs + +# Build the weed command inside the container. +RUN go get github.com/chrislusf/weed-fs/go/weed + EXPOSE 8080 EXPOSE 9333 VOLUME /data -ENTRYPOINT ["weed"] +ENTRYPOINT ["/go/bin/weed"] \ No newline at end of file From cbaaf1b539335b19278dad9baa2435f2100a29a5 Mon Sep 17 00:00:00 2001 From: chrislusf Date: Tue, 14 Oct 2014 17:29:23 -0700 Subject: [PATCH 26/27] Update Dockerfile revert back to original version to keep documentation consistent. --- Dockerfile | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/Dockerfile b/Dockerfile index 7332f660a..1243727a2 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,16 +1,6 @@ -# install docker -# sudo docker build -t seaweed . -# docker run seaweed - -FROM golang - -# Copy the local package files to the container's workspace. -ADD . /go/src/github.com/chrislusf/weed-fs - -# Build the weed command inside the container. -RUN go get github.com/chrislusf/weed-fs/go/weed - +FROM cydev/go +RUN go get code.google.com/p/weed-fs/go/weed EXPOSE 8080 EXPOSE 9333 VOLUME /data -ENTRYPOINT ["/go/bin/weed"] \ No newline at end of file +ENTRYPOINT ["weed"] From 92653d2c413d2efb3a5322be6e8347146fc19542 Mon Sep 17 00:00:00 2001 From: bmcquee Date: Sat, 18 Oct 2014 20:17:28 -0700 Subject: [PATCH 27/27] fix link to download binaries --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 2575cf4b5..ab07683dd 100644 --- a/README.md +++ b/README.md @@ -14,7 +14,7 @@ go get github.com/chrislusf/weed-fs/go/weed ## Reference For pre-compiled releases, - https://bintray.com/chrislusf/Weed-FS/weed + https://bintray.com/chrislusf/Weed-FS/seaweed ## Introduction