Mirror
/
seaweedfs
mirror of https://github.com/seaweedfs/seaweedfs.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

volume tailing chunks large files

pull/934/head
Chris Lu 6 years ago
parent
3dce1016cb
commit
fa176fe80f
5 changed files with 179 additions and 103 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 49
      unmaintained/volume_tailer/volume_tailer.go
  2. 1
      weed/pb/volume_server.proto
  3. 173
      weed/pb/volume_server_pb/volume_server.pb.go
  4. 28
      weed/server/volume_grpc_tail.go
  5. 31
      weed/storage/needle_read_write.go

49
unmaintained/volume_tailer/volume_tailer.go
View File

@ -10,6 +10,7 @@ import (
weed_server "github.com/chrislusf/seaweedfs/weed/server"
"github.com/chrislusf/seaweedfs/weed/storage"
"github.com/spf13/viper"
"golang.org/x/tools/godoc/util"
"io"
"log"
@ -19,6 +20,7 @@ var (
master = flag.String("master", "localhost:9333", "master server host and port")
volumeId = flag.Int("volumeId", -1, "a volume id")
timeoutSeconds = flag.Int("timeoutSeconds", 0, "disconnect if no activity after these seconds")
showTextFile = flag.Bool("showTextFile", false, "display textual file content")
)
func main() {
@ -59,7 +61,51 @@ func main() {
}
}
println("header:", len(resp.NeedleHeader), "body:", len(resp.NeedleBody))
needleHeader := resp.NeedleHeader
needleBody := resp.NeedleBody
if len(needleHeader) == 0 {
continue
}
for !resp.IsLastChunk {
resp, recvErr = stream.Recv()
if recvErr != nil {
if recvErr == io.EOF {
break
} else {
return recvErr
}
}
needleBody = append(needleBody, resp.NeedleBody...)
}
n := new(storage.Needle)
n.ParseNeedleHeader(needleHeader)
n.ReadNeedleBodyBytes(needleBody, storage.CurrentVersion)
if n.Size == 0 {
println("-", n.String())
continue
} else {
println("+", n.String())
}
if *showTextFile {
data := n.Data
if n.IsGzipped() {
if data, err = operation.UnGzipData(data); err != nil {
continue
}
}
if util.IsText(data) {
println(string(data))
}
println("-", n.String(), "compressed", n.IsGzipped(), "original size", len(data))
}
}
return nil
@ -70,5 +116,4 @@ func main() {
log.Printf("Error VolumeTail volume %d: %v", vid, err)
}
}

1
weed/pb/volume_server.proto
View File

