diff options
| author | chrislusf <chris.lu@gmail.com> | 2014-12-14 20:43:43 -0800 |
|---|---|---|
| committer | chrislusf <chris.lu@gmail.com> | 2014-12-14 20:43:43 -0800 |
| commit | 2b1369277f7b26db924a6732be1555e8fd441035 (patch) | |
| tree | 76d3cbaa6f4124c23243a68e67ad1f1d6d14c91b /go | |
| parent | e431d4121e8da8d7fc243b29b780c2cd535a4210 (diff) | |
| parent | d56c748fa889a119139c3a40528a18e8ce4123ad (diff) | |
| download | seaweedfs-2b1369277f7b26db924a6732be1555e8fd441035.tar.xz seaweedfs-2b1369277f7b26db924a6732be1555e8fd441035.zip | |
Merge pull request #33 from mcqueenorama/master
turn on filer when file.redirectOnRead
Diffstat (limited to 'go')
| -rw-r--r-- | go/weed/filer.go | 1 | ||||
| -rw-r--r-- | go/weed/server.go | 4 | ||||
| -rw-r--r-- | go/weed/weed_server/raft_server.go | 1 |
3 files changed, 6 insertions, 0 deletions
diff --git a/go/weed/filer.go b/go/weed/filer.go index 5ae3a3496..11154f183 100644 --- a/go/weed/filer.go +++ b/go/weed/filer.go @@ -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/server.go b/go/weed/server.go index 22222d699..67bbdb370 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 == "" { diff --git a/go/weed/weed_server/raft_server.go b/go/weed/weed_server/raft_server.go index 12148db49..b9aaef2b0 100644 --- a/go/weed/weed_server/raft_server.go +++ b/go/weed/weed_server/raft_server.go @@ -47,6 +47,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) // Clear old cluster configurations if peers are set if len(s.peers) > 0 { |