diff options
| author | chrislu <chris.lu@gmail.com> | 2024-05-02 08:13:53 -0700 |
|---|---|---|
| committer | chrislu <chris.lu@gmail.com> | 2024-05-02 08:13:53 -0700 |
| commit | a568d128fb48e7653f6e63e3d882917b5a959643 (patch) | |
| tree | 781a4008e493027474cdb3dd357c66890f95ed2c | |
| parent | f80fb1c02eb21b706142fd6cfb1414455beb52f7 (diff) | |
| parent | ee25ada73237324f91f0d49b58da0617ae0b9b61 (diff) | |
| download | seaweedfs-a568d128fb48e7653f6e63e3d882917b5a959643.tar.xz seaweedfs-a568d128fb48e7653f6e63e3d882917b5a959643.zip | |
Merge branch 'master' into mq-subscribe
| -rw-r--r-- | weed/sequence/memory_sequencer.go | 2 | ||||
| -rw-r--r-- | weed/server/master_server.go | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/weed/sequence/memory_sequencer.go b/weed/sequence/memory_sequencer.go index e20c29cc7..6e879bd79 100644 --- a/weed/sequence/memory_sequencer.go +++ b/weed/sequence/memory_sequencer.go @@ -4,7 +4,7 @@ import ( "sync" ) -// just for testing +// default Sequencer type MemorySequencer struct { counter uint64 sequenceLock sync.Mutex diff --git a/weed/server/master_server.go b/weed/server/master_server.go index f89c9598f..580cdfed2 100644 --- a/weed/server/master_server.go +++ b/weed/server/master_server.go @@ -59,7 +59,7 @@ type MasterServer struct { preallocateSize int64 - Topo *topology.Topology + Topo *topology.Topology vg *topology.VolumeGrowth volumeGrowthRequestChan chan *topology.VolumeGrowRequest @@ -347,6 +347,8 @@ func (ms *MasterServer) createSequencer(option *MasterOption) sequence.Sequencer glog.Error(err) seq = nil } + case "raft": + fallthrough default: seq = sequence.NewMemorySequencer() } |