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

comment out etcd support due to its os specific system calls

Browse source
This commit is contained in:
Chris Lu 2013-11-19 01:43:16 -08:00
parent fa1bb3cee3
commit bd0c7a3d28
3 changed files with 14 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
go/metastore/etcd_backing.go
View file

@ -1,3 +1,5 @@
// +build ignore
package metastore
import (

12
go/sequence/sequence.go
View file

@ -34,12 +34,12 @@ func NewFileSequencer(filepath string) (m *SequencerImpl) {
return
}
func NewEtcdSequencer(etcdCluster string) (m *SequencerImpl) {
m = &SequencerImpl{fileFullPath: "/weedfs/default/sequence"}
m.metaStore = &metastore.MetaStore{metastore.NewMetaStoreEtcdBacking(etcdCluster)}
m.initilize()
return
}
//func NewEtcdSequencer(etcdCluster string) (m *SequencerImpl) {
// m = &SequencerImpl{fileFullPath: "/weedfs/default/sequence"}
// m.metaStore = &metastore.MetaStore{metastore.NewMetaStoreEtcdBacking(etcdCluster)}
// m.initilize()
// return
//}
func (m *SequencerImpl) initilize() {
if !m.metaStore.Has(m.fileFullPath) {

12
go/weed/master.go
View file

@ -45,7 +45,7 @@ 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")
//etcdCluster = cmdMaster.Flag.String("etcd", "", "comma separated etcd urls, e.g., http://localhost:4001, See github.com/coreos/go-etcd/etcd")
masterWhiteList []string
)
@ -221,11 +221,11 @@ func runMaster(cmd *Command, args []string) bool {
masterWhiteList = strings.Split(*masterWhiteListOption, ",")
}
var seq sequence.Sequencer
if len(*etcdCluster) == 0 {
seq = sequence.NewFileSequencer(path.Join(*metaFolder, "weed.seq"))
} else {
seq = sequence.NewEtcdSequencer(*etcdCluster)
}
//if len(*etcdCluster) == 0 {
seq = sequence.NewFileSequencer(path.Join(*metaFolder, "weed.seq"))
//} else {
// seq = sequence.NewEtcdSequencer(*etcdCluster)
//}
var e error
if topo, e = topology.NewTopology("topo", *confFile, seq,
uint64(*volumeSizeLimitMB)*1024*1024, *mpulse); e != nil {