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

Merge pull request #33 from mcqueenorama/master

Browse Source 
turn on filer when file.redirectOnRead
This commit is contained in:
chrislusf
2014-12-14 20:43:43 -08:00
parent e431d4121e d56c748fa8
commit 2b1369277f
3 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
go/weed/filer.go
View File

@@ -57,6 +57,7 @@ var cmdFiler = &Command{
} }
func runFiler(cmd *Command, args []string) bool { func runFiler(cmd *Command, args []string) bool {
if err := util.TestFolderWritable(*f.dir); err != nil { if err := util.TestFolderWritable(*f.dir); err != nil {
glog.Fatalf("Check Meta Folder (-dir) Writable %s : %s", *f.dir, err) glog.Fatalf("Check Meta Folder (-dir) Writable %s : %s", *f.dir, err)
} }

4
go/weed/server.go
View File

@@ -101,6 +101,10 @@ func runServer(cmd *Command, args []string) bool {
} }
} }
if *filerOptions.redirectOnRead {
*isStartingFiler = true
}
*filerOptions.master = *serverPublicIp + ":" + strconv.Itoa(*masterPort) *filerOptions.master = *serverPublicIp + ":" + strconv.Itoa(*masterPort)
if *filerOptions.defaultReplicaPlacement == "" { if *filerOptions.defaultReplicaPlacement == "" {

1
go/weed/weed_server/raft_server.go
View File

@@ -47,6 +47,7 @@ func NewRaftServer(r *mux.Router, peers []string, httpAddr string, dataDir strin
var err error var err error
transporter := raft.NewHTTPTransporter("/cluster", 0) transporter := raft.NewHTTPTransporter("/cluster", 0)
transporter.Transport.MaxIdleConnsPerHost = 1024 transporter.Transport.MaxIdleConnsPerHost = 1024
glog.V(1).Infof("Starting RaftServer with IP:%v:", httpAddr)
// Clear old cluster configurations if peers are set // Clear old cluster configurations if peers are set
if len(s.peers) > 0 { if len(s.peers) > 0 {