aboutsummaryrefslogtreecommitdiff
path: root/go/storage
diff options
context:
space:
mode:
Diffstat (limited to 'go/storage')
-rw-r--r--go/storage/cdb_map.go4
-rw-r--r--go/storage/compact_map_perf_test.go2
-rw-r--r--go/storage/replica_placement.go61
-rw-r--r--go/storage/replication_type.go123
-rw-r--r--go/storage/store.go18
-rw-r--r--go/storage/volume.go18
-rw-r--r--go/storage/volume_info.go2
7 files changed, 83 insertions, 145 deletions
diff --git a/go/storage/cdb_map.go b/go/storage/cdb_map.go
index 3e38b0bdb..0d790cc0f 100644
--- a/go/storage/cdb_map.go
+++ b/go/storage/cdb_map.go
@@ -76,8 +76,8 @@ func (m cdbMap) FileCount() int {
func (m *cdbMap) DeletedCount() int {
return m.DeletionCounter
}
-func (m *cdbMap) NextFileKey(count int) (uint64) {
- return 0
+func (m *cdbMap) NextFileKey(count int) uint64 {
+ return 0
}
func getMetric(c *cdb.Cdb, m *mapMetric) error {
diff --git a/go/storage/compact_map_perf_test.go b/go/storage/compact_map_perf_test.go
index e940310c0..37b23a59f 100644
--- a/go/storage/compact_map_perf_test.go
+++ b/go/storage/compact_map_perf_test.go
@@ -3,8 +3,8 @@ package storage
import (
"code.google.com/p/weed-fs/go/glog"
"code.google.com/p/weed-fs/go/util"
- "os"
"log"
+ "os"
"testing"
)
diff --git a/go/storage/replica_placement.go b/go/storage/replica_placement.go
new file mode 100644
index 000000000..55428749b
--- /dev/null
+++ b/go/storage/replica_placement.go
@@ -0,0 +1,61 @@
+package storage
+
+import (
+ "errors"
+ "fmt"
+)
+
+const (
+ ReplicaPlacementCount = 9
+)
+
+type ReplicaPlacement struct {
+ SameRackCount int
+ DiffRackCount int
+ DiffDataCenterCount int
+}
+
+func NewReplicaPlacementFromString(t string) (*ReplicaPlacement, error) {
+ rp := &ReplicaPlacement{}
+ for i, c := range t {
+ count := int(c - '0')
+ if 0 <= count && count <= 2 {
+ switch i {
+ case 0:
+ rp.DiffDataCenterCount = count
+ case 1:
+ rp.DiffRackCount = count
+ case 2:
+ rp.SameRackCount = count
+ }
+ } else {
+ return rp, errors.New("Unknown Replication Type:" + t)
+ }
+ }
+ return rp, nil
+}
+
+func NewReplicaPlacementFromByte(b byte) (*ReplicaPlacement, error) {
+ return NewReplicaPlacementFromString(fmt.Sprintf("%d", b))
+}
+
+func (rp *ReplicaPlacement) Byte() byte {
+ ret := rp.DiffDataCenterCount*100 + rp.DiffRackCount*10 + rp.SameRackCount
+ return byte(ret)
+}
+
+func (rp *ReplicaPlacement) String() string {
+ b := make([]byte, 3)
+ b[0] = byte(rp.DiffDataCenterCount + '0')
+ b[1] = byte(rp.DiffRackCount + '0')
+ b[2] = byte(rp.SameRackCount + '0')
+ return string(b)
+}
+
+func (rp *ReplicaPlacement) GetCopyCount() int {
+ return rp.DiffDataCenterCount + rp.DiffRackCount + rp.SameRackCount + 1
+}
+
+func (rp *ReplicaPlacement) GetReplicationLevelIndex() int {
+ return rp.DiffDataCenterCount*3 + rp.DiffRackCount*3 + rp.SameRackCount
+}
diff --git a/go/storage/replication_type.go b/go/storage/replication_type.go
deleted file mode 100644
index 0902d1016..000000000
--- a/go/storage/replication_type.go
+++ /dev/null
@@ -1,123 +0,0 @@
-package storage
-
-import (
- "errors"
-)
-
-type ReplicationType string
-
-const (
- Copy000 = ReplicationType("000") // single copy
- Copy001 = ReplicationType("001") // 2 copies, both on the same racks, and same data center
- Copy010 = ReplicationType("010") // 2 copies, both on different racks, but same data center
- Copy100 = ReplicationType("100") // 2 copies, each on different data center
- Copy110 = ReplicationType("110") // 3 copies, 2 on different racks and local data center, 1 on different data center
- Copy200 = ReplicationType("200") // 3 copies, each on dffereint data center
- LengthRelicationType = 6
- CopyNil = ReplicationType(255) // nil value
-)
-
-func NewReplicationTypeFromString(t string) (ReplicationType, error) {
- switch t {
- case "000":
- return Copy000, nil
- case "001":
- return Copy001, nil
- case "010":
- return Copy010, nil
- case "100":
- return Copy100, nil
- case "110":
- return Copy110, nil
- case "200":
- return Copy200, nil
- }
- return Copy000, errors.New("Unknown Replication Type:" + t)
-}
-func NewReplicationTypeFromByte(b byte) (ReplicationType, error) {
- switch b {
- case byte(000):
- return Copy000, nil
- case byte(001):
- return Copy001, nil
- case byte(010):
- return Copy010, nil
- case byte(100):
- return Copy100, nil
- case byte(110):
- return Copy110, nil
- case byte(200):
- return Copy200, nil
- }
- return Copy000, errors.New("Unknown Replication Type:" + string(b))
-}
-
-func (r *ReplicationType) String() string {
- switch *r {
- case Copy000:
- return "000"
- case Copy001:
- return "001"
- case Copy010:
- return "010"
- case Copy100:
- return "100"
- case Copy110:
- return "110"
- case Copy200:
- return "200"
- }
- return "000"
-}
-func (r *ReplicationType) Byte() byte {
- switch *r {
- case Copy000:
- return byte(000)
- case Copy001:
- return byte(001)
- case Copy010:
- return byte(010)
- case Copy100:
- return byte(100)
- case Copy110:
- return byte(110)
- case Copy200:
- return byte(200)
- }
- return byte(000)
-}
-
-func (repType ReplicationType) GetReplicationLevelIndex() int {
- switch repType {
- case Copy000:
- return 0
- case Copy001:
- return 1
- case Copy010:
- return 2
- case Copy100:
- return 3
- case Copy110:
- return 4
- case Copy200:
- return 5
- }
- return -1
-}
-func (repType ReplicationType) GetCopyCount() int {
- switch repType {
- case Copy000:
- return 1
- case Copy001:
- return 2
- case Copy010:
- return 2
- case Copy100:
- return 2
- case Copy110:
- return 3
- case Copy200:
- return 3
- }
- return 0
-}
diff --git a/go/storage/store.go b/go/storage/store.go
index 52e78d27d..2df0e6cb7 100644
--- a/go/storage/store.go
+++ b/go/storage/store.go
@@ -79,8 +79,8 @@ func NewStore(port int, ip, publicUrl string, dirnames []string, maxVolumeCounts
}
return
}
-func (s *Store) AddVolume(volumeListString string, collection string, replicationType string) error {
- rt, e := NewReplicationTypeFromString(replicationType)
+func (s *Store) AddVolume(volumeListString string, collection string, replicaPlacement string) error {
+ rt, e := NewReplicaPlacementFromString(replicaPlacement)
if e != nil {
return e
}
@@ -130,13 +130,13 @@ func (s *Store) findFreeLocation() (ret *DiskLocation) {
}
return ret
}
-func (s *Store) addVolume(vid VolumeId, collection string, replicationType ReplicationType) error {
+func (s *Store) addVolume(vid VolumeId, collection string, replicaPlacement *ReplicaPlacement) error {
if s.findVolume(vid) != nil {
return fmt.Errorf("Volume Id %s already exists!", vid)
}
if location := s.findFreeLocation(); location != nil {
- glog.V(0).Infoln("In dir", location.directory, "adds volume =", vid, ", collection =", collection, ", replicationType =", replicationType)
- if volume, err := NewVolume(location.directory, collection, vid, replicationType); err == nil {
+ glog.V(0).Infoln("In dir", location.directory, "adds volume =", vid, ", collection =", collection, ", replicaPlacement =", replicaPlacement)
+ if volume, err := NewVolume(location.directory, collection, vid, replicaPlacement); err == nil {
location.volumes[vid] = volume
return nil
} else {
@@ -206,9 +206,9 @@ func (l *DiskLocation) loadExistingVolumes() {
}
if vid, err := NewVolumeId(base); err == nil {
if l.volumes[vid] == nil {
- if v, e := NewVolume(l.directory, collection, vid, CopyNil); e == nil {
+ if v, e := NewVolume(l.directory, collection, vid, nil); e == nil {
l.volumes[vid] = v
- glog.V(0).Infoln("data file", l.directory+"/"+name, "replicationType =", v.ReplicaType, "version =", v.Version(), "size =", v.Size())
+ glog.V(0).Infoln("data file", l.directory+"/"+name, "replicaPlacement =", v.ReplicaPlacement, "version =", v.Version(), "size =", v.Size())
}
}
}
@@ -223,7 +223,7 @@ func (s *Store) Status() []*VolumeInfo {
for k, v := range location.volumes {
s := &VolumeInfo{Id: VolumeId(k), Size: v.ContentSize(),
Collection: v.Collection,
- RepType: v.ReplicaType,
+ ReplicaPlacement: v.ReplicaPlacement,
Version: v.Version(),
FileCount: v.nm.FileCount(),
DeleteCount: v.nm.DeletedCount(),
@@ -261,7 +261,7 @@ func (s *Store) Join() error {
for k, v := range location.volumes {
s := &VolumeInfo{Id: VolumeId(k), Size: uint64(v.Size()),
Collection: v.Collection,
- RepType: v.ReplicaType,
+ ReplicaPlacement: v.ReplicaPlacement,
Version: v.Version(),
FileCount: v.nm.FileCount(),
DeleteCount: v.nm.DeletedCount(),
diff --git a/go/storage/volume.go b/go/storage/volume.go
index a8d8f9a58..59c3055e3 100644
--- a/go/storage/volume.go
+++ b/go/storage/volume.go
@@ -17,14 +17,14 @@ const (
)
type SuperBlock struct {
- Version Version
- ReplicaType ReplicationType
+ Version Version
+ ReplicaPlacement *ReplicaPlacement
}
func (s *SuperBlock) Bytes() []byte {
header := make([]byte, SuperBlockSize)
header[0] = byte(s.Version)
- header[1] = s.ReplicaType.Byte()
+ header[1] = s.ReplicaPlacement.Byte()
return header
}
@@ -41,15 +41,15 @@ type Volume struct {
accessLock sync.Mutex
}
-func NewVolume(dirname string, collection string, id VolumeId, replicationType ReplicationType) (v *Volume, e error) {
+func NewVolume(dirname string, collection string, id VolumeId, replicaPlacement *ReplicaPlacement) (v *Volume, e error) {
v = &Volume{dir: dirname, Collection: collection, Id: id}
- v.SuperBlock = SuperBlock{ReplicaType: replicationType}
+ v.SuperBlock = SuperBlock{ReplicaPlacement: replicaPlacement}
e = v.load(true, true)
return
}
func loadVolumeWithoutIndex(dirname string, collection string, id VolumeId) (v *Volume, e error) {
v = &Volume{dir: dirname, Collection: collection, Id: id}
- v.SuperBlock = SuperBlock{ReplicaType: CopyNil}
+ v.SuperBlock = SuperBlock{}
e = v.load(false, false)
return
}
@@ -90,7 +90,7 @@ func (v *Volume) load(alsoLoadIndex bool, createDatIfMissing bool) error {
}
}
- if v.ReplicaType == CopyNil {
+ if v.ReplicaPlacement == nil {
e = v.readSuperBlock()
} else {
e = v.maybeWriteSuperBlock()
@@ -173,13 +173,13 @@ func (v *Volume) readSuperBlock() (err error) {
}
func ParseSuperBlock(header []byte) (superBlock SuperBlock, err error) {
superBlock.Version = Version(header[0])
- if superBlock.ReplicaType, err = NewReplicationTypeFromByte(header[1]); err != nil {
+ if superBlock.ReplicaPlacement, err = NewReplicaPlacementFromByte(header[1]); err != nil {
err = fmt.Errorf("cannot read replica type: %s", err.Error())
}
return
}
func (v *Volume) NeedToReplicate() bool {
- return v.ReplicaType.GetCopyCount() > 1
+ return v.ReplicaPlacement.GetCopyCount() > 1
}
func (v *Volume) isFileUnchanged(n *Needle) bool {
diff --git a/go/storage/volume_info.go b/go/storage/volume_info.go
index c8eb7612e..1dfb3dcae 100644
--- a/go/storage/volume_info.go
+++ b/go/storage/volume_info.go
@@ -5,7 +5,7 @@ import ()
type VolumeInfo struct {
Id VolumeId
Size uint64
- RepType ReplicationType
+ ReplicaPlacement *ReplicaPlacement
Collection string
Version Version
FileCount int
generated by cgit v1.2.3 (git 2.25.1) at 2025-12-21 17:28:00 +0000