Browse Source

Merge branch 'master' into mq-subscribe

mq-subscribe
chrislu 8 months ago
parent
commit
a568d128fb
  1. 2
      weed/sequence/memory_sequencer.go
  2. 4
      weed/server/master_server.go

2
weed/sequence/memory_sequencer.go

@ -4,7 +4,7 @@ import (
"sync" "sync"
) )
// just for testing
// default Sequencer
type MemorySequencer struct { type MemorySequencer struct {
counter uint64 counter uint64
sequenceLock sync.Mutex sequenceLock sync.Mutex

4
weed/server/master_server.go

@ -59,7 +59,7 @@ type MasterServer struct {
preallocateSize int64 preallocateSize int64
Topo *topology.Topology
Topo *topology.Topology
vg *topology.VolumeGrowth vg *topology.VolumeGrowth
volumeGrowthRequestChan chan *topology.VolumeGrowRequest volumeGrowthRequestChan chan *topology.VolumeGrowRequest
@ -347,6 +347,8 @@ func (ms *MasterServer) createSequencer(option *MasterOption) sequence.Sequencer
glog.Error(err) glog.Error(err)
seq = nil seq = nil
} }
case "raft":
fallthrough
default: default:
seq = sequence.NewMemorySequencer() seq = sequence.NewMemorySequencer()
} }

Loading…
Cancel
Save