aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Lu <chris.lu@gmail.com>2019-05-19 21:38:18 -0700
committerChris Lu <chris.lu@gmail.com>2019-05-19 21:38:18 -0700
commitae499fd5aabcba3e66025ab1389cc863ca16ba9c (patch)
treee69dab710ab94941cb0e1dc066e6afbd42a6d69b
parent693d6c0f1bf430f4f6e2a1146864731c90d1ef28 (diff)
parent698dea779c05ab87758e486cc9ea34575c4cc95e (diff)
downloadseaweedfs-ae499fd5aabcba3e66025ab1389cc863ca16ba9c.tar.xz
seaweedfs-ae499fd5aabcba3e66025ab1389cc863ca16ba9c.zip
Merge branch 'master' into erasure_coding
-rw-r--r--weed/command/webdav.go2
-rw-r--r--weed/pb/volume_server.proto7
-rw-r--r--weed/pb/volume_server_pb/volume_server.pb.go203
-rw-r--r--weed/server/volume_grpc_copy.go11
4 files changed, 104 insertions, 119 deletions
diff --git a/weed/command/webdav.go b/weed/command/webdav.go
index 9ab2ce9de..125893dfa 100644
--- a/weed/command/webdav.go
+++ b/weed/command/webdav.go
@@ -37,7 +37,7 @@ func init() {
var cmdWebDav = &Command{
UsageLine: "webdav -port=7333 -filer=<ip:port>",
- Short: "start a webdav server that is backed by a filer",
+ Short: "<unstable> start a webdav server that is backed by a filer",
Long: `start a webdav server that is backed by a filer.
`,
diff --git a/weed/pb/volume_server.proto b/weed/pb/volume_server.proto
index ec4f09ef1..b5ebe6bed 100644
--- a/weed/pb/volume_server.proto
+++ b/weed/pb/volume_server.proto
@@ -162,10 +162,9 @@ message VolumeCopyResponse {
message CopyFileRequest {
uint32 volume_id = 1;
- bool is_idx_file = 2;
- bool is_dat_file = 3;
- uint32 compaction_revision = 4;
- uint64 stop_offset = 5;
+ string ext = 2;
+ uint32 compaction_revision = 3;
+ uint64 stop_offset = 4;
}
message CopyFileResponse {
bytes file_content = 1;
diff --git a/weed/pb/volume_server_pb/volume_server.pb.go b/weed/pb/volume_server_pb/volume_server.pb.go
index 30419967b..10bebc65e 100644
--- a/weed/pb/volume_server_pb/volume_server.pb.go
+++ b/weed/pb/volume_server_pb/volume_server.pb.go
@@ -600,10 +600,9 @@ func (m *VolumeCopyResponse) GetLastAppendAtNs() uint64 {
type CopyFileRequest struct {
VolumeId uint32 `protobuf:"varint,1,opt,name=volume_id,json=volumeId" json:"volume_id,omitempty"`
- IsIdxFile bool `protobuf:"varint,2,opt,name=is_idx_file,json=isIdxFile" json:"is_idx_file,omitempty"`
- IsDatFile bool `protobuf:"varint,3,opt,name=is_dat_file,json=isDatFile" json:"is_dat_file,omitempty"`
- CompactionRevision uint32 `protobuf:"varint,4,opt,name=compaction_revision,json=compactionRevision" json:"compaction_revision,omitempty"`
- StopOffset uint64 `protobuf:"varint,5,opt,name=stop_offset,json=stopOffset" json:"stop_offset,omitempty"`
+ Ext string `protobuf:"bytes,2,opt,name=ext" json:"ext,omitempty"`
+ CompactionRevision uint32 `protobuf:"varint,3,opt,name=compaction_revision,json=compactionRevision" json:"compaction_revision,omitempty"`
+ StopOffset uint64 `protobuf:"varint,4,opt,name=stop_offset,json=stopOffset" json:"stop_offset,omitempty"`
}
func (m *CopyFileRequest) Reset() { *m = CopyFileRequest{} }
@@ -618,18 +617,11 @@ func (m *CopyFileRequest) GetVolumeId() uint32 {
return 0
}
-func (m *CopyFileRequest) GetIsIdxFile() bool {
+func (m *CopyFileRequest) GetExt() string {
if m != nil {
- return m.IsIdxFile
+ return m.Ext
}
- return false
-}
-
-func (m *CopyFileRequest) GetIsDatFile() bool {
- if m != nil {
- return m.IsDatFile
- }
- return false
+ return ""
}
func (m *CopyFileRequest) GetCompactionRevision() uint32 {
@@ -1696,96 +1688,95 @@ var _VolumeServer_serviceDesc = grpc.ServiceDesc{
func init() { proto.RegisterFile("volume_server.proto", fileDescriptor0) }
var fileDescriptor0 = []byte{
- // 1453 bytes of a gzipped FileDescriptorProto
- 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xc4, 0x18, 0x4b, 0x73, 0xdc, 0x44,
- 0xd3, 0xca, 0xae, 0xed, 0x75, 0xef, 0xda, 0x71, 0xc6, 0x4e, 0xbc, 0x56, 0x5e, 0x8e, 0x92, 0x2f,
- 0xd9, 0x3c, 0x3e, 0x27, 0x24, 0x05, 0x04, 0x38, 0x40, 0x62, 0x43, 0xe1, 0x2a, 0x92, 0x54, 0xc9,
- 0x49, 0x0a, 0x0a, 0xaa, 0x54, 0x63, 0x69, 0x1c, 0xab, 0xac, 0xd5, 0x28, 0x9a, 0x91, 0x89, 0x29,
- 0x6e, 0xf0, 0x4f, 0xb8, 0xe5, 0xc0, 0x95, 0x2b, 0x7f, 0x88, 0x5f, 0xc0, 0x85, 0x9a, 0x87, 0xb4,
- 0x7a, 0x7a, 0x15, 0x72, 0xe0, 0x36, 0xea, 0x77, 0xf7, 0x74, 0xf7, 0x74, 0x0b, 0x56, 0x8e, 0x68,
- 0x90, 0x8c, 0x89, 0xc3, 0x48, 0x7c, 0x44, 0xe2, 0xcd, 0x28, 0xa6, 0x9c, 0xa2, 0xe5, 0x02, 0xd0,
- 0x89, 0xf6, 0xac, 0xbb, 0x80, 0x1e, 0x63, 0xee, 0x1e, 0x6c, 0x93, 0x80, 0x70, 0x62, 0x93, 0xd7,
- 0x09, 0x61, 0x1c, 0xad, 0x43, 0x6f, 0xdf, 0x0f, 0x88, 0xe3, 0x7b, 0x6c, 0x68, 0x6c, 0x74, 0x46,
- 0x0b, 0xf6, 0xbc, 0xf8, 0xde, 0xf1, 0x98, 0xf5, 0x0c, 0x56, 0x0a, 0x0c, 0x2c, 0xa2, 0x21, 0x23,
- 0xe8, 0x21, 0xcc, 0xc7, 0x84, 0x25, 0x01, 0x57, 0x0c, 0xfd, 0xfb, 0x97, 0x36, 0xcb, 0xba, 0x36,
- 0x33, 0x96, 0x24, 0xe0, 0x76, 0x4a, 0x6e, 0xf9, 0x30, 0xc8, 0x23, 0xd0, 0x1a, 0xcc, 0x6b, 0xdd,
- 0x43, 0x63, 0xc3, 0x18, 0x2d, 0xd8, 0x73, 0x4a, 0x35, 0x3a, 0x07, 0x73, 0x8c, 0x63, 0x9e, 0xb0,
- 0xe1, 0xa9, 0x0d, 0x63, 0x34, 0x6b, 0xeb, 0x2f, 0xb4, 0x0a, 0xb3, 0x24, 0x8e, 0x69, 0x3c, 0xec,
- 0x48, 0x72, 0xf5, 0x81, 0x10, 0x74, 0x99, 0xff, 0x13, 0x19, 0x76, 0x37, 0x8c, 0xd1, 0xa2, 0x2d,
- 0xcf, 0xd6, 0x3c, 0xcc, 0x7e, 0x39, 0x8e, 0xf8, 0xb1, 0xf5, 0x31, 0x0c, 0x5f, 0x62, 0x37, 0x49,
- 0xc6, 0x2f, 0xa5, 0x8d, 0x5b, 0x07, 0xc4, 0x3d, 0x4c, 0x7d, 0x3f, 0x0f, 0x0b, 0xda, 0x72, 0x6d,
- 0xc1, 0xa2, 0xdd, 0x53, 0x80, 0x1d, 0xcf, 0xfa, 0x02, 0xd6, 0x6b, 0x18, 0x75, 0x0c, 0xae, 0xc2,
- 0xe2, 0x2b, 0x1c, 0xef, 0xe1, 0x57, 0xc4, 0x89, 0x31, 0xf7, 0xa9, 0xe4, 0x36, 0xec, 0x81, 0x06,
- 0xda, 0x02, 0x66, 0x7d, 0x0f, 0x66, 0x41, 0x02, 0x1d, 0x47, 0xd8, 0xe5, 0x6d, 0x94, 0xa3, 0x0d,
- 0xe8, 0x47, 0x31, 0xc1, 0x41, 0x40, 0x5d, 0xcc, 0x89, 0x8c, 0x42, 0xc7, 0xce, 0x83, 0xac, 0x8b,
- 0x70, 0xbe, 0x56, 0xb8, 0x32, 0xd0, 0x7a, 0x58, 0xb2, 0x9e, 0x8e, 0xc7, 0x7e, 0x2b, 0xd5, 0xd6,
- 0x85, 0x8a, 0xd5, 0x92, 0x53, 0xcb, 0xfd, 0xa4, 0x84, 0x0d, 0x08, 0x0e, 0x93, 0xa8, 0x95, 0xe0,
- 0xb2, 0xc5, 0x29, 0x6b, 0x26, 0x79, 0x4d, 0x25, 0xc7, 0x16, 0x0d, 0x02, 0xe2, 0x72, 0x9f, 0x86,
- 0xa9, 0xd8, 0x4b, 0x00, 0x6e, 0x06, 0xd4, 0xa9, 0x92, 0x83, 0x58, 0x26, 0x0c, 0xab, 0xac, 0x5a,
- 0xec, 0x5b, 0x03, 0xce, 0x3e, 0xd2, 0x41, 0x53, 0x8a, 0x5b, 0x5d, 0x40, 0x51, 0xe5, 0xa9, 0xb2,
- 0xca, 0xf2, 0x05, 0x75, 0x2a, 0x17, 0x24, 0x28, 0x62, 0x12, 0x05, 0xbe, 0x8b, 0xa5, 0x88, 0xae,
- 0x14, 0x91, 0x07, 0xa1, 0x65, 0xe8, 0x70, 0x1e, 0x0c, 0x67, 0x25, 0x46, 0x1c, 0xad, 0x21, 0x9c,
- 0x2b, 0xdb, 0xaa, 0xdd, 0xf8, 0x08, 0xd6, 0x14, 0x64, 0xf7, 0x38, 0x74, 0x77, 0x65, 0x35, 0xb4,
- 0x0a, 0xfa, 0xdf, 0x06, 0x0c, 0xab, 0x8c, 0x3a, 0x8b, 0xdf, 0x37, 0x02, 0xef, 0xea, 0x1f, 0xba,
- 0x0c, 0x7d, 0x8e, 0xfd, 0xc0, 0xa1, 0xfb, 0xfb, 0x8c, 0xf0, 0xe1, 0xdc, 0x86, 0x31, 0xea, 0xda,
- 0x20, 0x40, 0xcf, 0x24, 0x04, 0xdd, 0x84, 0x65, 0x57, 0x65, 0xb2, 0x13, 0x93, 0x23, 0x9f, 0x09,
- 0xc9, 0xf3, 0xd2, 0xb0, 0xd3, 0x6e, 0x9a, 0xe1, 0x0a, 0x8c, 0x2c, 0x58, 0xf4, 0xbd, 0x37, 0x8e,
- 0x6c, 0x20, 0xb2, 0xfc, 0x7b, 0x52, 0x5a, 0xdf, 0xf7, 0xde, 0x7c, 0xe5, 0x07, 0x64, 0x57, 0x74,
- 0x81, 0x97, 0x70, 0x41, 0x39, 0xbf, 0x13, 0xba, 0x31, 0x19, 0x93, 0x90, 0xe3, 0x60, 0x8b, 0x46,
- 0xc7, 0xad, 0x52, 0x60, 0x1d, 0x7a, 0xcc, 0x0f, 0x5d, 0xe2, 0x84, 0xaa, 0x0d, 0x75, 0xed, 0x79,
- 0xf9, 0xfd, 0x94, 0x59, 0x8f, 0xe1, 0x62, 0x83, 0x5c, 0x1d, 0xd9, 0x2b, 0x30, 0x90, 0x86, 0xb9,
- 0x34, 0xe4, 0x24, 0xe4, 0x52, 0xf6, 0xc0, 0xee, 0x0b, 0xd8, 0x96, 0x02, 0x59, 0x1f, 0x00, 0x52,
- 0x32, 0x9e, 0xd0, 0x24, 0x6c, 0x57, 0x9a, 0x67, 0x61, 0xa5, 0xc0, 0xa2, 0x73, 0xe3, 0x01, 0xac,
- 0x2a, 0xf0, 0x8b, 0x70, 0xdc, 0x5a, 0xd6, 0x1a, 0x9c, 0x2d, 0x31, 0x69, 0x69, 0xf7, 0x53, 0x25,
- 0xc5, 0x77, 0xe2, 0x44, 0x61, 0xe7, 0x52, 0x0b, 0x8a, 0x4f, 0x85, 0xf5, 0xbb, 0x01, 0x67, 0xd2,
- 0x36, 0xd2, 0x32, 0xea, 0xef, 0x98, 0x76, 0x9d, 0xc6, 0xb4, 0xeb, 0x4e, 0xd2, 0x6e, 0x04, 0xcb,
- 0x8c, 0x26, 0xb1, 0x4b, 0x1c, 0x0f, 0x73, 0xec, 0x84, 0xd4, 0x23, 0x3a, 0x2b, 0x97, 0x14, 0x7c,
- 0x1b, 0x73, 0xfc, 0x94, 0x7a, 0xc4, 0xfa, 0x3c, 0xbd, 0x94, 0xc2, 0x6d, 0xde, 0x84, 0x33, 0x01,
- 0x66, 0xdc, 0xc1, 0x51, 0x44, 0x42, 0xcf, 0xc1, 0x5c, 0xa4, 0x84, 0x21, 0x53, 0x62, 0x49, 0x20,
- 0x1e, 0x49, 0xf8, 0x23, 0xfe, 0x94, 0x59, 0x7f, 0x1a, 0x70, 0x5a, 0xf0, 0x8a, 0x14, 0x6c, 0xe9,
- 0x6f, 0xdf, 0x67, 0x4e, 0x9a, 0xc9, 0xd2, 0xe1, 0x9e, 0xbd, 0xe0, 0xb3, 0x1d, 0x95, 0xc6, 0x1a,
- 0xef, 0x61, 0xae, 0xf0, 0x9d, 0x14, 0xbf, 0x8d, 0xb9, 0xc4, 0xdf, 0x85, 0x15, 0x5d, 0x19, 0x3e,
- 0x0d, 0x27, 0x45, 0xa3, 0xde, 0x42, 0x34, 0x41, 0x65, 0x75, 0x73, 0x19, 0xfa, 0x8c, 0xd3, 0x28,
- 0xad, 0xc1, 0x59, 0x55, 0x83, 0x02, 0xa4, 0x6a, 0xd0, 0xfa, 0x10, 0x96, 0x27, 0x1e, 0xb4, 0xcf,
- 0xe7, 0x5f, 0x8c, 0xb4, 0x45, 0x3d, 0xc7, 0x7e, 0xb0, 0x4b, 0x42, 0x8f, 0xc4, 0xef, 0x59, 0x67,
- 0xe8, 0x1e, 0xac, 0xfa, 0x5e, 0x40, 0x1c, 0xee, 0x8f, 0x09, 0x4d, 0xb8, 0xc3, 0x88, 0x4b, 0x43,
- 0x8f, 0xc9, 0x28, 0x2c, 0xda, 0x48, 0xe0, 0x9e, 0x2b, 0xd4, 0xae, 0xc2, 0x58, 0xbf, 0x66, 0xfd,
- 0x2e, 0x6f, 0xc5, 0xe4, 0xd5, 0x0e, 0x09, 0x11, 0x02, 0x0f, 0x08, 0xf6, 0x48, 0xac, 0xdd, 0x18,
- 0x28, 0xe0, 0xd7, 0x12, 0x26, 0xe2, 0xa3, 0x89, 0xf6, 0xa8, 0x77, 0x2c, 0x2d, 0x1a, 0xd8, 0xa0,
- 0x40, 0x8f, 0xa9, 0x77, 0x2c, 0x1b, 0x0f, 0x73, 0x64, 0x42, 0xb8, 0x07, 0x49, 0x78, 0xa8, 0xef,
- 0xa4, 0xef, 0xb3, 0x6f, 0x30, 0xe3, 0x5b, 0x02, 0x64, 0xfd, 0x61, 0xc0, 0xfa, 0xc4, 0x0c, 0x9b,
- 0xb8, 0xc4, 0x3f, 0xfa, 0x0f, 0xc2, 0x21, 0x38, 0x74, 0xe6, 0x17, 0x46, 0x34, 0x5d, 0x1c, 0x48,
- 0xe1, 0xf4, 0xfb, 0x20, 0x31, 0xf2, 0xf9, 0xaf, 0x31, 0x5c, 0x17, 0xf4, 0xa7, 0x70, 0xde, 0x26,
- 0xd8, 0x53, 0x14, 0xb2, 0xcd, 0xb6, 0x7f, 0x8a, 0xfe, 0x3a, 0x05, 0x17, 0xea, 0x99, 0xdb, 0x3c,
- 0x47, 0x9f, 0x81, 0x99, 0xb5, 0x7b, 0xe1, 0x3f, 0xe3, 0x78, 0x1c, 0x65, 0x11, 0x50, 0x81, 0x5a,
- 0xd3, 0xbd, 0xff, 0x79, 0x8a, 0x4f, 0xc3, 0x50, 0x79, 0x2b, 0x3a, 0x95, 0xb7, 0x42, 0x28, 0x48,
- 0xab, 0xac, 0x46, 0x41, 0x57, 0x29, 0xf0, 0x54, 0xd5, 0xd5, 0x29, 0xc8, 0x98, 0xa5, 0x02, 0x55,
- 0x56, 0x7d, 0x4d, 0x2f, 0x15, 0x5c, 0x04, 0xd0, 0x35, 0x94, 0x84, 0xe9, 0xdb, 0xb7, 0xa0, 0x2a,
- 0x28, 0x09, 0x79, 0x53, 0x21, 0xcf, 0x37, 0x16, 0x72, 0xb1, 0x53, 0xf6, 0x2a, 0x53, 0xd1, 0xb7,
- 0x00, 0xdb, 0x3e, 0x3b, 0x54, 0x41, 0x16, 0x5d, 0xd1, 0xf3, 0x63, 0x3d, 0x3c, 0x89, 0xa3, 0x80,
- 0xe0, 0x20, 0xd0, 0xa1, 0x13, 0x47, 0x31, 0x48, 0x27, 0x8c, 0x78, 0x3a, 0x3a, 0xf2, 0x2c, 0x60,
- 0xfb, 0x31, 0x21, 0x3a, 0x00, 0xf2, 0x6c, 0xfd, 0x66, 0xc0, 0xc2, 0x13, 0x32, 0xd6, 0x92, 0x2f,
- 0x01, 0xbc, 0xa2, 0x31, 0x4d, 0xb8, 0x1f, 0x12, 0xd5, 0x16, 0x67, 0xed, 0x1c, 0xe4, 0xdf, 0xeb,
- 0x91, 0x83, 0x3d, 0x09, 0xf6, 0x75, 0x30, 0xe5, 0x59, 0xc0, 0x0e, 0x08, 0x8e, 0x74, 0xfc, 0xe4,
- 0x59, 0xac, 0x05, 0x8c, 0x63, 0xf7, 0x50, 0x06, 0xab, 0x6b, 0xab, 0x8f, 0xfb, 0x6f, 0x97, 0x60,
- 0x90, 0x4f, 0x6d, 0xf4, 0x03, 0xf4, 0x73, 0xfb, 0x0c, 0xba, 0x56, 0x5d, 0x5b, 0xaa, 0xfb, 0x91,
- 0xf9, 0xbf, 0x29, 0x54, 0xba, 0x30, 0x66, 0x50, 0x08, 0x67, 0x2a, 0xfb, 0x02, 0xba, 0x55, 0xe5,
- 0x6e, 0xda, 0x46, 0xcc, 0xdb, 0xad, 0x68, 0x33, 0x7d, 0x1c, 0x56, 0x6a, 0x16, 0x00, 0x74, 0x67,
- 0x8a, 0x94, 0xc2, 0x12, 0x62, 0xfe, 0xbf, 0x25, 0x75, 0xa6, 0xf5, 0x35, 0xa0, 0xea, 0x76, 0x80,
- 0x6e, 0x4f, 0x15, 0x33, 0xd9, 0x3e, 0xcc, 0x3b, 0xed, 0x88, 0x1b, 0x1d, 0x55, 0x7b, 0xc3, 0x54,
- 0x47, 0x0b, 0x9b, 0xc9, 0x54, 0x47, 0x4b, 0xcb, 0xc8, 0x0c, 0x3a, 0x84, 0xe5, 0xf2, 0x4e, 0x81,
- 0x6e, 0x36, 0x2d, 0xba, 0x95, 0x95, 0xc5, 0xbc, 0xd5, 0x86, 0x34, 0x53, 0x46, 0x60, 0xa9, 0x38,
- 0xf7, 0xa3, 0x1b, 0x55, 0xfe, 0xda, 0x2d, 0xc6, 0x1c, 0x4d, 0x27, 0xcc, 0xfb, 0x54, 0xde, 0x05,
- 0xea, 0x7c, 0x6a, 0x58, 0x34, 0xea, 0x7c, 0x6a, 0x5a, 0x2d, 0xac, 0x19, 0xf4, 0x73, 0x3a, 0x60,
- 0x96, 0x66, 0x64, 0xb4, 0xd9, 0x24, 0xa6, 0x7e, 0x48, 0x37, 0xef, 0xb6, 0xa6, 0x4f, 0x75, 0xdf,
- 0x33, 0x44, 0xad, 0xe7, 0x46, 0xe5, 0xba, 0x5a, 0xaf, 0x0e, 0xdf, 0x75, 0xb5, 0x5e, 0x37, 0x6f,
- 0xcf, 0xa0, 0x3d, 0x58, 0x2c, 0x0c, 0xcf, 0xe8, 0x7a, 0x13, 0x67, 0x71, 0x24, 0x37, 0x6f, 0x4c,
- 0xa5, 0xcb, 0x74, 0x38, 0x69, 0xf7, 0xd2, 0xed, 0xaa, 0xd1, 0xb8, 0x62, 0xbf, 0xba, 0x3e, 0x8d,
- 0x2c, 0x53, 0xf0, 0x1d, 0xc0, 0x64, 0xd6, 0x45, 0x57, 0x9b, 0xf8, 0xf2, 0x57, 0x71, 0xed, 0x64,
- 0xa2, 0x4c, 0xf4, 0x8f, 0xb0, 0x5a, 0xf7, 0xd2, 0xa3, 0x9a, 0x2a, 0x3c, 0x61, 0x9c, 0x30, 0x37,
- 0xdb, 0x92, 0x67, 0x8a, 0x5f, 0x40, 0x2f, 0x9d, 0x5d, 0xd1, 0x95, 0x2a, 0x77, 0x69, 0x32, 0x37,
- 0xad, 0x93, 0x48, 0x72, 0xd9, 0x34, 0x4e, 0x0b, 0x67, 0x32, 0x54, 0x36, 0x17, 0x4e, 0x65, 0xfc,
- 0x6d, 0x2e, 0x9c, 0xea, 0x8c, 0x2a, 0xd5, 0xbd, 0x4e, 0xb7, 0x90, 0xfc, 0x0c, 0x56, 0xdb, 0x64,
- 0x9b, 0x46, 0xcc, 0xda, 0x26, 0xdb, 0x3c, 0xd6, 0xcd, 0xec, 0xcd, 0xc9, 0xbf, 0x86, 0x0f, 0xfe,
- 0x09, 0x00, 0x00, 0xff, 0xff, 0x5d, 0xcf, 0xff, 0x14, 0x4c, 0x14, 0x00, 0x00,
+ // 1436 bytes of a gzipped FileDescriptorProto
+ 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xc4, 0x58, 0x4b, 0x73, 0xd4, 0xc6,
+ 0x13, 0xb7, 0xd8, 0xb5, 0xbd, 0xee, 0x5d, 0x9b, 0x65, 0x6c, 0xf0, 0x7a, 0x79, 0x19, 0xc1, 0x1f,
+ 0x96, 0xc7, 0xdf, 0x10, 0xa8, 0x24, 0x24, 0x39, 0x24, 0x60, 0x92, 0x0a, 0x55, 0x01, 0xaa, 0x64,
+ 0xa0, 0x92, 0x4a, 0xaa, 0x54, 0x63, 0xa9, 0x8d, 0x55, 0xd6, 0x4a, 0x42, 0x33, 0x72, 0x70, 0x2a,
+ 0xb7, 0xe4, 0x13, 0xe4, 0x2b, 0xe4, 0xc6, 0x21, 0xd7, 0x7c, 0xaa, 0x7c, 0x82, 0x5c, 0x52, 0xf3,
+ 0x90, 0x76, 0xf5, 0xf2, 0x8a, 0x70, 0xc8, 0x6d, 0xb6, 0xa7, 0xdf, 0xea, 0xee, 0xf9, 0xf5, 0xc2,
+ 0xea, 0x61, 0xe8, 0x27, 0x63, 0xb4, 0x19, 0xc6, 0x87, 0x18, 0x6f, 0x45, 0x71, 0xc8, 0x43, 0xd2,
+ 0xcf, 0x11, 0xed, 0x68, 0xd7, 0xbc, 0x0d, 0xe4, 0x21, 0xe5, 0xce, 0xfe, 0x23, 0xf4, 0x91, 0xa3,
+ 0x85, 0xaf, 0x13, 0x64, 0x9c, 0x6c, 0x40, 0x67, 0xcf, 0xf3, 0xd1, 0xf6, 0x5c, 0x36, 0x30, 0x36,
+ 0x5b, 0xa3, 0x25, 0x6b, 0x51, 0xfc, 0x7e, 0xec, 0x32, 0xf3, 0x19, 0xac, 0xe6, 0x04, 0x58, 0x14,
+ 0x06, 0x0c, 0xc9, 0x7d, 0x58, 0x8c, 0x91, 0x25, 0x3e, 0x57, 0x02, 0xdd, 0xbb, 0x17, 0xb6, 0x8a,
+ 0xb6, 0xb6, 0x32, 0x91, 0xc4, 0xe7, 0x56, 0xca, 0x6e, 0x7a, 0xd0, 0x9b, 0xbe, 0x20, 0xeb, 0xb0,
+ 0xa8, 0x6d, 0x0f, 0x8c, 0x4d, 0x63, 0xb4, 0x64, 0x2d, 0x28, 0xd3, 0xe4, 0x0c, 0x2c, 0x30, 0x4e,
+ 0x79, 0xc2, 0x06, 0x27, 0x36, 0x8d, 0xd1, 0xbc, 0xa5, 0x7f, 0x91, 0x35, 0x98, 0xc7, 0x38, 0x0e,
+ 0xe3, 0x41, 0x4b, 0xb2, 0xab, 0x1f, 0x84, 0x40, 0x9b, 0x79, 0x3f, 0xe1, 0xa0, 0xbd, 0x69, 0x8c,
+ 0x96, 0x2d, 0x79, 0x36, 0x17, 0x61, 0xfe, 0xcb, 0x71, 0xc4, 0x8f, 0xcc, 0x8f, 0x61, 0xf0, 0x92,
+ 0x3a, 0x49, 0x32, 0x7e, 0x29, 0x7d, 0xdc, 0xde, 0x47, 0xe7, 0x20, 0x8d, 0xfd, 0x2c, 0x2c, 0x69,
+ 0xcf, 0xb5, 0x07, 0xcb, 0x56, 0x47, 0x11, 0x1e, 0xbb, 0xe6, 0x17, 0xb0, 0x51, 0x21, 0xa8, 0x73,
+ 0x70, 0x19, 0x96, 0x5f, 0xd1, 0x78, 0x97, 0xbe, 0x42, 0x3b, 0xa6, 0xdc, 0x0b, 0xa5, 0xb4, 0x61,
+ 0xf5, 0x34, 0xd1, 0x12, 0x34, 0xf3, 0x7b, 0x18, 0xe6, 0x34, 0x84, 0xe3, 0x88, 0x3a, 0xbc, 0x89,
+ 0x71, 0xb2, 0x09, 0xdd, 0x28, 0x46, 0xea, 0xfb, 0xa1, 0x43, 0x39, 0xca, 0x2c, 0xb4, 0xac, 0x69,
+ 0x92, 0x79, 0x1e, 0xce, 0x56, 0x2a, 0x57, 0x0e, 0x9a, 0xf7, 0x0b, 0xde, 0x87, 0xe3, 0xb1, 0xd7,
+ 0xc8, 0xb4, 0x79, 0xae, 0xe4, 0xb5, 0x94, 0xd4, 0x7a, 0x3f, 0x29, 0xdc, 0xfa, 0x48, 0x83, 0x24,
+ 0x6a, 0xa4, 0xb8, 0xe8, 0x71, 0x2a, 0x9a, 0x69, 0x5e, 0x57, 0xc5, 0xb1, 0x1d, 0xfa, 0x3e, 0x3a,
+ 0xdc, 0x0b, 0x83, 0x54, 0xed, 0x05, 0x00, 0x27, 0x23, 0xea, 0x52, 0x99, 0xa2, 0x98, 0x43, 0x18,
+ 0x94, 0x45, 0xb5, 0xda, 0xb7, 0x06, 0x9c, 0x7e, 0xa0, 0x93, 0xa6, 0x0c, 0x37, 0xfa, 0x00, 0x79,
+ 0x93, 0x27, 0x8a, 0x26, 0x8b, 0x1f, 0xa8, 0x55, 0xfa, 0x40, 0x82, 0x23, 0xc6, 0xc8, 0xf7, 0x1c,
+ 0x2a, 0x55, 0xb4, 0xa5, 0x8a, 0x69, 0x12, 0xe9, 0x43, 0x8b, 0x73, 0x7f, 0x30, 0x2f, 0x6f, 0xc4,
+ 0xd1, 0x1c, 0xc0, 0x99, 0xa2, 0xaf, 0x3a, 0x8c, 0x8f, 0x60, 0x5d, 0x51, 0x76, 0x8e, 0x02, 0x67,
+ 0x47, 0x76, 0x43, 0xa3, 0xa4, 0xff, 0x6d, 0xc0, 0xa0, 0x2c, 0xa8, 0xab, 0xf8, 0x7d, 0x33, 0xf0,
+ 0xae, 0xf1, 0x91, 0x8b, 0xd0, 0xe5, 0xd4, 0xf3, 0xed, 0x70, 0x6f, 0x8f, 0x21, 0x1f, 0x2c, 0x6c,
+ 0x1a, 0xa3, 0xb6, 0x05, 0x82, 0xf4, 0x4c, 0x52, 0xc8, 0x75, 0xe8, 0x3b, 0xaa, 0x92, 0xed, 0x18,
+ 0x0f, 0x3d, 0x26, 0x34, 0x2f, 0x4a, 0xc7, 0x4e, 0x3a, 0x69, 0x85, 0x2b, 0x32, 0x31, 0x61, 0xd9,
+ 0x73, 0xdf, 0xd8, 0x72, 0x80, 0xc8, 0xf6, 0xef, 0x48, 0x6d, 0x5d, 0xcf, 0x7d, 0xf3, 0x95, 0xe7,
+ 0xe3, 0x8e, 0x98, 0x02, 0x2f, 0xe1, 0x9c, 0x0a, 0xfe, 0x71, 0xe0, 0xc4, 0x38, 0xc6, 0x80, 0x53,
+ 0x7f, 0x3b, 0x8c, 0x8e, 0x1a, 0x95, 0xc0, 0x06, 0x74, 0x98, 0x17, 0x38, 0x68, 0x07, 0x6a, 0x0c,
+ 0xb5, 0xad, 0x45, 0xf9, 0xfb, 0x29, 0x33, 0x1f, 0xc2, 0xf9, 0x1a, 0xbd, 0x3a, 0xb3, 0x97, 0xa0,
+ 0x27, 0x1d, 0x73, 0xc2, 0x80, 0x63, 0xc0, 0xa5, 0xee, 0x9e, 0xd5, 0x15, 0xb4, 0x6d, 0x45, 0x32,
+ 0x3f, 0x00, 0xa2, 0x74, 0x3c, 0x09, 0x93, 0xa0, 0x59, 0x6b, 0x9e, 0x86, 0xd5, 0x9c, 0x88, 0xae,
+ 0x8d, 0x7b, 0xb0, 0xa6, 0xc8, 0x2f, 0x82, 0x71, 0x63, 0x5d, 0xeb, 0x70, 0xba, 0x20, 0xa4, 0xb5,
+ 0xdd, 0x4d, 0x8d, 0xe4, 0xdf, 0x89, 0x63, 0x95, 0x9d, 0x49, 0x3d, 0xc8, 0x3f, 0x15, 0xe6, 0x1f,
+ 0x06, 0x9c, 0x4a, 0xc7, 0x48, 0xc3, 0xac, 0xbf, 0x63, 0xd9, 0xb5, 0x6a, 0xcb, 0xae, 0x3d, 0x29,
+ 0xbb, 0x11, 0xf4, 0x59, 0x98, 0xc4, 0x0e, 0xda, 0x2e, 0xe5, 0xd4, 0x0e, 0x42, 0x17, 0x75, 0x55,
+ 0xae, 0x28, 0xfa, 0x23, 0xca, 0xe9, 0xd3, 0xd0, 0x45, 0xf3, 0xf3, 0xf4, 0xa3, 0xe4, 0xbe, 0xe6,
+ 0x75, 0x38, 0xe5, 0x53, 0xc6, 0x6d, 0x1a, 0x45, 0x18, 0xb8, 0x36, 0xe5, 0xa2, 0x24, 0x0c, 0x59,
+ 0x12, 0x2b, 0xe2, 0xe2, 0x81, 0xa4, 0x3f, 0xe0, 0x4f, 0x99, 0xf9, 0x9b, 0x01, 0x27, 0x85, 0xac,
+ 0x28, 0xc1, 0x46, 0xf1, 0xf6, 0xa1, 0x85, 0x6f, 0xb8, 0x0e, 0x54, 0x1c, 0xc9, 0x6d, 0x58, 0xd5,
+ 0xb5, 0xee, 0x85, 0xc1, 0xa4, 0x0d, 0x5a, 0x52, 0x90, 0x4c, 0xae, 0xb2, 0x4e, 0xb8, 0x08, 0x5d,
+ 0xc6, 0xc3, 0x28, 0xed, 0xaa, 0xb6, 0xea, 0x2a, 0x41, 0x52, 0x5d, 0x65, 0x7e, 0x08, 0xfd, 0x89,
+ 0x4f, 0xcd, 0x2b, 0xf4, 0x17, 0x23, 0x1d, 0x3a, 0xcf, 0xa9, 0xe7, 0xef, 0x60, 0xe0, 0x62, 0xfc,
+ 0x9e, 0x9d, 0x43, 0xee, 0xc0, 0x9a, 0xe7, 0xfa, 0x68, 0x73, 0x6f, 0x8c, 0x61, 0xc2, 0x6d, 0x86,
+ 0x4e, 0x18, 0xb8, 0x2c, 0x8d, 0x4e, 0xdc, 0x3d, 0x57, 0x57, 0x3b, 0xea, 0xc6, 0xfc, 0x35, 0x9b,
+ 0x60, 0xd3, 0x5e, 0x4c, 0xde, 0xe1, 0x00, 0x51, 0x28, 0xdc, 0x47, 0xea, 0x62, 0xac, 0xc3, 0xe8,
+ 0x29, 0xe2, 0xd7, 0x92, 0x26, 0xf2, 0xa3, 0x99, 0x76, 0x43, 0xf7, 0x48, 0x7a, 0xd4, 0xb3, 0x40,
+ 0x91, 0x1e, 0x86, 0xee, 0x91, 0x1c, 0x25, 0xcc, 0x96, 0x9f, 0xd8, 0xd9, 0x4f, 0x82, 0x03, 0xe9,
+ 0x4d, 0xc7, 0xea, 0x7a, 0xec, 0x1b, 0xca, 0xf8, 0xb6, 0x20, 0x99, 0x7f, 0x1a, 0xb0, 0x31, 0x71,
+ 0xc3, 0x42, 0x07, 0xbd, 0xc3, 0xff, 0x20, 0x1d, 0x42, 0x42, 0xd7, 0x72, 0x0e, 0x74, 0xe9, 0x72,
+ 0x27, 0xea, 0x4e, 0x4f, 0x7c, 0x79, 0x23, 0x1f, 0xf4, 0x0a, 0xc7, 0x75, 0x8b, 0x7e, 0x0a, 0x67,
+ 0x2d, 0xa4, 0xae, 0xe2, 0x90, 0x83, 0xb3, 0xf9, 0xe3, 0xf2, 0xd7, 0x09, 0x38, 0x57, 0x2d, 0xdc,
+ 0xe4, 0x81, 0xf9, 0x0c, 0x86, 0xd9, 0x00, 0x17, 0xf1, 0x33, 0x4e, 0xc7, 0x51, 0x96, 0x01, 0x95,
+ 0xa8, 0x75, 0x3d, 0xcd, 0x9f, 0xa7, 0xf7, 0x69, 0x1a, 0x4a, 0xd3, 0xbf, 0x55, 0x9a, 0xfe, 0xc2,
+ 0x80, 0x4b, 0x79, 0x9d, 0x01, 0xd5, 0x26, 0xeb, 0x2e, 0xe5, 0x75, 0x06, 0x32, 0x61, 0x69, 0x60,
+ 0x5e, 0x19, 0xd0, 0xfc, 0xd2, 0xc0, 0x79, 0x00, 0xdd, 0x43, 0x49, 0x90, 0xbe, 0x66, 0x4b, 0xaa,
+ 0x83, 0x92, 0xa0, 0xb6, 0x91, 0x17, 0x6b, 0x1b, 0x39, 0x3f, 0xfb, 0x3a, 0x25, 0x9c, 0xf3, 0x2d,
+ 0xc0, 0x23, 0x8f, 0x1d, 0xa8, 0x24, 0x8b, 0xc9, 0xe1, 0x7a, 0xb1, 0x86, 0x43, 0xe2, 0x28, 0x28,
+ 0xd4, 0xf7, 0x75, 0xea, 0xc4, 0x51, 0x40, 0xe3, 0x84, 0xa1, 0xab, 0xb3, 0x23, 0xcf, 0x82, 0xb6,
+ 0x17, 0x23, 0xea, 0x04, 0xc8, 0xb3, 0xf9, 0xbb, 0x01, 0x4b, 0x4f, 0x70, 0xac, 0x35, 0x5f, 0x00,
+ 0x78, 0x15, 0xc6, 0x61, 0xc2, 0xbd, 0x00, 0xd5, 0xa0, 0x9b, 0xb7, 0xa6, 0x28, 0xff, 0xde, 0x8e,
+ 0x84, 0xea, 0xe8, 0xef, 0xe9, 0x64, 0xca, 0xb3, 0xa0, 0xed, 0x23, 0x8d, 0x74, 0xfe, 0xe4, 0x59,
+ 0x00, 0x7d, 0xc6, 0xa9, 0x73, 0x20, 0x93, 0xd5, 0xb6, 0xd4, 0x8f, 0xbb, 0x6f, 0x57, 0xa0, 0x37,
+ 0x5d, 0xda, 0xe4, 0x07, 0xe8, 0x4e, 0x6d, 0x28, 0xe4, 0x4a, 0x79, 0x11, 0x29, 0x6f, 0x3c, 0xc3,
+ 0xff, 0xcd, 0xe0, 0xd2, 0x8d, 0x31, 0x47, 0x02, 0x38, 0x55, 0xda, 0x00, 0xc8, 0x8d, 0xb2, 0x74,
+ 0xdd, 0x7e, 0x31, 0xbc, 0xd9, 0x88, 0x37, 0xb3, 0xc7, 0x61, 0xb5, 0x02, 0xd2, 0x93, 0x5b, 0x33,
+ 0xb4, 0xe4, 0xd6, 0x8a, 0xe1, 0xff, 0x1b, 0x72, 0x67, 0x56, 0x5f, 0x03, 0x29, 0xe3, 0x7d, 0x72,
+ 0x73, 0xa6, 0x9a, 0xc9, 0x3e, 0x31, 0xbc, 0xd5, 0x8c, 0xb9, 0x36, 0x50, 0xb5, 0x09, 0xcc, 0x0c,
+ 0x34, 0xb7, 0x6b, 0xcc, 0x0c, 0xb4, 0xb0, 0x5e, 0xcc, 0x91, 0x03, 0xe8, 0x17, 0xb7, 0x04, 0x72,
+ 0xbd, 0x6e, 0x75, 0x2d, 0x2d, 0x21, 0xc3, 0x1b, 0x4d, 0x58, 0x33, 0x63, 0x08, 0x2b, 0x79, 0x24,
+ 0x4f, 0xae, 0x95, 0xe5, 0x2b, 0xf7, 0x92, 0xe1, 0x68, 0x36, 0xe3, 0x74, 0x4c, 0x45, 0x74, 0x5f,
+ 0x15, 0x53, 0xcd, 0xea, 0x50, 0x15, 0x53, 0xdd, 0xb2, 0x60, 0xce, 0x91, 0x9f, 0x53, 0xc8, 0x58,
+ 0x40, 0xbd, 0x64, 0xab, 0x4e, 0x4d, 0x35, 0xec, 0x1e, 0xde, 0x6e, 0xcc, 0x9f, 0xda, 0xbe, 0x63,
+ 0x88, 0x5e, 0x9f, 0x02, 0xbf, 0x55, 0xbd, 0x5e, 0x86, 0xd3, 0x55, 0xbd, 0x5e, 0x85, 0xa0, 0xe7,
+ 0xc8, 0x2e, 0x2c, 0xe7, 0xe0, 0x30, 0xb9, 0x5a, 0x27, 0x99, 0x07, 0xd9, 0xc3, 0x6b, 0x33, 0xf9,
+ 0x32, 0x1b, 0x76, 0x3a, 0xbd, 0xf4, 0xb8, 0xaa, 0x75, 0x2e, 0x3f, 0xaf, 0xae, 0xce, 0x62, 0xcb,
+ 0x0c, 0x7c, 0x07, 0x30, 0x41, 0xaf, 0xe4, 0x72, 0x9d, 0xdc, 0xf4, 0xa7, 0xb8, 0x72, 0x3c, 0x53,
+ 0xa6, 0xfa, 0x47, 0x58, 0xab, 0x7a, 0xe9, 0x49, 0x45, 0x17, 0x1e, 0x03, 0x27, 0x86, 0x5b, 0x4d,
+ 0xd9, 0x33, 0xc3, 0x2f, 0xa0, 0x93, 0x62, 0x57, 0x72, 0xa9, 0x2c, 0x5d, 0xc0, 0xda, 0x43, 0xf3,
+ 0x38, 0x96, 0xa9, 0x6a, 0x1a, 0xa7, 0x8d, 0x33, 0x01, 0x95, 0xf5, 0x8d, 0x53, 0x82, 0xbf, 0xf5,
+ 0x8d, 0x53, 0xc6, 0xa8, 0xd2, 0xdc, 0xeb, 0x74, 0xaf, 0x98, 0xc6, 0x60, 0x95, 0x43, 0xb6, 0x0e,
+ 0x62, 0x56, 0x0e, 0xd9, 0x7a, 0x58, 0x37, 0xb7, 0xbb, 0x20, 0xff, 0x07, 0xbc, 0xf7, 0x4f, 0x00,
+ 0x00, 0x00, 0xff, 0xff, 0x5d, 0xbf, 0x08, 0x06, 0x1e, 0x14, 0x00, 0x00,
}
diff --git a/weed/server/volume_grpc_copy.go b/weed/server/volume_grpc_copy.go
index e3ade61a1..6bb61dfba 100644
--- a/weed/server/volume_grpc_copy.go
+++ b/weed/server/volume_grpc_copy.go
@@ -52,7 +52,7 @@ func (vs *VolumeServer) VolumeCopy(ctx context.Context, req *volume_server_pb.Vo
copyFileClient, err := client.CopyFile(ctx, &volume_server_pb.CopyFileRequest{
VolumeId: req.VolumeId,
- IsIdxFile: true,
+ Ext: ".idx",
CompactionRevision: volFileInfoResp.CompactionRevision,
StopOffset: volFileInfoResp.IdxFileSize,
})
@@ -68,7 +68,7 @@ func (vs *VolumeServer) VolumeCopy(ctx context.Context, req *volume_server_pb.Vo
copyFileClient, err = client.CopyFile(ctx, &volume_server_pb.CopyFileRequest{
VolumeId: req.VolumeId,
- IsDatFile: true,
+ Ext: ".dat",
CompactionRevision: volFileInfoResp.CompactionRevision,
StopOffset: volFileInfoResp.DatFileSize,
})
@@ -189,12 +189,7 @@ func (vs *VolumeServer) CopyFile(req *volume_server_pb.CopyFileRequest, stream v
bytesToRead := int64(req.StopOffset)
const BufferSize = 1024 * 1024 * 2
- var fileName = v.FileName()
- if req.IsDatFile {
- fileName += ".dat"
- } else if req.IsIdxFile {
- fileName += ".idx"
- }
+ var fileName = v.FileName() + req.Ext
file, err := os.Open(fileName)
if err != nil {
return err