Browse Source

switch to my forked repo

pull/33/head
Brian McQueen 10 years ago
parent
commit
c0dfdf4392
  1. 2
      go/filer/client_operations.go
  2. 2
      go/filer/directory_in_map.go
  3. 2
      go/filer/filer_embedded.go
  4. 2
      go/filer/files_in_leveldb.go
  5. 4
      go/operation/assign_file_id.go
  6. 2
      go/operation/delete_content.go
  7. 4
      go/operation/list_masters.go
  8. 2
      go/operation/lookup.go
  9. 2
      go/operation/submit.go
  10. 2
      go/operation/upload_content.go
  11. 2
      go/storage/cdb_map.go
  12. 2
      go/storage/cdb_map_test.go
  13. 4
      go/storage/compact_map_perf_test.go
  14. 2
      go/storage/compress.go
  15. 2
      go/storage/crc.go
  16. 4
      go/storage/file_id.go
  17. 6
      go/storage/needle.go
  18. 4
      go/storage/needle_map.go
  19. 4
      go/storage/needle_read_write.go
  20. 6
      go/storage/store.go
  21. 2
      go/storage/store_vacuum.go
  22. 2
      go/storage/volume.go
  23. 2
      go/storage/volume_info.go
  24. 2
      go/storage/volume_super_block.go
  25. 2
      go/storage/volume_vacuum.go
  26. 2
      go/tools/read_index.go
  27. 4
      go/topology/allocate_volume.go
  28. 4
      go/topology/cluster_commands.go
  29. 4
      go/topology/collection.go
  30. 4
      go/topology/data_node.go
  31. 4
      go/topology/node.go
  32. 8
      go/topology/store_replicate.go
  33. 10
      go/topology/topology.go
  34. 4
      go/topology/topology_event_handling.go
  35. 6
      go/topology/topology_vacuum.go
  36. 4
      go/topology/volume_growth.go
  37. 4
      go/topology/volume_growth_test.go
  38. 4
      go/topology/volume_layout.go
  39. 2
      go/util/config.go
  40. 2
      go/util/file_util.go
  41. 2
      go/util/net_timeout.go
  42. 6
      go/weed/benchmark.go
  43. 4
      go/weed/compact.go
  44. 4
      go/weed/download.go
  45. 4
      go/weed/export.go
  46. 7
      go/weed/filer.go
  47. 4
      go/weed/fix.go
  48. 6
      go/weed/master.go
  49. 8
      go/weed/mount_std.go
  50. 6
      go/weed/server.go
  51. 2
      go/weed/shell.go
  52. 2
      go/weed/upload.go
  53. 2
      go/weed/version.go
  54. 6
      go/weed/volume.go
  55. 2
      go/weed/volume_test.go
  56. 2
      go/weed/weed.go
  57. 10
      go/weed/weed_server/common.go
  58. 4
      go/weed/weed_server/filer_server.go
  59. 6
      go/weed/weed_server/filer_server_handlers.go
  60. 2
      go/weed/weed_server/filer_server_handlers_admin.go
  61. 8
      go/weed/weed_server/master_server.go
  62. 6
      go/weed/weed_server/master_server_handlers.go
  63. 10
      go/weed/weed_server/master_server_handlers_admin.go
  64. 4
      go/weed/weed_server/raft_server.go
  65. 4
      go/weed/weed_server/raft_server_handlers.go
  66. 4
      go/weed/weed_server/volume_server.go
  67. 12
      go/weed/weed_server/volume_server_handlers.go
  68. 6
      go/weed/weed_server/volume_server_handlers_admin.go
  69. 2
      go/weed/weed_server/volume_server_handlers_vacuum.go

2
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"
)

2
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

2
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 {

2
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"
)

4
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 {

2
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 {

4
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 {

2
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 {

2
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 {

2
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 {

2
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"
)

2
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"

4
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) {

2
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"
)
/*

2
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)

4
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 {

6
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 (

4
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 {

4
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 (

6
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 (

2
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) {

2
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 {

2
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 {

2
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 (

2
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 {

2
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 (

4
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 {

4
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"
)

4
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 {

4
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 {

4
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

8
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) {

10
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"
)

4
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) {

6
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 {

4
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"
)
/*

4
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 = `

4
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

2
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 {

2
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) {

2
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

6
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 {

4
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() {

4
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 (

4
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() {

7
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)
}

4
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() {

6
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"
)

8
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 {

6
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"
)

2
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() {

2
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 (

2
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{

6
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() {

2
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) {

2
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

10
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

4
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 {

6
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"
)

2
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"
)
/*

8
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"
)

6
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) {

10
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) {

4
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"
)

4
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"
)

4
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 {

12
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("\\", "\\\\", "\"", "\\\"")

6
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) {

2
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) {

Loading…
Cancel
Save