@ -174,6 +174,7 @@ message VolumeTailRequest {
message VolumeTailResponse {
bytes needle_header = 1;
bytes needle_body = 2;
bool is_last_chunk = 3;
}
message ReadVolumeFileStatusRequest {

173
weed/pb/volume_server_pb/volume_server.pb.go
View File

@ -671,6 +671,7 @@ func (m *VolumeTailRequest) GetDrainingSeconds() uint32 {
type VolumeTailResponse struct {
NeedleHeader []byte `protobuf:"bytes,1,opt,name=needle_header,json=needleHeader,proto3" json:"needle_header,omitempty"`
NeedleBody []byte `protobuf:"bytes,2,opt,name=needle_body,json=needleBody,proto3" json:"needle_body,omitempty"`
IsLastChunk bool `protobuf:"varint,3,opt,name=is_last_chunk,json=isLastChunk" json:"is_last_chunk,omitempty"`
}
func (m *VolumeTailResponse) Reset() { *m = VolumeTailResponse{} }
@ -692,6 +693,13 @@ func (m *VolumeTailResponse) GetNeedleBody() []byte {
return nil
}
func (m *VolumeTailResponse) GetIsLastChunk() bool {
if m != nil {
return m.IsLastChunk
}
return false
}
type ReadVolumeFileStatusRequest struct {
VolumeId uint32 `protobuf:"varint,1,opt,name=volume_id,json=volumeId" json:"volume_id,omitempty"`
}
@ -1563,86 +1571,87 @@ var _VolumeServer_serviceDesc = grpc.ServiceDesc{
func init() { proto.RegisterFile("volume_server.proto", fileDescriptor0) }
var fileDescriptor0 = []byte{
// 1282 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xa4, 0x58, 0xdd, 0x73, 0xdb, 0x44,
0x10, 0x8f, 0x6a, 0x3b, 0xb6, 0xd7, 0x76, 0xeb, 0x5e, 0xd2, 0xc6, 0x55, 0x93, 0xe0, 0x5e, 0x4b,
0xeb, 0xb6, 0x21, 0x85, 0x74, 0x80, 0xc2, 0x13, 0x24, 0x81, 0x21, 0x0f, 0x6d, 0x67, 0x94, 0x36,
0x03, 0x94, 0x19, 0xcd, 0x45, 0xba, 0x24, 0x9a, 0xc8, 0x92, 0x2b, 0x9d, 0x42, 0xc3, 0xf0, 0xdf,
0x30, 0xbc, 0xf0, 0xc0, 0x3f, 0xc8, 0x0c, 0xc3, 0xdc, 0x87, 0x14, 0x7d, 0xc6, 0x2a, 0x7d, 0x3b,
0xed, 0xed, 0xfe, 0xf6, 0xe3, 0xf6, 0xf6, 0x7e, 0x36, 0x2c, 0x9d, 0xf9, 0x6e, 0x34, 0xa5, 0x66,
0x48, 0x83, 0x33, 0x1a, 0x6c, 0xce, 0x02, 0x9f, 0xf9, 0x68, 0x98, 0x11, 0x9a, 0xb3, 0x43, 0xfc,
0x04, 0xd0, 0x36, 0x61, 0xd6, 0xc9, 0x2e, 0x75, 0x29, 0xa3, 0x06, 0x7d, 0x1b, 0xd1, 0x90, 0xa1,
0x5b, 0xd0, 0x39, 0x72, 0x5c, 0x6a, 0x3a, 0x76, 0x38, 0xd2, 0xc6, 0x8d, 0x49, 0xd7, 0x68, 0xf3,
0xef, 0x3d, 0x3b, 0xc4, 0x2f, 0x61, 0x29, 0x63, 0x10, 0xce, 0x7c, 0x2f, 0xa4, 0xe8, 0x19, 0xb4,
0x03, 0x1a, 0x46, 0x2e, 0x93, 0x06, 0xbd, 0xad, 0xf5, 0xcd, 0xbc, 0xaf, 0xcd, 0xc4, 0x24, 0x72,
0x99, 0x11, 0xab, 0x63, 0x07, 0xfa, 0xe9, 0x0d, 0xb4, 0x02, 0x6d, 0xe5, 0x7b, 0xa4, 0x8d, 0xb5,
0x49, 0xd7, 0x58, 0x94, 0xae, 0xd1, 0x4d, 0x58, 0x0c, 0x19, 0x61, 0x51, 0x38, 0xba, 0x32, 0xd6,
0x26, 0x2d, 0x43, 0x7d, 0xa1, 0x65, 0x68, 0xd1, 0x20, 0xf0, 0x83, 0x51, 0x43, 0xa8, 0xcb, 0x0f,
0x84, 0xa0, 0x19, 0x3a, 0xbf, 0xd1, 0x51, 0x73, 0xac, 0x4d, 0x06, 0x86, 0x58, 0xe3, 0x36, 0xb4,
0xbe, 0x9b, 0xce, 0xd8, 0x39, 0xfe, 0x12, 0x46, 0x07, 0xc4, 0x8a, 0xa2, 0xe9, 0x81, 0x88, 0x71,
0xe7, 0x84, 0x5a, 0xa7, 0x71, 0xee, 0xb7, 0xa1, 0xab, 0x22, 0x57, 0x11, 0x0c, 0x8c, 0x8e, 0x14,
0xec, 0xd9, 0xf8, 0x1b, 0xb8, 0x55, 0x62, 0xa8, 0x6a, 0x70, 0x17, 0x06, 0xc7, 0x24, 0x38, 0x24,
0xc7, 0xd4, 0x0c, 0x08, 0x73, 0x7c, 0x61, 0xad, 0x19, 0x7d, 0x25, 0x34, 0xb8, 0x0c, 0xbf, 0x01,
0x3d, 0x83, 0xe0, 0x4f, 0x67, 0xc4, 0x62, 0x75, 0x9c, 0xa3, 0x31, 0xf4, 0x66, 0x01, 0x25, 0xae,
0xeb, 0x5b, 0x84, 0x51, 0x51, 0x85, 0x86, 0x91, 0x16, 0xe1, 0x35, 0xb8, 0x5d, 0x0a, 0x2e, 0x03,
0xc4, 0xcf, 0x72, 0xd1, 0xfb, 0xd3, 0xa9, 0x53, 0xcb, 0x35, 0x5e, 0x2d, 0x44, 0x2d, 0x2c, 0x15,
0xee, 0x57, 0xb9, 0x5d, 0x97, 0x12, 0x2f, 0x9a, 0xd5, 0x02, 0xce, 0x47, 0x1c, 0x9b, 0x26, 0xc8,
0x2b, 0xb2, 0x39, 0x76, 0x7c, 0xd7, 0xa5, 0x16, 0x73, 0x7c, 0x2f, 0x86, 0x5d, 0x07, 0xb0, 0x12,
0xa1, 0x6a, 0x95, 0x94, 0x04, 0xeb, 0x30, 0x2a, 0x9a, 0x2a, 0xd8, 0xbf, 0x34, 0xb8, 0xf1, 0xad,
0x2a, 0x9a, 0x74, 0x5c, 0xeb, 0x00, 0xb2, 0x2e, 0xaf, 0xe4, 0x5d, 0xe6, 0x0f, 0xa8, 0x51, 0x38,
0x20, 0xae, 0x11, 0xd0, 0x99, 0xeb, 0x58, 0x44, 0x40, 0x34, 0x05, 0x44, 0x5a, 0x84, 0x86, 0xd0,
0x60, 0xcc, 0x1d, 0xb5, 0xc4, 0x0e, 0x5f, 0xe2, 0x11, 0xdc, 0xcc, 0xc7, 0xaa, 0xd2, 0xf8, 0x02,
0x56, 0xa4, 0x64, 0xff, 0xdc, 0xb3, 0xf6, 0xc5, 0x6d, 0xa8, 0x55, 0xf4, 0x7f, 0x34, 0x18, 0x15,
0x0d, 0x55, 0x17, 0x7f, 0x68, 0x05, 0xde, 0x37, 0x3f, 0xf4, 0x11, 0xf4, 0x18, 0x71, 0x5c, 0xd3,
0x3f, 0x3a, 0x0a, 0x29, 0x1b, 0x2d, 0x8e, 0xb5, 0x49, 0xd3, 0x00, 0x2e, 0x7a, 0x29, 0x24, 0xe8,
0x21, 0x0c, 0x2d, 0xd9, 0xc9, 0x66, 0x40, 0xcf, 0x9c, 0x90, 0x23, 0xb7, 0x45, 0x60, 0xd7, 0xac,
0xb8, 0xc3, 0xa5, 0x18, 0x61, 0x18, 0x38, 0xf6, 0x3b, 0x53, 0x0c, 0x10, 0x71, 0xfd, 0x3b, 0x02,
0xad, 0xe7, 0xd8, 0xef, 0xbe, 0x77, 0x5c, 0xba, 0xcf, 0xa7, 0xc0, 0x01, 0xac, 0xca, 0xe4, 0xf7,
0x3c, 0x2b, 0xa0, 0x53, 0xea, 0x31, 0xe2, 0xee, 0xf8, 0xb3, 0xf3, 0x5a, 0x2d, 0x70, 0x0b, 0x3a,
0xa1, 0xe3, 0x59, 0xd4, 0xf4, 0xe4, 0x18, 0x6a, 0x1a, 0x6d, 0xf1, 0xfd, 0x22, 0xc4, 0xdb, 0xb0,
0x56, 0x81, 0xab, 0x2a, 0x7b, 0x07, 0xfa, 0x22, 0x30, 0xcb, 0xf7, 0x18, 0xf5, 0x98, 0xc0, 0xee,
0x1b, 0x3d, 0x2e, 0xdb, 0x91, 0x22, 0xfc, 0x19, 0x20, 0x89, 0xf1, 0xdc, 0x8f, 0xbc, 0x7a, 0x57,
0xf3, 0x06, 0x2c, 0x65, 0x4c, 0x54, 0x6f, 0x3c, 0x85, 0x65, 0x29, 0x7e, 0xed, 0x4d, 0x6b, 0x63,
0xad, 0xc0, 0x8d, 0x9c, 0x91, 0x42, 0xdb, 0x8a, 0x9d, 0x64, 0xdf, 0x89, 0x4b, 0xc1, 0x6e, 0xc6,
0x11, 0x64, 0x9f, 0x0a, 0xfc, 0xb7, 0x06, 0xd7, 0xe3, 0x31, 0x52, 0xb3, 0xea, 0xef, 0xd9, 0x76,
0x8d, 0xca, 0xb6, 0x6b, 0x5e, 0xb4, 0xdd, 0x04, 0x86, 0xa1, 0x1f, 0x05, 0x16, 0x35, 0x6d, 0xc2,
0x88, 0xe9, 0xf9, 0x36, 0x55, 0x5d, 0x79, 0x55, 0xca, 0x77, 0x09, 0x23, 0x2f, 0x7c, 0x9b, 0xe2,
0xe5, 0xf8, 0x50, 0xd2, 0xa7, 0x89, 0x3d, 0xb8, 0xc6, 0xbf, 0x79, 0x5b, 0xd5, 0xcc, 0xa1, 0xe7,
0x84, 0x66, 0xdc, 0x9d, 0x22, 0x89, 0x8e, 0xd1, 0x75, 0xc2, 0x3d, 0xd9, 0x9a, 0x6a, 0xdf, 0x26,
0x4c, 0xee, 0x37, 0xe2, 0xfd, 0x5d, 0xc2, 0xf8, 0x3e, 0xfe, 0x1c, 0x86, 0x17, 0xfe, 0xea, 0x77,
0x54, 0x14, 0x17, 0xfb, 0x15, 0x71, 0xdc, 0x0f, 0x6c, 0x71, 0x34, 0x81, 0x6b, 0x76, 0x40, 0x1c,
0xcf, 0xf1, 0x8e, 0xf7, 0xa9, 0xe5, 0x7b, 0x76, 0x28, 0xe2, 0x1c, 0x18, 0x79, 0x31, 0xfe, 0x39,
0xae, 0x99, 0x74, 0x7b, 0xf1, 0x42, 0x7a, 0x94, 0xda, 0x2e, 0x35, 0x4f, 0x28, 0xb1, 0x69, 0xa0,
0x02, 0xee, 0x4b, 0xe1, 0x0f, 0x42, 0xc6, 0xe7, 0x81, 0x52, 0x3a, 0xf4, 0xed, 0x73, 0x11, 0x42,
0xdf, 0x00, 0x29, 0xda, 0xf6, 0xed, 0x73, 0xfc, 0x35, 0xdc, 0x36, 0x28, 0xb1, 0x25, 0xbe, 0xb8,
0xd6, 0xf5, 0x47, 0xdf, 0xbf, 0x1a, 0xac, 0x96, 0x1b, 0xd7, 0x19, 0x7f, 0x1b, 0x80, 0x92, 0xf1,
0xc2, 0x9c, 0x29, 0x0d, 0x19, 0x99, 0xce, 0x54, 0x91, 0x86, 0x6a, 0xc6, 0xbc, 0x8a, 0xe5, 0xc5,
0x61, 0xd4, 0x28, 0x0c, 0x23, 0x8e, 0x18, 0x1f, 0x79, 0x0a, 0xb1, 0x29, 0x11, 0x6d, 0x79, 0xf4,
0x19, 0xc4, 0x44, 0x5b, 0x20, 0xb6, 0x24, 0xa2, 0x52, 0x14, 0x88, 0x6b, 0x00, 0xaa, 0x27, 0x22,
0x2f, 0x9e, 0xa6, 0x5d, 0xd9, 0x11, 0x91, 0xc7, 0xf0, 0x8f, 0x00, 0xbb, 0x4e, 0x78, 0x2a, 0xb3,
0xe6, 0xd7, 0xc2, 0x76, 0x02, 0xf5, 0x7a, 0xf2, 0x25, 0x97, 0x10, 0xd7, 0x55, 0x39, 0xf1, 0x25,
0x67, 0x52, 0x51, 0x48, 0x6d, 0x15, 0xbd, 0x58, 0x73, 0xd9, 0x51, 0x40, 0xa9, 0x0a, 0x54, 0xac,
0xf1, 0x1f, 0x1a, 0x74, 0x9f, 0xd3, 0xa9, 0x42, 0x5e, 0x07, 0x38, 0xf6, 0x03, 0x3f, 0x62, 0x8e,
0x47, 0x43, 0xe1, 0xa0, 0x65, 0xa4, 0x24, 0xff, 0xdf, 0x8f, 0x60, 0x76, 0xd4, 0x3d, 0x52, 0xb9,
0x8b, 0x35, 0x97, 0x9d, 0x50, 0x32, 0x53, 0xe9, 0x8a, 0x35, 0xe7, 0x85, 0x21, 0x23, 0xd6, 0xa9,
0x78, 0x2b, 0x9a, 0x86, 0xfc, 0xd8, 0xfa, 0x73, 0x00, 0x7d, 0xf5, 0xf6, 0x09, 0x62, 0x8a, 0x7e,
0x81, 0x5e, 0x8a, 0xd0, 0xa2, 0x7b, 0x45, 0xde, 0x5a, 0x24, 0xc8, 0xfa, 0xc7, 0x73, 0xb4, 0xd4,
0x8c, 0x58, 0x40, 0x1e, 0x5c, 0x2f, 0x10, 0x46, 0xf4, 0xa8, 0x68, 0x5d, 0x45, 0x47, 0xf5, 0xc7,
0xb5, 0x74, 0x13, 0x7f, 0x0c, 0x96, 0x4a, 0x18, 0x20, 0xda, 0x98, 0x83, 0x92, 0x61, 0xa1, 0xfa,
0x27, 0x35, 0xb5, 0x13, 0xaf, 0x6f, 0x01, 0x15, 0xe9, 0x21, 0x7a, 0x3c, 0x17, 0xe6, 0x82, 0x7e,
0xea, 0x1b, 0xf5, 0x94, 0x2b, 0x13, 0x95, 0xc4, 0x71, 0x6e, 0xa2, 0x19, 0x6a, 0x3a, 0x37, 0xd1,
0x1c, 0x1b, 0x5d, 0x40, 0xa7, 0x30, 0xcc, 0x93, 0x4a, 0xf4, 0xb0, 0xea, 0x97, 0x4e, 0x81, 0xb3,
0xea, 0x8f, 0xea, 0xa8, 0x26, 0xce, 0x28, 0x5c, 0xcd, 0x12, 0x3f, 0xf4, 0xa0, 0x68, 0x5f, 0x4a,
0x63, 0xf5, 0xc9, 0x7c, 0xc5, 0x74, 0x4e, 0x79, 0x32, 0x58, 0x96, 0x53, 0x05, 0xd3, 0x2c, 0xcb,
0xa9, 0x8a, 0x5b, 0xe2, 0x05, 0xf4, 0x7b, 0xcc, 0x30, 0x72, 0x24, 0x09, 0x6d, 0x56, 0xc1, 0x94,
0xb3, 0x34, 0xfd, 0x49, 0x6d, 0xfd, 0xd8, 0xf7, 0xa7, 0x1a, 0xbf, 0xeb, 0x29, 0xae, 0x54, 0x76,
0xd7, 0x8b, 0xec, 0xab, 0xec, 0xae, 0x97, 0x11, 0xae, 0x05, 0x74, 0x08, 0x83, 0x0c, 0x7b, 0x42,
0xf7, 0xab, 0x2c, 0xb3, 0x9c, 0x4c, 0x7f, 0x30, 0x57, 0x2f, 0xf1, 0x61, 0xc6, 0xd3, 0x4b, 0x8d,
0xab, 0xca, 0xe0, 0xb2, 0xf3, 0xea, 0xfe, 0x3c, 0xb5, 0xc4, 0xc1, 0x4f, 0x00, 0x17, 0x64, 0x07,
0xdd, 0xad, 0xb2, 0x4b, 0x1f, 0xc5, 0xbd, 0xcb, 0x95, 0x12, 0xe8, 0x5f, 0x61, 0xb9, 0xec, 0xe9,
0x45, 0x25, 0xb7, 0xf0, 0x92, 0xf7, 0x5d, 0xdf, 0xac, 0xab, 0x9e, 0x38, 0x7e, 0x0d, 0x9d, 0x98,
0x3a, 0xa1, 0x3b, 0x45, 0xeb, 0x1c, 0x8d, 0xd3, 0xf1, 0x65, 0x2a, 0xa9, 0x6e, 0x7a, 0x13, 0x97,
0x8a, 0x73, 0x9c, 0xea, 0x52, 0xa5, 0x88, 0x57, 0x75, 0xa9, 0xd2, 0x34, 0x89, 0x83, 0x1f, 0x2e,
0x8a, 0x7f, 0x6c, 0x9e, 0xfe, 0x17, 0x00, 0x00, 0xff, 0xff, 0x07, 0xe0, 0xca, 0x7c, 0xc8, 0x11,
0x00, 0x00,
// 1305 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xa4, 0x58, 0x5b, 0x6f, 0xd4, 0xc6,
0x17, 0x8f, 0xd9, 0xcd, 0xed, 0xec, 0x2e, 0x2c, 0x93, 0x40, 0x16, 0x73, 0xf9, 0x2f, 0x03, 0x7f,
0x58, 0x2e, 0x0d, 0x2d, 0xa8, 0x2d, 0xed, 0x53, 0x4b, 0xd2, 0xaa, 0x91, 0x0a, 0x48, 0x0e, 0xa0,
0x56, 0x54, 0xb2, 0x26, 0xf6, 0x24, 0x19, 0xc5, 0x6b, 0x2f, 0x9e, 0x31, 0x25, 0x55, 0xd5, 0x2f,
0x53, 0xf5, 0xa5, 0x0f, 0xfd, 0x82, 0x95, 0xaa, 0x6a, 0x2e, 0x76, 0x7c, 0xcd, 0x9a, 0xf2, 0x36,
0x3e, 0x73, 0xce, 0xef, 0x5c, 0xe6, 0xcc, 0x99, 0xdf, 0x2e, 0xac, 0xbd, 0x8d, 0x82, 0x64, 0x4a,
0x5d, 0x4e, 0xe3, 0xb7, 0x34, 0xde, 0x9c, 0xc5, 0x91, 0x88, 0xd0, 0xb0, 0x20, 0x74, 0x67, 0x7b,
0xf8, 0x01, 0xa0, 0x27, 0x44, 0x78, 0x87, 0xdb, 0x34, 0xa0, 0x82, 0x3a, 0xf4, 0x4d, 0x42, 0xb9,
0x40, 0x97, 0x60, 0x65, 0x9f, 0x05, 0xd4, 0x65, 0x3e, 0x1f, 0x59, 0xe3, 0xce, 0x64, 0xd5, 0x59,
0x96, 0xdf, 0x3b, 0x3e, 0xc7, 0xcf, 0x61, 0xad, 0x60, 0xc0, 0x67, 0x51, 0xc8, 0x29, 0x7a, 0x0c,
0xcb, 0x31, 0xe5, 0x49, 0x20, 0xb4, 0x41, 0xef, 0xe1, 0xb5, 0xcd, 0xb2, 0xaf, 0xcd, 0xcc, 0x24,
0x09, 0x84, 0x93, 0xaa, 0x63, 0x06, 0xfd, 0xfc, 0x06, 0xda, 0x80, 0x65, 0xe3, 0x7b, 0x64, 0x8d,
0xad, 0xc9, 0xaa, 0xb3, 0xa4, 0x5d, 0xa3, 0x8b, 0xb0, 0xc4, 0x05, 0x11, 0x09, 0x1f, 0x9d, 0x19,
0x5b, 0x93, 0x45, 0xc7, 0x7c, 0xa1, 0x75, 0x58, 0xa4, 0x71, 0x1c, 0xc5, 0xa3, 0x8e, 0x52, 0xd7,
0x1f, 0x08, 0x41, 0x97, 0xb3, 0x5f, 0xe8, 0xa8, 0x3b, 0xb6, 0x26, 0x03, 0x47, 0xad, 0xf1, 0x32,
0x2c, 0x7e, 0x33, 0x9d, 0x89, 0x63, 0xfc, 0x39, 0x8c, 0x5e, 0x11, 0x2f, 0x49, 0xa6, 0xaf, 0x54,
0x8c, 0x5b, 0x87, 0xd4, 0x3b, 0x4a, 0x73, 0xbf, 0x0c, 0xab, 0x26, 0x72, 0x13, 0xc1, 0xc0, 0x59,
0xd1, 0x82, 0x1d, 0x1f, 0x7f, 0x05, 0x97, 0x6a, 0x0c, 0x4d, 0x0d, 0x6e, 0xc0, 0xe0, 0x80, 0xc4,
0x7b, 0xe4, 0x80, 0xba, 0x31, 0x11, 0x2c, 0x52, 0xd6, 0x96, 0xd3, 0x37, 0x42, 0x47, 0xca, 0xf0,
0x6b, 0xb0, 0x0b, 0x08, 0xd1, 0x74, 0x46, 0x3c, 0xd1, 0xc6, 0x39, 0x1a, 0x43, 0x6f, 0x16, 0x53,
0x12, 0x04, 0x91, 0x47, 0x04, 0x55, 0x55, 0xe8, 0x38, 0x79, 0x11, 0xbe, 0x0a, 0x97, 0x6b, 0xc1,
0x75, 0x80, 0xf8, 0x71, 0x29, 0xfa, 0x68, 0x3a, 0x65, 0xad, 0x5c, 0xe3, 0x2b, 0x95, 0xa8, 0x95,
0xa5, 0xc1, 0xfd, 0xa2, 0xb4, 0x1b, 0x50, 0x12, 0x26, 0xb3, 0x56, 0xc0, 0xe5, 0x88, 0x53, 0xd3,
0x0c, 0x79, 0x43, 0x37, 0xc7, 0x56, 0x14, 0x04, 0xd4, 0x13, 0x2c, 0x0a, 0x53, 0xd8, 0x6b, 0x00,
0x5e, 0x26, 0x34, 0xad, 0x92, 0x93, 0x60, 0x1b, 0x46, 0x55, 0x53, 0x03, 0xfb, 0xa7, 0x05, 0x17,
0xbe, 0x36, 0x45, 0xd3, 0x8e, 0x5b, 0x1d, 0x40, 0xd1, 0xe5, 0x99, 0xb2, 0xcb, 0xf2, 0x01, 0x75,
0x2a, 0x07, 0x24, 0x35, 0x62, 0x3a, 0x0b, 0x98, 0x47, 0x14, 0x44, 0x57, 0x41, 0xe4, 0x45, 0x68,
0x08, 0x1d, 0x21, 0x82, 0xd1, 0xa2, 0xda, 0x91, 0x4b, 0x3c, 0x82, 0x8b, 0xe5, 0x58, 0x4d, 0x1a,
0x9f, 0xc1, 0x86, 0x96, 0xec, 0x1e, 0x87, 0xde, 0xae, 0xba, 0x0d, 0xad, 0x8a, 0xfe, 0xb7, 0x05,
0xa3, 0xaa, 0xa1, 0xe9, 0xe2, 0x0f, 0xad, 0xc0, 0xfb, 0xe6, 0x87, 0xfe, 0x07, 0x3d, 0x41, 0x58,
0xe0, 0x46, 0xfb, 0xfb, 0x9c, 0x8a, 0xd1, 0xd2, 0xd8, 0x9a, 0x74, 0x1d, 0x90, 0xa2, 0xe7, 0x4a,
0x82, 0xee, 0xc0, 0xd0, 0xd3, 0x9d, 0xec, 0xc6, 0xf4, 0x2d, 0xe3, 0x12, 0x79, 0x59, 0x05, 0x76,
0xce, 0x4b, 0x3b, 0x5c, 0x8b, 0x11, 0x86, 0x01, 0xf3, 0xdf, 0xb9, 0x6a, 0x80, 0xa8, 0xeb, 0xbf,
0xa2, 0xd0, 0x7a, 0xcc, 0x7f, 0xf7, 0x2d, 0x0b, 0xe8, 0xae, 0x9c, 0x02, 0xaf, 0xe0, 0x8a, 0x4e,
0x7e, 0x27, 0xf4, 0x62, 0x3a, 0xa5, 0xa1, 0x20, 0xc1, 0x56, 0x34, 0x3b, 0x6e, 0xd5, 0x02, 0x97,
0x60, 0x85, 0xb3, 0xd0, 0xa3, 0x6e, 0xa8, 0xc7, 0x50, 0xd7, 0x59, 0x56, 0xdf, 0xcf, 0x38, 0x7e,
0x02, 0x57, 0x1b, 0x70, 0x4d, 0x65, 0xaf, 0x43, 0x5f, 0x05, 0xe6, 0x45, 0xa1, 0xa0, 0xa1, 0x50,
0xd8, 0x7d, 0xa7, 0x27, 0x65, 0x5b, 0x5a, 0x84, 0x3f, 0x01, 0xa4, 0x31, 0x9e, 0x46, 0x49, 0xd8,
0xee, 0x6a, 0x5e, 0x80, 0xb5, 0x82, 0x89, 0xe9, 0x8d, 0x47, 0xb0, 0xae, 0xc5, 0x2f, 0xc3, 0x69,
0x6b, 0xac, 0x0d, 0xb8, 0x50, 0x32, 0x32, 0x68, 0x0f, 0x53, 0x27, 0xc5, 0x77, 0xe2, 0x54, 0xb0,
0x8b, 0x69, 0x04, 0xc5, 0xa7, 0x02, 0xff, 0x65, 0xc1, 0xf9, 0x74, 0x8c, 0xb4, 0xac, 0xfa, 0x7b,
0xb6, 0x5d, 0xa7, 0xb1, 0xed, 0xba, 0x27, 0x6d, 0x37, 0x81, 0x21, 0x8f, 0x92, 0xd8, 0xa3, 0xae,
0x4f, 0x04, 0x71, 0xc3, 0xc8, 0xa7, 0xa6, 0x2b, 0xcf, 0x6a, 0xf9, 0x36, 0x11, 0xe4, 0x59, 0xe4,
0x53, 0xbc, 0x9e, 0x1e, 0x4a, 0xfe, 0x34, 0x71, 0x08, 0xe7, 0xe4, 0xb7, 0x6c, 0xab, 0x96, 0x39,
0xf4, 0x18, 0x77, 0xd3, 0xee, 0x54, 0x49, 0xac, 0x38, 0xab, 0x8c, 0xef, 0xe8, 0xd6, 0x34, 0xfb,
0x3e, 0x11, 0x7a, 0xbf, 0x93, 0xee, 0x6f, 0x13, 0x21, 0xf7, 0xf1, 0xa7, 0x30, 0x3c, 0xf1, 0xd7,
0xbe, 0xa3, 0x92, 0xb4, 0xd8, 0x2f, 0x08, 0x0b, 0x3e, 0xb0, 0xc5, 0xd1, 0x04, 0xce, 0xf9, 0x31,
0x61, 0x21, 0x0b, 0x0f, 0x76, 0xa9, 0x17, 0x85, 0x3e, 0x57, 0x71, 0x0e, 0x9c, 0xb2, 0x18, 0xff,
0x96, 0xd6, 0x4c, 0xbb, 0x3d, 0x79, 0x21, 0x43, 0x4a, 0xfd, 0x80, 0xba, 0x87, 0x94, 0xf8, 0x34,
0x36, 0x01, 0xf7, 0xb5, 0xf0, 0x3b, 0x25, 0x93, 0xf3, 0xc0, 0x28, 0xed, 0x45, 0xfe, 0xb1, 0x0a,
0xa1, 0xef, 0x80, 0x16, 0x3d, 0x89, 0xfc, 0x63, 0x75, 0xc9, 0xb9, 0x1b, 0x10, 0x2e, 0x5c, 0xef,
0x30, 0x09, 0x8f, 0x4c, 0xad, 0x7a, 0x8c, 0x7f, 0x4f, 0xb8, 0xd8, 0x92, 0x22, 0xfc, 0x25, 0x5c,
0x76, 0x28, 0xf1, 0x75, 0x0c, 0xea, 0xea, 0xb7, 0x1f, 0x8f, 0xff, 0x58, 0x70, 0xa5, 0xde, 0xb8,
0xcd, 0x88, 0xbc, 0x0f, 0x28, 0x1b, 0x41, 0x82, 0x4d, 0x29, 0x17, 0x64, 0x3a, 0x33, 0x85, 0x1c,
0x9a, 0x39, 0xf4, 0x22, 0x95, 0x57, 0x07, 0x56, 0xa7, 0x32, 0xb0, 0x24, 0x62, 0xda, 0x16, 0x39,
0xc4, 0xae, 0x46, 0xf4, 0x75, 0x7b, 0x14, 0x10, 0x33, 0x6d, 0x85, 0xb8, 0xa8, 0x11, 0x8d, 0xa2,
0x42, 0xbc, 0x0a, 0x60, 0xfa, 0x26, 0x09, 0xd3, 0x89, 0xbb, 0xaa, 0xbb, 0x26, 0x09, 0x05, 0xfe,
0x01, 0x60, 0x9b, 0xf1, 0x23, 0x9d, 0xb5, 0xbc, 0x3a, 0x3e, 0x8b, 0xcd, 0x0b, 0x2b, 0x97, 0x52,
0x42, 0x82, 0xc0, 0xe4, 0x24, 0x97, 0x92, 0x6d, 0x25, 0x9c, 0xfa, 0x26, 0x7a, 0xb5, 0x96, 0xb2,
0xfd, 0x98, 0x52, 0x13, 0xa8, 0x5a, 0xe3, 0xdf, 0x2d, 0x58, 0x7d, 0x4a, 0xa7, 0x06, 0xf9, 0x1a,
0xc0, 0x41, 0x14, 0x47, 0x89, 0x60, 0x21, 0xe5, 0xca, 0xc1, 0xa2, 0x93, 0x93, 0xfc, 0x77, 0x3f,
0x8a, 0xfd, 0xd1, 0x60, 0xdf, 0xe4, 0xae, 0xd6, 0x52, 0x76, 0x48, 0xc9, 0xcc, 0xa4, 0xab, 0xd6,
0x92, 0x3b, 0x72, 0x41, 0xbc, 0x23, 0xf5, 0x9e, 0x74, 0x1d, 0xfd, 0xf1, 0xf0, 0x8f, 0x01, 0xf4,
0xcd, 0xfb, 0xa8, 0xc8, 0x2b, 0xfa, 0x09, 0x7a, 0x39, 0xd2, 0x8b, 0x6e, 0x56, 0xb9, 0x6d, 0x95,
0x44, 0xdb, 0xff, 0x9f, 0xa3, 0x65, 0xe6, 0xc8, 0x02, 0x0a, 0xe1, 0x7c, 0x85, 0x54, 0xa2, 0xbb,
0x55, 0xeb, 0x26, 0xca, 0x6a, 0xdf, 0x6b, 0xa5, 0x9b, 0xf9, 0x13, 0xb0, 0x56, 0xc3, 0x12, 0xd1,
0xfd, 0x39, 0x28, 0x05, 0xa6, 0x6a, 0x7f, 0xd4, 0x52, 0x3b, 0xf3, 0xfa, 0x06, 0x50, 0x95, 0x42,
0xa2, 0x7b, 0x73, 0x61, 0x4e, 0x28, 0xaa, 0x7d, 0xbf, 0x9d, 0x72, 0x63, 0xa2, 0x9a, 0x5c, 0xce,
0x4d, 0xb4, 0x40, 0x5f, 0xe7, 0x26, 0x5a, 0x62, 0xac, 0x0b, 0xe8, 0x08, 0x86, 0x65, 0xe2, 0x89,
0xee, 0x34, 0xfd, 0x1a, 0xaa, 0xf0, 0x5a, 0xfb, 0x6e, 0x1b, 0xd5, 0xcc, 0x19, 0x85, 0xb3, 0x45,
0x72, 0x88, 0x6e, 0x57, 0xed, 0x6b, 0xa9, 0xae, 0x3d, 0x99, 0xaf, 0x98, 0xcf, 0xa9, 0x4c, 0x18,
0xeb, 0x72, 0x6a, 0x60, 0xa3, 0x75, 0x39, 0x35, 0xf1, 0x4f, 0xbc, 0x80, 0x7e, 0x4d, 0x59, 0x48,
0x89, 0x48, 0xa1, 0xcd, 0x26, 0x98, 0x7a, 0x26, 0x67, 0x3f, 0x68, 0xad, 0x9f, 0xfa, 0xfe, 0xd8,
0x92, 0x77, 0x3d, 0xc7, 0xa7, 0xea, 0xee, 0x7a, 0x95, 0xa1, 0xd5, 0xdd, 0xf5, 0x3a, 0x52, 0xb6,
0x80, 0xf6, 0x60, 0x50, 0x60, 0x58, 0xe8, 0x56, 0x93, 0x65, 0x91, 0xb7, 0xd9, 0xb7, 0xe7, 0xea,
0x65, 0x3e, 0xdc, 0x74, 0x7a, 0x99, 0x71, 0xd5, 0x18, 0x5c, 0x71, 0x5e, 0xdd, 0x9a, 0xa7, 0x96,
0x39, 0xf8, 0x11, 0xe0, 0x84, 0x10, 0xa1, 0x1b, 0x4d, 0x76, 0xf9, 0xa3, 0xb8, 0x79, 0xba, 0x52,
0x06, 0xfd, 0x33, 0xac, 0xd7, 0x3d, 0xbd, 0xa8, 0xe6, 0x16, 0x9e, 0xf2, 0xbe, 0xdb, 0x9b, 0x6d,
0xd5, 0x33, 0xc7, 0x2f, 0x61, 0x25, 0xa5, 0x57, 0xe8, 0x7a, 0xd5, 0xba, 0x44, 0xf5, 0x6c, 0x7c,
0x9a, 0x4a, 0xae, 0x9b, 0x5e, 0xa7, 0xa5, 0x92, 0x3c, 0xa8, 0xb9, 0x54, 0x39, 0x72, 0xd6, 0x5c,
0xaa, 0x3c, 0x95, 0x92, 0xe0, 0x7b, 0x4b, 0xea, 0x5f, 0x9d, 0x47, 0xff, 0x06, 0x00, 0x00, 0xff,
0xff, 0x71, 0xd9, 0xf3, 0x7e, 0xec, 0x11, 0x00, 0x00,
}

28
weed/server/volume_grpc_stream_follow.go → weed/server/volume_grpc_tail.go
View File

@ -30,6 +30,7 @@ func (vs *VolumeServer) VolumeTail(req *volume_server_pb.VolumeTailRequest, stre
time.Sleep(2 * time.Second)
if req.DrainingSeconds == 0 {
lastTimestampNs = lastProcessedTimestampNs
continue
}
if lastProcessedTimestampNs == lastTimestampNs {
@ -59,18 +60,31 @@ func sendNeedlesSince(stream volume_server_pb.VolumeServer_VolumeTailServer, v *
if isLastOne {
// need to heart beat to the client to ensure the connection health
sendErr := stream.Send(&volume_server_pb.VolumeTailResponse{})
sendErr := stream.Send(&volume_server_pb.VolumeTailResponse{IsLastChunk: true})
return lastTimestampNs, sendErr
}
err = storage.ScanVolumeFileNeedleFrom(v.Version(), v.DataFile(), foundOffset.ToAcutalOffset(), func(needleHeader, needleBody []byte, needleAppendAtNs uint64) error {
sendErr := stream.Send(&volume_server_pb.VolumeTailResponse{
NeedleHeader: needleHeader,
NeedleBody: needleBody,
})
if sendErr != nil {
return sendErr
blockSizeLimit := 1024 * 1024 * 2
isLastChunk := false
// need to send body by chunks
for i := 0; i < len(needleBody); i += blockSizeLimit {
stopOffset := i + blockSizeLimit
if stopOffset >= len(needleBody) {
isLastChunk = true
stopOffset = len(needleBody)
}
sendErr := stream.Send(&volume_server_pb.VolumeTailResponse{
NeedleHeader: needleHeader,
NeedleBody: needleBody[i:stopOffset],
IsLastChunk: isLastChunk,
})
if sendErr != nil {
return sendErr
}
}
lastProcessedTimestampNs = needleAppendAtNs

31
weed/storage/needle_read_write.go
View File

@ -304,28 +304,35 @@ func (n *Needle) ReadNeedleBody(r *os.File, version Version, offset int64, bodyL
if bodyLength <= 0 {
return nil, nil
}
bytes = make([]byte, bodyLength)
if _, err = r.ReadAt(bytes, offset); err != nil {
return
}
err = n.ReadNeedleBodyBytes(bytes, version)
return
}
func (n *Needle) ReadNeedleBodyBytes(needleBody []byte, version Version) (err error) {
if len(needleBody) <= 0 {
return nil
}
switch version {
case Version1:
bytes = make([]byte, bodyLength)
if _, err = r.ReadAt(bytes, offset); err != nil {
return
}
n.Data = bytes[:n.Size]
n.Data = needleBody[:n.Size]
n.Checksum = NewCRC(n.Data)
case Version2, Version3:
bytes = make([]byte, bodyLength)
if _, err = r.ReadAt(bytes, offset); err != nil {
return
}
err = n.readNeedleDataVersion2(bytes[0:n.Size])
err = n.readNeedleDataVersion2(needleBody[0:n.Size])
n.Checksum = NewCRC(n.Data)
if version == Version3 {
tsOffset := n.Size + NeedleChecksumSize
n.AppendAtNs = util.BytesToUint64(bytes[tsOffset : tsOffset+TimestampSize])
n.AppendAtNs = util.BytesToUint64(needleBody[tsOffset : tsOffset+TimestampSize])
}
default:
err = fmt.Errorf("Unsupported Version! (%d)", version)
err = fmt.Errorf("unsupported version %d!", version)
}
return
}

Write Preview
Loading…
Cancel
Save