aboutsummaryrefslogtreecommitdiff
path: root/weed/server/filer_server.go
diff options
context:
space:
mode:
authorChris Lu <chris.lu@gmail.com>2016-07-20 23:45:55 -0700
committerChris Lu <chris.lu@gmail.com>2016-07-20 23:45:55 -0700
commitcdae9fc680c8e7f99c0ef47dd98f674df76e5078 (patch)
tree8189bdfb1f38fce7ddc2a2ff73ab040caeb5f30a /weed/server/filer_server.go
parent40ba6d2a6f146ab730cc5409c3dbcfb71f7acab9 (diff)
downloadseaweedfs-cdae9fc680c8e7f99c0ef47dd98f674df76e5078.tar.xz
seaweedfs-cdae9fc680c8e7f99c0ef47dd98f674df76e5078.zip
add "weed copy" command to copy files to filer
Diffstat (limited to 'weed/server/filer_server.go')
-rw-r--r--weed/server/filer_server.go12
1 files changed, 9 insertions, 3 deletions
diff --git a/weed/server/filer_server.go b/weed/server/filer_server.go
index 1b54f0840..b99bbd7c9 100644
--- a/weed/server/filer_server.go
+++ b/weed/server/filer_server.go
@@ -62,6 +62,7 @@ func NewFilerServer(r *http.ServeMux, ip string, port int, master string, dir st
}
r.HandleFunc("/admin/mv", fs.moveHandler)
+ r.HandleFunc("/admin/register", fs.registerHandler)
}
r.HandleFunc("/", fs.filerHandler)
@@ -73,9 +74,14 @@ func NewFilerServer(r *http.ServeMux, ip string, port int, master string, dir st
glog.V(0).Infof("Filer server bootstraps with master %s", fs.getMasterNode())
//force initialize with all available master nodes
- _, err := fs.masterNodes.FindMaster()
- if err != nil {
- glog.Fatalf("filer server failed to get master cluster info:%s", err.Error())
+ for {
+ _, err := fs.masterNodes.FindMaster()
+ if err != nil {
+ glog.Infof("filer server failed to get master cluster info:%s", err.Error())
+ time.Sleep(3 * time.Second)
+ } else {
+ break
+ }
}
for {