Major:

change replication_type to ReplicaPlacement, hopefully cleaner code
works for 9 possible ReplicaPlacement
xyz
x : number of copies on other data centers
y : number of copies on other racks
z : number of copies on current rack
x y z each can be 0,1,2

Minor:
weed server "-mdir" default to "-dir" if empty

1 files changed, 7 insertions, 7 deletions

diff --git a/go/topology/collection.go b/go/topology/collection.go
index 0a7971424..8042369a9 100644
--- a/go/topology/collection.go
+++ b/go/topology/collection.go
@@ -13,17 +13,17 @@ type Collection struct {
 
 func NewCollection(name string, volumeSizeLimit uint64) *Collection {
 	c := &Collection{Name: name, volumeSizeLimit: volumeSizeLimit}
-	c.replicaType2VolumeLayout = make([]*VolumeLayout, storage.LengthRelicationType)
+	c.replicaType2VolumeLayout = make([]*VolumeLayout, storage.ReplicaPlacementCount)
 	return c
 }
 
-func (c *Collection) GetOrCreateVolumeLayout(repType storage.ReplicationType) *VolumeLayout {
-	replicationTypeIndex := repType.GetReplicationLevelIndex()
-	if c.replicaType2VolumeLayout[replicationTypeIndex] == nil {
-		glog.V(0).Infoln("collection", c.Name, "adding replication type", repType)
-		c.replicaType2VolumeLayout[replicationTypeIndex] = NewVolumeLayout(repType, c.volumeSizeLimit)
+func (c *Collection) GetOrCreateVolumeLayout(rp *storage.ReplicaPlacement) *VolumeLayout {
+	replicaPlacementIndex := rp.GetReplicationLevelIndex()
+	if c.replicaType2VolumeLayout[replicaPlacementIndex] == nil {
+		glog.V(0).Infoln("collection", c.Name, "adding replication type", rp)
+		c.replicaType2VolumeLayout[replicaPlacementIndex] = NewVolumeLayout(rp, c.volumeSizeLimit)
 	}
-	return c.replicaType2VolumeLayout[replicationTypeIndex]
+	return c.replicaType2VolumeLayout[replicaPlacementIndex]
 }
 
 func (c *Collection) Lookup(vid storage.VolumeId) []*DataNode {