diff options
| -rw-r--r-- | go/metastore/etcd_backing.go | 2 | ||||
| -rw-r--r-- | go/sequence/sequence.go | 12 | ||||
| -rw-r--r-- | go/weed/master.go | 12 |
3 files changed, 14 insertions, 12 deletions
diff --git a/go/metastore/etcd_backing.go b/go/metastore/etcd_backing.go index d0f47e387..7d4a5aef6 100644 --- a/go/metastore/etcd_backing.go +++ b/go/metastore/etcd_backing.go @@ -1,3 +1,5 @@ +// +build ignore + package metastore import ( diff --git a/go/sequence/sequence.go b/go/sequence/sequence.go index bbc4bdf82..d86d88385 100644 --- a/go/sequence/sequence.go +++ b/go/sequence/sequence.go @@ -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) { diff --git a/go/weed/master.go b/go/weed/master.go index 3beecaaf9..4fff9c2dd 100644 --- a/go/weed/master.go +++ b/go/weed/master.go @@ -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 { |