aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Lu <chris.lu@gmail.com>2018-06-11 23:13:33 -0700
committerChris Lu <chris.lu@gmail.com>2018-06-11 23:13:33 -0700
commit5bd72696ac1d602d67c5313e3a7b1848d290f712 (patch)
tree13209e17bd989cfb90de00cad464ad7d7e47a669
parent98110c16970a1c231a5cc04e0eb85ec48d649e14 (diff)
downloadseaweedfs-5bd72696ac1d602d67c5313e3a7b1848d290f712.tar.xz
seaweedfs-5bd72696ac1d602d67c5313e3a7b1848d290f712.zip
weed mount add ttl option
-rw-r--r--weed/command/mount.go2
-rw-r--r--weed/command/mount_std.go3
-rw-r--r--weed/filesys/dir.go14
-rw-r--r--weed/filesys/dirty_page.go1
-rw-r--r--weed/filesys/wfs.go4
-rw-r--r--weed/pb/filer.proto1
-rw-r--r--weed/pb/filer_pb/filer.pb.go130
-rw-r--r--weed/server/filer_grpc_server.go7
8 files changed, 94 insertions, 68 deletions
diff --git a/weed/command/mount.go b/weed/command/mount.go
index df215674f..a4ee03ac5 100644
--- a/weed/command/mount.go
+++ b/weed/command/mount.go
@@ -6,6 +6,7 @@ type MountOptions struct {
dir *string
collection *string
replication *string
+ ttlSec *int
chunkSizeLimitMB *int
}
@@ -20,6 +21,7 @@ func init() {
mountOptions.dir = cmdMount.Flag.String("dir", ".", "mount weed filer to this directory")
mountOptions.collection = cmdMount.Flag.String("collection", "", "collection to create the files")
mountOptions.replication = cmdMount.Flag.String("replication", "000", "replication to create to files")
+ mountOptions.ttlSec = cmdMount.Flag.Int("ttl", 0, "file ttl in seconds")
mountOptions.chunkSizeLimitMB = cmdMount.Flag.Int("chunkSizeLimitMB", 16, "local write buffer size, also chunk large files")
}
diff --git a/weed/command/mount_std.go b/weed/command/mount_std.go
index f64dccb54..f2ec349bc 100644
--- a/weed/command/mount_std.go
+++ b/weed/command/mount_std.go
@@ -73,7 +73,8 @@ func runMount(cmd *Command, args []string) bool {
filerAddress := fmt.Sprintf("%s:%d", hostnameAndPort[0], filerGrpcPort)
err = fs.Serve(c, filesys.NewSeaweedFileSystem(
- filerAddress, *mountOptions.collection, *mountOptions.replication, *mountOptions.chunkSizeLimitMB))
+ filerAddress, *mountOptions.collection, *mountOptions.replication, int32(*mountOptions.ttlSec),
+ *mountOptions.chunkSizeLimitMB))
if err != nil {
fuse.Unmount(*mountOptions.dir)
}
diff --git a/weed/filesys/dir.go b/weed/filesys/dir.go
index b6379c7dc..b48226979 100644
--- a/weed/filesys/dir.go
+++ b/weed/filesys/dir.go
@@ -10,6 +10,7 @@ import (
"github.com/chrislusf/seaweedfs/weed/pb/filer_pb"
"path/filepath"
"time"
+ "github.com/chrislusf/seaweedfs/weed/filer2"
)
type Dir struct {
@@ -110,11 +111,14 @@ func (dir *Dir) Create(ctx context.Context, req *fuse.CreateRequest,
Name: req.Name,
IsDirectory: req.Mode&os.ModeDir > 0,
Attributes: &filer_pb.FuseAttributes{
- Mtime: time.Now().Unix(),
- Crtime: time.Now().Unix(),
- FileMode: uint32(req.Mode),
- Uid: req.Uid,
- Gid: req.Gid,
+ Mtime: time.Now().Unix(),
+ Crtime: time.Now().Unix(),
+ FileMode: uint32(req.Mode),
+ Uid: req.Uid,
+ Gid: req.Gid,
+ Collection: dir.wfs.collection,
+ Replication: dir.wfs.replication,
+ TtlSec: dir.wfs.ttlSec,
},
},
}
diff --git a/weed/filesys/dirty_page.go b/weed/filesys/dirty_page.go
index ca8c29b7a..172262c98 100644
--- a/weed/filesys/dirty_page.go
+++ b/weed/filesys/dirty_page.go
@@ -121,6 +121,7 @@ func (pages *ContinuousDirtyPages) saveToStorage(ctx context.Context, buf []byte
Count: 1,
Replication: pages.f.wfs.replication,
Collection: pages.f.wfs.collection,
+ TtlSec: pages.f.wfs.ttlSec,
}
resp, err := client.AssignVolume(ctx, request)
diff --git a/weed/filesys/wfs.go b/weed/filesys/wfs.go
index 18a7da23f..a126bf3ea 100644
--- a/weed/filesys/wfs.go
+++ b/weed/filesys/wfs.go
@@ -16,6 +16,7 @@ type WFS struct {
listDirectoryEntriesCache *ccache.Cache
collection string
replication string
+ ttlSec int32
chunkSizeLimit int64
// contains all open handles
@@ -24,12 +25,13 @@ type WFS struct {
pathToHandleLock sync.Mutex
}
-func NewSeaweedFileSystem(filerGrpcAddress string, collection string, replication string, chunkSizeLimitMB int) *WFS {
+func NewSeaweedFileSystem(filerGrpcAddress string, collection string, replication string, ttlSec int32, chunkSizeLimitMB int) *WFS {
return &WFS{
filerGrpcAddress: filerGrpcAddress,
listDirectoryEntriesCache: ccache.New(ccache.Configure().MaxSize(6000).ItemsToPrune(100)),
collection: collection,
replication: replication,
+ ttlSec: ttlSec,
chunkSizeLimit: int64(chunkSizeLimitMB) * 1024 * 1024,
pathToHandleIndex: make(map[string]int),
}
diff --git a/weed/pb/filer.proto b/weed/pb/filer.proto
index d4329e5c7..684782cfe 100644
--- a/weed/pb/filer.proto
+++ b/weed/pb/filer.proto
@@ -126,6 +126,7 @@ message AssignVolumeRequest {
int32 count = 1;
string collection = 2;
string replication = 3;
+ int32 ttl_sec = 4;
}
message AssignVolumeResponse {
diff --git a/weed/pb/filer_pb/filer.pb.go b/weed/pb/filer_pb/filer.pb.go
index 2eac69c4d..2675ab6a0 100644
--- a/weed/pb/filer_pb/filer.pb.go
+++ b/weed/pb/filer_pb/filer.pb.go
@@ -499,6 +499,7 @@ type AssignVolumeRequest struct {
Count int32 `protobuf:"varint,1,opt,name=count" json:"count,omitempty"`
Collection string `protobuf:"bytes,2,opt,name=collection" json:"collection,omitempty"`
Replication string `protobuf:"bytes,3,opt,name=replication" json:"replication,omitempty"`
+ TtlSec int32 `protobuf:"varint,4,opt,name=ttl_sec,json=ttlSec" json:"ttl_sec,omitempty"`
}
func (m *AssignVolumeRequest) Reset() { *m = AssignVolumeRequest{} }
@@ -527,6 +528,13 @@ func (m *AssignVolumeRequest) GetReplication() string {
return ""
}
+func (m *AssignVolumeRequest) GetTtlSec() int32 {
+ if m != nil {
+ return m.TtlSec
+ }
+ return 0
+}
+
type AssignVolumeResponse struct {
FileId string `protobuf:"bytes,1,opt,name=file_id,json=fileId" json:"file_id,omitempty"`
Url string `protobuf:"bytes,2,opt,name=url" json:"url,omitempty"`
@@ -971,66 +979,66 @@ var _SeaweedFiler_serviceDesc = grpc.ServiceDesc{
func init() { proto.RegisterFile("filer.proto", fileDescriptor0) }
var fileDescriptor0 = []byte{
- // 964 bytes of a gzipped FileDescriptorProto
+ // 971 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xb4, 0x56, 0xdd, 0x6e, 0xdc, 0x44,
- 0x14, 0x8e, 0xd7, 0xd9, 0xcd, 0xfa, 0xec, 0xa6, 0xc0, 0x6c, 0x5a, 0xcc, 0x36, 0xa9, 0x96, 0xa1,
- 0x45, 0xa9, 0x90, 0xa2, 0x28, 0x70, 0x51, 0x81, 0x90, 0xa8, 0x9a, 0x52, 0x55, 0x4a, 0x55, 0xc9,
- 0x21, 0x48, 0x5c, 0xad, 0x1c, 0xfb, 0x64, 0x19, 0xc5, 0x6b, 0x1b, 0xcf, 0x38, 0x28, 0xdc, 0x72,
- 0xc9, 0x05, 0x4f, 0xc1, 0x1b, 0xf0, 0x06, 0xbc, 0x18, 0x9a, 0x1f, 0x7b, 0xc7, 0x6b, 0x6f, 0x7f,
- 0x2e, 0x7a, 0x37, 0x73, 0x7e, 0xbe, 0xf3, 0x1d, 0xfb, 0x9c, 0xcf, 0x86, 0xd1, 0x15, 0x4b, 0xb0,
- 0x38, 0xca, 0x8b, 0x4c, 0x64, 0x64, 0xa8, 0x2e, 0xf3, 0xfc, 0x92, 0xbe, 0x86, 0xfb, 0x67, 0x59,
- 0x76, 0x5d, 0xe6, 0xa7, 0xac, 0xc0, 0x48, 0x64, 0xc5, 0xed, 0xf3, 0x54, 0x14, 0xb7, 0x01, 0xfe,
- 0x56, 0x22, 0x17, 0x64, 0x1f, 0xbc, 0xb8, 0x72, 0xf8, 0xce, 0xcc, 0x39, 0xf4, 0x82, 0x95, 0x81,
- 0x10, 0xd8, 0x4e, 0xc3, 0x25, 0xfa, 0x3d, 0xe5, 0x50, 0x67, 0xfa, 0x1c, 0xf6, 0xbb, 0x01, 0x79,
- 0x9e, 0xa5, 0x1c, 0xc9, 0x23, 0xe8, 0xa3, 0x34, 0x28, 0xb4, 0xd1, 0xc9, 0x47, 0x47, 0x15, 0x95,
- 0x23, 0x1d, 0xa7, 0xbd, 0xf4, 0x04, 0xc8, 0x19, 0xe3, 0x42, 0xda, 0x18, 0xf2, 0x77, 0xa2, 0x43,
- 0x7f, 0x80, 0x49, 0x23, 0xc7, 0x54, 0x7c, 0x0c, 0x3b, 0xa8, 0x4d, 0xbe, 0x33, 0x73, 0xbb, 0x6a,
- 0x56, 0x7e, 0xfa, 0x8f, 0x03, 0x7d, 0x65, 0xaa, 0x5b, 0x73, 0x56, 0xad, 0x91, 0xcf, 0x61, 0xcc,
- 0xf8, 0x7c, 0x45, 0x40, 0xb6, 0x3d, 0x0c, 0x46, 0x8c, 0xd7, 0xad, 0x92, 0xaf, 0x60, 0x10, 0xfd,
- 0x5a, 0xa6, 0xd7, 0xdc, 0x77, 0x55, 0xa9, 0xc9, 0xaa, 0xd4, 0x8f, 0x2c, 0xc1, 0x67, 0xd2, 0x17,
- 0x98, 0x10, 0xf2, 0x04, 0x20, 0x14, 0xa2, 0x60, 0x97, 0xa5, 0x40, 0xee, 0x6f, 0xab, 0xe7, 0xe1,
- 0x5b, 0x09, 0x25, 0xc7, 0xa7, 0xb5, 0x3f, 0xb0, 0x62, 0xe9, 0x15, 0x78, 0x35, 0x1c, 0xf9, 0x14,
- 0x76, 0x64, 0xce, 0x9c, 0xc5, 0x86, 0xed, 0x40, 0x5e, 0x5f, 0xc6, 0xe4, 0x1e, 0x0c, 0xb2, 0xab,
- 0x2b, 0x8e, 0x42, 0x31, 0x75, 0x03, 0x73, 0x93, 0xbd, 0x71, 0xf6, 0x07, 0xfa, 0xee, 0xcc, 0x39,
- 0xdc, 0x0e, 0xd4, 0x99, 0xec, 0x41, 0x7f, 0x29, 0xd8, 0x12, 0x15, 0x0d, 0x37, 0xd0, 0x17, 0xfa,
- 0x57, 0x0f, 0xee, 0x34, 0x69, 0x90, 0xfb, 0xe0, 0xa9, 0x6a, 0x0a, 0xc1, 0x51, 0x08, 0x6a, 0x9a,
- 0xce, 0x1b, 0x28, 0x3d, 0x0b, 0xa5, 0x4e, 0x59, 0x66, 0xb1, 0x2e, 0xba, 0xab, 0x53, 0x5e, 0x65,
- 0x31, 0x92, 0x8f, 0xc1, 0x2d, 0x59, 0xac, 0xca, 0xee, 0x06, 0xf2, 0x28, 0x2d, 0x0b, 0x16, 0xfb,
- 0x7d, 0x6d, 0x59, 0x30, 0xd5, 0x48, 0x54, 0x28, 0xdc, 0x81, 0x6e, 0x44, 0xdf, 0x64, 0x23, 0x4b,
- 0x69, 0xdd, 0xd1, 0x2f, 0x49, 0x9e, 0xc9, 0x0c, 0x46, 0x05, 0xe6, 0x09, 0x8b, 0x42, 0xc1, 0xb2,
- 0xd4, 0x1f, 0x2a, 0x97, 0x6d, 0x22, 0x0f, 0x00, 0xa2, 0x2c, 0x49, 0x30, 0x52, 0x01, 0x9e, 0x0a,
- 0xb0, 0x2c, 0xf2, 0x79, 0x0a, 0x91, 0xcc, 0x39, 0x46, 0x3e, 0xcc, 0x9c, 0xc3, 0x7e, 0x30, 0x10,
- 0x22, 0x39, 0xc7, 0x88, 0x2e, 0xe0, 0xb3, 0x17, 0xa8, 0xc6, 0xeb, 0xd6, 0x7a, 0x2f, 0x66, 0x34,
- 0xbb, 0x06, 0xe6, 0x00, 0x20, 0x0f, 0x0b, 0x4c, 0x85, 0x1c, 0x1a, 0xb3, 0x25, 0x9e, 0xb6, 0x9c,
- 0xb2, 0xc2, 0x7e, 0x71, 0xae, 0xfd, 0xe2, 0xe8, 0x9f, 0x0e, 0x4c, 0xbb, 0x2a, 0x99, 0x81, 0x6e,
- 0xce, 0x8d, 0xf3, 0xee, 0x73, 0x63, 0x8d, 0x67, 0xef, 0xad, 0xe3, 0x49, 0x8f, 0xe1, 0xee, 0x0b,
- 0x14, 0xca, 0x9e, 0xa5, 0x02, 0x53, 0x51, 0xb5, 0xba, 0x69, 0xe0, 0xe8, 0x09, 0xdc, 0x5b, 0xcf,
- 0x30, 0x94, 0x7d, 0xd8, 0x89, 0xb4, 0x49, 0xa5, 0x8c, 0x83, 0xea, 0x4a, 0x7f, 0x01, 0xf2, 0xac,
- 0xc0, 0x50, 0xe0, 0x7b, 0xe8, 0x4e, 0xad, 0x21, 0xbd, 0x37, 0x6a, 0xc8, 0x5d, 0x98, 0x34, 0xa0,
- 0x35, 0x17, 0x59, 0xf1, 0x22, 0x8f, 0x3f, 0x54, 0xc5, 0x06, 0xb4, 0xa9, 0xf8, 0xb7, 0x03, 0xe4,
- 0x14, 0x13, 0x7c, 0xaf, 0x92, 0x1d, 0xe2, 0xda, 0x52, 0x20, 0xb7, 0xad, 0x40, 0x0f, 0xe1, 0x8e,
- 0x0c, 0x51, 0xd5, 0xe6, 0x71, 0x28, 0x42, 0xb5, 0x5a, 0xc3, 0x60, 0xcc, 0xb8, 0xa6, 0x70, 0x1a,
- 0x8a, 0x50, 0x12, 0x6d, 0x10, 0x32, 0x44, 0x97, 0x30, 0x79, 0xca, 0x39, 0x5b, 0xa4, 0x3f, 0x67,
- 0x49, 0xb9, 0xc4, 0x8a, 0xe8, 0x1e, 0xf4, 0xa3, 0xac, 0x34, 0xef, 0xae, 0x1f, 0xe8, 0xcb, 0xda,
- 0x1e, 0xf5, 0x5a, 0x7b, 0xb4, 0xb6, 0x89, 0x6e, 0x6b, 0x13, 0xe9, 0x0d, 0xec, 0x35, 0xcb, 0x99,
- 0x69, 0xd9, 0xa8, 0x68, 0x52, 0x2c, 0x8a, 0xc4, 0xd4, 0x92, 0x47, 0xb5, 0x62, 0xe5, 0x65, 0xc2,
- 0xa2, 0xb9, 0x74, 0xb8, 0x66, 0xc5, 0x94, 0xe5, 0xa2, 0x48, 0x56, 0xcc, 0xb7, 0x2d, 0xe6, 0xf4,
- 0x1b, 0x98, 0xe8, 0x6f, 0x54, 0xb3, 0xcd, 0x03, 0x80, 0x1b, 0x65, 0x98, 0xb3, 0x58, 0x7f, 0x2b,
- 0xbc, 0xc0, 0xd3, 0x96, 0x97, 0x31, 0xa7, 0xdf, 0x83, 0x77, 0x96, 0x69, 0xe6, 0x9c, 0x1c, 0x83,
- 0x97, 0x54, 0x17, 0xf3, 0x59, 0x21, 0xab, 0xa1, 0xa8, 0xe2, 0x82, 0x55, 0x10, 0xfd, 0x0e, 0x86,
- 0x95, 0xb9, 0xea, 0xc3, 0xd9, 0xd4, 0x47, 0x6f, 0xad, 0x0f, 0xfa, 0x9f, 0x03, 0x7b, 0x4d, 0xca,
- 0xe6, 0x51, 0x5d, 0xc0, 0x6e, 0x5d, 0x62, 0xbe, 0x0c, 0x73, 0xc3, 0xe5, 0xd8, 0xe6, 0xd2, 0x4e,
- 0xab, 0x09, 0xf2, 0x57, 0x61, 0xae, 0x47, 0x60, 0x9c, 0x58, 0xa6, 0xe9, 0x4f, 0xf0, 0x49, 0x2b,
- 0x44, 0xb2, 0xbe, 0xc6, 0x6a, 0x52, 0xe5, 0x91, 0x3c, 0x86, 0xfe, 0x4d, 0x98, 0x94, 0x68, 0xd6,
- 0x62, 0xd2, 0x7e, 0x02, 0x3c, 0xd0, 0x11, 0xdf, 0xf6, 0x9e, 0x38, 0x27, 0xff, 0xf6, 0x61, 0x7c,
- 0x8e, 0xe1, 0xef, 0x88, 0xb1, 0x14, 0x89, 0x82, 0x2c, 0xaa, 0xae, 0x9a, 0x3f, 0x0b, 0xe4, 0xd1,
- 0x3a, 0xfd, 0xce, 0xbf, 0x93, 0xe9, 0x97, 0x6f, 0x0b, 0x33, 0x63, 0xbd, 0x45, 0xce, 0x60, 0x64,
- 0xfd, 0x1a, 0x90, 0x7d, 0x2b, 0xb1, 0xf5, 0x97, 0x31, 0x3d, 0xd8, 0xe0, 0xad, 0xd1, 0x42, 0x20,
- 0x6d, 0x79, 0x26, 0x5f, 0xac, 0xd2, 0x36, 0x7e, 0x26, 0xa6, 0x0f, 0xdf, 0x1c, 0x64, 0x13, 0xb6,
- 0xb4, 0xcb, 0x26, 0xdc, 0x56, 0x4b, 0x9b, 0x70, 0x97, 0xe0, 0x29, 0x34, 0x4b, 0x97, 0x6c, 0xb4,
- 0xb6, 0x12, 0xda, 0x68, 0x5d, 0x62, 0xa6, 0xd0, 0x2c, 0xf1, 0xb0, 0xd1, 0xda, 0x22, 0x67, 0xa3,
- 0x75, 0x29, 0xce, 0x16, 0x79, 0x0d, 0x63, 0x5b, 0x04, 0x88, 0x95, 0xd0, 0xa1, 0x45, 0xd3, 0x07,
- 0x9b, 0xdc, 0x36, 0xa0, 0x3d, 0xf3, 0x36, 0x60, 0xc7, 0xd6, 0xdb, 0x80, 0x5d, 0xab, 0x42, 0xb7,
- 0x2e, 0x07, 0xea, 0xa7, 0xf9, 0xeb, 0xff, 0x03, 0x00, 0x00, 0xff, 0xff, 0x63, 0x17, 0x06, 0x1b,
- 0x43, 0x0b, 0x00, 0x00,
+ 0x14, 0x8e, 0xd7, 0xeb, 0xcd, 0xfa, 0xec, 0xa6, 0xc0, 0x6c, 0x5a, 0xcc, 0x36, 0xa9, 0x16, 0xd3,
+ 0xa2, 0x54, 0x48, 0x51, 0x14, 0xb8, 0xa8, 0x40, 0x48, 0x54, 0x4d, 0xa9, 0x2a, 0xa5, 0xaa, 0xe4,
+ 0x10, 0x24, 0xae, 0x56, 0x8e, 0x7d, 0x76, 0x19, 0xc5, 0x6b, 0x1b, 0xcf, 0x38, 0x28, 0xdc, 0x22,
+ 0x71, 0xc3, 0x05, 0x4f, 0xc1, 0x1b, 0xf0, 0x06, 0xbc, 0x18, 0x9a, 0x1f, 0x7b, 0xc7, 0x6b, 0x6f,
+ 0x7f, 0x2e, 0xb8, 0x9b, 0x39, 0x3f, 0xdf, 0xf9, 0x8e, 0x7d, 0xce, 0x67, 0xc3, 0x68, 0x41, 0x13,
+ 0x2c, 0x8e, 0xf3, 0x22, 0xe3, 0x19, 0x19, 0xca, 0xcb, 0x3c, 0xbf, 0xf2, 0x5f, 0xc3, 0xfd, 0xf3,
+ 0x2c, 0xbb, 0x2e, 0xf3, 0x33, 0x5a, 0x60, 0xc4, 0xb3, 0xe2, 0xf6, 0x79, 0xca, 0x8b, 0xdb, 0x00,
+ 0x7f, 0x29, 0x91, 0x71, 0x72, 0x00, 0x6e, 0x5c, 0x39, 0x3c, 0x6b, 0x66, 0x1d, 0xb9, 0xc1, 0xda,
+ 0x40, 0x08, 0xf4, 0xd3, 0x70, 0x85, 0x5e, 0x4f, 0x3a, 0xe4, 0xd9, 0x7f, 0x0e, 0x07, 0xdd, 0x80,
+ 0x2c, 0xcf, 0x52, 0x86, 0xe4, 0x11, 0x38, 0x28, 0x0c, 0x12, 0x6d, 0x74, 0xfa, 0xc1, 0x71, 0x45,
+ 0xe5, 0x58, 0xc5, 0x29, 0xaf, 0x7f, 0x0a, 0xe4, 0x9c, 0x32, 0x2e, 0x6c, 0x14, 0xd9, 0x3b, 0xd1,
+ 0xf1, 0xbf, 0x83, 0x49, 0x23, 0x47, 0x57, 0x7c, 0x0c, 0xbb, 0xa8, 0x4c, 0x9e, 0x35, 0xb3, 0xbb,
+ 0x6a, 0x56, 0x7e, 0xff, 0x6f, 0x0b, 0x1c, 0x69, 0xaa, 0x5b, 0xb3, 0xd6, 0xad, 0x91, 0x4f, 0x61,
+ 0x4c, 0xd9, 0x7c, 0x4d, 0x40, 0xb4, 0x3d, 0x0c, 0x46, 0x94, 0xd5, 0xad, 0x92, 0x2f, 0x60, 0x10,
+ 0xfd, 0x5c, 0xa6, 0xd7, 0xcc, 0xb3, 0x65, 0xa9, 0xc9, 0xba, 0xd4, 0xf7, 0x34, 0xc1, 0x67, 0xc2,
+ 0x17, 0xe8, 0x10, 0xf2, 0x04, 0x20, 0xe4, 0xbc, 0xa0, 0x57, 0x25, 0x47, 0xe6, 0xf5, 0xe5, 0xf3,
+ 0xf0, 0x8c, 0x84, 0x92, 0xe1, 0xd3, 0xda, 0x1f, 0x18, 0xb1, 0xfe, 0x02, 0xdc, 0x1a, 0x8e, 0x7c,
+ 0x0c, 0xbb, 0x22, 0x67, 0x4e, 0x63, 0xcd, 0x76, 0x20, 0xae, 0x2f, 0x63, 0x72, 0x0f, 0x06, 0xd9,
+ 0x62, 0xc1, 0x90, 0x4b, 0xa6, 0x76, 0xa0, 0x6f, 0xa2, 0x37, 0x46, 0x7f, 0x43, 0xcf, 0x9e, 0x59,
+ 0x47, 0xfd, 0x40, 0x9e, 0xc9, 0x3e, 0x38, 0x2b, 0x4e, 0x57, 0x28, 0x69, 0xd8, 0x81, 0xba, 0xf8,
+ 0x7f, 0xf6, 0xe0, 0x4e, 0x93, 0x06, 0xb9, 0x0f, 0xae, 0xac, 0x26, 0x11, 0x2c, 0x89, 0x20, 0xa7,
+ 0xe9, 0xa2, 0x81, 0xd2, 0x33, 0x50, 0xea, 0x94, 0x55, 0x16, 0xab, 0xa2, 0x7b, 0x2a, 0xe5, 0x55,
+ 0x16, 0x23, 0xf9, 0x10, 0xec, 0x92, 0xc6, 0xb2, 0xec, 0x5e, 0x20, 0x8e, 0xc2, 0xb2, 0xa4, 0xb1,
+ 0xe7, 0x28, 0xcb, 0x92, 0xca, 0x46, 0xa2, 0x42, 0xe2, 0x0e, 0x54, 0x23, 0xea, 0x26, 0x1a, 0x59,
+ 0x09, 0xeb, 0xae, 0x7a, 0x49, 0xe2, 0x4c, 0x66, 0x30, 0x2a, 0x30, 0x4f, 0x68, 0x14, 0x72, 0x9a,
+ 0xa5, 0xde, 0x50, 0xba, 0x4c, 0x13, 0x79, 0x00, 0x10, 0x65, 0x49, 0x82, 0x91, 0x0c, 0x70, 0x65,
+ 0x80, 0x61, 0x11, 0xcf, 0x93, 0xf3, 0x64, 0xce, 0x30, 0xf2, 0x60, 0x66, 0x1d, 0x39, 0xc1, 0x80,
+ 0xf3, 0xe4, 0x02, 0x23, 0x7f, 0x09, 0x9f, 0xbc, 0x40, 0x39, 0x5e, 0xb7, 0xc6, 0x7b, 0xd1, 0xa3,
+ 0xd9, 0x35, 0x30, 0x87, 0x00, 0x79, 0x58, 0x60, 0xca, 0xc5, 0xd0, 0xe8, 0x2d, 0x71, 0x95, 0xe5,
+ 0x8c, 0x16, 0xe6, 0x8b, 0xb3, 0xcd, 0x17, 0xe7, 0xff, 0x6e, 0xc1, 0xb4, 0xab, 0x92, 0x1e, 0xe8,
+ 0xe6, 0xdc, 0x58, 0xef, 0x3e, 0x37, 0xc6, 0x78, 0xf6, 0xde, 0x3a, 0x9e, 0xfe, 0x09, 0xdc, 0x7d,
+ 0x81, 0x5c, 0xda, 0xb3, 0x94, 0x63, 0xca, 0xab, 0x56, 0xb7, 0x0d, 0x9c, 0x7f, 0x0a, 0xf7, 0x36,
+ 0x33, 0x34, 0x65, 0x0f, 0x76, 0x23, 0x65, 0x92, 0x29, 0xe3, 0xa0, 0xba, 0xfa, 0x3f, 0x01, 0x79,
+ 0x56, 0x60, 0xc8, 0xf1, 0x3d, 0x74, 0xa7, 0xd6, 0x90, 0xde, 0x1b, 0x35, 0xe4, 0x2e, 0x4c, 0x1a,
+ 0xd0, 0x8a, 0x8b, 0xa8, 0x78, 0x99, 0xc7, 0xff, 0x57, 0xc5, 0x06, 0xb4, 0xae, 0xf8, 0x97, 0x05,
+ 0xe4, 0x0c, 0x13, 0x7c, 0xaf, 0x92, 0x1d, 0xe2, 0xda, 0x52, 0x20, 0xbb, 0xad, 0x40, 0x0f, 0xe1,
+ 0x8e, 0x08, 0x91, 0xd5, 0xe6, 0x71, 0xc8, 0x43, 0xb9, 0x5a, 0xc3, 0x60, 0x4c, 0x99, 0xa2, 0x70,
+ 0x16, 0xf2, 0x50, 0x10, 0x6d, 0x10, 0xd2, 0x44, 0xff, 0xb0, 0x60, 0xf2, 0x94, 0x31, 0xba, 0x4c,
+ 0x7f, 0xcc, 0x92, 0x72, 0x85, 0x15, 0xd3, 0x7d, 0x70, 0xa2, 0xac, 0xd4, 0x2f, 0xcf, 0x09, 0xd4,
+ 0x65, 0x63, 0x91, 0x7a, 0xad, 0x45, 0xda, 0x58, 0x45, 0xbb, 0xbd, 0x8a, 0xc6, 0xaa, 0xf5, 0x1b,
+ 0xab, 0x76, 0x03, 0xfb, 0x4d, 0x1e, 0x7a, 0x8e, 0xb6, 0x6a, 0x9d, 0x90, 0x91, 0x22, 0xd1, 0x24,
+ 0xc4, 0x51, 0x2e, 0x5f, 0x79, 0x95, 0xd0, 0x68, 0x2e, 0x1c, 0xb6, 0x5e, 0x3e, 0x69, 0xb9, 0x2c,
+ 0x92, 0x75, 0x4b, 0x7d, 0xa3, 0x25, 0xff, 0x2b, 0x98, 0xa8, 0xaf, 0x57, 0xb3, 0xff, 0x43, 0x80,
+ 0x1b, 0x69, 0x98, 0xd3, 0x58, 0x7d, 0x45, 0xdc, 0xc0, 0x55, 0x96, 0x97, 0x31, 0xf3, 0xbf, 0x05,
+ 0xf7, 0x3c, 0x53, 0x2d, 0x31, 0x72, 0x02, 0x6e, 0x52, 0x5d, 0xf4, 0x07, 0x87, 0xac, 0xc7, 0xa5,
+ 0x8a, 0x0b, 0xd6, 0x41, 0xfe, 0x37, 0x30, 0xac, 0xcc, 0x55, 0x1f, 0xd6, 0xb6, 0x3e, 0x7a, 0x1b,
+ 0x7d, 0xf8, 0xff, 0x5a, 0xb0, 0xdf, 0xa4, 0xac, 0x1f, 0xd5, 0x25, 0xec, 0xd5, 0x25, 0xe6, 0xab,
+ 0x30, 0xd7, 0x5c, 0x4e, 0x4c, 0x2e, 0xed, 0xb4, 0x9a, 0x20, 0x7b, 0x15, 0xe6, 0x6a, 0x38, 0xc6,
+ 0x89, 0x61, 0x9a, 0xfe, 0x00, 0x1f, 0xb5, 0x42, 0x04, 0xeb, 0x6b, 0xac, 0x66, 0x58, 0x1c, 0xc9,
+ 0x63, 0x70, 0x6e, 0xc2, 0xa4, 0x44, 0xbd, 0x30, 0x93, 0xf6, 0x13, 0x60, 0x81, 0x8a, 0xf8, 0xba,
+ 0xf7, 0xc4, 0x3a, 0xfd, 0xc7, 0x81, 0xf1, 0x05, 0x86, 0xbf, 0x22, 0xc6, 0x42, 0x3e, 0x0a, 0xb2,
+ 0xac, 0xba, 0x6a, 0xfe, 0x46, 0x90, 0x47, 0x9b, 0xf4, 0x3b, 0xff, 0x5b, 0xa6, 0x9f, 0xbf, 0x2d,
+ 0x4c, 0x0f, 0xfc, 0x0e, 0x39, 0x87, 0x91, 0xf1, 0xd3, 0x40, 0x0e, 0x8c, 0xc4, 0xd6, 0xff, 0xc7,
+ 0xf4, 0x70, 0x8b, 0xb7, 0x46, 0x0b, 0x81, 0xb4, 0x85, 0x9b, 0x7c, 0xb6, 0x4e, 0xdb, 0xfa, 0x01,
+ 0x99, 0x3e, 0x7c, 0x73, 0x90, 0x49, 0xd8, 0x50, 0x35, 0x93, 0x70, 0x5b, 0x47, 0x4d, 0xc2, 0x5d,
+ 0x52, 0x28, 0xd1, 0x0c, 0xc5, 0x32, 0xd1, 0xda, 0x1a, 0x69, 0xa2, 0x75, 0xc9, 0x9c, 0x44, 0x33,
+ 0x64, 0xc5, 0x44, 0x6b, 0xcb, 0x9f, 0x89, 0xd6, 0xa5, 0x45, 0x3b, 0xe4, 0x35, 0x8c, 0x4d, 0x11,
+ 0x20, 0x46, 0x42, 0x87, 0x48, 0x4d, 0x1f, 0x6c, 0x73, 0x9b, 0x80, 0xe6, 0xcc, 0x9b, 0x80, 0x1d,
+ 0x5b, 0x6f, 0x02, 0x76, 0xad, 0x8a, 0xbf, 0x73, 0x35, 0x90, 0xbf, 0xd3, 0x5f, 0xfe, 0x17, 0x00,
+ 0x00, 0xff, 0xff, 0x00, 0xdc, 0x65, 0x5f, 0x5d, 0x0b, 0x00, 0x00,
}
diff --git a/weed/server/filer_grpc_server.go b/weed/server/filer_grpc_server.go
index 4271d342f..d1c4c716c 100644
--- a/weed/server/filer_grpc_server.go
+++ b/weed/server/filer_grpc_server.go
@@ -11,6 +11,7 @@ import (
"github.com/chrislusf/seaweedfs/weed/glog"
"github.com/chrislusf/seaweedfs/weed/operation"
"github.com/chrislusf/seaweedfs/weed/pb/filer_pb"
+ "strconv"
)
func (fs *FilerServer) LookupDirectoryEntry(ctx context.Context, req *filer_pb.LookupDirectoryEntryRequest) (*filer_pb.LookupDirectoryEntryResponse, error) {
@@ -167,10 +168,16 @@ func (fs *FilerServer) DeleteEntry(ctx context.Context, req *filer_pb.DeleteEntr
func (fs *FilerServer) AssignVolume(ctx context.Context, req *filer_pb.AssignVolumeRequest) (resp *filer_pb.AssignVolumeResponse, err error) {
+ ttlStr := ""
+ if req.TtlSec > 0 {
+ ttlStr = strconv.Itoa(int(req.TtlSec))
+ }
+
assignResult, err := operation.Assign(fs.filer.GetMaster(), &operation.VolumeAssignRequest{
Count: uint64(req.Count),
Replication: req.Replication,
Collection: req.Collection,
+ Ttl: ttlStr,
})
if err != nil {
return nil, fmt.Errorf("assign volume: %v", err)