Merge pull request #37 from chrislusf/master

sync

1 files changed, 36 insertions, 0 deletions

diff --git a/weed/operation/assign_file_id.go b/weed/operation/assign_file_id.go
index 893bf516c..16ad04476 100644
--- a/weed/operation/assign_file_id.go
+++ b/weed/operation/assign_file_id.go
@@ -5,6 +5,7 @@ import (
 	"fmt"
 	"strings"
 
+	"github.com/chrislusf/seaweedfs/weed/storage/needle"
 	"google.golang.org/grpc"
 
 	"github.com/chrislusf/seaweedfs/weed/pb/master_pb"
@@ -101,3 +102,38 @@ func LookupJwt(master string, fileId string) security.EncodedJwt {
 
 	return security.EncodedJwt(tokenStr)
 }
+
+type StorageOption struct {
+	Replication string
+	Collection  string
+	DataCenter  string
+	Rack        string
+	TtlSeconds  int32
+	Fsync       bool
+}
+
+func (so *StorageOption) TtlString() string {
+	return needle.SecondsToTTL(so.TtlSeconds)
+}
+
+func (so *StorageOption) ToAssignRequests(count int) (ar *VolumeAssignRequest, altRequest *VolumeAssignRequest) {
+	ar = &VolumeAssignRequest{
+		Count:       uint64(count),
+		Replication: so.Replication,
+		Collection:  so.Collection,
+		Ttl:         so.TtlString(),
+		DataCenter:  so.DataCenter,
+		Rack:        so.Rack,
+	}
+	if so.DataCenter != "" || so.Rack != "" {
+		altRequest = &VolumeAssignRequest{
+			Count:       uint64(count),
+			Replication: so.Replication,
+			Collection:  so.Collection,
+			Ttl:         so.TtlString(),
+			DataCenter:  "",
+			Rack:        "",
+		}
+	}
+	return
+}