diff --git a/satellite/internalpb/metainfo_sat.pb.go b/satellite/internalpb/metainfo_sat.pb.go index dfaae8e67..fc0d561c8 100644 --- a/satellite/internalpb/metainfo_sat.pb.go +++ b/satellite/internalpb/metainfo_sat.pb.go @@ -29,7 +29,6 @@ type StreamID struct { Bucket []byte `protobuf:"bytes,1,opt,name=bucket,proto3" json:"bucket,omitempty"` EncryptedObjectKey []byte `protobuf:"bytes,2,opt,name=encrypted_object_key,json=encryptedObjectKey,proto3" json:"encrypted_object_key,omitempty"` Version int32 `protobuf:"varint,3,opt,name=version,proto3" json:"version,omitempty"` - Redundancy *pb.RedundancyScheme `protobuf:"bytes,4,opt,name=redundancy,proto3" json:"redundancy,omitempty"` EncryptionParameters *pb.EncryptionParameters `protobuf:"bytes,12,opt,name=encryption_parameters,json=encryptionParameters,proto3" json:"encryption_parameters,omitempty"` CreationDate time.Time `protobuf:"bytes,5,opt,name=creation_date,json=creationDate,proto3,stdtime" json:"creation_date"` ExpirationDate time.Time `protobuf:"bytes,6,opt,name=expiration_date,json=expirationDate,proto3,stdtime" json:"expiration_date"` @@ -86,13 +85,6 @@ func (m *StreamID) GetVersion() int32 { return 0 } -func (m *StreamID) GetRedundancy() *pb.RedundancyScheme { - if m != nil { - return m.Redundancy - } - return nil -} - func (m *StreamID) GetEncryptionParameters() *pb.EncryptionParameters { if m != nil { return m.EncryptionParameters @@ -222,41 +214,39 @@ func init() { func init() { proto.RegisterFile("metainfo_sat.proto", fileDescriptor_47c60bd892d94aaf) } var fileDescriptor_47c60bd892d94aaf = []byte{ - // 566 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x53, 0xcd, 0x6e, 0xd3, 0x4c, - 0x14, 0xfd, 0xfc, 0xb5, 0xf9, 0x9b, 0xa4, 0x4d, 0x35, 0x4d, 0x91, 0x95, 0x82, 0x62, 0x15, 0x21, - 0x85, 0x8d, 0x8d, 0xda, 0x15, 0x62, 0x45, 0x14, 0x16, 0x11, 0x3f, 0x2d, 0x0e, 0x6c, 0xd8, 0x58, - 0x63, 0xcf, 0xad, 0x99, 0xd6, 0x9e, 0xb1, 0x66, 0xc6, 0xa8, 0x59, 0xf2, 0x06, 0x6c, 0x78, 0x27, - 0x9e, 0x81, 0x45, 0x79, 0x15, 0xe4, 0xf1, 0x5f, 0x24, 0xda, 0x05, 0xec, 0xe6, 0x9e, 0x7b, 0xee, - 0xc9, 0xcd, 0xb9, 0xc7, 0x08, 0xa7, 0xa0, 0x09, 0xe3, 0x97, 0x22, 0x50, 0x44, 0xbb, 0x99, 0x14, - 0x5a, 0x60, 0xac, 0x88, 0x86, 0x24, 0x61, 0x1a, 0xdc, 0xba, 0x3b, 0x3d, 0x00, 0x1e, 0xc9, 0x4d, - 0xa6, 0x99, 0xe0, 0x25, 0x6b, 0x8a, 0x62, 0x11, 0x8b, 0xea, 0x3d, 0x8b, 0x85, 0x88, 0x13, 0xf0, - 0x4c, 0x15, 0xe6, 0x97, 0x9e, 0x66, 0x29, 0x28, 0x4d, 0xd2, 0xac, 0x22, 0x8c, 0x33, 0xc1, 0xb8, - 0x06, 0x49, 0xc3, 0x0a, 0xd8, 0xaf, 0x95, 0xcb, 0xfa, 0xe4, 0xfb, 0x2e, 0xea, 0xaf, 0xb5, 0x04, - 0x92, 0xae, 0x96, 0xf8, 0x01, 0xea, 0x86, 0x79, 0x74, 0x0d, 0xda, 0xb6, 0x1c, 0x6b, 0x3e, 0xf2, - 0xab, 0x0a, 0x3f, 0x43, 0x93, 0x6a, 0x0d, 0xa0, 0x81, 0x08, 0xaf, 0x20, 0xd2, 0xc1, 0x35, 0x6c, - 0xec, 0xff, 0x0d, 0x0b, 0x37, 0xbd, 0x73, 0xd3, 0x7a, 0x0d, 0x1b, 0x6c, 0xa3, 0xde, 0x17, 0x90, - 0x8a, 0x09, 0x6e, 0xef, 0x38, 0xd6, 0xbc, 0xe3, 0xd7, 0x25, 0x7e, 0x81, 0x90, 0x04, 0x9a, 0x73, - 0x4a, 0x78, 0xb4, 0xb1, 0x77, 0x1d, 0x6b, 0x3e, 0x3c, 0x3d, 0x76, 0xdb, 0x35, 0xfd, 0xa6, 0xb9, - 0x8e, 0x3e, 0x43, 0x0a, 0xfe, 0x16, 0x1d, 0x7f, 0x44, 0x47, 0xad, 0x1f, 0x41, 0x46, 0x24, 0x49, - 0x41, 0x83, 0x54, 0xf6, 0xc8, 0xe8, 0x38, 0xee, 0x96, 0x5b, 0xaf, 0x9a, 0xe7, 0x45, 0xc3, 0xf3, - 0x27, 0x70, 0x07, 0x8a, 0x57, 0x68, 0x2f, 0x92, 0x40, 0x8c, 0x28, 0x25, 0x1a, 0xec, 0x8e, 0x91, - 0x9b, 0xba, 0xa5, 0xbd, 0x6e, 0x6d, 0xaf, 0xfb, 0xa1, 0xb6, 0x77, 0xd1, 0xff, 0x71, 0x3b, 0xfb, - 0xef, 0xdb, 0xaf, 0x99, 0xe5, 0x8f, 0xea, 0xd1, 0x25, 0xd1, 0x80, 0xdf, 0xa2, 0x31, 0xdc, 0x64, - 0x4c, 0x6e, 0x89, 0x75, 0xff, 0x42, 0x6c, 0xbf, 0x1d, 0x36, 0x72, 0x4f, 0xd1, 0x41, 0x9a, 0x27, - 0x9a, 0x65, 0x44, 0xea, 0xca, 0x79, 0x7b, 0xe8, 0x58, 0xf3, 0xbe, 0x3f, 0x6e, 0xf0, 0xd2, 0x75, - 0xec, 0xa1, 0xc3, 0x26, 0x3f, 0x81, 0x62, 0x31, 0x27, 0x3a, 0x97, 0x60, 0x0f, 0xca, 0x1b, 0x35, - 0xad, 0x75, 0xdd, 0xc1, 0xc7, 0x68, 0xa0, 0xcc, 0xe5, 0x03, 0x46, 0x6d, 0x64, 0x68, 0xfd, 0x12, - 0x58, 0xd1, 0x93, 0xaf, 0x3b, 0x68, 0xb0, 0x86, 0x38, 0x05, 0xae, 0x57, 0x4b, 0xfc, 0x7c, 0x9b, - 0x6a, 0x99, 0xff, 0xf3, 0xd0, 0xfd, 0x33, 0xad, 0x6e, 0x9d, 0xa4, 0x56, 0x08, 0xcf, 0xd0, 0xd0, - 0x2c, 0xcf, 0xf3, 0x34, 0x04, 0x69, 0x22, 0xd3, 0xf1, 0x51, 0x01, 0xbd, 0x33, 0x08, 0x9e, 0xa0, - 0x0e, 0xe3, 0x14, 0x6e, 0xaa, 0xa0, 0x94, 0x05, 0x3e, 0x43, 0x7b, 0x52, 0x08, 0x1d, 0x64, 0x0c, - 0x22, 0x28, 0x7e, 0xb5, 0x38, 0xc9, 0x68, 0x31, 0x2e, 0x9c, 0xfa, 0x79, 0x3b, 0xeb, 0x5d, 0x14, - 0xf8, 0x6a, 0xe9, 0x0f, 0x0b, 0x56, 0x59, 0x50, 0xfc, 0x1e, 0x1d, 0x09, 0xc9, 0x62, 0xc6, 0x49, - 0x12, 0x08, 0x49, 0x41, 0x06, 0x09, 0x4b, 0x99, 0x56, 0x76, 0xd7, 0xd9, 0x99, 0x0f, 0x4f, 0x1f, - 0xb5, 0x8b, 0xbe, 0xa4, 0x54, 0x82, 0x52, 0x40, 0xcf, 0x0b, 0xda, 0x9b, 0x82, 0xe5, 0x1f, 0xd6, - 0xb3, 0x2d, 0x76, 0x47, 0x34, 0x7a, 0xff, 0x1c, 0x8d, 0x7b, 0x0e, 0xd4, 0xbf, 0xef, 0x40, 0x8b, - 0x27, 0x9f, 0x1e, 0x2b, 0x2d, 0xe4, 0x95, 0xcb, 0x84, 0x67, 0x1e, 0x5e, 0x43, 0xf2, 0xcc, 0xe7, - 0xc2, 0x49, 0x92, 0x85, 0x61, 0xd7, 0xec, 0x70, 0xf6, 0x3b, 0x00, 0x00, 0xff, 0xff, 0x89, 0x67, - 0x88, 0xd3, 0x53, 0x04, 0x00, 0x00, + // 530 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x52, 0x4d, 0x6f, 0xd3, 0x40, + 0x10, 0xc5, 0x44, 0x49, 0x93, 0x4d, 0xda, 0x54, 0xdb, 0x14, 0x59, 0x01, 0x14, 0xab, 0x08, 0x29, + 0x5c, 0x6c, 0xd4, 0x9e, 0x38, 0x12, 0x85, 0x43, 0xc4, 0x47, 0x8b, 0x03, 0x17, 0x2e, 0xd6, 0x3a, + 0x3b, 0xb5, 0xb6, 0xb5, 0x77, 0xad, 0xdd, 0x09, 0x6a, 0x8e, 0xfc, 0x03, 0x7e, 0x16, 0x3f, 0x01, + 0x71, 0x28, 0x7f, 0x05, 0x79, 0xfd, 0x91, 0x48, 0xb4, 0x07, 0xb8, 0xed, 0xbc, 0x79, 0xfb, 0x76, + 0xe7, 0xbd, 0x21, 0x34, 0x03, 0x64, 0x42, 0x5e, 0xaa, 0xc8, 0x30, 0xf4, 0x73, 0xad, 0x50, 0x51, + 0x6a, 0x18, 0x42, 0x9a, 0x0a, 0x04, 0xbf, 0xee, 0x8e, 0x0f, 0x41, 0xae, 0xf4, 0x26, 0x47, 0xa1, + 0x64, 0xc9, 0x1a, 0x93, 0x44, 0x25, 0xaa, 0x3a, 0x4f, 0x12, 0xa5, 0x92, 0x14, 0x02, 0x5b, 0xc5, + 0xeb, 0xcb, 0x00, 0x45, 0x06, 0x06, 0x59, 0x96, 0x57, 0x84, 0x83, 0x5a, 0xa8, 0xac, 0x4f, 0x7e, + 0xb6, 0x48, 0x77, 0x89, 0x1a, 0x58, 0xb6, 0x98, 0xd3, 0x47, 0xa4, 0x13, 0xaf, 0x57, 0xd7, 0x80, + 0xae, 0xe3, 0x39, 0xd3, 0x41, 0x58, 0x55, 0xf4, 0x25, 0x19, 0x55, 0xaf, 0x02, 0x8f, 0x54, 0x7c, + 0x05, 0x2b, 0x8c, 0xae, 0x61, 0xe3, 0x3e, 0xb4, 0x2c, 0xda, 0xf4, 0xce, 0x6d, 0xeb, 0x2d, 0x6c, + 0xa8, 0x4b, 0xf6, 0xbe, 0x82, 0x36, 0x42, 0x49, 0xb7, 0xe5, 0x39, 0xd3, 0x76, 0x58, 0x97, 0xf4, + 0x33, 0x39, 0xde, 0x4e, 0x10, 0xe5, 0x4c, 0xb3, 0x0c, 0x10, 0xb4, 0x71, 0x07, 0x9e, 0x33, 0xed, + 0x9f, 0x7a, 0xfe, 0xce, 0x7c, 0x6f, 0x9a, 0xe3, 0x45, 0xc3, 0x0b, 0x47, 0x70, 0x07, 0x4a, 0x17, + 0x64, 0x7f, 0xa5, 0x81, 0x59, 0x51, 0xce, 0x10, 0xdc, 0xb6, 0x95, 0x1b, 0xfb, 0xa5, 0x21, 0x7e, + 0x6d, 0x88, 0xff, 0xa9, 0x36, 0x64, 0xd6, 0xfd, 0x71, 0x3b, 0x79, 0xf0, 0xfd, 0xf7, 0xc4, 0x09, + 0x07, 0xf5, 0xd5, 0x39, 0x43, 0xa0, 0xef, 0xc9, 0x10, 0x6e, 0x72, 0xa1, 0x77, 0xc4, 0x3a, 0xff, + 0x20, 0x76, 0xb0, 0xbd, 0x6c, 0xe5, 0x5e, 0x90, 0xc3, 0x6c, 0x9d, 0xa2, 0xc8, 0x99, 0xc6, 0xca, + 0x3c, 0xb7, 0xef, 0x39, 0xd3, 0x6e, 0x38, 0x6c, 0xf0, 0xd2, 0x38, 0x1a, 0x90, 0xa3, 0x26, 0xf1, + 0xc8, 0x88, 0x44, 0x32, 0x5c, 0x6b, 0x70, 0x7b, 0xa5, 0xcd, 0x4d, 0x6b, 0x59, 0x77, 0xe8, 0x63, + 0xd2, 0x33, 0x36, 0xbc, 0x48, 0x70, 0x97, 0x58, 0x5a, 0xb7, 0x04, 0x16, 0xfc, 0xe4, 0x5b, 0x8b, + 0xf4, 0x96, 0x90, 0x64, 0x20, 0x71, 0x31, 0xa7, 0xaf, 0x76, 0xa9, 0x8e, 0x9d, 0xe7, 0x89, 0xff, + 0xf7, 0x7e, 0xf9, 0xf5, 0x32, 0x6c, 0x85, 0xe8, 0x84, 0xf4, 0xed, 0xe7, 0xe5, 0x3a, 0x8b, 0x41, + 0xdb, 0xd4, 0xdb, 0x21, 0x29, 0xa0, 0x0f, 0x16, 0xa1, 0x23, 0xd2, 0x16, 0x92, 0xc3, 0x4d, 0x95, + 0x75, 0x59, 0xd0, 0x33, 0xb2, 0xaf, 0x95, 0xc2, 0x28, 0x17, 0xb0, 0x82, 0xe2, 0xd5, 0x22, 0x92, + 0xc1, 0x6c, 0x58, 0x38, 0xf5, 0xeb, 0x76, 0xb2, 0x77, 0x51, 0xe0, 0x8b, 0x79, 0xd8, 0x2f, 0x58, + 0x65, 0xc1, 0xe9, 0x47, 0x72, 0xac, 0xb4, 0x48, 0x84, 0x64, 0x69, 0xa4, 0x34, 0x07, 0x1d, 0xa5, + 0x22, 0x13, 0x68, 0xdc, 0x8e, 0xd7, 0x9a, 0xf6, 0x4f, 0x9f, 0x6e, 0x3f, 0xfa, 0x9a, 0x73, 0x0d, + 0xc6, 0x00, 0x3f, 0x2f, 0x68, 0xef, 0x0a, 0x56, 0x78, 0x54, 0xdf, 0xdd, 0x62, 0x77, 0xac, 0xc6, + 0xde, 0x7f, 0xaf, 0xc6, 0x3d, 0x01, 0x75, 0xef, 0x0b, 0x68, 0xf6, 0xfc, 0xcb, 0x33, 0x83, 0x4a, + 0x5f, 0xf9, 0x42, 0x05, 0xf6, 0x10, 0x34, 0xa4, 0x40, 0x48, 0x04, 0x2d, 0x59, 0x9a, 0xc7, 0x71, + 0xc7, 0xfe, 0xe1, 0xec, 0x4f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x02, 0x47, 0xce, 0x91, 0x05, 0x04, + 0x00, 0x00, } diff --git a/satellite/internalpb/metainfo_sat.proto b/satellite/internalpb/metainfo_sat.proto index 28d1d999d..4d3835135 100644 --- a/satellite/internalpb/metainfo_sat.proto +++ b/satellite/internalpb/metainfo_sat.proto @@ -9,7 +9,6 @@ package satellite.metainfo; import "encryption.proto"; import "gogo.proto"; import "google/protobuf/timestamp.proto"; -import "pointerdb.proto"; import "metainfo.proto"; message StreamID { @@ -17,7 +16,6 @@ message StreamID { bytes encrypted_object_key = 2; int32 version = 3; - pointerdb.RedundancyScheme redundancy = 4; encryption.EncryptionParameters encryption_parameters = 12; google.protobuf.Timestamp creation_date = 5 [(gogoproto.stdtime) = true, (gogoproto.nullable) = false]; diff --git a/satellite/metainfo/metainfo.go b/satellite/metainfo/metainfo.go index 590de73b5..af1905cfc 100644 --- a/satellite/metainfo/metainfo.go +++ b/satellite/metainfo/metainfo.go @@ -655,8 +655,6 @@ func (endpoint *Endpoint) BeginObject(ctx context.Context, req *pb.ObjectBeginRe return nil, err } - // use only satellite values for Redundancy Scheme - pbRS := endpoint.defaultRS streamID, err := uuid.New() if err != nil { endpoint.log.Error("internal", zap.Error(err)) @@ -696,7 +694,6 @@ func (endpoint *Endpoint) BeginObject(ctx context.Context, req *pb.ObjectBeginRe Bucket: req.Bucket, EncryptedObjectKey: req.EncryptedPath, Version: int32(object.Version), - Redundancy: pbRS, CreationDate: object.CreatedAt, ExpirationDate: req.ExpiresAt, StreamId: streamID[:], @@ -716,7 +713,7 @@ func (endpoint *Endpoint) BeginObject(ctx context.Context, req *pb.ObjectBeginRe EncryptedPath: req.EncryptedPath, Version: req.Version, StreamId: satStreamID, - RedundancyScheme: pbRS, + RedundancyScheme: endpoint.defaultRS, }, nil } @@ -1638,7 +1635,7 @@ func (endpoint *Endpoint) BeginSegment(ctx context.Context, req *pb.SegmentBegin return nil, err } - redundancy, err := eestream.NewRedundancyStrategyFromProto(streamID.Redundancy) + redundancy, err := eestream.NewRedundancyStrategyFromProto(endpoint.defaultRS) if err != nil { return nil, rpcstatus.Error(rpcstatus.InvalidArgument, err.Error()) } @@ -1740,16 +1737,15 @@ func (endpoint *Endpoint) CommitSegment(ctx context.Context, req *pb.SegmentComm } // cheap basic verification - - if numResults := len(req.UploadResult); numResults < int(streamID.Redundancy.GetSuccessThreshold()) { + if numResults := len(req.UploadResult); numResults < int(endpoint.defaultRS.GetSuccessThreshold()) { endpoint.log.Debug("the results of uploaded pieces for the segment is below the redundancy optimal threshold", zap.Int("upload pieces results", numResults), - zap.Int32("redundancy optimal threshold", streamID.Redundancy.GetSuccessThreshold()), + zap.Int32("redundancy optimal threshold", endpoint.defaultRS.GetSuccessThreshold()), zap.Stringer("Segment ID", req.SegmentId), ) return nil, rpcstatus.Errorf(rpcstatus.InvalidArgument, "the number of results of uploaded pieces (%d) is below the optimal threshold (%d)", - numResults, streamID.Redundancy.GetSuccessThreshold(), + numResults, endpoint.defaultRS.GetSuccessThreshold(), ) } @@ -2458,7 +2454,6 @@ func (endpoint *Endpoint) objectToProto(ctx context.Context, object metabase.Obj ExpirationDate: expires, StreamId: object.StreamID[:], MultipartObject: multipartObject, - Redundancy: rs, EncryptionParameters: &pb.EncryptionParameters{ CipherSuite: pb.CipherSuite(object.Encryption.CipherSuite), BlockSize: int64(object.Encryption.BlockSize), @@ -2596,9 +2591,6 @@ func (endpoint *Endpoint) objectEntryToProtoListItem(ctx context.Context, bucket ExpirationDate: item.ExpiresAt, StreamId: entry.StreamID[:], MultipartObject: entry.FixedSegmentSize <= 0, - // TODO: defaultRS may change while the upload is pending. - // Ideally, we should remove redundancy from satStreamID. - Redundancy: endpoint.defaultRS, EncryptionParameters: &pb.EncryptionParameters{ CipherSuite: pb.CipherSuite(entry.Encryption.CipherSuite), BlockSize: int64(entry.Encryption.BlockSize), @@ -2756,7 +2748,6 @@ func (endpoint *Endpoint) BeginMoveObject(ctx context.Context, req *pb.ObjectBeg Bucket: req.Bucket, EncryptedObjectKey: req.EncryptedObjectKey, Version: int32(metabase.DefaultVersion), - Redundancy: endpoint.defaultRS, StreamId: result.StreamID[:], EncryptionParameters: &pb.EncryptionParameters{ CipherSuite: pb.CipherSuite(result.EncryptionParameters.CipherSuite),