From c48fc8b4de5922c44d22da306699f789353ecdd4 Mon Sep 17 00:00:00 2001 From: Chris Lu Date: Sat, 25 Jan 2020 09:17:19 -0800 Subject: [PATCH] grpc send error via response instead of grpc error --- other/java/client/src/main/proto/filer.proto | 1 + weed/command/filer_copy.go | 4 +- weed/filesys/dir.go | 5 +- weed/filesys/dir_link.go | 2 +- weed/filesys/dirty_page_interval.go | 6 +- weed/filesys/filehandle.go | 2 +- weed/pb/filer.proto | 1 + weed/pb/filer_pb/filer.pb.go | 215 +++++++++--------- weed/pb/filer_pb/filer_pb_helper.go | 14 ++ weed/replication/sink/filersink/filer_sink.go | 2 +- weed/s3api/filer_util.go | 4 +- weed/server/filer_grpc_server.go | 14 +- weed/server/webdav_server.go | 4 +- weed/shell/command_fs_meta_load.go | 2 +- 14 files changed, 152 insertions(+), 124 deletions(-) diff --git a/other/java/client/src/main/proto/filer.proto b/other/java/client/src/main/proto/filer.proto index 41c1650d4..6357d971f 100644 --- a/other/java/client/src/main/proto/filer.proto +++ b/other/java/client/src/main/proto/filer.proto @@ -127,6 +127,7 @@ message CreateEntryRequest { } message CreateEntryResponse { + string error = 1; } message UpdateEntryRequest { diff --git a/weed/command/filer_copy.go b/weed/command/filer_copy.go index f14d18c52..71143f307 100644 --- a/weed/command/filer_copy.go +++ b/weed/command/filer_copy.go @@ -331,7 +331,7 @@ func (worker *FileCopyWorker) uploadFileAsOne(ctx context.Context, task FileCopy }, } - if _, err := client.CreateEntry(ctx, request); err != nil { + if err := filer_pb.CreateEntry(ctx, client, request); err != nil { return fmt.Errorf("update fh: %v", err) } return nil @@ -435,7 +435,7 @@ func (worker *FileCopyWorker) uploadFileInChunks(ctx context.Context, task FileC }, } - if _, err := client.CreateEntry(ctx, request); err != nil { + if err := filer_pb.CreateEntry(ctx, client, request); err != nil { return fmt.Errorf("update fh: %v", err) } return nil diff --git a/weed/filesys/dir.go b/weed/filesys/dir.go index 7af5544ff..fe6b30619 100644 --- a/weed/filesys/dir.go +++ b/weed/filesys/dir.go @@ -129,8 +129,7 @@ func (dir *Dir) Create(ctx context.Context, req *fuse.CreateRequest, glog.V(1).Infof("create: %v", req.String()) if err := dir.wfs.WithFilerClient(ctx, func(client filer_pb.SeaweedFilerClient) error { - if _, err := client.CreateEntry(ctx, request); err != nil { - glog.V(0).Infof("create %s/%s: %v", dir.Path, req.Name, err) + if err := filer_pb.CreateEntry(ctx, client, request); err != nil { if strings.Contains(err.Error(), "EEXIST") { return fuse.EEXIST } @@ -174,7 +173,7 @@ func (dir *Dir) Mkdir(ctx context.Context, req *fuse.MkdirRequest) (fs.Node, err } glog.V(1).Infof("mkdir: %v", request) - if _, err := client.CreateEntry(ctx, request); err != nil { + if err := filer_pb.CreateEntry(ctx, client, request); err != nil { glog.V(0).Infof("mkdir %s/%s: %v", dir.Path, req.Name, err) return err } diff --git a/weed/filesys/dir_link.go b/weed/filesys/dir_link.go index 8e60872d3..13be62670 100644 --- a/weed/filesys/dir_link.go +++ b/weed/filesys/dir_link.go @@ -36,7 +36,7 @@ func (dir *Dir) Symlink(ctx context.Context, req *fuse.SymlinkRequest) (fs.Node, } err := dir.wfs.WithFilerClient(ctx, func(client filer_pb.SeaweedFilerClient) error { - if _, err := client.CreateEntry(ctx, request); err != nil { + if err := filer_pb.CreateEntry(ctx, client, request); err != nil { glog.V(0).Infof("symlink %s/%s: %v", dir.Path, req.NewName, err) return fuse.EIO } diff --git a/weed/filesys/dirty_page_interval.go b/weed/filesys/dirty_page_interval.go index 79b3af335..c64196cdf 100644 --- a/weed/filesys/dirty_page_interval.go +++ b/weed/filesys/dirty_page_interval.go @@ -31,12 +31,12 @@ func (list *IntervalLinkedList) Size() int64 { return list.Tail.Offset + list.Tail.Size - list.Head.Offset } func (list *IntervalLinkedList) addNodeToTail(node *IntervalNode) { - // glog.V(0).Infof("add to tail [%d,%d) + [%d,%d) => [%d,%d)", list.Head.Offset, list.Tail.Offset+list.Tail.Size, node.Offset, node.Offset+node.Size, list.Head.Offset, node.Offset+node.Size) + glog.V(4).Infof("add to tail [%d,%d) + [%d,%d) => [%d,%d)", list.Head.Offset, list.Tail.Offset+list.Tail.Size, node.Offset, node.Offset+node.Size, list.Head.Offset, node.Offset+node.Size) list.Tail.Next = node list.Tail = node } func (list *IntervalLinkedList) addNodeToHead(node *IntervalNode) { - // glog.V(0).Infof("add to head [%d,%d) + [%d,%d) => [%d,%d)", node.Offset, node.Offset+node.Size, list.Head.Offset, list.Tail.Offset+list.Tail.Size, node.Offset, list.Tail.Offset+list.Tail.Size) + glog.V(4).Infof("add to head [%d,%d) + [%d,%d) => [%d,%d)", node.Offset, node.Offset+node.Size, list.Head.Offset, list.Tail.Offset+list.Tail.Size, node.Offset, list.Tail.Offset+list.Tail.Size) node.Next = list.Head list.Head = node } @@ -102,7 +102,7 @@ func (c *ContinuousIntervals) AddInterval(data []byte, offset int64) (hasOverlap } if prevList != nil && nextList != nil { - // glog.V(4).Infof("connecting [%d,%d) + [%d,%d) => [%d,%d)", prevList.Head.Offset, prevList.Tail.Offset+prevList.Tail.Size, nextList.Head.Offset, nextList.Tail.Offset+nextList.Tail.Size, prevList.Head.Offset, nextList.Tail.Offset+nextList.Tail.Size) + glog.V(4).Infof("connecting [%d,%d) + [%d,%d) => [%d,%d)", prevList.Head.Offset, prevList.Tail.Offset+prevList.Tail.Size, nextList.Head.Offset, nextList.Tail.Offset+nextList.Tail.Size, prevList.Head.Offset, nextList.Tail.Offset+nextList.Tail.Size) prevList.Tail.Next = nextList.Head prevList.Tail = nextList.Tail c.removeList(nextList) diff --git a/weed/filesys/filehandle.go b/weed/filesys/filehandle.go index 9fe4201db..fad5418e2 100644 --- a/weed/filesys/filehandle.go +++ b/weed/filesys/filehandle.go @@ -194,7 +194,7 @@ func (fh *FileHandle) Flush(ctx context.Context, req *fuse.FlushRequest) error { fh.f.entry.Chunks = chunks // fh.f.entryViewCache = nil - if _, err := client.CreateEntry(ctx, request); err != nil { + if err := filer_pb.CreateEntry(ctx, client, request); err != nil { glog.Errorf("update fh: %v", err) return fmt.Errorf("update fh: %v", err) } diff --git a/weed/pb/filer.proto b/weed/pb/filer.proto index 41c1650d4..6357d971f 100644 --- a/weed/pb/filer.proto +++ b/weed/pb/filer.proto @@ -127,6 +127,7 @@ message CreateEntryRequest { } message CreateEntryResponse { + string error = 1; } message UpdateEntryRequest { diff --git a/weed/pb/filer_pb/filer.pb.go b/weed/pb/filer_pb/filer.pb.go index 043a46504..01b3e8d90 100644 --- a/weed/pb/filer_pb/filer.pb.go +++ b/weed/pb/filer_pb/filer.pb.go @@ -527,6 +527,7 @@ func (m *CreateEntryRequest) GetOExcl() bool { } type CreateEntryResponse struct { + Error string `protobuf:"bytes,1,opt,name=error" json:"error,omitempty"` } func (m *CreateEntryResponse) Reset() { *m = CreateEntryResponse{} } @@ -534,6 +535,13 @@ func (m *CreateEntryResponse) String() string { return proto.CompactT func (*CreateEntryResponse) ProtoMessage() {} func (*CreateEntryResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{11} } +func (m *CreateEntryResponse) GetError() string { + if m != nil { + return m.Error + } + return "" +} + type UpdateEntryRequest struct { Directory string `protobuf:"bytes,1,opt,name=directory" json:"directory,omitempty"` Entry *Entry `protobuf:"bytes,2,opt,name=entry" json:"entry,omitempty"` @@ -1465,107 +1473,108 @@ var _SeaweedFiler_serviceDesc = grpc.ServiceDesc{ func init() { proto.RegisterFile("filer.proto", fileDescriptor0) } var fileDescriptor0 = []byte{ - // 1624 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xb4, 0x58, 0x4b, 0x6f, 0xdb, 0xc6, - 0x16, 0x36, 0xf5, 0xe6, 0x91, 0x94, 0xd8, 0x63, 0x3b, 0x51, 0xe4, 0xc7, 0x75, 0xe8, 0x9b, 0x5c, - 0x5f, 0x34, 0x70, 0x03, 0x37, 0x8b, 0xa4, 0x69, 0x17, 0x89, 0x1f, 0x85, 0x51, 0xe7, 0x01, 0x3a, - 0x29, 0x5a, 0x14, 0x28, 0x41, 0x93, 0x23, 0x79, 0x6a, 0x92, 0xa3, 0x0e, 0x87, 0xb6, 0xd3, 0x9f, - 0xd0, 0x65, 0x97, 0x05, 0xba, 0xee, 0x9f, 0x28, 0xba, 0x29, 0x8a, 0xfe, 0x9b, 0x2e, 0xbb, 0x2e, - 0x66, 0x86, 0xa4, 0x86, 0xa2, 0x6c, 0x27, 0x28, 0xb2, 0xe3, 0x9c, 0xf7, 0x39, 0x73, 0xce, 0xf9, - 0x46, 0x82, 0xf6, 0x80, 0x04, 0x98, 0x6d, 0x8e, 0x18, 0xe5, 0x14, 0xb5, 0xe4, 0xc1, 0x19, 0x1d, - 0x59, 0x2f, 0x60, 0xe9, 0x80, 0xd2, 0x93, 0x64, 0xb4, 0x43, 0x18, 0xf6, 0x38, 0x65, 0x6f, 0x76, - 0x23, 0xce, 0xde, 0xd8, 0xf8, 0xbb, 0x04, 0xc7, 0x1c, 0x2d, 0x83, 0xe9, 0x67, 0x8c, 0x9e, 0xb1, - 0x66, 0x6c, 0x98, 0xf6, 0x98, 0x80, 0x10, 0xd4, 0x22, 0x37, 0xc4, 0xbd, 0x8a, 0x64, 0xc8, 0x6f, - 0x6b, 0x17, 0x96, 0xa7, 0x1b, 0x8c, 0x47, 0x34, 0x8a, 0x31, 0xba, 0x03, 0x75, 0x2c, 0x08, 0xd2, - 0x5a, 0x7b, 0xeb, 0xfa, 0x66, 0x16, 0xca, 0xa6, 0x92, 0x53, 0x5c, 0xeb, 0x37, 0x03, 0xd0, 0x01, - 0x89, 0xb9, 0x20, 0x12, 0x1c, 0xbf, 0x5d, 0x3c, 0x37, 0xa0, 0x31, 0x62, 0x78, 0x40, 0xce, 0xd3, - 0x88, 0xd2, 0x13, 0xba, 0x07, 0x73, 0x31, 0x77, 0x19, 0xdf, 0x63, 0x34, 0xdc, 0x23, 0x01, 0x7e, - 0x2e, 0x82, 0xae, 0x4a, 0x91, 0x32, 0x03, 0x6d, 0x02, 0x22, 0x91, 0x17, 0x24, 0x31, 0x39, 0xc5, - 0x87, 0x19, 0xb7, 0x57, 0x5b, 0x33, 0x36, 0x5a, 0xf6, 0x14, 0x0e, 0x5a, 0x80, 0x7a, 0x40, 0x42, - 0xc2, 0x7b, 0xf5, 0x35, 0x63, 0xa3, 0x6b, 0xab, 0x83, 0xf5, 0x09, 0xcc, 0x17, 0xe2, 0x7f, 0xb7, - 0xf4, 0x7f, 0xae, 0x40, 0x5d, 0x12, 0xf2, 0x1a, 0x1b, 0xe3, 0x1a, 0xa3, 0xdb, 0xd0, 0x21, 0xb1, - 0x33, 0x2e, 0x44, 0x45, 0xc6, 0xd6, 0x26, 0x71, 0x5e, 0x73, 0xf4, 0x01, 0x34, 0xbc, 0xe3, 0x24, - 0x3a, 0x89, 0x7b, 0xd5, 0xb5, 0xea, 0x46, 0x7b, 0x6b, 0x7e, 0xec, 0x48, 0x24, 0xba, 0x2d, 0x78, - 0x76, 0x2a, 0x82, 0x1e, 0x02, 0xb8, 0x9c, 0x33, 0x72, 0x94, 0x70, 0x1c, 0xcb, 0x4c, 0xdb, 0x5b, - 0x3d, 0x4d, 0x21, 0x89, 0xf1, 0x93, 0x9c, 0x6f, 0x6b, 0xb2, 0xe8, 0x11, 0xb4, 0xf0, 0x39, 0xc7, - 0x91, 0x8f, 0xfd, 0x5e, 0x5d, 0x3a, 0x5a, 0x99, 0xc8, 0x68, 0x73, 0x37, 0xe5, 0xab, 0xfc, 0x72, - 0xf1, 0xfe, 0x63, 0xe8, 0x16, 0x58, 0x68, 0x16, 0xaa, 0x27, 0x38, 0xbb, 0x55, 0xf1, 0x29, 0x2a, - 0x7b, 0xea, 0x06, 0x89, 0x6a, 0xb0, 0x8e, 0xad, 0x0e, 0x1f, 0x57, 0x1e, 0x1a, 0xd6, 0x0e, 0x98, - 0x7b, 0x49, 0x10, 0xe4, 0x8a, 0x3e, 0x61, 0x99, 0xa2, 0x4f, 0xd8, 0xb8, 0xca, 0x95, 0x4b, 0xab, - 0xfc, 0xab, 0x01, 0x73, 0xbb, 0xa7, 0x38, 0xe2, 0xcf, 0x29, 0x27, 0x03, 0xe2, 0xb9, 0x9c, 0xd0, - 0x08, 0xdd, 0x03, 0x93, 0x06, 0xbe, 0x73, 0xe9, 0x35, 0xb5, 0x68, 0x90, 0x46, 0x7d, 0x0f, 0xcc, - 0x08, 0x9f, 0x39, 0x97, 0xba, 0x6b, 0x45, 0xf8, 0x4c, 0x49, 0xaf, 0x43, 0xd7, 0xc7, 0x01, 0xe6, - 0xd8, 0xc9, 0x6f, 0x47, 0x5c, 0x5d, 0x47, 0x11, 0xb7, 0xd5, 0x75, 0xdc, 0x85, 0xeb, 0xc2, 0xe4, - 0xc8, 0x65, 0x38, 0xe2, 0xce, 0xc8, 0xe5, 0xc7, 0xf2, 0x4e, 0x4c, 0xbb, 0x1b, 0xe1, 0xb3, 0x97, - 0x92, 0xfa, 0xd2, 0xe5, 0xc7, 0xd6, 0xdf, 0x06, 0x98, 0xf9, 0x65, 0xa2, 0x9b, 0xd0, 0x14, 0x6e, - 0x1d, 0xe2, 0xa7, 0x95, 0x68, 0x88, 0xe3, 0xbe, 0x2f, 0xa6, 0x82, 0x0e, 0x06, 0x31, 0xe6, 0x32, - 0xbc, 0xaa, 0x9d, 0x9e, 0x44, 0x67, 0xc5, 0xe4, 0x7b, 0x35, 0x08, 0x35, 0x5b, 0x7e, 0x8b, 0x8a, - 0x87, 0x9c, 0x84, 0x58, 0x3a, 0xac, 0xda, 0xea, 0x80, 0xe6, 0xa1, 0x8e, 0x1d, 0xee, 0x0e, 0x65, - 0x87, 0x9b, 0x76, 0x0d, 0xbf, 0x72, 0x87, 0xe8, 0xbf, 0x70, 0x2d, 0xa6, 0x09, 0xf3, 0xb0, 0x93, - 0xb9, 0x6d, 0x48, 0x6e, 0x47, 0x51, 0xf7, 0x94, 0x73, 0x0b, 0xaa, 0x03, 0xe2, 0xf7, 0x9a, 0xb2, - 0x30, 0xb3, 0xc5, 0x26, 0xdc, 0xf7, 0x6d, 0xc1, 0x44, 0x1f, 0x02, 0xe4, 0x96, 0xfc, 0x5e, 0xeb, - 0x02, 0x51, 0x33, 0xb3, 0xeb, 0x5b, 0x5f, 0x42, 0x23, 0x35, 0xbf, 0x04, 0xe6, 0x29, 0x0d, 0x92, - 0x30, 0x4f, 0xbb, 0x6b, 0xb7, 0x14, 0x61, 0xdf, 0x47, 0xb7, 0x40, 0xee, 0x39, 0x47, 0x74, 0x55, - 0x45, 0x26, 0x29, 0x2b, 0xf4, 0x39, 0x96, 0x9b, 0xc2, 0xa3, 0xf4, 0x84, 0xa8, 0xec, 0x9b, 0x76, - 0x7a, 0xb2, 0xfe, 0xaa, 0xc0, 0xb5, 0x62, 0xbb, 0x0b, 0x17, 0xd2, 0x8a, 0xac, 0x95, 0x21, 0xcd, - 0x48, 0xb3, 0x87, 0x85, 0x7a, 0x55, 0xf4, 0x7a, 0x65, 0x2a, 0x21, 0xf5, 0x95, 0x83, 0xae, 0x52, - 0x79, 0x46, 0x7d, 0x2c, 0xba, 0x35, 0x21, 0xbe, 0x2c, 0x70, 0xd7, 0x16, 0x9f, 0x82, 0x32, 0x24, - 0x7e, 0xba, 0x3e, 0xc4, 0xa7, 0x0c, 0x8f, 0x49, 0xbb, 0x0d, 0x75, 0x65, 0xea, 0x24, 0xae, 0x2c, - 0x14, 0xd4, 0xa6, 0xba, 0x07, 0xf1, 0x8d, 0xd6, 0xa0, 0xcd, 0xf0, 0x28, 0x48, 0xbb, 0x57, 0x96, - 0xcf, 0xb4, 0x75, 0x12, 0x5a, 0x05, 0xf0, 0x68, 0x10, 0x60, 0x4f, 0x0a, 0x98, 0x52, 0x40, 0xa3, - 0x88, 0xce, 0xe1, 0x3c, 0x70, 0x62, 0xec, 0xf5, 0x60, 0xcd, 0xd8, 0xa8, 0xdb, 0x0d, 0xce, 0x83, - 0x43, 0xec, 0x89, 0x3c, 0x92, 0x18, 0x33, 0x47, 0x2e, 0xa0, 0xb6, 0xd4, 0x6b, 0x09, 0x82, 0x5c, - 0x93, 0x2b, 0x00, 0x43, 0x46, 0x93, 0x91, 0xe2, 0x76, 0xd6, 0xaa, 0x62, 0x17, 0x4b, 0x8a, 0x64, - 0xdf, 0x81, 0x6b, 0xf1, 0x9b, 0x30, 0x20, 0xd1, 0x89, 0xc3, 0x5d, 0x36, 0xc4, 0xbc, 0xd7, 0x55, - 0x3d, 0x9c, 0x52, 0x5f, 0x49, 0xa2, 0x35, 0x02, 0xb4, 0xcd, 0xb0, 0xcb, 0xf1, 0x3b, 0xc0, 0xce, - 0xdb, 0x4d, 0x37, 0x5a, 0x84, 0x06, 0x75, 0xf0, 0xb9, 0x17, 0xa4, 0x43, 0x56, 0xa7, 0xbb, 0xe7, - 0x5e, 0x60, 0x2d, 0xc2, 0x7c, 0xc1, 0xa3, 0x5a, 0xcc, 0xd6, 0x57, 0x80, 0x5e, 0x8f, 0xfc, 0xf7, - 0x11, 0x88, 0xf0, 0x58, 0x30, 0x9d, 0x7a, 0xfc, 0xc3, 0x00, 0xb4, 0x23, 0xe7, 0xfe, 0xdf, 0x41, - 0xae, 0x98, 0x44, 0x01, 0x07, 0x6a, 0xaf, 0xf8, 0x2e, 0x77, 0x53, 0xb0, 0xea, 0x90, 0x58, 0xd9, - 0xdf, 0x71, 0xb9, 0x9b, 0x82, 0x06, 0xc3, 0x5e, 0xc2, 0x04, 0x7e, 0xc9, 0x76, 0x93, 0xa0, 0x61, - 0x67, 0x24, 0xf4, 0x00, 0x6e, 0x90, 0x61, 0x44, 0x19, 0x1e, 0x8b, 0x39, 0x98, 0x31, 0xca, 0x64, - 0x1b, 0xb6, 0xec, 0x05, 0xc5, 0xcd, 0x15, 0x76, 0x05, 0x4f, 0xa4, 0x57, 0x48, 0x23, 0x4d, 0xef, - 0x27, 0x03, 0x7a, 0x4f, 0x38, 0x0d, 0x89, 0x67, 0x63, 0x11, 0x66, 0x21, 0xc9, 0x75, 0xe8, 0x8a, - 0x1d, 0x3b, 0x99, 0x68, 0x87, 0x06, 0xfe, 0x18, 0xc3, 0x6e, 0x81, 0x58, 0xb3, 0x8e, 0x96, 0x6f, - 0x93, 0x06, 0xbe, 0xec, 0xae, 0x75, 0x10, 0xbb, 0x50, 0xd3, 0x57, 0x68, 0xde, 0x89, 0xf0, 0x59, - 0x41, 0x5f, 0x08, 0x49, 0x7d, 0xb5, 0x40, 0x9b, 0x11, 0x3e, 0x13, 0xfa, 0xd6, 0x12, 0xdc, 0x9a, - 0x12, 0x5b, 0x1a, 0xf9, 0x2f, 0x06, 0xcc, 0x3f, 0x89, 0x63, 0x32, 0x8c, 0xbe, 0x90, 0xab, 0x24, - 0x0b, 0x7a, 0x01, 0xea, 0x1e, 0x4d, 0x22, 0x2e, 0x83, 0xad, 0xdb, 0xea, 0x30, 0x31, 0x5d, 0x95, - 0xd2, 0x74, 0x4d, 0xcc, 0x67, 0xb5, 0x3c, 0x9f, 0xda, 0xfc, 0xd5, 0x0a, 0xf3, 0xf7, 0x1f, 0x68, - 0x8b, 0xeb, 0x74, 0x3c, 0x1c, 0x71, 0xcc, 0xd2, 0xed, 0x0b, 0x82, 0xb4, 0x2d, 0x29, 0xd6, 0x0f, - 0x06, 0x2c, 0x14, 0x23, 0x4d, 0x9f, 0x19, 0x17, 0x82, 0x81, 0xd8, 0x3e, 0x2c, 0x48, 0xc3, 0x14, - 0x9f, 0x62, 0x8e, 0x47, 0xc9, 0x51, 0x40, 0x3c, 0x47, 0x30, 0x54, 0x78, 0xa6, 0xa2, 0xbc, 0x66, - 0xc1, 0x38, 0xe9, 0x9a, 0x9e, 0x34, 0x82, 0x9a, 0x9b, 0xf0, 0xe3, 0x0c, 0x10, 0xc4, 0xb7, 0xf5, - 0x00, 0xe6, 0xd5, 0xcb, 0xaf, 0x58, 0xb5, 0x15, 0x80, 0x7c, 0x45, 0xc7, 0x3d, 0x43, 0xed, 0x89, - 0x6c, 0x47, 0xc7, 0xd6, 0xa7, 0x60, 0x1e, 0x50, 0x55, 0x88, 0x18, 0xdd, 0x07, 0x33, 0xc8, 0x0e, - 0x52, 0xb4, 0xbd, 0x85, 0xc6, 0x43, 0x95, 0xc9, 0xd9, 0x63, 0x21, 0xeb, 0x31, 0xb4, 0x32, 0x72, - 0x96, 0x9b, 0x71, 0x51, 0x6e, 0x95, 0x89, 0xdc, 0xac, 0xdf, 0x0d, 0x58, 0x28, 0x86, 0x9c, 0x96, - 0xef, 0x35, 0x74, 0x73, 0x17, 0x4e, 0xe8, 0x8e, 0xd2, 0x58, 0xee, 0xeb, 0xb1, 0x94, 0xd5, 0xf2, - 0x00, 0xe3, 0x67, 0xee, 0x48, 0xb5, 0x54, 0x27, 0xd0, 0x48, 0xfd, 0x57, 0x30, 0x57, 0x12, 0x99, - 0xf2, 0xec, 0xf9, 0xbf, 0xfe, 0xec, 0x29, 0x3c, 0xdd, 0x72, 0x6d, 0xfd, 0x2d, 0xf4, 0x08, 0x6e, - 0xaa, 0xf9, 0xdb, 0xce, 0x9b, 0x2e, 0xab, 0x7d, 0xb1, 0x37, 0x8d, 0xc9, 0xde, 0xb4, 0xfa, 0xd0, - 0x2b, 0xab, 0xa6, 0x53, 0x30, 0x84, 0xb9, 0x43, 0xee, 0x72, 0x12, 0x73, 0xe2, 0xe5, 0xef, 0xef, - 0x89, 0x66, 0x36, 0xae, 0x02, 0x9b, 0xf2, 0x38, 0xcc, 0x42, 0x95, 0xf3, 0xac, 0xcf, 0xc4, 0xa7, - 0xb8, 0x05, 0xa4, 0x7b, 0x4a, 0xef, 0xe0, 0x3d, 0xb8, 0x12, 0xfd, 0xc0, 0x29, 0x77, 0x03, 0x05, - 0xe6, 0x35, 0x09, 0xe6, 0xa6, 0xa4, 0x48, 0x34, 0x57, 0x78, 0xe7, 0x2b, 0x6e, 0x5d, 0x41, 0xbd, - 0x20, 0x48, 0xe6, 0x0a, 0x80, 0x1c, 0x29, 0x35, 0x0d, 0x0d, 0xa5, 0x2b, 0x28, 0xdb, 0x82, 0x60, - 0xad, 0xc2, 0xf2, 0x67, 0x98, 0x8b, 0x67, 0x09, 0xdb, 0xa6, 0xd1, 0x80, 0x0c, 0x13, 0xe6, 0x6a, - 0x57, 0x61, 0xfd, 0x68, 0xc0, 0xca, 0x05, 0x02, 0x69, 0xc2, 0x3d, 0x68, 0x86, 0x6e, 0xcc, 0x31, - 0xcb, 0xa6, 0x24, 0x3b, 0x4e, 0x96, 0xa2, 0x72, 0x55, 0x29, 0xaa, 0xa5, 0x52, 0x2c, 0x42, 0x23, - 0x74, 0xcf, 0x9d, 0xf0, 0x28, 0x7d, 0x77, 0xd4, 0x43, 0xf7, 0xfc, 0xd9, 0xd1, 0xd6, 0x9f, 0x4d, - 0xe8, 0x1c, 0x62, 0xf7, 0x0c, 0x63, 0x5f, 0x06, 0x86, 0x86, 0xd9, 0x40, 0x14, 0x7f, 0xbd, 0xa1, - 0x3b, 0x93, 0x9d, 0x3f, 0xf5, 0xe7, 0x62, 0xff, 0xee, 0x55, 0x62, 0x69, 0x6f, 0xcd, 0xa0, 0xe7, - 0xd0, 0xd6, 0x7e, 0x1e, 0xa1, 0x65, 0x4d, 0xb1, 0xf4, 0xab, 0xaf, 0xbf, 0x72, 0x01, 0x37, 0xb3, - 0x76, 0xdf, 0x40, 0x07, 0xd0, 0xd6, 0x50, 0x5d, 0xb7, 0x57, 0x7e, 0x5e, 0xe8, 0xf6, 0xa6, 0x3d, - 0x05, 0x66, 0x84, 0x35, 0x0d, 0xb1, 0x75, 0x6b, 0xe5, 0x37, 0x82, 0x6e, 0x6d, 0x1a, 0xcc, 0x4b, - 0x6b, 0x1a, 0x40, 0xea, 0xd6, 0xca, 0xf0, 0xaf, 0x5b, 0x9b, 0x86, 0xaa, 0x33, 0xe8, 0x1b, 0x98, - 0x2b, 0x41, 0x17, 0xb2, 0xc6, 0x5a, 0x17, 0x61, 0x6e, 0x7f, 0xfd, 0x52, 0x99, 0xdc, 0xfe, 0x0b, - 0xe8, 0xe8, 0x90, 0x82, 0xb4, 0x80, 0xa6, 0x80, 0x62, 0x7f, 0xf5, 0x22, 0xb6, 0x6e, 0x50, 0xdf, - 0x96, 0xba, 0xc1, 0x29, 0x78, 0xa1, 0x1b, 0x9c, 0xb6, 0x64, 0xad, 0x19, 0xf4, 0x35, 0xcc, 0x4e, - 0x6e, 0x2d, 0x74, 0x7b, 0xb2, 0x6c, 0xa5, 0x65, 0xd8, 0xb7, 0x2e, 0x13, 0xc9, 0x8d, 0xef, 0x03, - 0x8c, 0x97, 0x11, 0x5a, 0x1a, 0xeb, 0x94, 0x96, 0x61, 0x7f, 0x79, 0x3a, 0x33, 0x37, 0xf5, 0x2d, - 0x2c, 0x4e, 0x9d, 0x78, 0xa4, 0x8d, 0xc9, 0x65, 0x3b, 0xa3, 0xff, 0xbf, 0x2b, 0xe5, 0x32, 0x5f, - 0x4f, 0x57, 0x61, 0x36, 0x56, 0x83, 0x3c, 0x88, 0x37, 0xbd, 0x80, 0xe0, 0x88, 0x3f, 0x05, 0xa9, - 0xf1, 0x92, 0x51, 0x4e, 0x8f, 0x1a, 0xf2, 0x8f, 0x9f, 0x8f, 0xfe, 0x09, 0x00, 0x00, 0xff, 0xff, - 0x32, 0x00, 0xf8, 0x2b, 0x07, 0x12, 0x00, 0x00, + // 1633 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xb4, 0x18, 0x4b, 0x6f, 0xdc, 0xc6, + 0x59, 0xdc, 0x37, 0xbf, 0xdd, 0xb5, 0xa5, 0x59, 0xc9, 0x5e, 0xaf, 0x1e, 0x95, 0xa9, 0xda, 0x55, + 0x61, 0x43, 0x35, 0x54, 0x1f, 0xec, 0xba, 0x3d, 0xd8, 0x7a, 0x14, 0x42, 0xe5, 0x07, 0x28, 0xbb, + 0x68, 0x11, 0x20, 0x04, 0x45, 0xce, 0xae, 0x26, 0x22, 0x39, 0x9b, 0xe1, 0x50, 0x92, 0xf3, 0x13, + 0x72, 0xcc, 0x31, 0x40, 0xce, 0xf9, 0x13, 0x41, 0x2e, 0x41, 0x90, 0x7f, 0x93, 0x63, 0xce, 0xc1, + 0xcc, 0x90, 0xdc, 0xe1, 0x72, 0x25, 0xd9, 0x08, 0x7c, 0x9b, 0xf9, 0xde, 0xef, 0x6f, 0x48, 0x68, + 0x0f, 0x49, 0x80, 0xd9, 0xd6, 0x98, 0x51, 0x4e, 0x51, 0x4b, 0x5e, 0x9c, 0xf1, 0xb1, 0xf5, 0x1a, + 0x96, 0x0f, 0x29, 0x3d, 0x4d, 0xc6, 0xbb, 0x84, 0x61, 0x8f, 0x53, 0xf6, 0x7e, 0x2f, 0xe2, 0xec, + 0xbd, 0x8d, 0xbf, 0x4c, 0x70, 0xcc, 0xd1, 0x0a, 0x98, 0x7e, 0x86, 0xe8, 0x1b, 0xeb, 0xc6, 0xa6, + 0x69, 0x4f, 0x00, 0x08, 0x41, 0x2d, 0x72, 0x43, 0xdc, 0xaf, 0x48, 0x84, 0x3c, 0x5b, 0x7b, 0xb0, + 0x32, 0x5b, 0x60, 0x3c, 0xa6, 0x51, 0x8c, 0xd1, 0x3d, 0xa8, 0x63, 0x01, 0x90, 0xd2, 0xda, 0xdb, + 0x37, 0xb7, 0x32, 0x53, 0xb6, 0x14, 0x9d, 0xc2, 0x5a, 0x3f, 0x1a, 0x80, 0x0e, 0x49, 0xcc, 0x05, + 0x90, 0xe0, 0xf8, 0xc3, 0xec, 0xb9, 0x05, 0x8d, 0x31, 0xc3, 0x43, 0x72, 0x91, 0x5a, 0x94, 0xde, + 0xd0, 0x43, 0x58, 0x88, 0xb9, 0xcb, 0xf8, 0x3e, 0xa3, 0xe1, 0x3e, 0x09, 0xf0, 0x2b, 0x61, 0x74, + 0x55, 0x92, 0x94, 0x11, 0x68, 0x0b, 0x10, 0x89, 0xbc, 0x20, 0x89, 0xc9, 0x19, 0x3e, 0xca, 0xb0, + 0xfd, 0xda, 0xba, 0xb1, 0xd9, 0xb2, 0x67, 0x60, 0xd0, 0x22, 0xd4, 0x03, 0x12, 0x12, 0xde, 0xaf, + 0xaf, 0x1b, 0x9b, 0x5d, 0x5b, 0x5d, 0xac, 0x7f, 0x42, 0xaf, 0x60, 0xff, 0xc7, 0xb9, 0xff, 0x5d, + 0x05, 0xea, 0x12, 0x90, 0xc7, 0xd8, 0x98, 0xc4, 0x18, 0xdd, 0x85, 0x0e, 0x89, 0x9d, 0x49, 0x20, + 0x2a, 0xd2, 0xb6, 0x36, 0x89, 0xf3, 0x98, 0xa3, 0x07, 0xd0, 0xf0, 0x4e, 0x92, 0xe8, 0x34, 0xee, + 0x57, 0xd7, 0xab, 0x9b, 0xed, 0xed, 0xde, 0x44, 0x91, 0x70, 0x74, 0x47, 0xe0, 0xec, 0x94, 0x04, + 0x3d, 0x01, 0x70, 0x39, 0x67, 0xe4, 0x38, 0xe1, 0x38, 0x96, 0x9e, 0xb6, 0xb7, 0xfb, 0x1a, 0x43, + 0x12, 0xe3, 0xe7, 0x39, 0xde, 0xd6, 0x68, 0xd1, 0x53, 0x68, 0xe1, 0x0b, 0x8e, 0x23, 0x1f, 0xfb, + 0xfd, 0xba, 0x54, 0xb4, 0x3a, 0xe5, 0xd1, 0xd6, 0x5e, 0x8a, 0x57, 0xfe, 0xe5, 0xe4, 0x83, 0x67, + 0xd0, 0x2d, 0xa0, 0xd0, 0x3c, 0x54, 0x4f, 0x71, 0x96, 0x55, 0x71, 0x14, 0x91, 0x3d, 0x73, 0x83, + 0x44, 0x15, 0x58, 0xc7, 0x56, 0x97, 0x7f, 0x54, 0x9e, 0x18, 0xd6, 0x2e, 0x98, 0xfb, 0x49, 0x10, + 0xe4, 0x8c, 0x3e, 0x61, 0x19, 0xa3, 0x4f, 0xd8, 0x24, 0xca, 0x95, 0x2b, 0xa3, 0xfc, 0x83, 0x01, + 0x0b, 0x7b, 0x67, 0x38, 0xe2, 0xaf, 0x28, 0x27, 0x43, 0xe2, 0xb9, 0x9c, 0xd0, 0x08, 0x3d, 0x04, + 0x93, 0x06, 0xbe, 0x73, 0x65, 0x9a, 0x5a, 0x34, 0x48, 0xad, 0x7e, 0x08, 0x66, 0x84, 0xcf, 0x9d, + 0x2b, 0xd5, 0xb5, 0x22, 0x7c, 0xae, 0xa8, 0x37, 0xa0, 0xeb, 0xe3, 0x00, 0x73, 0xec, 0xe4, 0xd9, + 0x11, 0xa9, 0xeb, 0x28, 0xe0, 0x8e, 0x4a, 0xc7, 0x7d, 0xb8, 0x29, 0x44, 0x8e, 0x5d, 0x86, 0x23, + 0xee, 0x8c, 0x5d, 0x7e, 0x22, 0x73, 0x62, 0xda, 0xdd, 0x08, 0x9f, 0xbf, 0x91, 0xd0, 0x37, 0x2e, + 0x3f, 0xb1, 0x7e, 0x33, 0xc0, 0xcc, 0x93, 0x89, 0x6e, 0x43, 0x53, 0xa8, 0x75, 0x88, 0x9f, 0x46, + 0xa2, 0x21, 0xae, 0x07, 0xbe, 0xe8, 0x0a, 0x3a, 0x1c, 0xc6, 0x98, 0x4b, 0xf3, 0xaa, 0x76, 0x7a, + 0x13, 0x95, 0x15, 0x93, 0xaf, 0x54, 0x23, 0xd4, 0x6c, 0x79, 0x16, 0x11, 0x0f, 0x39, 0x09, 0xb1, + 0x54, 0x58, 0xb5, 0xd5, 0x05, 0xf5, 0xa0, 0x8e, 0x1d, 0xee, 0x8e, 0x64, 0x85, 0x9b, 0x76, 0x0d, + 0xbf, 0x75, 0x47, 0xe8, 0xcf, 0x70, 0x23, 0xa6, 0x09, 0xf3, 0xb0, 0x93, 0xa9, 0x6d, 0x48, 0x6c, + 0x47, 0x41, 0xf7, 0x95, 0x72, 0x0b, 0xaa, 0x43, 0xe2, 0xf7, 0x9b, 0x32, 0x30, 0xf3, 0xc5, 0x22, + 0x3c, 0xf0, 0x6d, 0x81, 0x44, 0x7f, 0x03, 0xc8, 0x25, 0xf9, 0xfd, 0xd6, 0x25, 0xa4, 0x66, 0x26, + 0xd7, 0xb7, 0xfe, 0x07, 0x8d, 0x54, 0xfc, 0x32, 0x98, 0x67, 0x34, 0x48, 0xc2, 0xdc, 0xed, 0xae, + 0xdd, 0x52, 0x80, 0x03, 0x1f, 0xdd, 0x01, 0x39, 0xe7, 0x1c, 0x51, 0x55, 0x15, 0xe9, 0xa4, 0x8c, + 0xd0, 0x7f, 0xb0, 0x9c, 0x14, 0x1e, 0xa5, 0xa7, 0x44, 0x79, 0xdf, 0xb4, 0xd3, 0x9b, 0xf5, 0x6b, + 0x05, 0x6e, 0x14, 0xcb, 0x5d, 0xa8, 0x90, 0x52, 0x64, 0xac, 0x0c, 0x29, 0x46, 0x8a, 0x3d, 0x2a, + 0xc4, 0xab, 0xa2, 0xc7, 0x2b, 0x63, 0x09, 0xa9, 0xaf, 0x14, 0x74, 0x15, 0xcb, 0x4b, 0xea, 0x63, + 0x51, 0xad, 0x09, 0xf1, 0x65, 0x80, 0xbb, 0xb6, 0x38, 0x0a, 0xc8, 0x88, 0xf8, 0xe9, 0xf8, 0x10, + 0x47, 0x69, 0x1e, 0x93, 0x72, 0x1b, 0x2a, 0x65, 0xea, 0x26, 0x52, 0x16, 0x0a, 0x68, 0x53, 0xe5, + 0x41, 0x9c, 0xd1, 0x3a, 0xb4, 0x19, 0x1e, 0x07, 0x69, 0xf5, 0xca, 0xf0, 0x99, 0xb6, 0x0e, 0x42, + 0x6b, 0x00, 0x1e, 0x0d, 0x02, 0xec, 0x49, 0x02, 0x53, 0x12, 0x68, 0x10, 0x51, 0x39, 0x9c, 0x07, + 0x4e, 0x8c, 0xbd, 0x3e, 0xac, 0x1b, 0x9b, 0x75, 0xbb, 0xc1, 0x79, 0x70, 0x84, 0x3d, 0xe1, 0x47, + 0x12, 0x63, 0xe6, 0xc8, 0x01, 0xd4, 0x96, 0x7c, 0x2d, 0x01, 0x90, 0x63, 0x72, 0x15, 0x60, 0xc4, + 0x68, 0x32, 0x56, 0xd8, 0xce, 0x7a, 0x55, 0xcc, 0x62, 0x09, 0x91, 0xe8, 0x7b, 0x70, 0x23, 0x7e, + 0x1f, 0x06, 0x24, 0x3a, 0x75, 0xb8, 0xcb, 0x46, 0x98, 0xf7, 0xbb, 0xaa, 0x86, 0x53, 0xe8, 0x5b, + 0x09, 0xb4, 0xc6, 0x80, 0x76, 0x18, 0x76, 0x39, 0xfe, 0x88, 0xb5, 0xf3, 0x61, 0xdd, 0x8d, 0x96, + 0xa0, 0x41, 0x1d, 0x7c, 0xe1, 0x05, 0x69, 0x93, 0xd5, 0xe9, 0xde, 0x85, 0x17, 0x58, 0x0f, 0xa0, + 0x57, 0xd0, 0x98, 0x0e, 0xe6, 0x45, 0xa8, 0x63, 0xc6, 0x68, 0x36, 0x46, 0xd4, 0xc5, 0xfa, 0x3f, + 0xa0, 0x77, 0x63, 0xff, 0x53, 0x98, 0x67, 0x2d, 0x41, 0xaf, 0x20, 0x5a, 0xd9, 0x61, 0xfd, 0x6c, + 0x00, 0xda, 0x95, 0xd3, 0xe0, 0x8f, 0x2d, 0x62, 0xd1, 0x9f, 0x62, 0x49, 0xa8, 0x69, 0xe3, 0xbb, + 0xdc, 0x4d, 0x57, 0x58, 0x87, 0xc4, 0x4a, 0xfe, 0xae, 0xcb, 0xdd, 0x74, 0x95, 0x30, 0xec, 0x25, + 0x4c, 0x6c, 0x35, 0x59, 0x84, 0x72, 0x95, 0xd8, 0x19, 0x08, 0x3d, 0x86, 0x5b, 0x64, 0x14, 0x51, + 0x86, 0x27, 0x64, 0x8e, 0x0a, 0x55, 0x43, 0x12, 0x2f, 0x2a, 0x6c, 0xce, 0xb0, 0x27, 0x23, 0xb7, + 0x04, 0xbd, 0x82, 0x1b, 0xa9, 0x7b, 0xdf, 0x1a, 0xd0, 0x7f, 0xce, 0x69, 0x48, 0x3c, 0x1b, 0x0b, + 0x33, 0x0b, 0x4e, 0x6e, 0x40, 0x57, 0x4c, 0xde, 0x69, 0x47, 0x3b, 0x34, 0xf0, 0x27, 0x9b, 0xed, + 0x0e, 0x88, 0xe1, 0xeb, 0x68, 0xfe, 0x36, 0x69, 0xe0, 0xcb, 0x9a, 0xdb, 0x00, 0x31, 0x21, 0x35, + 0x7e, 0xb5, 0xe3, 0x3b, 0x11, 0x3e, 0x2f, 0xf0, 0x0b, 0x22, 0xc9, 0xaf, 0xc6, 0x6a, 0x33, 0xc2, + 0xe7, 0x82, 0xdf, 0x5a, 0x86, 0x3b, 0x33, 0x6c, 0x4b, 0x2d, 0xff, 0xde, 0x80, 0xde, 0xf3, 0x38, + 0x26, 0xa3, 0xe8, 0xbf, 0x72, 0xc0, 0x64, 0x46, 0x2f, 0x42, 0xdd, 0xa3, 0x49, 0xc4, 0xa5, 0xb1, + 0x75, 0x5b, 0x5d, 0xa6, 0x7a, 0xae, 0x52, 0xea, 0xb9, 0xa9, 0xae, 0xad, 0x96, 0xbb, 0x56, 0xeb, + 0xca, 0x5a, 0xa1, 0x2b, 0xff, 0x04, 0x6d, 0x91, 0x4e, 0xc7, 0xc3, 0x11, 0xc7, 0x2c, 0x9d, 0xc9, + 0x20, 0x40, 0x3b, 0x12, 0x62, 0x7d, 0x6d, 0xc0, 0x62, 0xd1, 0xd2, 0xb4, 0xc6, 0x2f, 0x5d, 0x11, + 0x62, 0x26, 0xb1, 0x20, 0x35, 0x53, 0x1c, 0x45, 0x77, 0x8f, 0x93, 0xe3, 0x80, 0x78, 0x8e, 0x40, + 0x28, 0xf3, 0x4c, 0x05, 0x79, 0xc7, 0x82, 0x89, 0xd3, 0x35, 0xdd, 0x69, 0x04, 0x35, 0x37, 0xe1, + 0x27, 0xd9, 0x9a, 0x10, 0x67, 0xeb, 0x31, 0xf4, 0xd4, 0x7b, 0xb0, 0x18, 0xb5, 0x55, 0x80, 0x7c, + 0x70, 0xc7, 0x7d, 0x43, 0x4d, 0x8f, 0x6c, 0x72, 0xc7, 0xd6, 0xbf, 0xc0, 0x3c, 0xa4, 0x2a, 0x10, + 0x31, 0x7a, 0x04, 0x66, 0x90, 0x5d, 0x24, 0x69, 0x7b, 0x1b, 0x4d, 0x9a, 0x2a, 0xa3, 0xb3, 0x27, + 0x44, 0xd6, 0x33, 0x68, 0x65, 0xe0, 0xcc, 0x37, 0xe3, 0x32, 0xdf, 0x2a, 0x53, 0xbe, 0x59, 0x3f, + 0x19, 0xb0, 0x58, 0x34, 0x39, 0x0d, 0xdf, 0x3b, 0xe8, 0xe6, 0x2a, 0x9c, 0xd0, 0x1d, 0xa7, 0xb6, + 0x3c, 0xd2, 0x6d, 0x29, 0xb3, 0xe5, 0x06, 0xc6, 0x2f, 0xdd, 0xb1, 0x2a, 0xa9, 0x4e, 0xa0, 0x81, + 0x06, 0x6f, 0x61, 0xa1, 0x44, 0x32, 0xe3, 0x31, 0xf4, 0x57, 0xfd, 0x31, 0x54, 0x78, 0xd0, 0xe5, + 0xdc, 0xfa, 0x0b, 0xe9, 0x29, 0xdc, 0x56, 0xfd, 0xb7, 0x93, 0x17, 0x5d, 0x16, 0xfb, 0x62, 0x6d, + 0x1a, 0xd3, 0xb5, 0x69, 0x0d, 0xa0, 0x5f, 0x66, 0x4d, 0xbb, 0x60, 0x04, 0x0b, 0x47, 0xdc, 0xe5, + 0x24, 0xe6, 0xc4, 0xcb, 0x5f, 0xe5, 0x53, 0xc5, 0x6c, 0x5c, 0xb7, 0x82, 0xca, 0xed, 0x30, 0x0f, + 0x55, 0xce, 0xb3, 0x3a, 0x13, 0x47, 0x91, 0x05, 0xa4, 0x6b, 0x4a, 0x73, 0xf0, 0x09, 0x54, 0x89, + 0x7a, 0xe0, 0x94, 0xbb, 0x81, 0x5a, 0xf1, 0x35, 0xb9, 0xe2, 0x4d, 0x09, 0x91, 0x3b, 0x5e, 0x6d, + 0x41, 0x5f, 0x61, 0xeb, 0xea, 0x01, 0x20, 0x00, 0x12, 0xb9, 0x0a, 0x20, 0x5b, 0x4a, 0x75, 0x43, + 0x43, 0xf1, 0x0a, 0xc8, 0x8e, 0x00, 0x58, 0x6b, 0xb0, 0xf2, 0x6f, 0xcc, 0xc5, 0x63, 0x85, 0xed, + 0xd0, 0x68, 0x48, 0x46, 0x09, 0x73, 0xb5, 0x54, 0x58, 0xdf, 0x18, 0xb0, 0x7a, 0x09, 0x41, 0xea, + 0x70, 0x1f, 0x9a, 0xa1, 0x1b, 0x73, 0xcc, 0xb2, 0x2e, 0xc9, 0xae, 0xd3, 0xa1, 0xa8, 0x5c, 0x17, + 0x8a, 0x6a, 0x29, 0x14, 0x4b, 0xd0, 0x08, 0xdd, 0x0b, 0x27, 0x3c, 0x4e, 0x5f, 0x23, 0xf5, 0xd0, + 0xbd, 0x78, 0x79, 0xbc, 0xfd, 0x4b, 0x13, 0x3a, 0x47, 0xd8, 0x3d, 0xc7, 0xd8, 0x97, 0x86, 0xa1, + 0x51, 0xd6, 0x10, 0xc5, 0x6f, 0x3a, 0x74, 0x6f, 0xba, 0xf2, 0x67, 0x7e, 0x44, 0x0e, 0xee, 0x5f, + 0x47, 0x96, 0xd6, 0xd6, 0x1c, 0x7a, 0x05, 0x6d, 0xed, 0xa3, 0x09, 0xad, 0x68, 0x8c, 0xa5, 0x6f, + 0xc1, 0xc1, 0xea, 0x25, 0xd8, 0x4c, 0xda, 0x23, 0x03, 0x1d, 0x42, 0x5b, 0xdb, 0xf5, 0xba, 0xbc, + 0xf2, 0xa3, 0x43, 0x97, 0x37, 0xe3, 0x81, 0x60, 0xcd, 0x09, 0x69, 0xda, 0xc6, 0xd6, 0xa5, 0x95, + 0xdf, 0x08, 0xba, 0xb4, 0x59, 0x6b, 0x5e, 0x4a, 0xd3, 0x16, 0xa4, 0x2e, 0xad, 0xbc, 0xfe, 0x75, + 0x69, 0xb3, 0xb6, 0xea, 0x1c, 0xfa, 0x1c, 0x16, 0x4a, 0xab, 0x0b, 0x59, 0x13, 0xae, 0xcb, 0x76, + 0xee, 0x60, 0xe3, 0x4a, 0x9a, 0x5c, 0xfe, 0x6b, 0xe8, 0xe8, 0x2b, 0x05, 0x69, 0x06, 0xcd, 0x58, + 0x8a, 0x83, 0xb5, 0xcb, 0xd0, 0xba, 0x40, 0x7d, 0x5a, 0xea, 0x02, 0x67, 0xec, 0x0b, 0x5d, 0xe0, + 0xac, 0x21, 0x6b, 0xcd, 0xa1, 0xcf, 0x60, 0x7e, 0x7a, 0x6a, 0xa1, 0xbb, 0xd3, 0x61, 0x2b, 0x0d, + 0xc3, 0x81, 0x75, 0x15, 0x49, 0x2e, 0xfc, 0x00, 0x60, 0x32, 0x8c, 0xd0, 0xf2, 0x84, 0xa7, 0x34, + 0x0c, 0x07, 0x2b, 0xb3, 0x91, 0xb9, 0xa8, 0x2f, 0x60, 0x69, 0x66, 0xc7, 0x23, 0xad, 0x4d, 0xae, + 0x9a, 0x19, 0x83, 0xbf, 0x5c, 0x4b, 0x97, 0xe9, 0x7a, 0xb1, 0x06, 0xf3, 0xb1, 0x6a, 0xe4, 0x61, + 0xbc, 0xe5, 0x05, 0x04, 0x47, 0xfc, 0x05, 0x48, 0x8e, 0x37, 0x8c, 0x72, 0x7a, 0xdc, 0x90, 0xbf, + 0x83, 0xfe, 0xfe, 0x7b, 0x00, 0x00, 0x00, 0xff, 0xff, 0xc5, 0xce, 0x15, 0x02, 0x1d, 0x12, 0x00, + 0x00, } diff --git a/weed/pb/filer_pb/filer_pb_helper.go b/weed/pb/filer_pb/filer_pb_helper.go index 5c40332e6..b2ffacc01 100644 --- a/weed/pb/filer_pb/filer_pb_helper.go +++ b/weed/pb/filer_pb/filer_pb_helper.go @@ -1,6 +1,9 @@ package filer_pb import ( + "context" + "fmt" + "github.com/chrislusf/seaweedfs/weed/storage/needle" ) @@ -67,3 +70,14 @@ func AfterEntryDeserialization(chunks []*FileChunk) { } } + +func CreateEntry(ctx context.Context, client SeaweedFilerClient, request *CreateEntryRequest) error { + resp, err := client.CreateEntry(ctx, request) + if err == nil && resp.Error != "" { + return fmt.Errorf("CreateEntry: %v", resp.Error) + } + if err != nil { + return fmt.Errorf("CreateEntry: %v", err) + } + return err +} diff --git a/weed/replication/sink/filersink/filer_sink.go b/weed/replication/sink/filersink/filer_sink.go index f99c7fdf6..58a3ab9c2 100644 --- a/weed/replication/sink/filersink/filer_sink.go +++ b/weed/replication/sink/filersink/filer_sink.go @@ -124,7 +124,7 @@ func (fs *FilerSink) CreateEntry(ctx context.Context, key string, entry *filer_p } glog.V(1).Infof("create: %v", request) - if _, err := client.CreateEntry(ctx, request); err != nil { + if err := filer_pb.CreateEntry(ctx, client, request); err != nil { glog.V(0).Infof("create entry %s: %v", key, err) return fmt.Errorf("create entry %s: %v", key, err) } diff --git a/weed/s3api/filer_util.go b/weed/s3api/filer_util.go index ed9612d35..2fceacd2a 100644 --- a/weed/s3api/filer_util.go +++ b/weed/s3api/filer_util.go @@ -37,7 +37,7 @@ func (s3a *S3ApiServer) mkdir(ctx context.Context, parentDirectoryPath string, d } glog.V(1).Infof("mkdir: %v", request) - if _, err := client.CreateEntry(ctx, request); err != nil { + if err := filer_pb.CreateEntry(ctx, client, request); err != nil { glog.V(0).Infof("mkdir %v: %v", request, err) return fmt.Errorf("mkdir %s/%s: %v", parentDirectoryPath, dirName, err) } @@ -68,7 +68,7 @@ func (s3a *S3ApiServer) mkFile(ctx context.Context, parentDirectoryPath string, } glog.V(1).Infof("create file: %s/%s", parentDirectoryPath, fileName) - if _, err := client.CreateEntry(ctx, request); err != nil { + if err := filer_pb.CreateEntry(ctx, client, request); err != nil { glog.V(0).Infof("create file %v:%v", request, err) return fmt.Errorf("create file %s/%s: %v", parentDirectoryPath, fileName, err) } diff --git a/weed/server/filer_grpc_server.go b/weed/server/filer_grpc_server.go index 5145035d2..03954a58c 100644 --- a/weed/server/filer_grpc_server.go +++ b/weed/server/filer_grpc_server.go @@ -132,27 +132,31 @@ func (fs *FilerServer) LookupVolume(ctx context.Context, req *filer_pb.LookupVol func (fs *FilerServer) CreateEntry(ctx context.Context, req *filer_pb.CreateEntryRequest) (resp *filer_pb.CreateEntryResponse, err error) { + resp = &filer_pb.CreateEntryResponse{} + fullpath := filer2.FullPath(filepath.ToSlash(filepath.Join(req.Directory, req.Entry.Name))) chunks, garbages := filer2.CompactFileChunks(req.Entry.Chunks) if req.Entry.Attributes == nil { glog.V(3).Infof("CreateEntry %s: nil attributes", filepath.Join(req.Directory, req.Entry.Name)) - return nil, fmt.Errorf("can not create entry with empty attributes") + resp.Error = fmt.Sprintf("can not create entry with empty attributes") + return } - err = fs.filer.CreateEntry(ctx, &filer2.Entry{ + createErr := fs.filer.CreateEntry(ctx, &filer2.Entry{ FullPath: fullpath, Attr: filer2.PbToEntryAttribute(req.Entry.Attributes), Chunks: chunks, }, req.OExcl) - if err == nil { + if createErr == nil { fs.filer.DeleteChunks(garbages) } else { - glog.V(3).Infof("CreateEntry %s: %v", filepath.Join(req.Directory, req.Entry.Name), err) + glog.V(3).Infof("CreateEntry %s: %v", filepath.Join(req.Directory, req.Entry.Name), createErr) + resp.Error = createErr.Error() } - return &filer_pb.CreateEntryResponse{}, err + return } func (fs *FilerServer) UpdateEntry(ctx context.Context, req *filer_pb.UpdateEntryRequest) (*filer_pb.UpdateEntryResponse, error) { diff --git a/weed/server/webdav_server.go b/weed/server/webdav_server.go index 17f814302..875cc2999 100644 --- a/weed/server/webdav_server.go +++ b/weed/server/webdav_server.go @@ -155,7 +155,7 @@ func (fs *WebDavFileSystem) Mkdir(ctx context.Context, fullDirPath string, perm } glog.V(1).Infof("mkdir: %v", request) - if _, err := client.CreateEntry(ctx, request); err != nil { + if err := filer_pb.CreateEntry(ctx, client, request); err != nil { return fmt.Errorf("mkdir %s/%s: %v", dir, name, err) } @@ -187,7 +187,7 @@ func (fs *WebDavFileSystem) OpenFile(ctx context.Context, fullFilePath string, f dir, name := filer2.FullPath(fullFilePath).DirAndName() err = fs.WithFilerClient(ctx, func(client filer_pb.SeaweedFilerClient) error { - if _, err := client.CreateEntry(ctx, &filer_pb.CreateEntryRequest{ + if err := filer_pb.CreateEntry(ctx, client, &filer_pb.CreateEntryRequest{ Directory: dir, Entry: &filer_pb.Entry{ Name: name, diff --git a/weed/shell/command_fs_meta_load.go b/weed/shell/command_fs_meta_load.go index 5ea8de9f5..52dd0321b 100644 --- a/weed/shell/command_fs_meta_load.go +++ b/weed/shell/command_fs_meta_load.go @@ -80,7 +80,7 @@ func (c *commandFsMetaLoad) Do(args []string, commandEnv *CommandEnv, writer io. return err } - if _, err = client.CreateEntry(ctx, &filer_pb.CreateEntryRequest{ + if err := filer_pb.CreateEntry(ctx, client, &filer_pb.CreateEntryRequest{ Directory: fullEntry.Dir, Entry: fullEntry.Entry, }); err != nil {