From d4e75a0d183b57180b2ff0be2531db540c0c9aa6 Mon Sep 17 00:00:00 2001 From: Chris Lu Date: Wed, 22 Jan 2020 11:42:40 -0800 Subject: [PATCH] filer: option to create file only if it is new, O_EXCL --- other/java/client/src/main/proto/filer.proto | 1 + weed/filer2/filer.go | 5 +- weed/filer2/leveldb/leveldb_store_test.go | 2 +- weed/filer2/leveldb2/leveldb2_store_test.go | 2 +- weed/filesys/dir.go | 30 +-- weed/pb/filer.proto | 1 + weed/pb/filer_pb/filer.pb.go | 213 +++++++++--------- weed/server/filer_grpc_server.go | 2 +- weed/server/filer_grpc_server_rename.go | 2 +- weed/server/filer_server_handlers_write.go | 2 +- .../filer_server_handlers_write_autochunk.go | 2 +- 11 files changed, 140 insertions(+), 122 deletions(-) diff --git a/other/java/client/src/main/proto/filer.proto b/other/java/client/src/main/proto/filer.proto index ef847cbe7..41c1650d4 100644 --- a/other/java/client/src/main/proto/filer.proto +++ b/other/java/client/src/main/proto/filer.proto @@ -123,6 +123,7 @@ message FuseAttributes { message CreateEntryRequest { string directory = 1; Entry entry = 2; + bool o_excl = 3; } message CreateEntryResponse { diff --git a/weed/filer2/filer.go b/weed/filer2/filer.go index b724e20fd..96a010fce 100644 --- a/weed/filer2/filer.go +++ b/weed/filer2/filer.go @@ -72,7 +72,7 @@ func (f *Filer) RollbackTransaction(ctx context.Context) error { return f.store.RollbackTransaction(ctx) } -func (f *Filer) CreateEntry(ctx context.Context, entry *Entry) error { +func (f *Filer) CreateEntry(ctx context.Context, entry *Entry, o_excl bool) error { if string(entry.FullPath) == "/" { return nil @@ -160,6 +160,9 @@ func (f *Filer) CreateEntry(ctx context.Context, entry *Entry) error { return fmt.Errorf("insert entry %s: %v", entry.FullPath, err) } } else { + if o_excl { + return fmt.Errorf("EEXIST: entry %s already exists", entry.FullPath) + } if err := f.UpdateEntry(ctx, oldEntry, entry); err != nil { glog.Errorf("update entry %s: %v", entry.FullPath, err) return fmt.Errorf("update entry %s: %v", entry.FullPath, err) diff --git a/weed/filer2/leveldb/leveldb_store_test.go b/weed/filer2/leveldb/leveldb_store_test.go index 904de8c97..983e1cbe9 100644 --- a/weed/filer2/leveldb/leveldb_store_test.go +++ b/weed/filer2/leveldb/leveldb_store_test.go @@ -30,7 +30,7 @@ func TestCreateAndFind(t *testing.T) { }, } - if err := filer.CreateEntry(ctx, entry1); err != nil { + if err := filer.CreateEntry(ctx, entry1, false); err != nil { t.Errorf("create entry %v: %v", entry1.FullPath, err) return } diff --git a/weed/filer2/leveldb2/leveldb2_store_test.go b/weed/filer2/leveldb2/leveldb2_store_test.go index e28ef7dac..58637b7b6 100644 --- a/weed/filer2/leveldb2/leveldb2_store_test.go +++ b/weed/filer2/leveldb2/leveldb2_store_test.go @@ -30,7 +30,7 @@ func TestCreateAndFind(t *testing.T) { }, } - if err := filer.CreateEntry(ctx, entry1); err != nil { + if err := filer.CreateEntry(ctx, entry1, false); err != nil { t.Errorf("create entry %v: %v", entry1.FullPath, err) return } diff --git a/weed/filesys/dir.go b/weed/filesys/dir.go index 7ed638e0e..3c1672911 100644 --- a/weed/filesys/dir.go +++ b/weed/filesys/dir.go @@ -3,6 +3,7 @@ package filesys import ( "context" "os" + "strings" "time" "github.com/chrislusf/seaweedfs/weed/filer2" @@ -123,26 +124,29 @@ func (dir *Dir) Create(ctx context.Context, req *fuse.CreateRequest, TtlSec: dir.wfs.option.TtlSec, }, }, + OExcl: req.Flags&fuse.OpenExclusive != 0, } - glog.V(1).Infof("create: %v", request) + glog.V(1).Infof("create: %v", req.String()) - if request.Entry.IsDirectory { - 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) - return fuse.EIO + 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 strings.Contains(err.Error(), "EEXIST") { + return fuse.EEXIST } - return nil - }); err != nil { - return nil, nil, err + return fuse.EIO } + return nil + }); err != nil { + return nil, nil, err } - node := dir.newFile(req.Name, request.Entry) - file := node.(*File) - if !request.Entry.IsDirectory { - file.isOpen = true + if request.Entry.IsDirectory { + return node, nil, nil } + + file := node.(*File) + file.isOpen = true fh := dir.wfs.AcquireHandle(file, req.Uid, req.Gid) fh.dirtyMetadata = true return file, fh, nil diff --git a/weed/pb/filer.proto b/weed/pb/filer.proto index ef847cbe7..41c1650d4 100644 --- a/weed/pb/filer.proto +++ b/weed/pb/filer.proto @@ -123,6 +123,7 @@ message FuseAttributes { message CreateEntryRequest { string directory = 1; Entry entry = 2; + bool o_excl = 3; } message CreateEntryResponse { diff --git a/weed/pb/filer_pb/filer.pb.go b/weed/pb/filer_pb/filer.pb.go index c8214aa94..043a46504 100644 --- a/weed/pb/filer_pb/filer.pb.go +++ b/weed/pb/filer_pb/filer.pb.go @@ -497,6 +497,7 @@ func (m *FuseAttributes) GetSymlinkTarget() string { type CreateEntryRequest struct { Directory string `protobuf:"bytes,1,opt,name=directory" json:"directory,omitempty"` Entry *Entry `protobuf:"bytes,2,opt,name=entry" json:"entry,omitempty"` + OExcl bool `protobuf:"varint,3,opt,name=o_excl,json=oExcl" json:"o_excl,omitempty"` } func (m *CreateEntryRequest) Reset() { *m = CreateEntryRequest{} } @@ -518,6 +519,13 @@ func (m *CreateEntryRequest) GetEntry() *Entry { return nil } +func (m *CreateEntryRequest) GetOExcl() bool { + if m != nil { + return m.OExcl + } + return false +} + type CreateEntryResponse struct { } @@ -1457,106 +1465,107 @@ var _SeaweedFiler_serviceDesc = grpc.ServiceDesc{ func init() { proto.RegisterFile("filer.proto", fileDescriptor0) } var fileDescriptor0 = []byte{ - // 1603 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xb4, 0x58, 0xcd, 0x6f, 0xdc, 0x44, - 0x14, 0x8f, 0xf7, 0xdb, 0x6f, 0x77, 0xdb, 0x64, 0x92, 0xb6, 0xdb, 0xcd, 0x07, 0xa9, 0x43, 0x4b, - 0x10, 0x55, 0xa8, 0x42, 0x0f, 0x2d, 0x85, 0x43, 0x9b, 0x0f, 0x14, 0x91, 0x7e, 0xc8, 0x69, 0x11, - 0x08, 0x09, 0xcb, 0xb1, 0x67, 0x37, 0x43, 0x6c, 0xcf, 0x32, 0x1e, 0x27, 0x29, 0x7f, 0x02, 0x47, - 0x8e, 0x48, 0x9c, 0xf9, 0x27, 0x10, 0x17, 0x84, 0xf8, 0x6f, 0x38, 0x72, 0x46, 0x33, 0x63, 0x7b, - 0xc7, 0xeb, 0x4d, 0xd2, 0x0a, 0xf5, 0xe6, 0x79, 0xdf, 0xef, 0xcd, 0x7b, 0xbf, 0x37, 0xbb, 0xd0, - 0x1e, 0x90, 0x00, 0xb3, 0x8d, 0x11, 0xa3, 0x9c, 0xa2, 0x96, 0x3c, 0x38, 0xa3, 0x43, 0xeb, 0x39, - 0x2c, 0xee, 0x53, 0x7a, 0x9c, 0x8c, 0xb6, 0x09, 0xc3, 0x1e, 0xa7, 0xec, 0xf5, 0x4e, 0xc4, 0xd9, - 0x6b, 0x1b, 0xff, 0x90, 0xe0, 0x98, 0xa3, 0x25, 0x30, 0xfd, 0x8c, 0xd1, 0x33, 0x56, 0x8d, 0x75, - 0xd3, 0x1e, 0x13, 0x10, 0x82, 0x5a, 0xe4, 0x86, 0xb8, 0x57, 0x91, 0x0c, 0xf9, 0x6d, 0xed, 0xc0, - 0xd2, 0x74, 0x83, 0xf1, 0x88, 0x46, 0x31, 0x46, 0xb7, 0xa1, 0x8e, 0x05, 0x41, 0x5a, 0x6b, 0x6f, - 0x5e, 0xdd, 0xc8, 0x42, 0xd9, 0x50, 0x72, 0x8a, 0x6b, 0xfd, 0x61, 0x00, 0xda, 0x27, 0x31, 0x17, - 0x44, 0x82, 0xe3, 0x37, 0x8b, 0xe7, 0x3a, 0x34, 0x46, 0x0c, 0x0f, 0xc8, 0x59, 0x1a, 0x51, 0x7a, - 0x42, 0x77, 0x61, 0x2e, 0xe6, 0x2e, 0xe3, 0xbb, 0x8c, 0x86, 0xbb, 0x24, 0xc0, 0xcf, 0x44, 0xd0, - 0x55, 0x29, 0x52, 0x66, 0xa0, 0x0d, 0x40, 0x24, 0xf2, 0x82, 0x24, 0x26, 0x27, 0xf8, 0x20, 0xe3, - 0xf6, 0x6a, 0xab, 0xc6, 0x7a, 0xcb, 0x9e, 0xc2, 0x41, 0x0b, 0x50, 0x0f, 0x48, 0x48, 0x78, 0xaf, - 0xbe, 0x6a, 0xac, 0x77, 0x6d, 0x75, 0xb0, 0x3e, 0x83, 0xf9, 0x42, 0xfc, 0x6f, 0x97, 0xfe, 0xaf, - 0x15, 0xa8, 0x4b, 0x42, 0x5e, 0x63, 0x63, 0x5c, 0x63, 0x74, 0x0b, 0x3a, 0x24, 0x76, 0xc6, 0x85, - 0xa8, 0xc8, 0xd8, 0xda, 0x24, 0xce, 0x6b, 0x8e, 0x3e, 0x82, 0x86, 0x77, 0x94, 0x44, 0xc7, 0x71, - 0xaf, 0xba, 0x5a, 0x5d, 0x6f, 0x6f, 0xce, 0x8f, 0x1d, 0x89, 0x44, 0xb7, 0x04, 0xcf, 0x4e, 0x45, - 0xd0, 0x03, 0x00, 0x97, 0x73, 0x46, 0x0e, 0x13, 0x8e, 0x63, 0x99, 0x69, 0x7b, 0xb3, 0xa7, 0x29, - 0x24, 0x31, 0x7e, 0x9c, 0xf3, 0x6d, 0x4d, 0x16, 0x3d, 0x84, 0x16, 0x3e, 0xe3, 0x38, 0xf2, 0xb1, - 0xdf, 0xab, 0x4b, 0x47, 0xcb, 0x13, 0x19, 0x6d, 0xec, 0xa4, 0x7c, 0x95, 0x5f, 0x2e, 0xde, 0x7f, - 0x04, 0xdd, 0x02, 0x0b, 0xcd, 0x42, 0xf5, 0x18, 0x67, 0xb7, 0x2a, 0x3e, 0x45, 0x65, 0x4f, 0xdc, - 0x20, 0x51, 0x0d, 0xd6, 0xb1, 0xd5, 0xe1, 0xd3, 0xca, 0x03, 0xc3, 0xda, 0x06, 0x73, 0x37, 0x09, - 0x82, 0x5c, 0xd1, 0x27, 0x2c, 0x53, 0xf4, 0x09, 0x1b, 0x57, 0xb9, 0x72, 0x61, 0x95, 0x7f, 0x37, - 0x60, 0x6e, 0xe7, 0x04, 0x47, 0xfc, 0x19, 0xe5, 0x64, 0x40, 0x3c, 0x97, 0x13, 0x1a, 0xa1, 0xbb, - 0x60, 0xd2, 0xc0, 0x77, 0x2e, 0xbc, 0xa6, 0x16, 0x0d, 0xd2, 0xa8, 0xef, 0x82, 0x19, 0xe1, 0x53, - 0xe7, 0x42, 0x77, 0xad, 0x08, 0x9f, 0x2a, 0xe9, 0x35, 0xe8, 0xfa, 0x38, 0xc0, 0x1c, 0x3b, 0xf9, - 0xed, 0x88, 0xab, 0xeb, 0x28, 0xe2, 0x96, 0xba, 0x8e, 0x3b, 0x70, 0x55, 0x98, 0x1c, 0xb9, 0x0c, - 0x47, 0xdc, 0x19, 0xb9, 0xfc, 0x48, 0xde, 0x89, 0x69, 0x77, 0x23, 0x7c, 0xfa, 0x42, 0x52, 0x5f, - 0xb8, 0xfc, 0xc8, 0xfa, 0xd7, 0x00, 0x33, 0xbf, 0x4c, 0x74, 0x03, 0x9a, 0xc2, 0xad, 0x43, 0xfc, - 0xb4, 0x12, 0x0d, 0x71, 0xdc, 0xf3, 0xc5, 0x54, 0xd0, 0xc1, 0x20, 0xc6, 0x5c, 0x86, 0x57, 0xb5, - 0xd3, 0x93, 0xe8, 0xac, 0x98, 0xfc, 0xa8, 0x06, 0xa1, 0x66, 0xcb, 0x6f, 0x51, 0xf1, 0x90, 0x93, - 0x10, 0x4b, 0x87, 0x55, 0x5b, 0x1d, 0xd0, 0x3c, 0xd4, 0xb1, 0xc3, 0xdd, 0xa1, 0xec, 0x70, 0xd3, - 0xae, 0xe1, 0x97, 0xee, 0x10, 0xbd, 0x0f, 0x57, 0x62, 0x9a, 0x30, 0x0f, 0x3b, 0x99, 0xdb, 0x86, - 0xe4, 0x76, 0x14, 0x75, 0x57, 0x39, 0xb7, 0xa0, 0x3a, 0x20, 0x7e, 0xaf, 0x29, 0x0b, 0x33, 0x5b, - 0x6c, 0xc2, 0x3d, 0xdf, 0x16, 0x4c, 0xf4, 0x31, 0x40, 0x6e, 0xc9, 0xef, 0xb5, 0xce, 0x11, 0x35, - 0x33, 0xbb, 0xbe, 0xf5, 0x35, 0x34, 0x52, 0xf3, 0x8b, 0x60, 0x9e, 0xd0, 0x20, 0x09, 0xf3, 0xb4, - 0xbb, 0x76, 0x4b, 0x11, 0xf6, 0x7c, 0x74, 0x13, 0x24, 0xce, 0x39, 0xa2, 0xab, 0x2a, 0x32, 0x49, - 0x59, 0xa1, 0x2f, 0xb1, 0x44, 0x0a, 0x8f, 0xd2, 0x63, 0xa2, 0xb2, 0x6f, 0xda, 0xe9, 0xc9, 0xfa, - 0xa7, 0x02, 0x57, 0x8a, 0xed, 0x2e, 0x5c, 0x48, 0x2b, 0xb2, 0x56, 0x86, 0x34, 0x23, 0xcd, 0x1e, - 0x14, 0xea, 0x55, 0xd1, 0xeb, 0x95, 0xa9, 0x84, 0xd4, 0x57, 0x0e, 0xba, 0x4a, 0xe5, 0x29, 0xf5, - 0xb1, 0xe8, 0xd6, 0x84, 0xf8, 0xb2, 0xc0, 0x5d, 0x5b, 0x7c, 0x0a, 0xca, 0x90, 0xf8, 0x29, 0x7c, - 0x88, 0x4f, 0x19, 0x1e, 0x93, 0x76, 0x1b, 0xea, 0xca, 0xd4, 0x49, 0x5c, 0x59, 0x28, 0xa8, 0x4d, - 0x75, 0x0f, 0xe2, 0x1b, 0xad, 0x42, 0x9b, 0xe1, 0x51, 0x90, 0x76, 0xaf, 0x2c, 0x9f, 0x69, 0xeb, - 0x24, 0xb4, 0x02, 0xe0, 0xd1, 0x20, 0xc0, 0x9e, 0x14, 0x30, 0xa5, 0x80, 0x46, 0x11, 0x9d, 0xc3, - 0x79, 0xe0, 0xc4, 0xd8, 0xeb, 0xc1, 0xaa, 0xb1, 0x5e, 0xb7, 0x1b, 0x9c, 0x07, 0x07, 0xd8, 0x13, - 0x79, 0x24, 0x31, 0x66, 0x8e, 0x04, 0xa0, 0xb6, 0xd4, 0x6b, 0x09, 0x82, 0x84, 0xc9, 0x65, 0x80, - 0x21, 0xa3, 0xc9, 0x48, 0x71, 0x3b, 0xab, 0x55, 0x81, 0xc5, 0x92, 0x22, 0xd9, 0xb7, 0xe1, 0x4a, - 0xfc, 0x3a, 0x0c, 0x48, 0x74, 0xec, 0x70, 0x97, 0x0d, 0x31, 0xef, 0x75, 0x55, 0x0f, 0xa7, 0xd4, - 0x97, 0x92, 0x68, 0x7d, 0x03, 0x68, 0x8b, 0x61, 0x97, 0xe3, 0xb7, 0x58, 0x3b, 0x6f, 0x38, 0xdd, - 0xd7, 0x60, 0xbe, 0x60, 0x5a, 0x21, 0xb0, 0xf0, 0xf8, 0x6a, 0xe4, 0xbf, 0x2b, 0x8f, 0x05, 0xd3, - 0xa9, 0xc7, 0xbf, 0x0c, 0x40, 0xdb, 0x72, 0xc0, 0xff, 0xdf, 0x6e, 0x15, 0x23, 0x27, 0x70, 0x5f, - 0x01, 0x88, 0xef, 0x72, 0x37, 0xdd, 0x4a, 0x1d, 0x12, 0x2b, 0xfb, 0xdb, 0x2e, 0x77, 0xd3, 0xed, - 0xc0, 0xb0, 0x97, 0x30, 0xb1, 0xa8, 0x64, 0x5f, 0xc9, 0xed, 0x60, 0x67, 0x24, 0x74, 0x1f, 0xae, - 0x93, 0x61, 0x44, 0x19, 0x1e, 0x8b, 0x39, 0x98, 0x31, 0xca, 0x64, 0xbf, 0xb5, 0xec, 0x05, 0xc5, - 0xcd, 0x15, 0x76, 0x04, 0x4f, 0xa4, 0x57, 0x48, 0x23, 0x4d, 0xef, 0x17, 0x03, 0x7a, 0x8f, 0x39, - 0x0d, 0x89, 0x67, 0x63, 0x11, 0x66, 0x21, 0xc9, 0x35, 0xe8, 0x0a, 0x30, 0x9d, 0x4c, 0xb4, 0x43, - 0x03, 0x7f, 0xbc, 0xac, 0x6e, 0x82, 0xc0, 0x53, 0x47, 0xcb, 0xb7, 0x49, 0x03, 0x5f, 0xb6, 0xd1, - 0x1a, 0x08, 0xd0, 0xd3, 0xf4, 0xd5, 0xda, 0xee, 0x44, 0xf8, 0xb4, 0xa0, 0x2f, 0x84, 0xa4, 0xbe, - 0x42, 0xca, 0x66, 0x84, 0x4f, 0x85, 0xbe, 0xb5, 0x08, 0x37, 0xa7, 0xc4, 0x96, 0x46, 0xfe, 0x9b, - 0x01, 0xf3, 0x8f, 0xe3, 0x98, 0x0c, 0xa3, 0xaf, 0x24, 0x66, 0x64, 0x41, 0x2f, 0x40, 0xdd, 0xa3, - 0x49, 0xc4, 0x65, 0xb0, 0x75, 0x5b, 0x1d, 0x26, 0xc6, 0xa8, 0x52, 0x1a, 0xa3, 0x89, 0x41, 0xac, - 0x96, 0x07, 0x51, 0x1b, 0xb4, 0x5a, 0x61, 0xd0, 0xde, 0x83, 0xb6, 0xb8, 0x4e, 0xc7, 0xc3, 0x11, - 0xc7, 0x2c, 0x85, 0x59, 0x10, 0xa4, 0x2d, 0x49, 0xb1, 0x7e, 0x32, 0x60, 0xa1, 0x18, 0x69, 0xfa, - 0x9e, 0x38, 0x17, 0xf5, 0x05, 0xcc, 0xb0, 0x20, 0x0d, 0x53, 0x7c, 0x8a, 0x81, 0x1d, 0x25, 0x87, - 0x01, 0xf1, 0x1c, 0xc1, 0x50, 0xe1, 0x99, 0x8a, 0xf2, 0x8a, 0x05, 0xe3, 0xa4, 0x6b, 0x7a, 0xd2, - 0x08, 0x6a, 0x6e, 0xc2, 0x8f, 0x32, 0xe4, 0x17, 0xdf, 0xd6, 0x7d, 0x98, 0x57, 0x4f, 0xbc, 0x62, - 0xd5, 0x96, 0x01, 0x72, 0x2c, 0x8e, 0x7b, 0x86, 0x02, 0x84, 0x0c, 0x8c, 0x63, 0xeb, 0x73, 0x30, - 0xf7, 0xa9, 0x2a, 0x44, 0x8c, 0xee, 0x81, 0x19, 0x64, 0x07, 0x29, 0xda, 0xde, 0x44, 0xe3, 0xa1, - 0xca, 0xe4, 0xec, 0xb1, 0x90, 0xf5, 0x08, 0x5a, 0x19, 0x39, 0xcb, 0xcd, 0x38, 0x2f, 0xb7, 0xca, - 0x44, 0x6e, 0xd6, 0x9f, 0x06, 0x2c, 0x14, 0x43, 0x4e, 0xcb, 0xf7, 0x0a, 0xba, 0xb9, 0x0b, 0x27, - 0x74, 0x47, 0x69, 0x2c, 0xf7, 0xf4, 0x58, 0xca, 0x6a, 0x79, 0x80, 0xf1, 0x53, 0x77, 0xa4, 0x5a, - 0xaa, 0x13, 0x68, 0xa4, 0xfe, 0x4b, 0x98, 0x2b, 0x89, 0x4c, 0x79, 0xdf, 0x7c, 0xa8, 0xbf, 0x6f, - 0x0a, 0x6f, 0xb4, 0x5c, 0x5b, 0x7f, 0xf4, 0x3c, 0x84, 0x1b, 0x6a, 0xfe, 0xb6, 0xf2, 0xa6, 0xcb, - 0x6a, 0x5f, 0xec, 0x4d, 0x63, 0xb2, 0x37, 0xad, 0x3e, 0xf4, 0xca, 0xaa, 0xe9, 0x14, 0x0c, 0x61, - 0xee, 0x80, 0xbb, 0x9c, 0xc4, 0x9c, 0x78, 0xf9, 0x43, 0x7b, 0xa2, 0x99, 0x8d, 0xcb, 0xb6, 0x4a, - 0x79, 0x1c, 0x66, 0xa1, 0xca, 0x79, 0xd6, 0x67, 0xe2, 0x53, 0xdc, 0x02, 0xd2, 0x3d, 0xa5, 0x77, - 0xf0, 0x0e, 0x5c, 0x89, 0x7e, 0xe0, 0x94, 0xbb, 0x81, 0xda, 0xda, 0x35, 0xb9, 0xb5, 0x4d, 0x49, - 0x91, 0x6b, 0x5b, 0x2d, 0x36, 0x5f, 0x71, 0xeb, 0x6a, 0xa7, 0x0b, 0x82, 0x64, 0x2e, 0x03, 0xc8, - 0x91, 0x52, 0xd3, 0xd0, 0x50, 0xba, 0x82, 0xb2, 0x25, 0x08, 0xd6, 0x0a, 0x2c, 0x7d, 0x81, 0xb9, - 0x78, 0x7f, 0xb0, 0x2d, 0x1a, 0x0d, 0xc8, 0x30, 0x61, 0xae, 0x76, 0x15, 0xd6, 0xcf, 0x06, 0x2c, - 0x9f, 0x23, 0x90, 0x26, 0xdc, 0x83, 0x66, 0xe8, 0xc6, 0x1c, 0xb3, 0x6c, 0x4a, 0xb2, 0xe3, 0x64, - 0x29, 0x2a, 0x97, 0x95, 0xa2, 0x5a, 0x2a, 0xc5, 0x35, 0x68, 0x84, 0xee, 0x99, 0x13, 0x1e, 0xa6, - 0x0f, 0x8c, 0x7a, 0xe8, 0x9e, 0x3d, 0x3d, 0xdc, 0xfc, 0xbb, 0x09, 0x9d, 0x03, 0xec, 0x9e, 0x62, - 0xec, 0xcb, 0xc0, 0xd0, 0x30, 0x1b, 0x88, 0xe2, 0xcf, 0x34, 0x74, 0x7b, 0xb2, 0xf3, 0xa7, 0xfe, - 0x2e, 0xec, 0xdf, 0xb9, 0x4c, 0x2c, 0xed, 0xad, 0x19, 0xf4, 0x0c, 0xda, 0xda, 0xef, 0x20, 0xb4, - 0xa4, 0x29, 0x96, 0x7e, 0xde, 0xf5, 0x97, 0xcf, 0xe1, 0x66, 0xd6, 0xee, 0x19, 0x68, 0x1f, 0xda, - 0xda, 0x56, 0xd7, 0xed, 0x95, 0xdf, 0x11, 0xba, 0xbd, 0x69, 0x4f, 0x81, 0x19, 0x61, 0x4d, 0xdb, - 0xd8, 0xba, 0xb5, 0xf2, 0x1b, 0x41, 0xb7, 0x36, 0x6d, 0xcd, 0x4b, 0x6b, 0xda, 0x82, 0xd4, 0xad, - 0x95, 0xd7, 0xbf, 0x6e, 0x6d, 0xda, 0x56, 0x9d, 0x41, 0xdf, 0xc1, 0x5c, 0x69, 0x75, 0x21, 0x6b, - 0xac, 0x75, 0xde, 0xce, 0xed, 0xaf, 0x5d, 0x28, 0x93, 0xdb, 0x7f, 0x0e, 0x1d, 0x7d, 0xa5, 0x20, - 0x2d, 0xa0, 0x29, 0x4b, 0xb1, 0xbf, 0x72, 0x1e, 0x5b, 0x37, 0xa8, 0xa3, 0xa5, 0x6e, 0x70, 0xca, - 0xbe, 0xd0, 0x0d, 0x4e, 0x03, 0x59, 0x6b, 0x06, 0x7d, 0x0b, 0xb3, 0x93, 0xa8, 0x85, 0x6e, 0x4d, - 0x96, 0xad, 0x04, 0x86, 0x7d, 0xeb, 0x22, 0x91, 0xdc, 0xf8, 0x1e, 0xc0, 0x18, 0x8c, 0xd0, 0xe2, - 0x58, 0xa7, 0x04, 0x86, 0xfd, 0xa5, 0xe9, 0xcc, 0xdc, 0xd4, 0xf7, 0x70, 0x6d, 0xea, 0xc4, 0x23, - 0x6d, 0x4c, 0x2e, 0xc2, 0x8c, 0xfe, 0x07, 0x97, 0xca, 0x65, 0xbe, 0x9e, 0xac, 0xc0, 0x6c, 0xac, - 0x06, 0x79, 0x10, 0x6f, 0x78, 0x01, 0xc1, 0x11, 0x7f, 0x02, 0x52, 0xe3, 0x05, 0xa3, 0x9c, 0x1e, - 0x36, 0xe4, 0x3f, 0x3c, 0x9f, 0xfc, 0x17, 0x00, 0x00, 0xff, 0xff, 0x14, 0x43, 0x9d, 0xb9, 0xf0, - 0x11, 0x00, 0x00, + // 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, } diff --git a/weed/server/filer_grpc_server.go b/weed/server/filer_grpc_server.go index a84feec2d..d82ef9782 100644 --- a/weed/server/filer_grpc_server.go +++ b/weed/server/filer_grpc_server.go @@ -139,7 +139,7 @@ func (fs *FilerServer) CreateEntry(ctx context.Context, req *filer_pb.CreateEntr FullPath: fullpath, Attr: filer2.PbToEntryAttribute(req.Entry.Attributes), Chunks: chunks, - }) + }, req.OExcl) if err == nil { fs.filer.DeleteChunks(garbages) diff --git a/weed/server/filer_grpc_server_rename.go b/weed/server/filer_grpc_server_rename.go index dfa59e7fe..0669a26f1 100644 --- a/weed/server/filer_grpc_server_rename.go +++ b/weed/server/filer_grpc_server_rename.go @@ -107,7 +107,7 @@ func (fs *FilerServer) moveSelfEntry(ctx context.Context, oldParent filer2.FullP Attr: entry.Attr, Chunks: entry.Chunks, } - createErr := fs.filer.CreateEntry(ctx, newEntry) + createErr := fs.filer.CreateEntry(ctx, newEntry, false) if createErr != nil { return createErr } diff --git a/weed/server/filer_server_handlers_write.go b/weed/server/filer_server_handlers_write.go index a7dcc39a0..6b5d258bc 100644 --- a/weed/server/filer_server_handlers_write.go +++ b/weed/server/filer_server_handlers_write.go @@ -193,7 +193,7 @@ func (fs *FilerServer) updateFilerStore(ctx context.Context, r *http.Request, w entry.Attr.Mime = mime.TypeByExtension(ext) } // glog.V(4).Infof("saving %s => %+v", path, entry) - if dbErr := fs.filer.CreateEntry(ctx, entry); dbErr != nil { + if dbErr := fs.filer.CreateEntry(ctx, entry, false); dbErr != nil { fs.filer.DeleteChunks(entry.Chunks) glog.V(0).Infof("failing to write %s to filer server : %v", path, dbErr) writeJsonError(w, r, http.StatusInternalServerError, dbErr) diff --git a/weed/server/filer_server_handlers_write_autochunk.go b/weed/server/filer_server_handlers_write_autochunk.go index 8ff7ab2c0..5739c2d4e 100644 --- a/weed/server/filer_server_handlers_write_autochunk.go +++ b/weed/server/filer_server_handlers_write_autochunk.go @@ -176,7 +176,7 @@ func (fs *FilerServer) doAutoChunk(ctx context.Context, w http.ResponseWriter, r }, Chunks: fileChunks, } - if dbErr := fs.filer.CreateEntry(ctx, entry); dbErr != nil { + if dbErr := fs.filer.CreateEntry(ctx, entry, false); dbErr != nil { fs.filer.DeleteChunks(entry.Chunks) replyerr = dbErr filerResult.Error = dbErr.Error()