diff options
| author | Chris Lu <chris.lu@gmail.com> | 2013-12-03 23:30:55 -0800 |
|---|---|---|
| committer | Chris Lu <chris.lu@gmail.com> | 2013-12-03 23:30:55 -0800 |
| commit | 2e2f426fe28f8e3d94d7d1dee3afde2655425741 (patch) | |
| tree | 9862c5580b88670d2505a1752a7fb62fcaced6ea /go/weed | |
| parent | 5fdb1d89cebbb2f4947a1d2b356b83f90b951239 (diff) | |
| download | seaweedfs-2e2f426fe28f8e3d94d7d1dee3afde2655425741.tar.xz seaweedfs-2e2f426fe28f8e3d94d7d1dee3afde2655425741.zip | |
clean up etcd backing for sequence persistent storage. It uses some OS
specific calls and is not OS-agnostic.
Diffstat (limited to 'go/weed')
| -rw-r--r-- | go/weed/master.go | 1 | ||||
| -rw-r--r-- | go/weed/weed_server/master_server.go | 4 |
2 files changed, 0 insertions, 5 deletions
diff --git a/go/weed/master.go b/go/weed/master.go index a1dffe5ac..55ded2869 100644 --- a/go/weed/master.go +++ b/go/weed/master.go @@ -37,7 +37,6 @@ var ( mMaxCpu = cmdMaster.Flag.Int("maxCpu", 0, "maximum number of CPUs. 0 means all available CPUs") garbageThreshold = cmdMaster.Flag.String("garbageThreshold", "0.3", "threshold to vacuum and reclaim spaces") masterWhiteListOption = cmdMaster.Flag.String("whiteList", "", "comma separated Ip addresses having write permission. No limit if empty.") - //etcdCluster = cmdMaster.Flag.String("etcd", "", "comma separated etcd urls, e.g., http://localhost:4001, See github.com/coreos/go-etcd/etcd") masterWhiteList []string ) diff --git a/go/weed/weed_server/master_server.go b/go/weed/weed_server/master_server.go index ee1181f1d..e13358105 100644 --- a/go/weed/weed_server/master_server.go +++ b/go/weed/weed_server/master_server.go @@ -40,11 +40,7 @@ func NewMasterServer(r *mux.Router, version string, port int, metaFolder string, garbageThreshold: garbageThreshold, whiteList: whiteList, } - //if len(*etcdCluster) == 0 { seq := sequence.NewFileSequencer(path.Join(metaFolder, "weed.seq")) - //} else { - // seq = sequence.NewEtcdSequencer(*etcdCluster) - //} var e error if ms.topo, e = topology.NewTopology("topo", confFile, seq, uint64(volumeSizeLimitMB)*1024*1024, pulseSeconds); e != nil { |