gitlab-com-seaweedfs/seaweedfs
1
0
Fork 0
mirror of https://github.com/seaweedfs/seaweedfs.git synced 2024-01-19 02:48:24 +00:00
Code Issues Projects Releases Wiki Activity

go fmt

Browse source
This commit is contained in:
Chris Lu 2018-05-27 11:52:26 -07:00
parent 8647191bee
commit 458ada173e
36 changed files with 105 additions and 107 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
weed/command/filer.go
View file

@ -5,14 +5,14 @@ import (
"strconv" "strconv"
"time" "time"
"github.com/chrislusf/seaweedfs/weed/filer2"
"github.com/chrislusf/seaweedfs/weed/glog" "github.com/chrislusf/seaweedfs/weed/glog"
"github.com/chrislusf/seaweedfs/weed/pb/filer_pb"
"github.com/chrislusf/seaweedfs/weed/server" "github.com/chrislusf/seaweedfs/weed/server"
"github.com/chrislusf/seaweedfs/weed/util" "github.com/chrislusf/seaweedfs/weed/util"
"github.com/soheilhy/cmux" "github.com/soheilhy/cmux"
"google.golang.org/grpc/reflection"
"google.golang.org/grpc" "google.golang.org/grpc"
"github.com/chrislusf/seaweedfs/weed/pb/filer_pb" "google.golang.org/grpc/reflection"
"github.com/chrislusf/seaweedfs/weed/filer2"
) )
var ( var (

2
weed/command/filer_copy.go
View file

@ -68,7 +68,7 @@ func runCopy(cmd *Command, args []string) bool {
return false return false
} }
filerDestination := args[len(args)-1] filerDestination := args[len(args)-1]
fileOrDirs := args[0: len(args)-1] fileOrDirs := args[0 : len(args)-1]
filerUrl, err := url.Parse(filerDestination) filerUrl, err := url.Parse(filerDestination)
if err != nil { if err != nil {

2
weed/command/mount_std.go
View file

@ -8,9 +8,9 @@ import (
"bazil.org/fuse" "bazil.org/fuse"
"bazil.org/fuse/fs" "bazil.org/fuse/fs"
"github.com/chrislusf/seaweedfs/weed/filesys"
"github.com/chrislusf/seaweedfs/weed/glog" "github.com/chrislusf/seaweedfs/weed/glog"
"github.com/chrislusf/seaweedfs/weed/util" "github.com/chrislusf/seaweedfs/weed/util"
"github.com/chrislusf/seaweedfs/weed/filesys"
) )
func runMount(cmd *Command, args []string) bool { func runMount(cmd *Command, args []string) bool {

2
weed/filer2/abstract_sql/abstract_sql_store.go
View file

@ -1,8 +1,8 @@
package abstract_sql package abstract_sql
import ( import (
"fmt"
"database/sql" "database/sql"
"fmt"
"github.com/chrislusf/seaweedfs/weed/filer2" "github.com/chrislusf/seaweedfs/weed/filer2"
"github.com/chrislusf/seaweedfs/weed/glog" "github.com/chrislusf/seaweedfs/weed/glog"

2
weed/filer2/cassandra/cassandra_store.go
View file

@ -2,9 +2,9 @@ package cassandra
import ( import (
"fmt" "fmt"
"github.com/gocql/gocql"
"github.com/chrislusf/seaweedfs/weed/filer2" "github.com/chrislusf/seaweedfs/weed/filer2"
"github.com/chrislusf/seaweedfs/weed/glog" "github.com/chrislusf/seaweedfs/weed/glog"
"github.com/gocql/gocql"
"github.com/spf13/viper" "github.com/spf13/viper"
) )

20
weed/filer2/configuration.go
View file

@ -3,8 +3,8 @@ package filer2
import ( import (
"os" "os"
"github.com/spf13/viper"
"github.com/chrislusf/seaweedfs/weed/glog" "github.com/chrislusf/seaweedfs/weed/glog"
"github.com/spf13/viper"
) )
const ( const (
@ -20,12 +20,11 @@ enabled = false
enabled = false enabled = false
dir = "." # directory to store level db files dir = "." # directory to store level db files
[mysql] ####################################################
# multiple filers on shared storage, fairly scalable # multiple filers on shared storage, fairly scalable
# ####################################################
# need to choose or create a database.
# need to manually create a table "filemeta". [mysql]
#
# CREATE TABLE IF NOT EXISTS filemeta ( # CREATE TABLE IF NOT EXISTS filemeta (
# dirhash BIGINT COMMENT 'first 64 bits of MD5 hash value of directory field', # dirhash BIGINT COMMENT 'first 64 bits of MD5 hash value of directory field',
# name VARCHAR(1000) COMMENT 'directory or file name', # name VARCHAR(1000) COMMENT 'directory or file name',
@ -33,7 +32,6 @@ dir = "." # directory to store level db files
# meta BLOB, # meta BLOB,
# PRIMARY KEY (dirhash, name) # PRIMARY KEY (dirhash, name)
# ) DEFAULT CHARSET=utf8; # ) DEFAULT CHARSET=utf8;
#
enabled = true enabled = true
hostname = "localhost" hostname = "localhost"
port = 3306 port = 3306
@ -90,10 +88,10 @@ var (
func (f *Filer) LoadConfiguration() { func (f *Filer) LoadConfiguration() {
// find a filer store // find a filer store
viper.SetConfigName("filer") // name of config file (without extension) viper.SetConfigName("filer") // name of config file (without extension)
viper.AddConfigPath(".") // optionally look for config in the working directory viper.AddConfigPath(".") // optionally look for config in the working directory
viper.AddConfigPath("$HOME/.seaweedfs") // call multiple times to add many search paths viper.AddConfigPath("$HOME/.seaweedfs") // call multiple times to add many search paths
viper.AddConfigPath("/etc/seaweedfs/") // path to look for the config file in viper.AddConfigPath("/etc/seaweedfs/") // path to look for the config file in
if err := viper.ReadInConfig(); err != nil { // Handle errors reading the config file if err := viper.ReadInConfig(); err != nil { // Handle errors reading the config file
glog.Fatalf("Failed to load filer.toml file from current directory, or $HOME/.seaweedfs/, or /etc/seaweedfs/" + glog.Fatalf("Failed to load filer.toml file from current directory, or $HOME/.seaweedfs/, or /etc/seaweedfs/" +
"\n\nPlease follow this example and add a filer.toml file to " + "\n\nPlease follow this example and add a filer.toml file to " +

2
weed/filer2/entry.go
View file

@ -15,7 +15,7 @@ type Attr struct {
Gid uint32 // group gid Gid uint32 // group gid
} }
func (attr Attr) IsDirectory() (bool) { func (attr Attr) IsDirectory() bool {
return attr.Mode&os.ModeDir > 0 return attr.Mode&os.ModeDir > 0
} }

4
weed/filer2/entry_codec.go
View file

@ -4,9 +4,9 @@ import (
"os" "os"
"time" "time"
"fmt"
"github.com/chrislusf/seaweedfs/weed/pb/filer_pb" "github.com/chrislusf/seaweedfs/weed/pb/filer_pb"
"github.com/gogo/protobuf/proto" "github.com/gogo/protobuf/proto"
"fmt"
) )
func (entry *Entry) EncodeAttributesAndChunks() ([]byte, error) { func (entry *Entry) EncodeAttributesAndChunks() ([]byte, error) {
@ -23,7 +23,7 @@ func (entry *Entry) EncodeAttributesAndChunks() ([]byte, error) {
return proto.Marshal(message) return proto.Marshal(message)
} }
func (entry *Entry) DecodeAttributesAndChunks(blob []byte) (error) { func (entry *Entry) DecodeAttributesAndChunks(blob []byte) error {
message := &filer_pb.Entry{} message := &filer_pb.Entry{}

2
weed/filer2/filechunks.go
View file

@ -1,9 +1,9 @@
package filer2 package filer2
import ( import (
"sort"
"log" "log"
"math" "math"
"sort"
"github.com/chrislusf/seaweedfs/weed/pb/filer_pb" "github.com/chrislusf/seaweedfs/weed/pb/filer_pb"
) )

30
weed/filer2/filechunks_test.go
View file

@ -1,8 +1,8 @@
package filer2 package filer2
import ( import (
"testing"
"log" "log"
"testing"
"github.com/chrislusf/seaweedfs/weed/pb/filer_pb" "github.com/chrislusf/seaweedfs/weed/pb/filer_pb"
) )
@ -163,9 +163,9 @@ func TestChunksReading(t *testing.T) {
Offset: 0, Offset: 0,
Size: 250, Size: 250,
Expected: []*ChunkView{ Expected: []*ChunkView{
{Offset: 0, Size: 100, FileId: "abc", LogicOffset:0}, {Offset: 0, Size: 100, FileId: "abc", LogicOffset: 0},
{Offset: 0, Size: 100, FileId: "asdf", LogicOffset:100}, {Offset: 0, Size: 100, FileId: "asdf", LogicOffset: 100},
{Offset: 0, Size: 50, FileId: "fsad", LogicOffset:200}, {Offset: 0, Size: 50, FileId: "fsad", LogicOffset: 200},
}, },
}, },
// case 1: updates overwrite full chunks // case 1: updates overwrite full chunks
@ -177,7 +177,7 @@ func TestChunksReading(t *testing.T) {
Offset: 50, Offset: 50,
Size: 100, Size: 100,
Expected: []*ChunkView{ Expected: []*ChunkView{
{Offset: 50, Size: 100, FileId: "asdf", LogicOffset:50}, {Offset: 50, Size: 100, FileId: "asdf", LogicOffset: 50},
}, },
}, },
// case 2: updates overwrite part of previous chunks // case 2: updates overwrite part of previous chunks
@ -189,8 +189,8 @@ func TestChunksReading(t *testing.T) {
Offset: 25, Offset: 25,
Size: 50, Size: 50,
Expected: []*ChunkView{ Expected: []*ChunkView{
{Offset: 25, Size: 25, FileId: "asdf", LogicOffset:25}, {Offset: 25, Size: 25, FileId: "asdf", LogicOffset: 25},
{Offset: 0, Size: 25, FileId: "abc", LogicOffset:50}, {Offset: 0, Size: 25, FileId: "abc", LogicOffset: 50},
}, },
}, },
// case 3: updates overwrite full chunks // case 3: updates overwrite full chunks
@ -203,8 +203,8 @@ func TestChunksReading(t *testing.T) {
Offset: 0, Offset: 0,
Size: 200, Size: 200,
Expected: []*ChunkView{ Expected: []*ChunkView{
{Offset: 0, Size: 50, FileId: "asdf", LogicOffset:0}, {Offset: 0, Size: 50, FileId: "asdf", LogicOffset: 0},
{Offset: 0, Size: 150, FileId: "xxxx", LogicOffset:50}, {Offset: 0, Size: 150, FileId: "xxxx", LogicOffset: 50},
}, },
}, },
// case 4: updates far away from prev chunks // case 4: updates far away from prev chunks
@ -217,7 +217,7 @@ func TestChunksReading(t *testing.T) {
Offset: 0, Offset: 0,
Size: 400, Size: 400,
Expected: []*ChunkView{ Expected: []*ChunkView{
{Offset: 0, Size: 200, FileId: "asdf", LogicOffset:0}, {Offset: 0, Size: 200, FileId: "asdf", LogicOffset: 0},
// {Offset: 0, Size: 150, FileId: "xxxx"}, // missing intervals should not happen // {Offset: 0, Size: 150, FileId: "xxxx"}, // missing intervals should not happen
}, },
}, },
@ -232,8 +232,8 @@ func TestChunksReading(t *testing.T) {
Offset: 0, Offset: 0,
Size: 220, Size: 220,
Expected: []*ChunkView{ Expected: []*ChunkView{
{Offset: 0, Size: 200, FileId: "asdf", LogicOffset:0}, {Offset: 0, Size: 200, FileId: "asdf", LogicOffset: 0},
{Offset: 0, Size: 20, FileId: "abc", LogicOffset:200}, {Offset: 0, Size: 20, FileId: "abc", LogicOffset: 200},
}, },
}, },
// case 6: same updates // case 6: same updates
@ -246,7 +246,7 @@ func TestChunksReading(t *testing.T) {
Offset: 0, Offset: 0,
Size: 100, Size: 100,
Expected: []*ChunkView{ Expected: []*ChunkView{
{Offset: 0, Size: 100, FileId: "abc", LogicOffset:0}, {Offset: 0, Size: 100, FileId: "abc", LogicOffset: 0},
}, },
}, },
// case 7: edge cases // case 7: edge cases
@ -259,8 +259,8 @@ func TestChunksReading(t *testing.T) {
Offset: 0, Offset: 0,
Size: 200, Size: 200,
Expected: []*ChunkView{ Expected: []*ChunkView{
{Offset: 0, Size: 100, FileId: "abc", LogicOffset:0}, {Offset: 0, Size: 100, FileId: "abc", LogicOffset: 0},
{Offset: 0, Size: 100, FileId: "asdf", LogicOffset:100}, {Offset: 0, Size: 100, FileId: "asdf", LogicOffset: 100},
}, },
}, },
} }

30
weed/filer2/filer.go
View file

@ -3,12 +3,12 @@ package filer2
import ( import (
"fmt" "fmt"
"github.com/karlseguin/ccache"
"strings"
"path/filepath"
"time"
"os"
"github.com/chrislusf/seaweedfs/weed/glog" "github.com/chrislusf/seaweedfs/weed/glog"
"github.com/karlseguin/ccache"
"os"
"path/filepath"
"strings"
"time"
) )
type Filer struct { type Filer struct {
@ -24,15 +24,15 @@ func NewFiler(master string) *Filer {
} }
} }
func (f *Filer) SetStore(store FilerStore) () { func (f *Filer) SetStore(store FilerStore) {
f.store = store f.store = store
} }
func (f *Filer) DisableDirectoryCache() () { func (f *Filer) DisableDirectoryCache() {
f.directoryCache = nil f.directoryCache = nil
} }
func (f *Filer) CreateEntry(entry *Entry) (error) { func (f *Filer) CreateEntry(entry *Entry) error {
dirParts := strings.Split(string(entry.FullPath), "/") dirParts := strings.Split(string(entry.FullPath), "/")
@ -94,11 +94,11 @@ func (f *Filer) CreateEntry(entry *Entry) (error) {
} }
/* /*
if !hasWritePermission(lastDirectoryEntry, entry) { if !hasWritePermission(lastDirectoryEntry, entry) {
glog.V(0).Infof("directory %s: %v, entry: uid=%d gid=%d", glog.V(0).Infof("directory %s: %v, entry: uid=%d gid=%d",
lastDirectoryEntry.FullPath, lastDirectoryEntry.Attr, entry.Uid, entry.Gid) lastDirectoryEntry.FullPath, lastDirectoryEntry.Attr, entry.Uid, entry.Gid)
return fmt.Errorf("no write permission in folder %v", lastDirectoryEntry.FullPath) return fmt.Errorf("no write permission in folder %v", lastDirectoryEntry.FullPath)
} }
*/ */
if err := f.store.InsertEntry(entry); err != nil { if err := f.store.InsertEntry(entry); err != nil {
@ -135,12 +135,12 @@ func (f *Filer) DeleteEntry(p FullPath) (fileEntry *Entry, err error) {
func (f *Filer) ListDirectoryEntries(p FullPath, startFileName string, inclusive bool, limit int) ([]*Entry, error) { func (f *Filer) ListDirectoryEntries(p FullPath, startFileName string, inclusive bool, limit int) ([]*Entry, error) {
if strings.HasSuffix(string(p), "/") && len(p) > 1 { if strings.HasSuffix(string(p), "/") && len(p) > 1 {
p = p[0:len(p)-1] p = p[0 : len(p)-1]
} }
return f.store.ListDirectoryEntries(p, startFileName, inclusive, limit) return f.store.ListDirectoryEntries(p, startFileName, inclusive, limit)
} }
func (f *Filer) cacheGetDirectory(dirpath string) (*Entry) { func (f *Filer) cacheGetDirectory(dirpath string) *Entry {
if f.directoryCache == nil { if f.directoryCache == nil {
return nil return nil
} }

4
weed/filer2/filerstore.go
View file

@ -7,8 +7,8 @@ import (
type FilerStore interface { type FilerStore interface {
GetName() string GetName() string
Initialize(viper *viper.Viper) (error) Initialize(viper *viper.Viper) error
InsertEntry(*Entry) (error) InsertEntry(*Entry) error
UpdateEntry(*Entry) (err error) UpdateEntry(*Entry) (err error)
FindEntry(FullPath) (entry *Entry, err error) FindEntry(FullPath) (entry *Entry, err error)
DeleteEntry(FullPath) (fileEntry *Entry, err error) DeleteEntry(FullPath) (fileEntry *Entry, err error)

2
weed/filer2/fullpath.go
View file

@ -25,7 +25,7 @@ func (fp FullPath) DirAndName() (string, string) {
return dir[:len(dir)-1], name return dir[:len(dir)-1], name
} }
func (fp FullPath) Name() (string) { func (fp FullPath) Name() string {
_, name := filepath.Split(string(fp)) _, name := filepath.Split(string(fp))
return name return name
} }

10
weed/filer2/leveldb/leveldb_store.go
View file

@ -1,15 +1,15 @@
package leveldb package leveldb
import ( import (
"fmt"
"bytes" "bytes"
"fmt"
"github.com/syndtr/goleveldb/leveldb"
"github.com/chrislusf/seaweedfs/weed/filer2" "github.com/chrislusf/seaweedfs/weed/filer2"
leveldb_util "github.com/syndtr/goleveldb/leveldb/util"
"github.com/chrislusf/seaweedfs/weed/glog" "github.com/chrislusf/seaweedfs/weed/glog"
"github.com/spf13/viper"
weed_util "github.com/chrislusf/seaweedfs/weed/util" weed_util "github.com/chrislusf/seaweedfs/weed/util"
"github.com/spf13/viper"
"github.com/syndtr/goleveldb/leveldb"
leveldb_util "github.com/syndtr/goleveldb/leveldb/util"
) )
const ( const (
@ -162,7 +162,7 @@ func genDirectoryKeyPrefix(fullpath filer2.FullPath, startFileName string) (keyP
return keyPrefix return keyPrefix
} }
func getNameFromKey(key []byte) (string) { func getNameFromKey(key []byte) string {
sepIndex := len(key) - 1 sepIndex := len(key) - 1
for sepIndex >= 0 && key[sepIndex] != DIR_FILE_SEPARATOR { for sepIndex >= 0 && key[sepIndex] != DIR_FILE_SEPARATOR {

2
weed/filer2/leveldb/leveldb_store_test.go
View file

@ -1,10 +1,10 @@
package leveldb package leveldb
import ( import (
"testing"
"github.com/chrislusf/seaweedfs/weed/filer2" "github.com/chrislusf/seaweedfs/weed/filer2"
"io/ioutil" "io/ioutil"
"os" "os"
"testing"
) )
func TestCreateAndFind(t *testing.T) { func TestCreateAndFind(t *testing.T) {

4
weed/filer2/memdb/memdb_store.go
View file

@ -1,11 +1,11 @@
package memdb package memdb
import ( import (
"fmt"
"github.com/chrislusf/seaweedfs/weed/filer2" "github.com/chrislusf/seaweedfs/weed/filer2"
"github.com/google/btree" "github.com/google/btree"
"strings"
"fmt"
"github.com/spf13/viper" "github.com/spf13/viper"
"strings"
) )
func init() { func init() {

2
weed/filer2/memdb/memdb_store_test.go
View file

@ -1,8 +1,8 @@
package memdb package memdb
import ( import (
"testing"
"github.com/chrislusf/seaweedfs/weed/filer2" "github.com/chrislusf/seaweedfs/weed/filer2"
"testing"
) )
func TestCreateAndFind(t *testing.T) { func TestCreateAndFind(t *testing.T) {

6
weed/filer2/mysql/mysql_store.go
View file

@ -1,13 +1,13 @@
package mysql package mysql
import ( import (
"fmt"
"database/sql" "database/sql"
"fmt"
"github.com/chrislusf/seaweedfs/weed/filer2" "github.com/chrislusf/seaweedfs/weed/filer2"
"github.com/spf13/viper"
_ "github.com/go-sql-driver/mysql"
"github.com/chrislusf/seaweedfs/weed/filer2/abstract_sql" "github.com/chrislusf/seaweedfs/weed/filer2/abstract_sql"
_ "github.com/go-sql-driver/mysql"
"github.com/spf13/viper"
) )
const ( const (

6
weed/filer2/postgres/postgres_store.go
View file

@ -1,13 +1,13 @@
package postgres package postgres
import ( import (
"fmt"
"database/sql" "database/sql"
"fmt"
"github.com/chrislusf/seaweedfs/weed/filer2" "github.com/chrislusf/seaweedfs/weed/filer2"
"github.com/spf13/viper"
_ "github.com/lib/pq"
"github.com/chrislusf/seaweedfs/weed/filer2/abstract_sql" "github.com/chrislusf/seaweedfs/weed/filer2/abstract_sql"
_ "github.com/lib/pq"
"github.com/spf13/viper"
) )
const ( const (

2
weed/filer2/redis/redis_store.go
View file

@ -4,8 +4,8 @@ import (
"fmt" "fmt"
"github.com/chrislusf/seaweedfs/weed/filer2" "github.com/chrislusf/seaweedfs/weed/filer2"
"github.com/chrislusf/seaweedfs/weed/glog" "github.com/chrislusf/seaweedfs/weed/glog"
"github.com/spf13/viper"
"github.com/go-redis/redis" "github.com/go-redis/redis"
"github.com/spf13/viper"
"sort" "sort"
"strings" "strings"
) )

4
weed/filesys/dir.go
View file

@ -7,12 +7,12 @@ import (
"path" "path"
"sync" "sync"
"bazil.org/fuse/fs"
"bazil.org/fuse" "bazil.org/fuse"
"bazil.org/fuse/fs"
"github.com/chrislusf/seaweedfs/weed/glog" "github.com/chrislusf/seaweedfs/weed/glog"
"github.com/chrislusf/seaweedfs/weed/pb/filer_pb" "github.com/chrislusf/seaweedfs/weed/pb/filer_pb"
"time"
"path/filepath" "path/filepath"
"time"
) )
type Dir struct { type Dir struct {

6
weed/filesys/file.go
View file

@ -1,15 +1,15 @@
package filesys package filesys
import ( import (
"context"
"bazil.org/fuse" "bazil.org/fuse"
"bazil.org/fuse/fs" "bazil.org/fuse/fs"
"context"
"github.com/chrislusf/seaweedfs/weed/filer2"
"github.com/chrislusf/seaweedfs/weed/glog" "github.com/chrislusf/seaweedfs/weed/glog"
"github.com/chrislusf/seaweedfs/weed/pb/filer_pb" "github.com/chrislusf/seaweedfs/weed/pb/filer_pb"
"path/filepath"
"os" "os"
"path/filepath"
"time" "time"
"github.com/chrislusf/seaweedfs/weed/filer2"
) )
var _ = fs.Node(&File{}) var _ = fs.Node(&File{})

17
weed/filesys/filehandle.go
View file

@ -1,19 +1,19 @@
package filesys package filesys
import ( import (
"bazil.org/fuse/fs"
"fmt"
"github.com/chrislusf/seaweedfs/weed/pb/filer_pb"
"github.com/chrislusf/seaweedfs/weed/filer2"
"context"
"github.com/chrislusf/seaweedfs/weed/glog"
"bazil.org/fuse" "bazil.org/fuse"
"bazil.org/fuse/fs"
"bytes" "bytes"
"context"
"fmt"
"github.com/chrislusf/seaweedfs/weed/filer2"
"github.com/chrislusf/seaweedfs/weed/glog"
"github.com/chrislusf/seaweedfs/weed/operation" "github.com/chrislusf/seaweedfs/weed/operation"
"time" "github.com/chrislusf/seaweedfs/weed/pb/filer_pb"
"github.com/chrislusf/seaweedfs/weed/util"
"strings" "strings"
"sync" "sync"
"github.com/chrislusf/seaweedfs/weed/util" "time"
) )
type FileHandle struct { type FileHandle struct {
@ -32,6 +32,7 @@ type FileHandle struct {
} }
var _ = fs.Handle(&FileHandle{}) var _ = fs.Handle(&FileHandle{})
// var _ = fs.HandleReadAller(&FileHandle{}) // var _ = fs.HandleReadAller(&FileHandle{})
var _ = fs.HandleReader(&FileHandle{}) var _ = fs.HandleReader(&FileHandle{})
var _ = fs.HandleFlusher(&FileHandle{}) var _ = fs.HandleFlusher(&FileHandle{})

4
weed/filesys/wfs.go
View file

@ -3,9 +3,9 @@ package filesys
import ( import (
"bazil.org/fuse/fs" "bazil.org/fuse/fs"
"fmt" "fmt"
"google.golang.org/grpc"
"github.com/chrislusf/seaweedfs/weed/pb/filer_pb" "github.com/chrislusf/seaweedfs/weed/pb/filer_pb"
"github.com/karlseguin/ccache" "github.com/karlseguin/ccache"
"google.golang.org/grpc"
) )
type WFS struct { type WFS struct {
@ -15,7 +15,7 @@ type WFS struct {
func NewSeaweedFileSystem(filer string) *WFS { func NewSeaweedFileSystem(filer string) *WFS {
return &WFS{ return &WFS{
filer: filer, filer: filer,
listDirectoryEntriesCache: ccache.New(ccache.Configure().MaxSize(6000).ItemsToPrune(100)), listDirectoryEntriesCache: ccache.New(ccache.Configure().MaxSize(6000).ItemsToPrune(100)),
} }
} }

2
weed/images/favicon.go
View file

@ -181,6 +181,7 @@ type bintree struct {
Func func() (*asset, error) Func func() (*asset, error)
Children map[string]*bintree Children map[string]*bintree
} }
var _bintree = &bintree{nil, map[string]*bintree{ var _bintree = &bintree{nil, map[string]*bintree{
"favicon": &bintree{nil, map[string]*bintree{ "favicon": &bintree{nil, map[string]*bintree{
"favicon.ico": &bintree{favicon, map[string]*bintree{}}, "favicon.ico": &bintree{favicon, map[string]*bintree{}},
@ -233,4 +234,3 @@ func _filePath(dir, name string) string {
cannonicalName := strings.Replace(name, "\\", "/", -1) cannonicalName := strings.Replace(name, "\\", "/", -1)
return filepath.Join(append([]string{dir}, strings.Split(cannonicalName, "/")...)...) return filepath.Join(append([]string{dir}, strings.Split(cannonicalName, "/")...)...)
} }

8
weed/server/filer_grpc_server.go
View file

@ -1,16 +1,16 @@
package weed_server package weed_server
import ( import (
"fmt"
"context" "context"
"time" "fmt"
"os" "os"
"path/filepath" "path/filepath"
"time"
"github.com/chrislusf/seaweedfs/weed/operation"
"github.com/chrislusf/seaweedfs/weed/pb/filer_pb"
"github.com/chrislusf/seaweedfs/weed/filer2" "github.com/chrislusf/seaweedfs/weed/filer2"
"github.com/chrislusf/seaweedfs/weed/glog" "github.com/chrislusf/seaweedfs/weed/glog"
"github.com/chrislusf/seaweedfs/weed/operation"
"github.com/chrislusf/seaweedfs/weed/pb/filer_pb"
) )
func (fs *FilerServer) LookupDirectoryEntry(ctx context.Context, req *filer_pb.LookupDirectoryEntryRequest) (*filer_pb.LookupDirectoryEntryResponse, error) { func (fs *FilerServer) LookupDirectoryEntry(ctx context.Context, req *filer_pb.LookupDirectoryEntryRequest) (*filer_pb.LookupDirectoryEntryResponse, error) {

8
weed/server/filer_server.go
View file

@ -7,10 +7,6 @@ import (
"sync" "sync"
"time" "time"
"github.com/chrislusf/seaweedfs/weed/glog"
"github.com/chrislusf/seaweedfs/weed/security"
"github.com/chrislusf/seaweedfs/weed/storage"
"github.com/chrislusf/seaweedfs/weed/util"
"github.com/chrislusf/seaweedfs/weed/filer2" "github.com/chrislusf/seaweedfs/weed/filer2"
_ "github.com/chrislusf/seaweedfs/weed/filer2/cassandra" _ "github.com/chrislusf/seaweedfs/weed/filer2/cassandra"
_ "github.com/chrislusf/seaweedfs/weed/filer2/leveldb" _ "github.com/chrislusf/seaweedfs/weed/filer2/leveldb"
@ -18,6 +14,10 @@ import (
_ "github.com/chrislusf/seaweedfs/weed/filer2/mysql" _ "github.com/chrislusf/seaweedfs/weed/filer2/mysql"
_ "github.com/chrislusf/seaweedfs/weed/filer2/postgres" _ "github.com/chrislusf/seaweedfs/weed/filer2/postgres"
_ "github.com/chrislusf/seaweedfs/weed/filer2/redis" _ "github.com/chrislusf/seaweedfs/weed/filer2/redis"
"github.com/chrislusf/seaweedfs/weed/glog"
"github.com/chrislusf/seaweedfs/weed/security"
"github.com/chrislusf/seaweedfs/weed/storage"
"github.com/chrislusf/seaweedfs/weed/util"
) )
type FilerServer struct { type FilerServer struct {

4
weed/server/filer_server_handlers_admin.go
View file

@ -3,10 +3,10 @@ package weed_server
import ( import (
"net/http" "net/http"
"github.com/chrislusf/seaweedfs/weed/glog"
"github.com/chrislusf/seaweedfs/weed/filer2" "github.com/chrislusf/seaweedfs/weed/filer2"
"strconv" "github.com/chrislusf/seaweedfs/weed/glog"
"github.com/chrislusf/seaweedfs/weed/pb/filer_pb" "github.com/chrislusf/seaweedfs/weed/pb/filer_pb"
"strconv"
"time" "time"
) )

2
weed/server/filer_server_handlers_read.go
View file

@ -7,11 +7,11 @@ import (
"strconv" "strconv"
"strings" "strings"
"github.com/chrislusf/seaweedfs/weed/filer2"
"github.com/chrislusf/seaweedfs/weed/glog" "github.com/chrislusf/seaweedfs/weed/glog"
"github.com/chrislusf/seaweedfs/weed/operation" "github.com/chrislusf/seaweedfs/weed/operation"
ui "github.com/chrislusf/seaweedfs/weed/server/filer_ui" ui "github.com/chrislusf/seaweedfs/weed/server/filer_ui"
"github.com/chrislusf/seaweedfs/weed/util" "github.com/chrislusf/seaweedfs/weed/util"
"github.com/chrislusf/seaweedfs/weed/filer2"
) )
// listDirectoryHandler lists directories and folers under a directory // listDirectoryHandler lists directories and folers under a directory

5
weed/server/filer_server_handlers_write.go
View file

@ -17,13 +17,12 @@ import (
"strconv" "strconv"
"strings" "strings"
"github.com/chrislusf/seaweedfs/weed/filer" "github.com/chrislusf/seaweedfs/weed/filer2"
"github.com/chrislusf/seaweedfs/weed/glog" "github.com/chrislusf/seaweedfs/weed/glog"
"github.com/chrislusf/seaweedfs/weed/operation" "github.com/chrislusf/seaweedfs/weed/operation"
"github.com/chrislusf/seaweedfs/weed/pb/filer_pb"
"github.com/chrislusf/seaweedfs/weed/storage" "github.com/chrislusf/seaweedfs/weed/storage"
"github.com/chrislusf/seaweedfs/weed/util" "github.com/chrislusf/seaweedfs/weed/util"
"github.com/chrislusf/seaweedfs/weed/filer2"
"github.com/chrislusf/seaweedfs/weed/pb/filer_pb"
"time" "time"
) )

2
weed/server/filer_ui/breadcrumb.go
View file

@ -1,8 +1,8 @@
package master_ui package master_ui
import ( import (
"strings"
"path/filepath" "path/filepath"
"strings"
) )
type Breadcrumb struct { type Breadcrumb struct {

2
weed/server/raft_server.go
View file

@ -198,7 +198,7 @@ func postFollowingOneRedirect(target string, contentType string, b bytes.Buffer)
reply := string(data) reply := string(data)
if strings.HasPrefix(reply, "\"http") { if strings.HasPrefix(reply, "\"http") {
urlStr := reply[1: len(reply)-1] urlStr := reply[1 : len(reply)-1]
glog.V(0).Infoln("Post redirected to ", urlStr) glog.V(0).Infoln("Post redirected to ", urlStr)
resp2, err2 := http.Post(urlStr, contentType, backupReader) resp2, err2 := http.Post(urlStr, contentType, backupReader)

2
weed/server/volume_server_handlers_admin.go
View file

@ -8,8 +8,8 @@ import (
"github.com/chrislusf/seaweedfs/weed/glog" "github.com/chrislusf/seaweedfs/weed/glog"
"github.com/chrislusf/seaweedfs/weed/stats" "github.com/chrislusf/seaweedfs/weed/stats"
"github.com/chrislusf/seaweedfs/weed/util"
"github.com/chrislusf/seaweedfs/weed/storage" "github.com/chrislusf/seaweedfs/weed/storage"
"github.com/chrislusf/seaweedfs/weed/util"
) )
func (vs *VolumeServer) statusHandler(w http.ResponseWriter, r *http.Request) { func (vs *VolumeServer) statusHandler(w http.ResponseWriter, r *http.Request) {

2
weed/server/volume_server_handlers_ui.go
View file

@ -5,9 +5,9 @@ import (
"path/filepath" "path/filepath"
"time" "time"
ui "github.com/chrislusf/seaweedfs/weed/server/volume_server_ui"
"github.com/chrislusf/seaweedfs/weed/stats" "github.com/chrislusf/seaweedfs/weed/stats"
"github.com/chrislusf/seaweedfs/weed/util" "github.com/chrislusf/seaweedfs/weed/util"
ui "github.com/chrislusf/seaweedfs/weed/server/volume_server_ui"
) )
func (vs *VolumeServer) uiStatusHandler(w http.ResponseWriter, r *http.Request) { func (vs *VolumeServer) uiStatusHandler(w http.ResponseWriter, r *http.Request) {

2
weed/storage/needle_map_memory.go
View file

@ -86,7 +86,7 @@ func WalkIndexFile(r *os.File, fn func(key uint64, offset, size uint32) error) e
for count > 0 && e == nil || e == io.EOF { for count > 0 && e == nil || e == io.EOF {
for i = 0; i+16 <= count; i += 16 { for i = 0; i+16 <= count; i += 16 {
key, offset, size = idxFileEntry(bytes[i: i+16]) key, offset, size = idxFileEntry(bytes[i : i+16])
if e = fn(key, offset, size); e != nil { if e = fn(key, offset, size); e != nil {
return e return e
} }

2
weed/storage/volume_checking.go
View file

@ -12,7 +12,7 @@ func getActualSize(size uint32) int64 {
return NeedleHeaderSize + int64(size) + NeedleChecksumSize + int64(padding) return NeedleHeaderSize + int64(size) + NeedleChecksumSize + int64(padding)
} }
func CheckVolumeDataIntegrity(v *Volume, indexFile *os.File) (error) { func CheckVolumeDataIntegrity(v *Volume, indexFile *os.File) error {
var indexSize int64 var indexSize int64
var e error var e error
if indexSize, e = verifyIndexFileIntegrity(indexFile); e != nil { if indexSize, e = verifyIndexFileIntegrity(indexFile); e != nil {