From bff7b71389557235c8573a77b0c030765c85fd1f Mon Sep 17 00:00:00 2001 From: bmcquee Date: Sun, 19 Oct 2014 08:51:07 -0700 Subject: [PATCH 1/8] fix func name HasWriableVolume --- go/topology/topology.go | 2 +- go/weed/weed_server/master_server_handlers.go | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go/topology/topology.go b/go/topology/topology.go index c90e8de0b..876b7c418 100644 --- a/go/topology/topology.go +++ b/go/topology/topology.go @@ -109,7 +109,7 @@ func (t *Topology) NextVolumeId() storage.VolumeId { return next } -func (t *Topology) HasWriableVolume(option *VolumeGrowOption) bool { +func (t *Topology) HasWriteableVolume(option *VolumeGrowOption) bool { vl := t.GetVolumeLayout(option.Collection, option.ReplicaPlacement, option.Ttl) return vl.GetActiveVolumeCount(option) > 0 } diff --git a/go/weed/weed_server/master_server_handlers.go b/go/weed/weed_server/master_server_handlers.go index 93e9e7d9a..7d54521d9 100644 --- a/go/weed/weed_server/master_server_handlers.go +++ b/go/weed/weed_server/master_server_handlers.go @@ -78,7 +78,7 @@ func (ms *MasterServer) dirAssignHandler(w http.ResponseWriter, r *http.Request) return } - if !ms.Topo.HasWriableVolume(option) { + if !ms.Topo.HasWriteableVolume(option) { if ms.Topo.FreeSpace() <= 0 { w.WriteHeader(http.StatusNotFound) writeJsonQuiet(w, r, operation.AssignResult{Error: "No free volumes left!"}) @@ -86,7 +86,7 @@ func (ms *MasterServer) dirAssignHandler(w http.ResponseWriter, r *http.Request) } else { ms.vgLock.Lock() defer ms.vgLock.Unlock() - if !ms.Topo.HasWriableVolume(option) { + if !ms.Topo.HasWriteableVolume(option) { if _, err = ms.vg.AutomaticGrowByType(option, ms.Topo); err != nil { writeJsonQuiet(w, r, operation.AssignResult{Error: "Cannot grow volume group! " + err.Error()}) return From 7ca10d8dcfe937ef91a6cfb261bf4f1909815071 Mon Sep 17 00:00:00 2001 From: bmcquee Date: Sun, 19 Oct 2014 20:03:00 -0700 Subject: [PATCH 2/8] add another logging line verbosity 2 --- go/weed/weed_server/raft_server.go | 1 + 1 file changed, 1 insertion(+) diff --git a/go/weed/weed_server/raft_server.go b/go/weed/weed_server/raft_server.go index e41867076..9a21249a9 100644 --- a/go/weed/weed_server/raft_server.go +++ b/go/weed/weed_server/raft_server.go @@ -44,6 +44,7 @@ func NewRaftServer(r *mux.Router, peers []string, httpAddr string, dataDir strin var err error transporter := raft.NewHTTPTransporter("/cluster", 0) transporter.Transport.MaxIdleConnsPerHost = 1024 + glog.V(1).Infof("Starting RaftServer with IP:%v:", httpAddr) s.raftServer, err = raft.NewServer(s.httpAddr, s.dataDir, transporter, nil, topo, "") if err != nil { From 626b896448473b3ce7f2ec40b644c2bfd0e3c714 Mon Sep 17 00:00:00 2001 From: bmcquee Date: Sun, 19 Oct 2014 23:01:15 -0700 Subject: [PATCH 3/8] change wriable to writeable --- go/weed/weed_server/master_server_handlers_admin.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/go/weed/weed_server/master_server_handlers_admin.go b/go/weed/weed_server/master_server_handlers_admin.go index c9a8020c2..17a09dac7 100644 --- a/go/weed/weed_server/master_server_handlers_admin.go +++ b/go/weed/weed_server/master_server_handlers_admin.go @@ -143,7 +143,7 @@ func (ms *MasterServer) deleteFromMasterServerHandler(w http.ResponseWriter, r * } } -func (ms *MasterServer) hasWriableVolume(option *topology.VolumeGrowOption) bool { +func (ms *MasterServer) hasWriteableVolume(option *topology.VolumeGrowOption) bool { vl := ms.Topo.GetVolumeLayout(option.Collection, option.ReplicaPlacement, option.Ttl) return vl.GetActiveVolumeCount(option) > 0 } From 02ae8b98a579dda3dd22d97a48a2890aec84cb62 Mon Sep 17 00:00:00 2001 From: bmcquee Date: Sun, 19 Oct 2014 23:07:58 -0700 Subject: [PATCH 4/8] Revert "change wriable to writeable" This reverts commit 626b896448473b3ce7f2ec40b644c2bfd0e3c714. --- go/weed/weed_server/master_server_handlers_admin.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/go/weed/weed_server/master_server_handlers_admin.go b/go/weed/weed_server/master_server_handlers_admin.go index 17a09dac7..c9a8020c2 100644 --- a/go/weed/weed_server/master_server_handlers_admin.go +++ b/go/weed/weed_server/master_server_handlers_admin.go @@ -143,7 +143,7 @@ func (ms *MasterServer) deleteFromMasterServerHandler(w http.ResponseWriter, r * } } -func (ms *MasterServer) hasWriteableVolume(option *topology.VolumeGrowOption) bool { +func (ms *MasterServer) hasWriableVolume(option *topology.VolumeGrowOption) bool { vl := ms.Topo.GetVolumeLayout(option.Collection, option.ReplicaPlacement, option.Ttl) return vl.GetActiveVolumeCount(option) > 0 } From bd664def45925d81dfae9c7edfb244d2367170ca Mon Sep 17 00:00:00 2001 From: bmcquee Date: Sun, 19 Oct 2014 23:08:01 -0700 Subject: [PATCH 5/8] Revert "fix func name HasWriableVolume" This reverts commit bff7b71389557235c8573a77b0c030765c85fd1f. --- go/topology/topology.go | 2 +- go/weed/weed_server/master_server_handlers.go | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go/topology/topology.go b/go/topology/topology.go index 876b7c418..c90e8de0b 100644 --- a/go/topology/topology.go +++ b/go/topology/topology.go @@ -109,7 +109,7 @@ func (t *Topology) NextVolumeId() storage.VolumeId { return next } -func (t *Topology) HasWriteableVolume(option *VolumeGrowOption) bool { +func (t *Topology) HasWriableVolume(option *VolumeGrowOption) bool { vl := t.GetVolumeLayout(option.Collection, option.ReplicaPlacement, option.Ttl) return vl.GetActiveVolumeCount(option) > 0 } diff --git a/go/weed/weed_server/master_server_handlers.go b/go/weed/weed_server/master_server_handlers.go index 7d54521d9..93e9e7d9a 100644 --- a/go/weed/weed_server/master_server_handlers.go +++ b/go/weed/weed_server/master_server_handlers.go @@ -78,7 +78,7 @@ func (ms *MasterServer) dirAssignHandler(w http.ResponseWriter, r *http.Request) return } - if !ms.Topo.HasWriteableVolume(option) { + if !ms.Topo.HasWriableVolume(option) { if ms.Topo.FreeSpace() <= 0 { w.WriteHeader(http.StatusNotFound) writeJsonQuiet(w, r, operation.AssignResult{Error: "No free volumes left!"}) @@ -86,7 +86,7 @@ func (ms *MasterServer) dirAssignHandler(w http.ResponseWriter, r *http.Request) } else { ms.vgLock.Lock() defer ms.vgLock.Unlock() - if !ms.Topo.HasWriteableVolume(option) { + if !ms.Topo.HasWriableVolume(option) { if _, err = ms.vg.AutomaticGrowByType(option, ms.Topo); err != nil { writeJsonQuiet(w, r, operation.AssignResult{Error: "Cannot grow volume group! " + err.Error()}) return From c0dfdf439264964cf702b8a872c59f7a79fbd05b Mon Sep 17 00:00:00 2001 From: Brian McQueen Date: Sun, 14 Dec 2014 00:20:21 -0800 Subject: [PATCH 6/8] switch to my forked repo --- 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 | 4 ++-- go/topology/data_node.go | 4 ++-- go/topology/node.go | 4 ++-- go/topology/store_replicate.go | 8 ++++---- go/topology/topology.go | 10 +++++----- 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 | 7 ++++--- 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, 141 insertions(+), 140 deletions(-) diff --git a/go/filer/client_operations.go b/go/filer/client_operations.go index b38368735..50f95bab1 100644 --- a/go/filer/client_operations.go +++ b/go/filer/client_operations.go @@ -5,7 +5,7 @@ import ( "errors" "fmt" - "github.com/chrislusf/weed-fs/go/util" + "github.com/mcqueenorama/weed-fs/go/util" "net/url" ) diff --git a/go/filer/directory_in_map.go b/go/filer/directory_in_map.go index ee601066c..d3fe7080f 100644 --- a/go/filer/directory_in_map.go +++ b/go/filer/directory_in_map.go @@ -10,7 +10,7 @@ import ( "strings" "sync" - "github.com/chrislusf/weed-fs/go/util" + "github.com/mcqueenorama/weed-fs/go/util" ) var writeLock sync.Mutex //serialize changes to dir.log diff --git a/go/filer/filer_embedded.go b/go/filer/filer_embedded.go index 0b9b4e668..58684a4d4 100644 --- a/go/filer/filer_embedded.go +++ b/go/filer/filer_embedded.go @@ -6,7 +6,7 @@ import ( "path/filepath" "strings" - "github.com/chrislusf/weed-fs/go/operation" + "github.com/mcqueenorama/weed-fs/go/operation" ) type FilerEmbedded struct { diff --git a/go/filer/files_in_leveldb.go b/go/filer/files_in_leveldb.go index 781bb0e5f..ca2c4e796 100644 --- a/go/filer/files_in_leveldb.go +++ b/go/filer/files_in_leveldb.go @@ -3,7 +3,7 @@ package filer import ( "bytes" - "github.com/chrislusf/weed-fs/go/glog" + "github.com/mcqueenorama/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 672bfa99c..4fe571d59 100644 --- a/go/operation/assign_file_id.go +++ b/go/operation/assign_file_id.go @@ -6,8 +6,8 @@ import ( "net/url" "strconv" - "github.com/chrislusf/weed-fs/go/glog" - "github.com/chrislusf/weed-fs/go/util" + "github.com/mcqueenorama/weed-fs/go/glog" + "github.com/mcqueenorama/weed-fs/go/util" ) type AssignResult struct { diff --git a/go/operation/delete_content.go b/go/operation/delete_content.go index 416a852b3..06787dabe 100644 --- a/go/operation/delete_content.go +++ b/go/operation/delete_content.go @@ -7,7 +7,7 @@ import ( "strings" "sync" - "github.com/chrislusf/weed-fs/go/util" + "github.com/mcqueenorama/weed-fs/go/util" ) type DeleteResult struct { diff --git a/go/operation/list_masters.go b/go/operation/list_masters.go index 7ada94243..542a3cb38 100644 --- a/go/operation/list_masters.go +++ b/go/operation/list_masters.go @@ -3,8 +3,8 @@ package operation import ( "encoding/json" - "github.com/chrislusf/weed-fs/go/glog" - "github.com/chrislusf/weed-fs/go/util" + "github.com/mcqueenorama/weed-fs/go/glog" + "github.com/mcqueenorama/weed-fs/go/util" ) type ClusterStatusResult struct { diff --git a/go/operation/lookup.go b/go/operation/lookup.go index e6b6658da..2fd238e7a 100644 --- a/go/operation/lookup.go +++ b/go/operation/lookup.go @@ -9,7 +9,7 @@ import ( "strings" "time" - "github.com/chrislusf/weed-fs/go/util" + "github.com/mcqueenorama/weed-fs/go/util" ) type Location struct { diff --git a/go/operation/submit.go b/go/operation/submit.go index 62db46617..c4f64f5a2 100644 --- a/go/operation/submit.go +++ b/go/operation/submit.go @@ -9,7 +9,7 @@ import ( "strconv" "strings" - "github.com/chrislusf/weed-fs/go/glog" + "github.com/mcqueenorama/weed-fs/go/glog" ) type FilePart struct { diff --git a/go/operation/upload_content.go b/go/operation/upload_content.go index 480d76dca..297d78a04 100644 --- a/go/operation/upload_content.go +++ b/go/operation/upload_content.go @@ -14,7 +14,7 @@ import ( "path/filepath" "strings" - "github.com/chrislusf/weed-fs/go/glog" + "github.com/mcqueenorama/weed-fs/go/glog" ) type UploadResult struct { diff --git a/go/storage/cdb_map.go b/go/storage/cdb_map.go index fbb59e9c0..824672cae 100644 --- a/go/storage/cdb_map.go +++ b/go/storage/cdb_map.go @@ -7,7 +7,7 @@ import ( "os" "path/filepath" - "github.com/chrislusf/weed-fs/go/util" + "github.com/mcqueenorama/weed-fs/go/util" "github.com/tgulacsi/go-cdb" ) diff --git a/go/storage/cdb_map_test.go b/go/storage/cdb_map_test.go index ed690f44f..3b13d5b76 100644 --- a/go/storage/cdb_map_test.go +++ b/go/storage/cdb_map_test.go @@ -6,7 +6,7 @@ import ( "runtime" "testing" - "github.com/chrislusf/weed-fs/go/glog" + "github.com/mcqueenorama/weed-fs/go/glog" ) var testIndexFilename string = "../../test/sample.idx" diff --git a/go/storage/compact_map_perf_test.go b/go/storage/compact_map_perf_test.go index f74684225..bebed48ba 100644 --- a/go/storage/compact_map_perf_test.go +++ b/go/storage/compact_map_perf_test.go @@ -5,8 +5,8 @@ import ( "os" "testing" - "github.com/chrislusf/weed-fs/go/glog" - "github.com/chrislusf/weed-fs/go/util" + "github.com/mcqueenorama/weed-fs/go/glog" + "github.com/mcqueenorama/weed-fs/go/util" ) func TestMemoryUsage(t *testing.T) { diff --git a/go/storage/compress.go b/go/storage/compress.go index 5efc9e1f1..88a9c9c15 100644 --- a/go/storage/compress.go +++ b/go/storage/compress.go @@ -7,7 +7,7 @@ import ( "io/ioutil" "strings" - "github.com/chrislusf/weed-fs/go/glog" + "github.com/mcqueenorama/weed-fs/go/glog" ) /* diff --git a/go/storage/crc.go b/go/storage/crc.go index af25b9e53..01452dd4a 100644 --- a/go/storage/crc.go +++ b/go/storage/crc.go @@ -4,7 +4,7 @@ import ( "fmt" "hash/crc32" - "github.com/chrislusf/weed-fs/go/util" + "github.com/mcqueenorama/weed-fs/go/util" ) var table = crc32.MakeTable(crc32.Castagnoli) diff --git a/go/storage/file_id.go b/go/storage/file_id.go index f6e36a98c..55ccdd110 100644 --- a/go/storage/file_id.go +++ b/go/storage/file_id.go @@ -5,8 +5,8 @@ import ( "errors" "strings" - "github.com/chrislusf/weed-fs/go/glog" - "github.com/chrislusf/weed-fs/go/util" + "github.com/mcqueenorama/weed-fs/go/glog" + "github.com/mcqueenorama/weed-fs/go/util" ) type FileId struct { diff --git a/go/storage/needle.go b/go/storage/needle.go index aa3206920..13ee34bd6 100644 --- a/go/storage/needle.go +++ b/go/storage/needle.go @@ -11,9 +11,9 @@ import ( "strings" "time" - "github.com/chrislusf/weed-fs/go/glog" - "github.com/chrislusf/weed-fs/go/images" - "github.com/chrislusf/weed-fs/go/util" + "github.com/mcqueenorama/weed-fs/go/glog" + "github.com/mcqueenorama/weed-fs/go/images" + "github.com/mcqueenorama/weed-fs/go/util" ) const ( diff --git a/go/storage/needle_map.go b/go/storage/needle_map.go index 504ca1552..c7150d4d9 100644 --- a/go/storage/needle_map.go +++ b/go/storage/needle_map.go @@ -5,8 +5,8 @@ import ( "io" "os" - "github.com/chrislusf/weed-fs/go/glog" - "github.com/chrislusf/weed-fs/go/util" + "github.com/mcqueenorama/weed-fs/go/glog" + "github.com/mcqueenorama/weed-fs/go/util" ) type NeedleMapper interface { diff --git a/go/storage/needle_read_write.go b/go/storage/needle_read_write.go index 663b5abbd..d4529f92d 100644 --- a/go/storage/needle_read_write.go +++ b/go/storage/needle_read_write.go @@ -6,8 +6,8 @@ import ( "io" "os" - "github.com/chrislusf/weed-fs/go/glog" - "github.com/chrislusf/weed-fs/go/util" + "github.com/mcqueenorama/weed-fs/go/glog" + "github.com/mcqueenorama/weed-fs/go/util" ) const ( diff --git a/go/storage/store.go b/go/storage/store.go index 80d8a30b8..97dc16f70 100644 --- a/go/storage/store.go +++ b/go/storage/store.go @@ -10,9 +10,9 @@ import ( "strings" proto "code.google.com/p/goprotobuf/proto" - "github.com/chrislusf/weed-fs/go/glog" - "github.com/chrislusf/weed-fs/go/operation" - "github.com/chrislusf/weed-fs/go/util" + "github.com/mcqueenorama/weed-fs/go/glog" + "github.com/mcqueenorama/weed-fs/go/operation" + "github.com/mcqueenorama/weed-fs/go/util" ) const ( diff --git a/go/storage/store_vacuum.go b/go/storage/store_vacuum.go index 209e3b4b3..0db083055 100644 --- a/go/storage/store_vacuum.go +++ b/go/storage/store_vacuum.go @@ -4,7 +4,7 @@ import ( "fmt" "strconv" - "github.com/chrislusf/weed-fs/go/glog" + "github.com/mcqueenorama/weed-fs/go/glog" ) func (s *Store) CheckCompactVolume(volumeIdString string, garbageThresholdString string) (error, bool) { diff --git a/go/storage/volume.go b/go/storage/volume.go index 5b0a83605..540da3140 100644 --- a/go/storage/volume.go +++ b/go/storage/volume.go @@ -10,7 +10,7 @@ import ( "sync" "time" - "github.com/chrislusf/weed-fs/go/glog" + "github.com/mcqueenorama/weed-fs/go/glog" ) type Volume struct { diff --git a/go/storage/volume_info.go b/go/storage/volume_info.go index 6410c1784..503967c97 100644 --- a/go/storage/volume_info.go +++ b/go/storage/volume_info.go @@ -1,7 +1,7 @@ package storage import ( - "github.com/chrislusf/weed-fs/go/operation" + "github.com/mcqueenorama/weed-fs/go/operation" ) type VolumeInfo struct { diff --git a/go/storage/volume_super_block.go b/go/storage/volume_super_block.go index 57e0deea9..32b799f26 100644 --- a/go/storage/volume_super_block.go +++ b/go/storage/volume_super_block.go @@ -4,7 +4,7 @@ import ( "fmt" "os" - "github.com/chrislusf/weed-fs/go/glog" + "github.com/mcqueenorama/weed-fs/go/glog" ) const ( diff --git a/go/storage/volume_vacuum.go b/go/storage/volume_vacuum.go index 7e026a61d..28028241a 100644 --- a/go/storage/volume_vacuum.go +++ b/go/storage/volume_vacuum.go @@ -5,7 +5,7 @@ import ( "os" "time" - "github.com/chrislusf/weed-fs/go/glog" + "github.com/mcqueenorama/weed-fs/go/glog" ) func (v *Volume) garbageLevel() float64 { diff --git a/go/tools/read_index.go b/go/tools/read_index.go index 1104dc348..ed18167b2 100644 --- a/go/tools/read_index.go +++ b/go/tools/read_index.go @@ -6,7 +6,7 @@ import ( "log" "os" - "github.com/chrislusf/weed-fs/go/storage" + "github.com/mcqueenorama/weed-fs/go/storage" ) var ( diff --git a/go/topology/allocate_volume.go b/go/topology/allocate_volume.go index a791b4c1c..38843dd54 100644 --- a/go/topology/allocate_volume.go +++ b/go/topology/allocate_volume.go @@ -5,8 +5,8 @@ import ( "errors" "net/url" - "github.com/chrislusf/weed-fs/go/storage" - "github.com/chrislusf/weed-fs/go/util" + "github.com/mcqueenorama/weed-fs/go/storage" + "github.com/mcqueenorama/weed-fs/go/util" ) type AllocateVolumeResult struct { diff --git a/go/topology/cluster_commands.go b/go/topology/cluster_commands.go index cafc52c76..c88de9e0b 100644 --- a/go/topology/cluster_commands.go +++ b/go/topology/cluster_commands.go @@ -1,8 +1,8 @@ package topology import ( - "github.com/chrislusf/weed-fs/go/glog" - "github.com/chrislusf/weed-fs/go/storage" + "github.com/mcqueenorama/weed-fs/go/glog" + "github.com/mcqueenorama/weed-fs/go/storage" "github.com/goraft/raft" ) diff --git a/go/topology/collection.go b/go/topology/collection.go index 4b47ae88a..cded90650 100644 --- a/go/topology/collection.go +++ b/go/topology/collection.go @@ -1,8 +1,8 @@ package topology import ( - "github.com/chrislusf/weed-fs/go/storage" - "github.com/chrislusf/weed-fs/go/util" + "github.com/mcqueenorama/weed-fs/go/storage" + "github.com/mcqueenorama/weed-fs/go/util" ) type Collection struct { diff --git a/go/topology/data_node.go b/go/topology/data_node.go index 109bd037f..c12396e87 100644 --- a/go/topology/data_node.go +++ b/go/topology/data_node.go @@ -3,8 +3,8 @@ package topology import ( "strconv" - "github.com/chrislusf/weed-fs/go/glog" - "github.com/chrislusf/weed-fs/go/storage" + "github.com/mcqueenorama/weed-fs/go/glog" + "github.com/mcqueenorama/weed-fs/go/storage" ) type DataNode struct { diff --git a/go/topology/node.go b/go/topology/node.go index 10955fa72..9c8e7700b 100644 --- a/go/topology/node.go +++ b/go/topology/node.go @@ -5,8 +5,8 @@ import ( "math/rand" "strings" - "github.com/chrislusf/weed-fs/go/glog" - "github.com/chrislusf/weed-fs/go/storage" + "github.com/mcqueenorama/weed-fs/go/glog" + "github.com/mcqueenorama/weed-fs/go/storage" ) type NodeId string diff --git a/go/topology/store_replicate.go b/go/topology/store_replicate.go index 0c52f9d30..b949b33c3 100644 --- a/go/topology/store_replicate.go +++ b/go/topology/store_replicate.go @@ -5,10 +5,10 @@ import ( "net/http" "strconv" - "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" + "github.com/mcqueenorama/weed-fs/go/glog" + "github.com/mcqueenorama/weed-fs/go/operation" + "github.com/mcqueenorama/weed-fs/go/storage" + "github.com/mcqueenorama/weed-fs/go/util" ) func ReplicatedWrite(masterNode string, s *storage.Store, volumeId storage.VolumeId, needle *storage.Needle, r *http.Request) (size uint32, errorStatus string) { diff --git a/go/topology/topology.go b/go/topology/topology.go index c2073ed2f..6c9cbe3da 100644 --- a/go/topology/topology.go +++ b/go/topology/topology.go @@ -5,11 +5,11 @@ import ( "io/ioutil" "math/rand" - "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" - "github.com/chrislusf/weed-fs/go/util" + "github.com/mcqueenorama/weed-fs/go/glog" + "github.com/mcqueenorama/weed-fs/go/operation" + "github.com/mcqueenorama/weed-fs/go/sequence" + "github.com/mcqueenorama/weed-fs/go/storage" + "github.com/mcqueenorama/weed-fs/go/util" "github.com/goraft/raft" ) diff --git a/go/topology/topology_event_handling.go b/go/topology/topology_event_handling.go index 7e36568b6..49e67c8f5 100644 --- a/go/topology/topology_event_handling.go +++ b/go/topology/topology_event_handling.go @@ -4,8 +4,8 @@ import ( "math/rand" "time" - "github.com/chrislusf/weed-fs/go/glog" - "github.com/chrislusf/weed-fs/go/storage" + "github.com/mcqueenorama/weed-fs/go/glog" + "github.com/mcqueenorama/weed-fs/go/storage" ) func (t *Topology) StartRefreshWritableVolumes(garbageThreshold string) { diff --git a/go/topology/topology_vacuum.go b/go/topology/topology_vacuum.go index d6fa2213e..9e532876f 100644 --- a/go/topology/topology_vacuum.go +++ b/go/topology/topology_vacuum.go @@ -6,9 +6,9 @@ import ( "net/url" "time" - "github.com/chrislusf/weed-fs/go/glog" - "github.com/chrislusf/weed-fs/go/storage" - "github.com/chrislusf/weed-fs/go/util" + "github.com/mcqueenorama/weed-fs/go/glog" + "github.com/mcqueenorama/weed-fs/go/storage" + "github.com/mcqueenorama/weed-fs/go/util" ) func batchVacuumVolumeCheck(vl *VolumeLayout, vid storage.VolumeId, locationlist *VolumeLocationList, garbageThreshold string) bool { diff --git a/go/topology/volume_growth.go b/go/topology/volume_growth.go index b1f241990..02466d539 100644 --- a/go/topology/volume_growth.go +++ b/go/topology/volume_growth.go @@ -5,8 +5,8 @@ import ( "math/rand" "sync" - "github.com/chrislusf/weed-fs/go/glog" - "github.com/chrislusf/weed-fs/go/storage" + "github.com/mcqueenorama/weed-fs/go/glog" + "github.com/mcqueenorama/weed-fs/go/storage" ) /* diff --git a/go/topology/volume_growth_test.go b/go/topology/volume_growth_test.go index 267b36042..333ab5a3a 100644 --- a/go/topology/volume_growth_test.go +++ b/go/topology/volume_growth_test.go @@ -5,8 +5,8 @@ import ( "fmt" "testing" - "github.com/chrislusf/weed-fs/go/sequence" - "github.com/chrislusf/weed-fs/go/storage" + "github.com/mcqueenorama/weed-fs/go/sequence" + "github.com/mcqueenorama/weed-fs/go/storage" ) var topologyLayout = ` diff --git a/go/topology/volume_layout.go b/go/topology/volume_layout.go index de72bf895..8c6f80954 100644 --- a/go/topology/volume_layout.go +++ b/go/topology/volume_layout.go @@ -5,8 +5,8 @@ import ( "math/rand" "sync" - "github.com/chrislusf/weed-fs/go/glog" - "github.com/chrislusf/weed-fs/go/storage" + "github.com/mcqueenorama/weed-fs/go/glog" + "github.com/mcqueenorama/weed-fs/go/storage" ) // mapping from volume to its locations, inverted from server to volume diff --git a/go/util/config.go b/go/util/config.go index 4cf1d7c64..071d731c9 100644 --- a/go/util/config.go +++ b/go/util/config.go @@ -13,7 +13,7 @@ import ( "encoding/json" "os" - "github.com/chrislusf/weed-fs/go/glog" + "github.com/mcqueenorama/weed-fs/go/glog" ) type Config struct { diff --git a/go/util/file_util.go b/go/util/file_util.go index 30e24f001..176aaac96 100644 --- a/go/util/file_util.go +++ b/go/util/file_util.go @@ -5,7 +5,7 @@ import ( "errors" "os" - "github.com/chrislusf/weed-fs/go/glog" + "github.com/mcqueenorama/weed-fs/go/glog" ) func TestFolderWritable(folder string) (err error) { diff --git a/go/util/net_timeout.go b/go/util/net_timeout.go index f274e4802..4e54b6798 100644 --- a/go/util/net_timeout.go +++ b/go/util/net_timeout.go @@ -4,7 +4,7 @@ import ( "net" "time" - "github.com/chrislusf/weed-fs/go/stats" + "github.com/mcqueenorama/weed-fs/go/stats" ) // Listener wraps a net.Listener, and gives a place to store the timeout diff --git a/go/weed/benchmark.go b/go/weed/benchmark.go index f4f0b1874..2d507ebb6 100644 --- a/go/weed/benchmark.go +++ b/go/weed/benchmark.go @@ -14,9 +14,9 @@ import ( "sync" "time" - "github.com/chrislusf/weed-fs/go/glog" - "github.com/chrislusf/weed-fs/go/operation" - "github.com/chrislusf/weed-fs/go/util" + "github.com/mcqueenorama/weed-fs/go/glog" + "github.com/mcqueenorama/weed-fs/go/operation" + "github.com/mcqueenorama/weed-fs/go/util" ) type BenchmarkOptions struct { diff --git a/go/weed/compact.go b/go/weed/compact.go index 71c4ea90f..1ecb85cf9 100644 --- a/go/weed/compact.go +++ b/go/weed/compact.go @@ -1,8 +1,8 @@ package main import ( - "github.com/chrislusf/weed-fs/go/glog" - "github.com/chrislusf/weed-fs/go/storage" + "github.com/mcqueenorama/weed-fs/go/glog" + "github.com/mcqueenorama/weed-fs/go/storage" ) func init() { diff --git a/go/weed/download.go b/go/weed/download.go index c782654f5..82c0fd45e 100644 --- a/go/weed/download.go +++ b/go/weed/download.go @@ -8,8 +8,8 @@ import ( "path" "strings" - "github.com/chrislusf/weed-fs/go/operation" - "github.com/chrislusf/weed-fs/go/util" + "github.com/mcqueenorama/weed-fs/go/operation" + "github.com/mcqueenorama/weed-fs/go/util" ) var ( diff --git a/go/weed/export.go b/go/weed/export.go index c9cc0e3fe..472e63aea 100644 --- a/go/weed/export.go +++ b/go/weed/export.go @@ -11,8 +11,8 @@ import ( "text/template" "time" - "github.com/chrislusf/weed-fs/go/glog" - "github.com/chrislusf/weed-fs/go/storage" + "github.com/mcqueenorama/weed-fs/go/glog" + "github.com/mcqueenorama/weed-fs/go/storage" ) func init() { diff --git a/go/weed/filer.go b/go/weed/filer.go index 5ae3a3496..173ccddc7 100644 --- a/go/weed/filer.go +++ b/go/weed/filer.go @@ -6,9 +6,9 @@ import ( "strconv" "time" - "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/mcqueenorama/weed-fs/go/glog" + "github.com/mcqueenorama/weed-fs/go/util" + "github.com/mcqueenorama/weed-fs/go/weed/weed_server" ) var ( @@ -57,6 +57,7 @@ var cmdFiler = &Command{ } func runFiler(cmd *Command, args []string) bool { + if err := util.TestFolderWritable(*f.dir); err != nil { glog.Fatalf("Check Meta Folder (-dir) Writable %s : %s", *f.dir, err) } diff --git a/go/weed/fix.go b/go/weed/fix.go index e66075ed2..0f5f0b7f3 100644 --- a/go/weed/fix.go +++ b/go/weed/fix.go @@ -5,8 +5,8 @@ import ( "path" "strconv" - "github.com/chrislusf/weed-fs/go/glog" - "github.com/chrislusf/weed-fs/go/storage" + "github.com/mcqueenorama/weed-fs/go/glog" + "github.com/mcqueenorama/weed-fs/go/storage" ) func init() { diff --git a/go/weed/master.go b/go/weed/master.go index f88964b6d..885e6e207 100644 --- a/go/weed/master.go +++ b/go/weed/master.go @@ -8,9 +8,9 @@ import ( "strings" "time" - "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/mcqueenorama/weed-fs/go/glog" + "github.com/mcqueenorama/weed-fs/go/util" + "github.com/mcqueenorama/weed-fs/go/weed/weed_server" "github.com/gorilla/mux" ) diff --git a/go/weed/mount_std.go b/go/weed/mount_std.go index 808c6c563..e930240b1 100644 --- a/go/weed/mount_std.go +++ b/go/weed/mount_std.go @@ -9,10 +9,10 @@ import ( "bazil.org/fuse" "bazil.org/fuse/fs" - "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" + "github.com/mcqueenorama/weed-fs/go/filer" + "github.com/mcqueenorama/weed-fs/go/glog" + "github.com/mcqueenorama/weed-fs/go/storage" + "github.com/mcqueenorama/weed-fs/go/util" ) func runMount(cmd *Command, args []string) bool { diff --git a/go/weed/server.go b/go/weed/server.go index 22222d699..13e9797ba 100644 --- a/go/weed/server.go +++ b/go/weed/server.go @@ -10,9 +10,9 @@ import ( "sync" "time" - "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/mcqueenorama/weed-fs/go/glog" + "github.com/mcqueenorama/weed-fs/go/util" + "github.com/mcqueenorama/weed-fs/go/weed/weed_server" "github.com/gorilla/mux" ) diff --git a/go/weed/shell.go b/go/weed/shell.go index f2c4990ea..04cfb4730 100644 --- a/go/weed/shell.go +++ b/go/weed/shell.go @@ -5,7 +5,7 @@ import ( "fmt" "os" - "github.com/chrislusf/weed-fs/go/glog" + "github.com/mcqueenorama/weed-fs/go/glog" ) func init() { diff --git a/go/weed/upload.go b/go/weed/upload.go index 2d67c0bd9..7623f7d9b 100644 --- a/go/weed/upload.go +++ b/go/weed/upload.go @@ -6,7 +6,7 @@ import ( "os" "path/filepath" - "github.com/chrislusf/weed-fs/go/operation" + "github.com/mcqueenorama/weed-fs/go/operation" ) var ( diff --git a/go/weed/version.go b/go/weed/version.go index 8d3a6fed7..13f7ea23a 100644 --- a/go/weed/version.go +++ b/go/weed/version.go @@ -4,7 +4,7 @@ import ( "fmt" "runtime" - "github.com/chrislusf/weed-fs/go/util" + "github.com/mcqueenorama/weed-fs/go/util" ) var cmdVersion = &Command{ diff --git a/go/weed/volume.go b/go/weed/volume.go index 212cb4b33..71a296702 100644 --- a/go/weed/volume.go +++ b/go/weed/volume.go @@ -8,9 +8,9 @@ import ( "strings" "time" - "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/mcqueenorama/weed-fs/go/glog" + "github.com/mcqueenorama/weed-fs/go/util" + "github.com/mcqueenorama/weed-fs/go/weed/weed_server" ) func init() { diff --git a/go/weed/volume_test.go b/go/weed/volume_test.go index ef00a8c7c..b936ba4f2 100644 --- a/go/weed/volume_test.go +++ b/go/weed/volume_test.go @@ -5,7 +5,7 @@ import ( "testing" "time" - "github.com/chrislusf/weed-fs/go/glog" + "github.com/mcqueenorama/weed-fs/go/glog" ) func TestXYZ(t *testing.T) { diff --git a/go/weed/weed.go b/go/weed/weed.go index c304b7f35..0620cdf17 100644 --- a/go/weed/weed.go +++ b/go/weed/weed.go @@ -13,7 +13,7 @@ import ( "unicode" "unicode/utf8" - "github.com/chrislusf/weed-fs/go/glog" + "github.com/mcqueenorama/weed-fs/go/glog" ) var IsDebug *bool diff --git a/go/weed/weed_server/common.go b/go/weed/weed_server/common.go index 39b0830e3..55f5e69a4 100644 --- a/go/weed/weed_server/common.go +++ b/go/weed/weed_server/common.go @@ -10,11 +10,11 @@ import ( "strconv" "strings" - "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" + "github.com/mcqueenorama/weed-fs/go/glog" + "github.com/mcqueenorama/weed-fs/go/operation" + "github.com/mcqueenorama/weed-fs/go/stats" + "github.com/mcqueenorama/weed-fs/go/storage" + "github.com/mcqueenorama/weed-fs/go/util" ) var serverStats *stats.ServerStats diff --git a/go/weed/weed_server/filer_server.go b/go/weed/weed_server/filer_server.go index 0bda58d06..2630a3398 100644 --- a/go/weed/weed_server/filer_server.go +++ b/go/weed/weed_server/filer_server.go @@ -4,8 +4,8 @@ import ( "net/http" "strconv" - "github.com/chrislusf/weed-fs/go/filer" - "github.com/chrislusf/weed-fs/go/glog" + "github.com/mcqueenorama/weed-fs/go/filer" + "github.com/mcqueenorama/weed-fs/go/glog" ) type FilerServer struct { diff --git a/go/weed/weed_server/filer_server_handlers.go b/go/weed/weed_server/filer_server_handlers.go index 6f22912a7..e5a7a860e 100644 --- a/go/weed/weed_server/filer_server_handlers.go +++ b/go/weed/weed_server/filer_server_handlers.go @@ -11,9 +11,9 @@ import ( "strconv" "strings" - "github.com/chrislusf/weed-fs/go/glog" - "github.com/chrislusf/weed-fs/go/operation" - "github.com/chrislusf/weed-fs/go/util" + "github.com/mcqueenorama/weed-fs/go/glog" + "github.com/mcqueenorama/weed-fs/go/operation" + "github.com/mcqueenorama/weed-fs/go/util" "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 5ba12e0b8..f63701a6b 100644 --- a/go/weed/weed_server/filer_server_handlers_admin.go +++ b/go/weed/weed_server/filer_server_handlers_admin.go @@ -3,7 +3,7 @@ package weed_server import ( "net/http" - "github.com/chrislusf/weed-fs/go/glog" + "github.com/mcqueenorama/weed-fs/go/glog" ) /* diff --git a/go/weed/weed_server/master_server.go b/go/weed/weed_server/master_server.go index d000cb610..d96354eb9 100644 --- a/go/weed/weed_server/master_server.go +++ b/go/weed/weed_server/master_server.go @@ -6,10 +6,10 @@ import ( "net/url" "sync" - "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/mcqueenorama/weed-fs/go/glog" + "github.com/mcqueenorama/weed-fs/go/sequence" + "github.com/mcqueenorama/weed-fs/go/topology" + "github.com/mcqueenorama/weed-fs/go/util" "github.com/goraft/raft" "github.com/gorilla/mux" ) diff --git a/go/weed/weed_server/master_server_handlers.go b/go/weed/weed_server/master_server_handlers.go index 7a7a3b70d..25839669f 100644 --- a/go/weed/weed_server/master_server_handlers.go +++ b/go/weed/weed_server/master_server_handlers.go @@ -5,9 +5,9 @@ import ( "strconv" "strings" - "github.com/chrislusf/weed-fs/go/operation" - "github.com/chrislusf/weed-fs/go/stats" - "github.com/chrislusf/weed-fs/go/storage" + "github.com/mcqueenorama/weed-fs/go/operation" + "github.com/mcqueenorama/weed-fs/go/stats" + "github.com/mcqueenorama/weed-fs/go/storage" ) func (ms *MasterServer) lookupVolumeId(vids []string, collection string) (volumeLocations map[string]operation.LookupResult) { diff --git a/go/weed/weed_server/master_server_handlers_admin.go b/go/weed/weed_server/master_server_handlers_admin.go index d7124e567..6ad83784b 100644 --- a/go/weed/weed_server/master_server_handlers_admin.go +++ b/go/weed/weed_server/master_server_handlers_admin.go @@ -9,11 +9,11 @@ import ( "strings" proto "code.google.com/p/goprotobuf/proto" - "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" + "github.com/mcqueenorama/weed-fs/go/glog" + "github.com/mcqueenorama/weed-fs/go/operation" + "github.com/mcqueenorama/weed-fs/go/storage" + "github.com/mcqueenorama/weed-fs/go/topology" + "github.com/mcqueenorama/weed-fs/go/util" ) func (ms *MasterServer) collectionDeleteHandler(w http.ResponseWriter, r *http.Request) { diff --git a/go/weed/weed_server/raft_server.go b/go/weed/weed_server/raft_server.go index b9aaef2b0..fb85daecf 100644 --- a/go/weed/weed_server/raft_server.go +++ b/go/weed/weed_server/raft_server.go @@ -14,8 +14,8 @@ import ( "strings" "time" - "github.com/chrislusf/weed-fs/go/glog" - "github.com/chrislusf/weed-fs/go/topology" + "github.com/mcqueenorama/weed-fs/go/glog" + "github.com/mcqueenorama/weed-fs/go/topology" "github.com/goraft/raft" "github.com/gorilla/mux" ) diff --git a/go/weed/weed_server/raft_server_handlers.go b/go/weed/weed_server/raft_server_handlers.go index b466d9afa..340a34e7b 100644 --- a/go/weed/weed_server/raft_server_handlers.go +++ b/go/weed/weed_server/raft_server_handlers.go @@ -6,8 +6,8 @@ import ( "net/http" "strings" - "github.com/chrislusf/weed-fs/go/glog" - "github.com/chrislusf/weed-fs/go/operation" + "github.com/mcqueenorama/weed-fs/go/glog" + "github.com/mcqueenorama/weed-fs/go/operation" "github.com/goraft/raft" ) diff --git a/go/weed/weed_server/volume_server.go b/go/weed/weed_server/volume_server.go index 0a65fd2f6..3e40a790a 100644 --- a/go/weed/weed_server/volume_server.go +++ b/go/weed/weed_server/volume_server.go @@ -6,8 +6,8 @@ import ( "strconv" "time" - "github.com/chrislusf/weed-fs/go/glog" - "github.com/chrislusf/weed-fs/go/storage" + "github.com/mcqueenorama/weed-fs/go/glog" + "github.com/mcqueenorama/weed-fs/go/storage" ) type VolumeServer struct { diff --git a/go/weed/weed_server/volume_server_handlers.go b/go/weed/weed_server/volume_server_handlers.go index 83f614941..e14bcea9e 100644 --- a/go/weed/weed_server/volume_server_handlers.go +++ b/go/weed/weed_server/volume_server_handlers.go @@ -9,12 +9,12 @@ import ( "strings" "time" - "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" + "github.com/mcqueenorama/weed-fs/go/glog" + "github.com/mcqueenorama/weed-fs/go/images" + "github.com/mcqueenorama/weed-fs/go/operation" + "github.com/mcqueenorama/weed-fs/go/stats" + "github.com/mcqueenorama/weed-fs/go/storage" + "github.com/mcqueenorama/weed-fs/go/topology" ) var fileNameEscaper = strings.NewReplacer("\\", "\\\\", "\"", "\\\"") diff --git a/go/weed/weed_server/volume_server_handlers_admin.go b/go/weed/weed_server/volume_server_handlers_admin.go index caf4c3be8..0d3f6ac5b 100644 --- a/go/weed/weed_server/volume_server_handlers_admin.go +++ b/go/weed/weed_server/volume_server_handlers_admin.go @@ -4,9 +4,9 @@ import ( "net/http" "path/filepath" - "github.com/chrislusf/weed-fs/go/glog" - "github.com/chrislusf/weed-fs/go/stats" - "github.com/chrislusf/weed-fs/go/util" + "github.com/mcqueenorama/weed-fs/go/glog" + "github.com/mcqueenorama/weed-fs/go/stats" + "github.com/mcqueenorama/weed-fs/go/util" ) func (vs *VolumeServer) statusHandler(w http.ResponseWriter, r *http.Request) { diff --git a/go/weed/weed_server/volume_server_handlers_vacuum.go b/go/weed/weed_server/volume_server_handlers_vacuum.go index f115e3b8b..da7172ae9 100644 --- a/go/weed/weed_server/volume_server_handlers_vacuum.go +++ b/go/weed/weed_server/volume_server_handlers_vacuum.go @@ -3,7 +3,7 @@ package weed_server import ( "net/http" - "github.com/chrislusf/weed-fs/go/glog" + "github.com/mcqueenorama/weed-fs/go/glog" ) func (vs *VolumeServer) vacuumVolumeCheckHandler(w http.ResponseWriter, r *http.Request) { From 57ec736941a554919cfed2bd2ac2bb694095a7d2 Mon Sep 17 00:00:00 2001 From: Brian McQueen Date: Sun, 14 Dec 2014 00:33:16 -0800 Subject: [PATCH 7/8] make it turn on the filer when filer.redirectOnRead is set --- go/weed/server.go | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/go/weed/server.go b/go/weed/server.go index 13e9797ba..6a5a0a935 100644 --- a/go/weed/server.go +++ b/go/weed/server.go @@ -101,6 +101,10 @@ func runServer(cmd *Command, args []string) bool { } } + if *filerOptions.redirectOnRead { + *isStartingFiler = true + } + *filerOptions.master = *serverPublicIp + ":" + strconv.Itoa(*masterPort) if *filerOptions.defaultReplicaPlacement == "" { From d56c748fa889a119139c3a40528a18e8ce4123ad Mon Sep 17 00:00:00 2001 From: Brian McQueen Date: Sun, 14 Dec 2014 00:35:26 -0800 Subject: [PATCH 8/8] switch it back to chris's repo --- 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 | 4 ++-- go/topology/data_node.go | 4 ++-- go/topology/node.go | 4 ++-- go/topology/store_replicate.go | 8 ++++---- go/topology/topology.go | 10 +++++----- 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, 140 insertions(+), 140 deletions(-) diff --git a/go/filer/client_operations.go b/go/filer/client_operations.go index 50f95bab1..b38368735 100644 --- a/go/filer/client_operations.go +++ b/go/filer/client_operations.go @@ -5,7 +5,7 @@ import ( "errors" "fmt" - "github.com/mcqueenorama/weed-fs/go/util" + "github.com/chrislusf/weed-fs/go/util" "net/url" ) diff --git a/go/filer/directory_in_map.go b/go/filer/directory_in_map.go index d3fe7080f..ee601066c 100644 --- a/go/filer/directory_in_map.go +++ b/go/filer/directory_in_map.go @@ -10,7 +10,7 @@ import ( "strings" "sync" - "github.com/mcqueenorama/weed-fs/go/util" + "github.com/chrislusf/weed-fs/go/util" ) var writeLock sync.Mutex //serialize changes to dir.log diff --git a/go/filer/filer_embedded.go b/go/filer/filer_embedded.go index 58684a4d4..0b9b4e668 100644 --- a/go/filer/filer_embedded.go +++ b/go/filer/filer_embedded.go @@ -6,7 +6,7 @@ import ( "path/filepath" "strings" - "github.com/mcqueenorama/weed-fs/go/operation" + "github.com/chrislusf/weed-fs/go/operation" ) type FilerEmbedded struct { diff --git a/go/filer/files_in_leveldb.go b/go/filer/files_in_leveldb.go index ca2c4e796..781bb0e5f 100644 --- a/go/filer/files_in_leveldb.go +++ b/go/filer/files_in_leveldb.go @@ -3,7 +3,7 @@ package filer import ( "bytes" - "github.com/mcqueenorama/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 4fe571d59..672bfa99c 100644 --- a/go/operation/assign_file_id.go +++ b/go/operation/assign_file_id.go @@ -6,8 +6,8 @@ import ( "net/url" "strconv" - "github.com/mcqueenorama/weed-fs/go/glog" - "github.com/mcqueenorama/weed-fs/go/util" + "github.com/chrislusf/weed-fs/go/glog" + "github.com/chrislusf/weed-fs/go/util" ) type AssignResult struct { diff --git a/go/operation/delete_content.go b/go/operation/delete_content.go index 06787dabe..416a852b3 100644 --- a/go/operation/delete_content.go +++ b/go/operation/delete_content.go @@ -7,7 +7,7 @@ import ( "strings" "sync" - "github.com/mcqueenorama/weed-fs/go/util" + "github.com/chrislusf/weed-fs/go/util" ) type DeleteResult struct { diff --git a/go/operation/list_masters.go b/go/operation/list_masters.go index 542a3cb38..7ada94243 100644 --- a/go/operation/list_masters.go +++ b/go/operation/list_masters.go @@ -3,8 +3,8 @@ package operation import ( "encoding/json" - "github.com/mcqueenorama/weed-fs/go/glog" - "github.com/mcqueenorama/weed-fs/go/util" + "github.com/chrislusf/weed-fs/go/glog" + "github.com/chrislusf/weed-fs/go/util" ) type ClusterStatusResult struct { diff --git a/go/operation/lookup.go b/go/operation/lookup.go index 2fd238e7a..e6b6658da 100644 --- a/go/operation/lookup.go +++ b/go/operation/lookup.go @@ -9,7 +9,7 @@ import ( "strings" "time" - "github.com/mcqueenorama/weed-fs/go/util" + "github.com/chrislusf/weed-fs/go/util" ) type Location struct { diff --git a/go/operation/submit.go b/go/operation/submit.go index c4f64f5a2..62db46617 100644 --- a/go/operation/submit.go +++ b/go/operation/submit.go @@ -9,7 +9,7 @@ import ( "strconv" "strings" - "github.com/mcqueenorama/weed-fs/go/glog" + "github.com/chrislusf/weed-fs/go/glog" ) type FilePart struct { diff --git a/go/operation/upload_content.go b/go/operation/upload_content.go index 297d78a04..480d76dca 100644 --- a/go/operation/upload_content.go +++ b/go/operation/upload_content.go @@ -14,7 +14,7 @@ import ( "path/filepath" "strings" - "github.com/mcqueenorama/weed-fs/go/glog" + "github.com/chrislusf/weed-fs/go/glog" ) type UploadResult struct { diff --git a/go/storage/cdb_map.go b/go/storage/cdb_map.go index 824672cae..fbb59e9c0 100644 --- a/go/storage/cdb_map.go +++ b/go/storage/cdb_map.go @@ -7,7 +7,7 @@ import ( "os" "path/filepath" - "github.com/mcqueenorama/weed-fs/go/util" + "github.com/chrislusf/weed-fs/go/util" "github.com/tgulacsi/go-cdb" ) diff --git a/go/storage/cdb_map_test.go b/go/storage/cdb_map_test.go index 3b13d5b76..ed690f44f 100644 --- a/go/storage/cdb_map_test.go +++ b/go/storage/cdb_map_test.go @@ -6,7 +6,7 @@ import ( "runtime" "testing" - "github.com/mcqueenorama/weed-fs/go/glog" + "github.com/chrislusf/weed-fs/go/glog" ) var testIndexFilename string = "../../test/sample.idx" diff --git a/go/storage/compact_map_perf_test.go b/go/storage/compact_map_perf_test.go index bebed48ba..f74684225 100644 --- a/go/storage/compact_map_perf_test.go +++ b/go/storage/compact_map_perf_test.go @@ -5,8 +5,8 @@ import ( "os" "testing" - "github.com/mcqueenorama/weed-fs/go/glog" - "github.com/mcqueenorama/weed-fs/go/util" + "github.com/chrislusf/weed-fs/go/glog" + "github.com/chrislusf/weed-fs/go/util" ) func TestMemoryUsage(t *testing.T) { diff --git a/go/storage/compress.go b/go/storage/compress.go index 88a9c9c15..5efc9e1f1 100644 --- a/go/storage/compress.go +++ b/go/storage/compress.go @@ -7,7 +7,7 @@ import ( "io/ioutil" "strings" - "github.com/mcqueenorama/weed-fs/go/glog" + "github.com/chrislusf/weed-fs/go/glog" ) /* diff --git a/go/storage/crc.go b/go/storage/crc.go index 01452dd4a..af25b9e53 100644 --- a/go/storage/crc.go +++ b/go/storage/crc.go @@ -4,7 +4,7 @@ import ( "fmt" "hash/crc32" - "github.com/mcqueenorama/weed-fs/go/util" + "github.com/chrislusf/weed-fs/go/util" ) var table = crc32.MakeTable(crc32.Castagnoli) diff --git a/go/storage/file_id.go b/go/storage/file_id.go index 55ccdd110..f6e36a98c 100644 --- a/go/storage/file_id.go +++ b/go/storage/file_id.go @@ -5,8 +5,8 @@ import ( "errors" "strings" - "github.com/mcqueenorama/weed-fs/go/glog" - "github.com/mcqueenorama/weed-fs/go/util" + "github.com/chrislusf/weed-fs/go/glog" + "github.com/chrislusf/weed-fs/go/util" ) type FileId struct { diff --git a/go/storage/needle.go b/go/storage/needle.go index 13ee34bd6..aa3206920 100644 --- a/go/storage/needle.go +++ b/go/storage/needle.go @@ -11,9 +11,9 @@ import ( "strings" "time" - "github.com/mcqueenorama/weed-fs/go/glog" - "github.com/mcqueenorama/weed-fs/go/images" - "github.com/mcqueenorama/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" ) const ( diff --git a/go/storage/needle_map.go b/go/storage/needle_map.go index c7150d4d9..504ca1552 100644 --- a/go/storage/needle_map.go +++ b/go/storage/needle_map.go @@ -5,8 +5,8 @@ import ( "io" "os" - "github.com/mcqueenorama/weed-fs/go/glog" - "github.com/mcqueenorama/weed-fs/go/util" + "github.com/chrislusf/weed-fs/go/glog" + "github.com/chrislusf/weed-fs/go/util" ) type NeedleMapper interface { diff --git a/go/storage/needle_read_write.go b/go/storage/needle_read_write.go index d4529f92d..663b5abbd 100644 --- a/go/storage/needle_read_write.go +++ b/go/storage/needle_read_write.go @@ -6,8 +6,8 @@ import ( "io" "os" - "github.com/mcqueenorama/weed-fs/go/glog" - "github.com/mcqueenorama/weed-fs/go/util" + "github.com/chrislusf/weed-fs/go/glog" + "github.com/chrislusf/weed-fs/go/util" ) const ( diff --git a/go/storage/store.go b/go/storage/store.go index 97dc16f70..80d8a30b8 100644 --- a/go/storage/store.go +++ b/go/storage/store.go @@ -10,9 +10,9 @@ import ( "strings" proto "code.google.com/p/goprotobuf/proto" - "github.com/mcqueenorama/weed-fs/go/glog" - "github.com/mcqueenorama/weed-fs/go/operation" - "github.com/mcqueenorama/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" ) const ( diff --git a/go/storage/store_vacuum.go b/go/storage/store_vacuum.go index 0db083055..209e3b4b3 100644 --- a/go/storage/store_vacuum.go +++ b/go/storage/store_vacuum.go @@ -4,7 +4,7 @@ import ( "fmt" "strconv" - "github.com/mcqueenorama/weed-fs/go/glog" + "github.com/chrislusf/weed-fs/go/glog" ) func (s *Store) CheckCompactVolume(volumeIdString string, garbageThresholdString string) (error, bool) { diff --git a/go/storage/volume.go b/go/storage/volume.go index 540da3140..5b0a83605 100644 --- a/go/storage/volume.go +++ b/go/storage/volume.go @@ -10,7 +10,7 @@ import ( "sync" "time" - "github.com/mcqueenorama/weed-fs/go/glog" + "github.com/chrislusf/weed-fs/go/glog" ) type Volume struct { diff --git a/go/storage/volume_info.go b/go/storage/volume_info.go index 503967c97..6410c1784 100644 --- a/go/storage/volume_info.go +++ b/go/storage/volume_info.go @@ -1,7 +1,7 @@ package storage import ( - "github.com/mcqueenorama/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 32b799f26..57e0deea9 100644 --- a/go/storage/volume_super_block.go +++ b/go/storage/volume_super_block.go @@ -4,7 +4,7 @@ import ( "fmt" "os" - "github.com/mcqueenorama/weed-fs/go/glog" + "github.com/chrislusf/weed-fs/go/glog" ) const ( diff --git a/go/storage/volume_vacuum.go b/go/storage/volume_vacuum.go index 28028241a..7e026a61d 100644 --- a/go/storage/volume_vacuum.go +++ b/go/storage/volume_vacuum.go @@ -5,7 +5,7 @@ import ( "os" "time" - "github.com/mcqueenorama/weed-fs/go/glog" + "github.com/chrislusf/weed-fs/go/glog" ) func (v *Volume) garbageLevel() float64 { diff --git a/go/tools/read_index.go b/go/tools/read_index.go index ed18167b2..1104dc348 100644 --- a/go/tools/read_index.go +++ b/go/tools/read_index.go @@ -6,7 +6,7 @@ import ( "log" "os" - "github.com/mcqueenorama/weed-fs/go/storage" + "github.com/chrislusf/weed-fs/go/storage" ) var ( diff --git a/go/topology/allocate_volume.go b/go/topology/allocate_volume.go index 38843dd54..a791b4c1c 100644 --- a/go/topology/allocate_volume.go +++ b/go/topology/allocate_volume.go @@ -5,8 +5,8 @@ import ( "errors" "net/url" - "github.com/mcqueenorama/weed-fs/go/storage" - "github.com/mcqueenorama/weed-fs/go/util" + "github.com/chrislusf/weed-fs/go/storage" + "github.com/chrislusf/weed-fs/go/util" ) type AllocateVolumeResult struct { diff --git a/go/topology/cluster_commands.go b/go/topology/cluster_commands.go index c88de9e0b..cafc52c76 100644 --- a/go/topology/cluster_commands.go +++ b/go/topology/cluster_commands.go @@ -1,8 +1,8 @@ package topology import ( - "github.com/mcqueenorama/weed-fs/go/glog" - "github.com/mcqueenorama/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 cded90650..4b47ae88a 100644 --- a/go/topology/collection.go +++ b/go/topology/collection.go @@ -1,8 +1,8 @@ package topology import ( - "github.com/mcqueenorama/weed-fs/go/storage" - "github.com/mcqueenorama/weed-fs/go/util" + "github.com/chrislusf/weed-fs/go/storage" + "github.com/chrislusf/weed-fs/go/util" ) type Collection struct { diff --git a/go/topology/data_node.go b/go/topology/data_node.go index c12396e87..109bd037f 100644 --- a/go/topology/data_node.go +++ b/go/topology/data_node.go @@ -3,8 +3,8 @@ package topology import ( "strconv" - "github.com/mcqueenorama/weed-fs/go/glog" - "github.com/mcqueenorama/weed-fs/go/storage" + "github.com/chrislusf/weed-fs/go/glog" + "github.com/chrislusf/weed-fs/go/storage" ) type DataNode struct { diff --git a/go/topology/node.go b/go/topology/node.go index 9c8e7700b..10955fa72 100644 --- a/go/topology/node.go +++ b/go/topology/node.go @@ -5,8 +5,8 @@ import ( "math/rand" "strings" - "github.com/mcqueenorama/weed-fs/go/glog" - "github.com/mcqueenorama/weed-fs/go/storage" + "github.com/chrislusf/weed-fs/go/glog" + "github.com/chrislusf/weed-fs/go/storage" ) type NodeId string diff --git a/go/topology/store_replicate.go b/go/topology/store_replicate.go index b949b33c3..0c52f9d30 100644 --- a/go/topology/store_replicate.go +++ b/go/topology/store_replicate.go @@ -5,10 +5,10 @@ import ( "net/http" "strconv" - "github.com/mcqueenorama/weed-fs/go/glog" - "github.com/mcqueenorama/weed-fs/go/operation" - "github.com/mcqueenorama/weed-fs/go/storage" - "github.com/mcqueenorama/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" ) func ReplicatedWrite(masterNode string, s *storage.Store, volumeId storage.VolumeId, needle *storage.Needle, r *http.Request) (size uint32, errorStatus string) { diff --git a/go/topology/topology.go b/go/topology/topology.go index 6c9cbe3da..c2073ed2f 100644 --- a/go/topology/topology.go +++ b/go/topology/topology.go @@ -5,11 +5,11 @@ import ( "io/ioutil" "math/rand" - "github.com/mcqueenorama/weed-fs/go/glog" - "github.com/mcqueenorama/weed-fs/go/operation" - "github.com/mcqueenorama/weed-fs/go/sequence" - "github.com/mcqueenorama/weed-fs/go/storage" - "github.com/mcqueenorama/weed-fs/go/util" + "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" + "github.com/chrislusf/weed-fs/go/util" "github.com/goraft/raft" ) diff --git a/go/topology/topology_event_handling.go b/go/topology/topology_event_handling.go index 49e67c8f5..7e36568b6 100644 --- a/go/topology/topology_event_handling.go +++ b/go/topology/topology_event_handling.go @@ -4,8 +4,8 @@ import ( "math/rand" "time" - "github.com/mcqueenorama/weed-fs/go/glog" - "github.com/mcqueenorama/weed-fs/go/storage" + "github.com/chrislusf/weed-fs/go/glog" + "github.com/chrislusf/weed-fs/go/storage" ) func (t *Topology) StartRefreshWritableVolumes(garbageThreshold string) { diff --git a/go/topology/topology_vacuum.go b/go/topology/topology_vacuum.go index 9e532876f..d6fa2213e 100644 --- a/go/topology/topology_vacuum.go +++ b/go/topology/topology_vacuum.go @@ -6,9 +6,9 @@ import ( "net/url" "time" - "github.com/mcqueenorama/weed-fs/go/glog" - "github.com/mcqueenorama/weed-fs/go/storage" - "github.com/mcqueenorama/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" ) func batchVacuumVolumeCheck(vl *VolumeLayout, vid storage.VolumeId, locationlist *VolumeLocationList, garbageThreshold string) bool { diff --git a/go/topology/volume_growth.go b/go/topology/volume_growth.go index 02466d539..b1f241990 100644 --- a/go/topology/volume_growth.go +++ b/go/topology/volume_growth.go @@ -5,8 +5,8 @@ import ( "math/rand" "sync" - "github.com/mcqueenorama/weed-fs/go/glog" - "github.com/mcqueenorama/weed-fs/go/storage" + "github.com/chrislusf/weed-fs/go/glog" + "github.com/chrislusf/weed-fs/go/storage" ) /* diff --git a/go/topology/volume_growth_test.go b/go/topology/volume_growth_test.go index 333ab5a3a..267b36042 100644 --- a/go/topology/volume_growth_test.go +++ b/go/topology/volume_growth_test.go @@ -5,8 +5,8 @@ import ( "fmt" "testing" - "github.com/mcqueenorama/weed-fs/go/sequence" - "github.com/mcqueenorama/weed-fs/go/storage" + "github.com/chrislusf/weed-fs/go/sequence" + "github.com/chrislusf/weed-fs/go/storage" ) var topologyLayout = ` diff --git a/go/topology/volume_layout.go b/go/topology/volume_layout.go index 8c6f80954..de72bf895 100644 --- a/go/topology/volume_layout.go +++ b/go/topology/volume_layout.go @@ -5,8 +5,8 @@ import ( "math/rand" "sync" - "github.com/mcqueenorama/weed-fs/go/glog" - "github.com/mcqueenorama/weed-fs/go/storage" + "github.com/chrislusf/weed-fs/go/glog" + "github.com/chrislusf/weed-fs/go/storage" ) // mapping from volume to its locations, inverted from server to volume diff --git a/go/util/config.go b/go/util/config.go index 071d731c9..4cf1d7c64 100644 --- a/go/util/config.go +++ b/go/util/config.go @@ -13,7 +13,7 @@ import ( "encoding/json" "os" - "github.com/mcqueenorama/weed-fs/go/glog" + "github.com/chrislusf/weed-fs/go/glog" ) type Config struct { diff --git a/go/util/file_util.go b/go/util/file_util.go index 176aaac96..30e24f001 100644 --- a/go/util/file_util.go +++ b/go/util/file_util.go @@ -5,7 +5,7 @@ import ( "errors" "os" - "github.com/mcqueenorama/weed-fs/go/glog" + "github.com/chrislusf/weed-fs/go/glog" ) func TestFolderWritable(folder string) (err error) { diff --git a/go/util/net_timeout.go b/go/util/net_timeout.go index 4e54b6798..f274e4802 100644 --- a/go/util/net_timeout.go +++ b/go/util/net_timeout.go @@ -4,7 +4,7 @@ import ( "net" "time" - "github.com/mcqueenorama/weed-fs/go/stats" + "github.com/chrislusf/weed-fs/go/stats" ) // Listener wraps a net.Listener, and gives a place to store the timeout diff --git a/go/weed/benchmark.go b/go/weed/benchmark.go index 2d507ebb6..f4f0b1874 100644 --- a/go/weed/benchmark.go +++ b/go/weed/benchmark.go @@ -14,9 +14,9 @@ import ( "sync" "time" - "github.com/mcqueenorama/weed-fs/go/glog" - "github.com/mcqueenorama/weed-fs/go/operation" - "github.com/mcqueenorama/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" ) type BenchmarkOptions struct { diff --git a/go/weed/compact.go b/go/weed/compact.go index 1ecb85cf9..71c4ea90f 100644 --- a/go/weed/compact.go +++ b/go/weed/compact.go @@ -1,8 +1,8 @@ package main import ( - "github.com/mcqueenorama/weed-fs/go/glog" - "github.com/mcqueenorama/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 82c0fd45e..c782654f5 100644 --- a/go/weed/download.go +++ b/go/weed/download.go @@ -8,8 +8,8 @@ import ( "path" "strings" - "github.com/mcqueenorama/weed-fs/go/operation" - "github.com/mcqueenorama/weed-fs/go/util" + "github.com/chrislusf/weed-fs/go/operation" + "github.com/chrislusf/weed-fs/go/util" ) var ( diff --git a/go/weed/export.go b/go/weed/export.go index 472e63aea..c9cc0e3fe 100644 --- a/go/weed/export.go +++ b/go/weed/export.go @@ -11,8 +11,8 @@ import ( "text/template" "time" - "github.com/mcqueenorama/weed-fs/go/glog" - "github.com/mcqueenorama/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/filer.go b/go/weed/filer.go index 173ccddc7..11154f183 100644 --- a/go/weed/filer.go +++ b/go/weed/filer.go @@ -6,9 +6,9 @@ import ( "strconv" "time" - "github.com/mcqueenorama/weed-fs/go/glog" - "github.com/mcqueenorama/weed-fs/go/util" - "github.com/mcqueenorama/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" ) var ( diff --git a/go/weed/fix.go b/go/weed/fix.go index 0f5f0b7f3..e66075ed2 100644 --- a/go/weed/fix.go +++ b/go/weed/fix.go @@ -5,8 +5,8 @@ import ( "path" "strconv" - "github.com/mcqueenorama/weed-fs/go/glog" - "github.com/mcqueenorama/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/master.go b/go/weed/master.go index 885e6e207..f88964b6d 100644 --- a/go/weed/master.go +++ b/go/weed/master.go @@ -8,9 +8,9 @@ import ( "strings" "time" - "github.com/mcqueenorama/weed-fs/go/glog" - "github.com/mcqueenorama/weed-fs/go/util" - "github.com/mcqueenorama/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" ) diff --git a/go/weed/mount_std.go b/go/weed/mount_std.go index e930240b1..808c6c563 100644 --- a/go/weed/mount_std.go +++ b/go/weed/mount_std.go @@ -9,10 +9,10 @@ import ( "bazil.org/fuse" "bazil.org/fuse/fs" - "github.com/mcqueenorama/weed-fs/go/filer" - "github.com/mcqueenorama/weed-fs/go/glog" - "github.com/mcqueenorama/weed-fs/go/storage" - "github.com/mcqueenorama/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" ) func runMount(cmd *Command, args []string) bool { diff --git a/go/weed/server.go b/go/weed/server.go index 6a5a0a935..67bbdb370 100644 --- a/go/weed/server.go +++ b/go/weed/server.go @@ -10,9 +10,9 @@ import ( "sync" "time" - "github.com/mcqueenorama/weed-fs/go/glog" - "github.com/mcqueenorama/weed-fs/go/util" - "github.com/mcqueenorama/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" ) diff --git a/go/weed/shell.go b/go/weed/shell.go index 04cfb4730..f2c4990ea 100644 --- a/go/weed/shell.go +++ b/go/weed/shell.go @@ -5,7 +5,7 @@ import ( "fmt" "os" - "github.com/mcqueenorama/weed-fs/go/glog" + "github.com/chrislusf/weed-fs/go/glog" ) func init() { diff --git a/go/weed/upload.go b/go/weed/upload.go index 7623f7d9b..2d67c0bd9 100644 --- a/go/weed/upload.go +++ b/go/weed/upload.go @@ -6,7 +6,7 @@ import ( "os" "path/filepath" - "github.com/mcqueenorama/weed-fs/go/operation" + "github.com/chrislusf/weed-fs/go/operation" ) var ( diff --git a/go/weed/version.go b/go/weed/version.go index 13f7ea23a..8d3a6fed7 100644 --- a/go/weed/version.go +++ b/go/weed/version.go @@ -4,7 +4,7 @@ import ( "fmt" "runtime" - "github.com/mcqueenorama/weed-fs/go/util" + "github.com/chrislusf/weed-fs/go/util" ) var cmdVersion = &Command{ diff --git a/go/weed/volume.go b/go/weed/volume.go index 71a296702..212cb4b33 100644 --- a/go/weed/volume.go +++ b/go/weed/volume.go @@ -8,9 +8,9 @@ import ( "strings" "time" - "github.com/mcqueenorama/weed-fs/go/glog" - "github.com/mcqueenorama/weed-fs/go/util" - "github.com/mcqueenorama/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" ) func init() { diff --git a/go/weed/volume_test.go b/go/weed/volume_test.go index b936ba4f2..ef00a8c7c 100644 --- a/go/weed/volume_test.go +++ b/go/weed/volume_test.go @@ -5,7 +5,7 @@ import ( "testing" "time" - "github.com/mcqueenorama/weed-fs/go/glog" + "github.com/chrislusf/weed-fs/go/glog" ) func TestXYZ(t *testing.T) { diff --git a/go/weed/weed.go b/go/weed/weed.go index 0620cdf17..c304b7f35 100644 --- a/go/weed/weed.go +++ b/go/weed/weed.go @@ -13,7 +13,7 @@ import ( "unicode" "unicode/utf8" - "github.com/mcqueenorama/weed-fs/go/glog" + "github.com/chrislusf/weed-fs/go/glog" ) var IsDebug *bool diff --git a/go/weed/weed_server/common.go b/go/weed/weed_server/common.go index 55f5e69a4..39b0830e3 100644 --- a/go/weed/weed_server/common.go +++ b/go/weed/weed_server/common.go @@ -10,11 +10,11 @@ import ( "strconv" "strings" - "github.com/mcqueenorama/weed-fs/go/glog" - "github.com/mcqueenorama/weed-fs/go/operation" - "github.com/mcqueenorama/weed-fs/go/stats" - "github.com/mcqueenorama/weed-fs/go/storage" - "github.com/mcqueenorama/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" ) var serverStats *stats.ServerStats diff --git a/go/weed/weed_server/filer_server.go b/go/weed/weed_server/filer_server.go index 2630a3398..0bda58d06 100644 --- a/go/weed/weed_server/filer_server.go +++ b/go/weed/weed_server/filer_server.go @@ -4,8 +4,8 @@ import ( "net/http" "strconv" - "github.com/mcqueenorama/weed-fs/go/filer" - "github.com/mcqueenorama/weed-fs/go/glog" + "github.com/chrislusf/weed-fs/go/filer" + "github.com/chrislusf/weed-fs/go/glog" ) type FilerServer struct { diff --git a/go/weed/weed_server/filer_server_handlers.go b/go/weed/weed_server/filer_server_handlers.go index e5a7a860e..6f22912a7 100644 --- a/go/weed/weed_server/filer_server_handlers.go +++ b/go/weed/weed_server/filer_server_handlers.go @@ -11,9 +11,9 @@ import ( "strconv" "strings" - "github.com/mcqueenorama/weed-fs/go/glog" - "github.com/mcqueenorama/weed-fs/go/operation" - "github.com/mcqueenorama/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" "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 f63701a6b..5ba12e0b8 100644 --- a/go/weed/weed_server/filer_server_handlers_admin.go +++ b/go/weed/weed_server/filer_server_handlers_admin.go @@ -3,7 +3,7 @@ package weed_server import ( "net/http" - "github.com/mcqueenorama/weed-fs/go/glog" + "github.com/chrislusf/weed-fs/go/glog" ) /* diff --git a/go/weed/weed_server/master_server.go b/go/weed/weed_server/master_server.go index d96354eb9..d000cb610 100644 --- a/go/weed/weed_server/master_server.go +++ b/go/weed/weed_server/master_server.go @@ -6,10 +6,10 @@ import ( "net/url" "sync" - "github.com/mcqueenorama/weed-fs/go/glog" - "github.com/mcqueenorama/weed-fs/go/sequence" - "github.com/mcqueenorama/weed-fs/go/topology" - "github.com/mcqueenorama/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" ) diff --git a/go/weed/weed_server/master_server_handlers.go b/go/weed/weed_server/master_server_handlers.go index 25839669f..7a7a3b70d 100644 --- a/go/weed/weed_server/master_server_handlers.go +++ b/go/weed/weed_server/master_server_handlers.go @@ -5,9 +5,9 @@ import ( "strconv" "strings" - "github.com/mcqueenorama/weed-fs/go/operation" - "github.com/mcqueenorama/weed-fs/go/stats" - "github.com/mcqueenorama/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" ) func (ms *MasterServer) lookupVolumeId(vids []string, collection string) (volumeLocations map[string]operation.LookupResult) { diff --git a/go/weed/weed_server/master_server_handlers_admin.go b/go/weed/weed_server/master_server_handlers_admin.go index 6ad83784b..d7124e567 100644 --- a/go/weed/weed_server/master_server_handlers_admin.go +++ b/go/weed/weed_server/master_server_handlers_admin.go @@ -9,11 +9,11 @@ import ( "strings" proto "code.google.com/p/goprotobuf/proto" - "github.com/mcqueenorama/weed-fs/go/glog" - "github.com/mcqueenorama/weed-fs/go/operation" - "github.com/mcqueenorama/weed-fs/go/storage" - "github.com/mcqueenorama/weed-fs/go/topology" - "github.com/mcqueenorama/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" ) func (ms *MasterServer) collectionDeleteHandler(w http.ResponseWriter, r *http.Request) { diff --git a/go/weed/weed_server/raft_server.go b/go/weed/weed_server/raft_server.go index fb85daecf..b9aaef2b0 100644 --- a/go/weed/weed_server/raft_server.go +++ b/go/weed/weed_server/raft_server.go @@ -14,8 +14,8 @@ import ( "strings" "time" - "github.com/mcqueenorama/weed-fs/go/glog" - "github.com/mcqueenorama/weed-fs/go/topology" + "github.com/chrislusf/weed-fs/go/glog" + "github.com/chrislusf/weed-fs/go/topology" "github.com/goraft/raft" "github.com/gorilla/mux" ) diff --git a/go/weed/weed_server/raft_server_handlers.go b/go/weed/weed_server/raft_server_handlers.go index 340a34e7b..b466d9afa 100644 --- a/go/weed/weed_server/raft_server_handlers.go +++ b/go/weed/weed_server/raft_server_handlers.go @@ -6,8 +6,8 @@ import ( "net/http" "strings" - "github.com/mcqueenorama/weed-fs/go/glog" - "github.com/mcqueenorama/weed-fs/go/operation" + "github.com/chrislusf/weed-fs/go/glog" + "github.com/chrislusf/weed-fs/go/operation" "github.com/goraft/raft" ) diff --git a/go/weed/weed_server/volume_server.go b/go/weed/weed_server/volume_server.go index 3e40a790a..0a65fd2f6 100644 --- a/go/weed/weed_server/volume_server.go +++ b/go/weed/weed_server/volume_server.go @@ -6,8 +6,8 @@ import ( "strconv" "time" - "github.com/mcqueenorama/weed-fs/go/glog" - "github.com/mcqueenorama/weed-fs/go/storage" + "github.com/chrislusf/weed-fs/go/glog" + "github.com/chrislusf/weed-fs/go/storage" ) type VolumeServer struct { diff --git a/go/weed/weed_server/volume_server_handlers.go b/go/weed/weed_server/volume_server_handlers.go index e14bcea9e..83f614941 100644 --- a/go/weed/weed_server/volume_server_handlers.go +++ b/go/weed/weed_server/volume_server_handlers.go @@ -9,12 +9,12 @@ import ( "strings" "time" - "github.com/mcqueenorama/weed-fs/go/glog" - "github.com/mcqueenorama/weed-fs/go/images" - "github.com/mcqueenorama/weed-fs/go/operation" - "github.com/mcqueenorama/weed-fs/go/stats" - "github.com/mcqueenorama/weed-fs/go/storage" - "github.com/mcqueenorama/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" ) var fileNameEscaper = strings.NewReplacer("\\", "\\\\", "\"", "\\\"") diff --git a/go/weed/weed_server/volume_server_handlers_admin.go b/go/weed/weed_server/volume_server_handlers_admin.go index 0d3f6ac5b..caf4c3be8 100644 --- a/go/weed/weed_server/volume_server_handlers_admin.go +++ b/go/weed/weed_server/volume_server_handlers_admin.go @@ -4,9 +4,9 @@ import ( "net/http" "path/filepath" - "github.com/mcqueenorama/weed-fs/go/glog" - "github.com/mcqueenorama/weed-fs/go/stats" - "github.com/mcqueenorama/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" ) func (vs *VolumeServer) statusHandler(w http.ResponseWriter, r *http.Request) { diff --git a/go/weed/weed_server/volume_server_handlers_vacuum.go b/go/weed/weed_server/volume_server_handlers_vacuum.go index da7172ae9..f115e3b8b 100644 --- a/go/weed/weed_server/volume_server_handlers_vacuum.go +++ b/go/weed/weed_server/volume_server_handlers_vacuum.go @@ -3,7 +3,7 @@ package weed_server import ( "net/http" - "github.com/mcqueenorama/weed-fs/go/glog" + "github.com/chrislusf/weed-fs/go/glog" ) func (vs *VolumeServer) vacuumVolumeCheckHandler(w http.ResponseWriter, r *http.Request) {