diff options
Diffstat (limited to 'weed/topology')
| -rw-r--r-- | weed/topology/topology_test.go | 10 | ||||
| -rw-r--r-- | weed/topology/volume_growth.go | 2 | ||||
| -rw-r--r-- | weed/topology/volume_growth_test.go | 5 | ||||
| -rw-r--r-- | weed/topology/volume_layout.go | 2 |
4 files changed, 10 insertions, 9 deletions
diff --git a/weed/topology/topology_test.go b/weed/topology/topology_test.go index 7ac994d0e..667e941df 100644 --- a/weed/topology/topology_test.go +++ b/weed/topology/topology_test.go @@ -49,7 +49,7 @@ func TestHandlingVolumeServerHeartbeat(t *testing.T) { DeletedByteCount: 34524, ReadOnly: false, ReplicaPlacement: uint32(0), - Version: uint32(needle.CurrentVersion), + Version: uint32(needle.GetCurrentVersion()), Ttl: 0, } volumeMessages = append(volumeMessages, volumeMessage) @@ -65,7 +65,7 @@ func TestHandlingVolumeServerHeartbeat(t *testing.T) { DeletedByteCount: 34524, ReadOnly: false, ReplicaPlacement: uint32(0), - Version: uint32(needle.CurrentVersion), + Version: uint32(needle.GetCurrentVersion()), Ttl: 0, DiskType: "ssd", } @@ -94,7 +94,7 @@ func TestHandlingVolumeServerHeartbeat(t *testing.T) { DeletedByteCount: 345240, ReadOnly: false, ReplicaPlacement: uint32(0), - Version: uint32(needle.CurrentVersion), + Version: uint32(needle.GetCurrentVersion()), Ttl: 0, } volumeMessages = append(volumeMessages, volumeMessage) @@ -117,7 +117,7 @@ func TestHandlingVolumeServerHeartbeat(t *testing.T) { Id: uint32(3), Collection: "", ReplicaPlacement: uint32(0), - Version: uint32(needle.CurrentVersion), + Version: uint32(needle.GetCurrentVersion()), Ttl: 0, } topo.IncrementalSyncDataNodeRegistration( @@ -191,7 +191,7 @@ func TestAddRemoveVolume(t *testing.T) { DeleteCount: 23, DeletedByteCount: 45, ReadOnly: false, - Version: needle.CurrentVersion, + Version: needle.GetCurrentVersion(), ReplicaPlacement: &super_block.ReplicaPlacement{}, Ttl: needle.EMPTY_TTL, } diff --git a/weed/topology/volume_growth.go b/weed/topology/volume_growth.go index 8bbcd2c27..8423ed5ca 100644 --- a/weed/topology/volume_growth.go +++ b/weed/topology/volume_growth.go @@ -264,7 +264,7 @@ func (vg *VolumeGrowth) grow(grpcDialOption grpc.DialOption, topo *Topology, vid Collection: option.Collection, ReplicaPlacement: option.ReplicaPlacement, Ttl: option.Ttl, - Version: needle.CurrentVersion, + Version: needle.GetCurrentVersion(), DiskType: option.DiskType.String(), ModifiedAtSecond: time.Now().Unix(), }) diff --git a/weed/topology/volume_growth_test.go b/weed/topology/volume_growth_test.go index 49dd0957c..286289148 100644 --- a/weed/topology/volume_growth_test.go +++ b/weed/topology/volume_growth_test.go @@ -3,9 +3,10 @@ package topology import ( "encoding/json" "fmt" - "github.com/seaweedfs/seaweedfs/weed/storage/types" "testing" + "github.com/seaweedfs/seaweedfs/weed/storage/types" + "github.com/seaweedfs/seaweedfs/weed/sequence" "github.com/seaweedfs/seaweedfs/weed/storage" "github.com/seaweedfs/seaweedfs/weed/storage/needle" @@ -104,7 +105,7 @@ func setup(topologyLayout string) *Topology { vi := storage.VolumeInfo{ Id: needle.VolumeId(int64(m["id"].(float64))), Size: uint64(m["size"].(float64)), - Version: needle.CurrentVersion, + Version: needle.GetCurrentVersion(), } if mVal, ok := m["collection"]; ok { vi.Collection = mVal.(string) diff --git a/weed/topology/volume_layout.go b/weed/topology/volume_layout.go index 852798c19..7c6fd71f3 100644 --- a/weed/topology/volume_layout.go +++ b/weed/topology/volume_layout.go @@ -265,7 +265,7 @@ func (vl *VolumeLayout) isCrowdedVolume(v *storage.VolumeInfo) bool { func (vl *VolumeLayout) isWritable(v *storage.VolumeInfo) bool { return !vl.isOversized(v) && - v.Version == needle.CurrentVersion && + v.Version == needle.GetCurrentVersion() && !v.ReadOnly } |