From 37ab84355fc25cee7d79047ec56f4ea12e11061f Mon Sep 17 00:00:00 2001 From: Ethan Adams Date: Tue, 15 Oct 2019 15:59:12 -0400 Subject: [PATCH] satellite/gracefulexit: protobuf field name updates (#3284) rename piece_id to original_piece_id --- pkg/pb/gracefulexit.pb.go | 137 ++++++++++++------------ pkg/pb/gracefulexit.proto | 8 +- proto.lock | 8 +- satellite/gracefulexit/endpoint.go | 8 +- satellite/gracefulexit/endpoint_test.go | 16 +-- 5 files changed, 89 insertions(+), 88 deletions(-) diff --git a/pkg/pb/gracefulexit.pb.go b/pkg/pb/gracefulexit.pb.go index 8aa53fb81..a30b4d1e5 100644 --- a/pkg/pb/gracefulexit.pb.go +++ b/pkg/pb/gracefulexit.pb.go @@ -310,7 +310,7 @@ type TransferSucceeded struct { AddressedOrderLimit *AddressedOrderLimit `protobuf:"bytes,1,opt,name=addressed_order_limit,json=addressedOrderLimit,proto3" json:"addressed_order_limit,omitempty"` OriginalPieceHash *PieceHash `protobuf:"bytes,2,opt,name=original_piece_hash,json=originalPieceHash,proto3" json:"original_piece_hash,omitempty"` ReplacementPieceHash *PieceHash `protobuf:"bytes,3,opt,name=replacement_piece_hash,json=replacementPieceHash,proto3" json:"replacement_piece_hash,omitempty"` - PieceId PieceID `protobuf:"bytes,4,opt,name=piece_id,json=pieceId,proto3,customtype=PieceID" json:"piece_id"` + OriginalPieceId PieceID `protobuf:"bytes,4,opt,name=original_piece_id,json=originalPieceId,proto3,customtype=PieceID" json:"original_piece_id"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -362,7 +362,7 @@ func (m *TransferSucceeded) GetReplacementPieceHash() *PieceHash { } type TransferFailed struct { - PieceId PieceID `protobuf:"bytes,1,opt,name=piece_id,json=pieceId,proto3,customtype=PieceID" json:"piece_id"` + OriginalPieceId PieceID `protobuf:"bytes,1,opt,name=original_piece_id,json=originalPieceId,proto3,customtype=PieceID" json:"original_piece_id"` Error TransferFailed_Error `protobuf:"varint,2,opt,name=error,proto3,enum=gracefulexit.TransferFailed_Error" json:"error,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` @@ -574,8 +574,8 @@ func (m *NotReady) XXX_DiscardUnknown() { var xxx_messageInfo_NotReady proto.InternalMessageInfo type TransferPiece struct { - PieceId PieceID `protobuf:"bytes,1,opt,name=piece_id,json=pieceId,proto3,customtype=PieceID" json:"piece_id"` - PrivateKey PiecePrivateKey `protobuf:"bytes,2,opt,name=private_key,json=privateKey,proto3,customtype=PiecePrivateKey" json:"private_key"` + OriginalPieceId PieceID `protobuf:"bytes,1,opt,name=original_piece_id,json=originalPieceId,proto3,customtype=PieceID" json:"original_piece_id"` + PrivateKey PiecePrivateKey `protobuf:"bytes,2,opt,name=private_key,json=privateKey,proto3,customtype=PiecePrivateKey" json:"private_key"` // addressed_order_limit contains the new piece id. AddressedOrderLimit *AddressedOrderLimit `protobuf:"bytes,3,opt,name=addressed_order_limit,json=addressedOrderLimit,proto3" json:"addressed_order_limit,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` @@ -615,7 +615,7 @@ func (m *TransferPiece) GetAddressedOrderLimit() *AddressedOrderLimit { } type DeletePiece struct { - PieceId PieceID `protobuf:"bytes,1,opt,name=piece_id,json=pieceId,proto3,customtype=PieceID" json:"piece_id"` + OriginalPieceId PieceID `protobuf:"bytes,1,opt,name=original_piece_id,json=originalPieceId,proto3,customtype=PieceID" json:"original_piece_id"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -990,69 +990,70 @@ func init() { func init() { proto.RegisterFile("gracefulexit.proto", fileDescriptor_8f0acbf2ce5fa631) } var fileDescriptor_8f0acbf2ce5fa631 = []byte{ - // 989 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x56, 0xdd, 0x6e, 0x1a, 0x47, - 0x14, 0x66, 0xed, 0x98, 0x9f, 0x03, 0xc6, 0x78, 0x1c, 0xdb, 0xd4, 0x4d, 0x02, 0xd9, 0x9b, 0xba, - 0x55, 0x6b, 0x55, 0xee, 0x6f, 0x54, 0xb5, 0x15, 0x0e, 0xd8, 0xa0, 0xd0, 0xc5, 0x1d, 0xec, 0x54, - 0xea, 0xcd, 0x6a, 0xc2, 0x1c, 0xe3, 0x55, 0x61, 0x97, 0xce, 0x0c, 0x51, 0x7c, 0xd3, 0xe7, 0xe8, - 0x55, 0xde, 0xa3, 0x6f, 0x90, 0x47, 0xa8, 0x2a, 0x35, 0xcf, 0x52, 0xcd, 0xec, 0xb0, 0x66, 0xb1, - 0xb1, 0x9a, 0xdc, 0x31, 0x67, 0xbe, 0xf3, 0xed, 0x77, 0xce, 0xf9, 0x66, 0x06, 0x20, 0x43, 0xc1, - 0x06, 0x78, 0x31, 0x1d, 0xe1, 0xab, 0x40, 0x1d, 0x4c, 0x44, 0xa4, 0x22, 0x52, 0x9a, 0x8f, 0xed, - 0xc1, 0x30, 0x1a, 0x46, 0xf1, 0xce, 0x5e, 0x79, 0x8c, 0x8a, 0x05, 0xe1, 0xc5, 0x6c, 0x5d, 0x8a, - 0x04, 0x47, 0x21, 0xe3, 0x95, 0x5b, 0x87, 0x47, 0x27, 0xa8, 0xbc, 0x28, 0x6c, 0xbd, 0x0a, 0x54, - 0x10, 0x0e, 0xfb, 0x4c, 0xe1, 0x68, 0x14, 0x28, 0x94, 0x14, 0x7f, 0x9f, 0xa2, 0x54, 0xee, 0xf7, - 0x50, 0xe9, 0x2b, 0x26, 0x94, 0x06, 0xd8, 0x18, 0xf9, 0x18, 0xf2, 0x61, 0xc4, 0xd1, 0x0f, 0xb8, - 0xac, 0x3a, 0xf5, 0xd5, 0xfd, 0xd2, 0x51, 0xf9, 0xcd, 0xdb, 0x5a, 0xe6, 0x9f, 0xb7, 0xb5, 0xac, - 0x17, 0x71, 0xec, 0x34, 0x69, 0x4e, 0xef, 0x77, 0xb8, 0x74, 0xff, 0x80, 0xad, 0x5b, 0xd8, 0xc9, - 0x47, 0x90, 0xb3, 0x0c, 0x55, 0xa7, 0xee, 0xdc, 0x42, 0x90, 0x8d, 0x09, 0x48, 0x0d, 0x8a, 0x3c, - 0x1a, 0xb3, 0x20, 0xf4, 0x43, 0x36, 0xc6, 0xea, 0x4a, 0xdd, 0xd9, 0x2f, 0x50, 0x88, 0x43, 0x1e, - 0x1b, 0x23, 0x79, 0x08, 0x20, 0x27, 0x6c, 0x80, 0xfe, 0x54, 0x22, 0xaf, 0xae, 0xd6, 0x9d, 0x7d, - 0x87, 0x16, 0x4c, 0xe4, 0x5c, 0x22, 0x77, 0x39, 0xd4, 0x96, 0x16, 0x28, 0x27, 0x51, 0x28, 0x91, - 0x34, 0x00, 0x64, 0x12, 0x35, 0xf5, 0x14, 0x0f, 0x1f, 0x1f, 0xa4, 0x9a, 0x7c, 0x4b, 0x3e, 0x9d, - 0x4b, 0x72, 0xbb, 0xb0, 0x91, 0x34, 0xa9, 0xaf, 0x98, 0x9a, 0xca, 0x45, 0xe1, 0xce, 0x0d, 0xe1, - 0x55, 0xc8, 0xc9, 0xe9, 0x60, 0x80, 0x52, 0x9a, 0xaa, 0xf2, 0x74, 0xb6, 0x74, 0x3d, 0xd8, 0x9c, - 0x6b, 0xb9, 0x55, 0xf9, 0x04, 0xf2, 0xd2, 0x30, 0x27, 0x1a, 0x1f, 0xa6, 0x35, 0x2e, 0x08, 0xa0, - 0x09, 0xdc, 0x7d, 0xbd, 0x02, 0x9b, 0x67, 0x82, 0x85, 0xf2, 0x02, 0x45, 0x5f, 0x7f, 0x03, 0x39, - 0x72, 0xf2, 0x33, 0x6c, 0x33, 0xce, 0x05, 0x4a, 0x89, 0xdc, 0x37, 0xa6, 0xf0, 0x47, 0xc1, 0x38, - 0x50, 0x46, 0xaa, 0x66, 0x4f, 0x8c, 0xd3, 0x98, 0xc1, 0x7a, 0x1a, 0xd5, 0xd5, 0x20, 0xba, 0xc5, - 0x6e, 0x06, 0x49, 0x03, 0xb6, 0x22, 0x11, 0x0c, 0x83, 0x90, 0x8d, 0xfc, 0x49, 0x80, 0x03, 0xf4, - 0x2f, 0x99, 0xbc, 0x34, 0xe5, 0x15, 0x0f, 0x37, 0x0f, 0xac, 0xf3, 0x4e, 0xf5, 0x4e, 0x9b, 0xc9, - 0x4b, 0xba, 0x39, 0x43, 0x27, 0x21, 0x72, 0x02, 0x3b, 0x02, 0x27, 0x23, 0x36, 0xc0, 0x31, 0x86, - 0x6a, 0x9e, 0x65, 0x75, 0x19, 0xcb, 0xfd, 0xb9, 0x84, 0x6b, 0xa2, 0x4f, 0x20, 0x1f, 0x27, 0x07, - 0xbc, 0x7a, 0xcf, 0x58, 0x6c, 0xc3, 0x5a, 0x2c, 0x67, 0x40, 0xda, 0xa4, 0x06, 0xd0, 0xe1, 0xee, - 0x5f, 0x0e, 0x94, 0x67, 0x0d, 0x3a, 0x66, 0xc1, 0x08, 0x79, 0x2a, 0xdd, 0xb9, 0x3b, 0x9d, 0x7c, - 0x0b, 0x6b, 0x28, 0x44, 0x24, 0x4c, 0xa1, 0xe5, 0x43, 0x37, 0x3d, 0x97, 0x34, 0xf1, 0x41, 0x4b, - 0x23, 0x69, 0x9c, 0xe0, 0x36, 0x60, 0xcd, 0xac, 0xc9, 0x3a, 0x14, 0xbc, 0xde, 0x99, 0x7f, 0xdc, - 0x3b, 0xf7, 0x9a, 0x95, 0x0c, 0x79, 0x00, 0xd5, 0xfe, 0x59, 0x8f, 0x36, 0x4e, 0x5a, 0xbe, 0xd7, - 0x6b, 0xb6, 0xfc, 0x73, 0xaf, 0xf1, 0xbc, 0xd1, 0xe9, 0x36, 0x8e, 0xba, 0xad, 0x8a, 0x43, 0x8a, - 0x90, 0x3b, 0xf7, 0x9e, 0x79, 0xbd, 0x5f, 0xbc, 0xca, 0x8a, 0xfb, 0xa7, 0x03, 0xa4, 0xaf, 0x22, - 0xc1, 0x86, 0xa8, 0x8f, 0xce, 0x4f, 0x28, 0x25, 0x1b, 0x22, 0xf9, 0x11, 0x0a, 0x72, 0x36, 0x6a, - 0x3b, 0xd1, 0xda, 0xed, 0xba, 0x12, 0x47, 0xb4, 0x33, 0xf4, 0x3a, 0x87, 0x7c, 0x0d, 0xd9, 0x0b, - 0xa3, 0xd8, 0x8e, 0xef, 0xc1, 0x5d, 0x55, 0xb5, 0x33, 0xd4, 0xa2, 0x8f, 0x0a, 0x90, 0xb3, 0x1a, - 0x5c, 0x80, 0xbc, 0x17, 0x29, 0x8a, 0x8c, 0x5f, 0xb9, 0x6f, 0x1c, 0x58, 0x9f, 0xe5, 0x98, 0x06, - 0xbe, 0x63, 0x87, 0x8b, 0x13, 0x11, 0xbc, 0x64, 0x0a, 0xfd, 0xdf, 0xf0, 0xca, 0x28, 0x2a, 0x1d, - 0xed, 0x5a, 0xf8, 0x86, 0x81, 0x9f, 0xc6, 0xfb, 0xcf, 0xf0, 0x8a, 0xc2, 0x24, 0xf9, 0xbd, 0xdc, - 0xe5, 0xab, 0xef, 0xeb, 0x72, 0xf7, 0x09, 0x14, 0x9b, 0x38, 0x42, 0x85, 0xef, 0x5c, 0x87, 0x7b, - 0x02, 0xeb, 0xfa, 0x84, 0x3e, 0x8d, 0xc6, 0x13, 0x4d, 0xa0, 0xbb, 0xbc, 0xab, 0xdb, 0xe9, 0x0f, - 0x6c, 0xc4, 0x97, 0xc1, 0x30, 0x64, 0x6a, 0x2a, 0xe2, 0x1b, 0xa3, 0x44, 0xb7, 0x71, 0x0e, 0xdf, - 0x9f, 0x6d, 0xba, 0xaf, 0x1d, 0x00, 0xcd, 0x64, 0xdd, 0xfa, 0x25, 0xec, 0x18, 0x1a, 0x3d, 0x83, - 0xa9, 0xb8, 0xc9, 0x72, 0x1f, 0x2d, 0x76, 0x2a, 0xae, 0x49, 0xc8, 0x37, 0x90, 0x15, 0xc8, 0x64, - 0x14, 0x5a, 0xe3, 0x2e, 0x18, 0xe4, 0x9a, 0xff, 0x80, 0x1a, 0x18, 0xb5, 0x70, 0xf7, 0x31, 0x64, - 0xe3, 0x08, 0xd9, 0x85, 0xad, 0xe7, 0x2d, 0xda, 0x39, 0xee, 0x3c, 0x6d, 0x9c, 0x75, 0x7a, 0x9e, - 0x7f, 0xdc, 0xe8, 0x74, 0x5b, 0xcd, 0x4a, 0xc6, 0xfd, 0x77, 0x05, 0x2a, 0xc9, 0x5d, 0x39, 0x33, - 0xe5, 0x57, 0x50, 0x08, 0x23, 0xe5, 0x0b, 0xed, 0x08, 0x6b, 0xca, 0x9d, 0xc5, 0x8b, 0x36, 0xf6, - 0x4b, 0x3b, 0x43, 0xf3, 0xa1, 0xfd, 0x4d, 0x9a, 0x50, 0x56, 0xd6, 0x3a, 0xf1, 0x85, 0x60, 0x2d, - 0xf9, 0xe1, 0xed, 0x96, 0x8c, 0xef, 0x80, 0x0c, 0x5d, 0x57, 0x29, 0xbf, 0xfd, 0x00, 0x25, 0x6e, - 0xc6, 0x66, 0x39, 0x62, 0x03, 0x7c, 0x90, 0xe6, 0x98, 0x1b, 0x6c, 0x3b, 0x43, 0x8b, 0x7c, 0x6e, - 0xce, 0x4d, 0x28, 0xa7, 0x46, 0x15, 0x5f, 0x2b, 0x37, 0x54, 0xa4, 0xe6, 0xab, 0x55, 0x60, 0x6a, - 0xe0, 0xdf, 0x41, 0x31, 0x99, 0x14, 0xf2, 0xea, 0x9a, 0xa1, 0xa8, 0x2e, 0x6b, 0x7c, 0x3b, 0x43, - 0x01, 0x93, 0xd5, 0xdc, 0xd9, 0x3a, 0xfc, 0xdb, 0x81, 0x8a, 0x3e, 0xef, 0x27, 0x36, 0x51, 0xe7, - 0x90, 0x97, 0xb0, 0xbb, 0xe4, 0xb1, 0x23, 0x9f, 0xa6, 0x3f, 0x71, 0xf7, 0xa3, 0xbf, 0xf7, 0xd9, - 0xff, 0x44, 0xdb, 0xb7, 0xa9, 0x0b, 0x85, 0xe4, 0xf5, 0x21, 0x8f, 0x96, 0x3c, 0x4b, 0x33, 0xee, - 0xda, 0xd2, 0xfd, 0x98, 0xed, 0xf0, 0x12, 0xb6, 0x93, 0x6f, 0xa4, 0xca, 0xeb, 0x41, 0xee, 0x54, - 0x44, 0xfa, 0x89, 0x24, 0xf5, 0x45, 0x92, 0xc5, 0x0b, 0x70, 0x6f, 0x51, 0xc6, 0x82, 0x17, 0xf7, - 0x9d, 0xcf, 0x9d, 0xa3, 0x7b, 0xbf, 0xae, 0x4c, 0x5e, 0xbc, 0xc8, 0x9a, 0xbf, 0x42, 0x5f, 0xfc, - 0x17, 0x00, 0x00, 0xff, 0xff, 0x34, 0x25, 0xf0, 0x42, 0x58, 0x09, 0x00, 0x00, + // 995 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x56, 0xdd, 0x6e, 0x1a, 0x47, + 0x14, 0x66, 0xed, 0x04, 0xcc, 0x01, 0x63, 0x3c, 0x8e, 0x6d, 0xea, 0x26, 0x81, 0xec, 0x4d, 0x5d, + 0xa9, 0xb5, 0x2a, 0xf7, 0x5f, 0x51, 0x5b, 0xe1, 0x80, 0x81, 0x86, 0x2e, 0xee, 0x60, 0xa7, 0x52, + 0x6f, 0x56, 0x13, 0xe6, 0x18, 0xaf, 0x0a, 0xbb, 0x74, 0x66, 0x88, 0xe2, 0x9b, 0x3e, 0x47, 0xaf, + 0xfa, 0x0a, 0x7d, 0x8d, 0xaa, 0x4f, 0xd0, 0x56, 0x6a, 0x9e, 0xa5, 0x9a, 0xd9, 0x61, 0xcd, 0x62, + 0x88, 0xa2, 0xe6, 0x6e, 0xe7, 0xcc, 0x77, 0xbe, 0xf9, 0xe6, 0x9c, 0x6f, 0x66, 0x16, 0xc8, 0x50, + 0xb0, 0x01, 0x5e, 0x4e, 0x47, 0xf8, 0x32, 0x50, 0x47, 0x13, 0x11, 0xa9, 0x88, 0x14, 0xe7, 0x63, + 0x07, 0x30, 0x8c, 0x86, 0x51, 0x3c, 0x73, 0x50, 0x1a, 0xa3, 0x62, 0x41, 0x78, 0x39, 0x1b, 0x17, + 0x23, 0xc1, 0x51, 0xc8, 0x78, 0xe4, 0xd6, 0xe0, 0x61, 0x0b, 0x95, 0x17, 0x85, 0xcd, 0x97, 0x81, + 0x0a, 0xc2, 0x61, 0x9f, 0x29, 0x1c, 0x8d, 0x02, 0x85, 0x92, 0xe2, 0xcf, 0x53, 0x94, 0xca, 0xfd, + 0x0a, 0xca, 0x7d, 0xc5, 0x84, 0xd2, 0x00, 0x1b, 0x23, 0xef, 0xc3, 0x46, 0x18, 0x71, 0xf4, 0x03, + 0x2e, 0x2b, 0x4e, 0x6d, 0xfd, 0xb0, 0x78, 0x52, 0xfa, 0xe3, 0x55, 0x35, 0xf3, 0xcf, 0xab, 0x6a, + 0xd6, 0x8b, 0x38, 0x76, 0x1a, 0x34, 0xa7, 0xe7, 0x3b, 0x5c, 0xba, 0xbf, 0xc0, 0xce, 0x12, 0x76, + 0xf2, 0x1e, 0xe4, 0x2c, 0x43, 0xc5, 0xa9, 0x39, 0x4b, 0x08, 0xb2, 0x31, 0x01, 0xa9, 0x42, 0x81, + 0x47, 0x63, 0x16, 0x84, 0x7e, 0xc8, 0xc6, 0x58, 0x59, 0xab, 0x39, 0x87, 0x79, 0x0a, 0x71, 0xc8, + 0x63, 0x63, 0x24, 0x0f, 0x00, 0xe4, 0x84, 0x0d, 0xd0, 0x9f, 0x4a, 0xe4, 0x95, 0xf5, 0x9a, 0x73, + 0xe8, 0xd0, 0xbc, 0x89, 0x5c, 0x48, 0xe4, 0x2e, 0x87, 0xea, 0xca, 0x0d, 0xca, 0x49, 0x14, 0x4a, + 0x24, 0x75, 0x00, 0x99, 0x44, 0xcd, 0x7e, 0x0a, 0xc7, 0x8f, 0x8e, 0x52, 0x45, 0x5e, 0x92, 0x4f, + 0xe7, 0x92, 0xdc, 0x2e, 0x6c, 0x25, 0x45, 0xea, 0x2b, 0xa6, 0xa6, 0x72, 0x51, 0xb8, 0x73, 0x4b, + 0x78, 0x05, 0x72, 0x72, 0x3a, 0x18, 0xa0, 0x94, 0x66, 0x57, 0x1b, 0x74, 0x36, 0x74, 0x3d, 0xd8, + 0x9e, 0x2b, 0xb9, 0x55, 0xf9, 0x25, 0x6c, 0x48, 0xc3, 0x9c, 0x68, 0x7c, 0x90, 0xd6, 0xb8, 0x20, + 0x80, 0x26, 0x70, 0xf7, 0xf7, 0x35, 0xd8, 0x3e, 0x17, 0x2c, 0x94, 0x97, 0x28, 0xfa, 0x7a, 0x0d, + 0xe4, 0xc8, 0xc9, 0xf7, 0xb0, 0xcb, 0x38, 0x17, 0x28, 0x25, 0x72, 0xdf, 0x98, 0xc2, 0x1f, 0x05, + 0xe3, 0x40, 0x19, 0xa9, 0x9a, 0x3d, 0x31, 0x4e, 0x7d, 0x06, 0xeb, 0x69, 0x54, 0x57, 0x83, 0xe8, + 0x0e, 0xbb, 0x1d, 0x24, 0x75, 0xd8, 0x89, 0x44, 0x30, 0x0c, 0x42, 0x36, 0xf2, 0x27, 0x01, 0x0e, + 0xd0, 0xbf, 0x62, 0xf2, 0xca, 0x6c, 0xaf, 0x70, 0xbc, 0x7d, 0x64, 0x9d, 0x77, 0xa6, 0x67, 0xda, + 0x4c, 0x5e, 0xd1, 0xed, 0x19, 0x3a, 0x09, 0x91, 0x16, 0xec, 0x09, 0x9c, 0x8c, 0xd8, 0x00, 0xc7, + 0x18, 0xaa, 0x79, 0x96, 0xf5, 0x55, 0x2c, 0xf7, 0xe6, 0x12, 0x6e, 0x88, 0x1e, 0xc3, 0xf6, 0x82, + 0x96, 0x80, 0x57, 0xee, 0x18, 0xaf, 0x6d, 0x59, 0xaf, 0xe5, 0x0c, 0xba, 0xd3, 0xa0, 0x5b, 0x29, + 0x1d, 0x1d, 0xee, 0xfe, 0xe9, 0x40, 0x69, 0x56, 0xb1, 0x53, 0x16, 0x8c, 0x90, 0x2f, 0xe7, 0x73, + 0xde, 0x8c, 0x8f, 0x7c, 0x01, 0x77, 0x51, 0x88, 0x48, 0x98, 0x52, 0x94, 0x8e, 0xdd, 0x74, 0xe7, + 0xd2, 0x2b, 0x1d, 0x35, 0x35, 0x92, 0xc6, 0x09, 0x6e, 0x1d, 0xee, 0x9a, 0x31, 0xd9, 0x84, 0xbc, + 0xd7, 0x3b, 0xf7, 0x4f, 0x7b, 0x17, 0x5e, 0xa3, 0x9c, 0x21, 0xf7, 0xa1, 0xd2, 0x3f, 0xef, 0xd1, + 0x7a, 0xab, 0xe9, 0x7b, 0xbd, 0x46, 0xd3, 0xbf, 0xf0, 0xea, 0xcf, 0xea, 0x9d, 0x6e, 0xfd, 0xa4, + 0xdb, 0x2c, 0x3b, 0xa4, 0x00, 0xb9, 0x0b, 0xef, 0xa9, 0xd7, 0xfb, 0xc1, 0x2b, 0xaf, 0xb9, 0xbf, + 0x3a, 0x40, 0xfa, 0x2a, 0x12, 0x6c, 0x88, 0xfa, 0x70, 0x7d, 0x87, 0x52, 0xb2, 0x21, 0x92, 0x6f, + 0x20, 0x2f, 0x67, 0x66, 0xb0, 0x3d, 0xaf, 0x2e, 0xd7, 0x95, 0x78, 0xa6, 0x9d, 0xa1, 0x37, 0x39, + 0xe4, 0x33, 0xc8, 0x5e, 0x1a, 0xc5, 0xb6, 0xc1, 0xf7, 0x5f, 0xb7, 0xab, 0x76, 0x86, 0x5a, 0xf4, + 0x49, 0x1e, 0x72, 0x56, 0x83, 0x0b, 0xb0, 0xe1, 0x45, 0x8a, 0x22, 0xe3, 0xd7, 0xee, 0xdf, 0x0e, + 0x6c, 0xce, 0x72, 0x4c, 0xdd, 0xde, 0xb6, 0xe4, 0x85, 0x89, 0x08, 0x5e, 0x30, 0x85, 0xfe, 0x4f, + 0x78, 0x6d, 0x24, 0x16, 0x4f, 0xf6, 0x6d, 0xda, 0x96, 0x41, 0x9d, 0xc5, 0xf3, 0x4f, 0xf1, 0x9a, + 0xc2, 0x24, 0xf9, 0x5e, 0x7d, 0x30, 0xd6, 0xff, 0xef, 0xc1, 0x70, 0xbf, 0x85, 0x42, 0x03, 0x47, + 0xa8, 0xf0, 0xed, 0x37, 0xe6, 0xb6, 0x60, 0x53, 0x9f, 0xf2, 0x27, 0xd1, 0x78, 0xa2, 0x19, 0x75, + 0x1f, 0xf6, 0x75, 0xc1, 0xfd, 0x81, 0x8d, 0xf8, 0x32, 0x18, 0x86, 0x4c, 0x4d, 0x45, 0x7c, 0xeb, + 0x14, 0xe9, 0x2e, 0xce, 0xe1, 0xfb, 0xb3, 0x49, 0xf7, 0x37, 0x07, 0x40, 0x33, 0x59, 0x83, 0x7f, + 0x02, 0x7b, 0x86, 0x46, 0x77, 0x69, 0x2a, 0x6e, 0xb3, 0xdc, 0x43, 0x8b, 0x9d, 0x8a, 0x1b, 0x12, + 0xf2, 0x39, 0x64, 0x05, 0x32, 0x19, 0x85, 0xd6, 0xda, 0x0b, 0x16, 0xba, 0xe1, 0x3f, 0xa2, 0x06, + 0x46, 0x2d, 0xdc, 0x7d, 0x04, 0xd9, 0x38, 0x42, 0xf6, 0x61, 0xe7, 0x59, 0x93, 0x76, 0x4e, 0x3b, + 0x4f, 0xea, 0xe7, 0x9d, 0x9e, 0xe7, 0x9f, 0xd6, 0x3b, 0xdd, 0x66, 0xa3, 0x9c, 0x71, 0xff, 0x5d, + 0x83, 0x72, 0x72, 0xdf, 0xce, 0x6c, 0xfb, 0x29, 0xe4, 0xc3, 0x48, 0xf9, 0x42, 0x7b, 0xc6, 0xda, + 0x76, 0x6f, 0xf1, 0xb2, 0x8e, 0x1d, 0xd5, 0xce, 0xd0, 0x8d, 0xd0, 0x7e, 0x93, 0x06, 0x94, 0x94, + 0x35, 0x57, 0x5c, 0x72, 0x6b, 0xda, 0x77, 0x97, 0x9b, 0x36, 0xbe, 0x47, 0x32, 0x74, 0x53, 0xa5, + 0x1c, 0xf9, 0x35, 0x14, 0xb9, 0xe9, 0xa3, 0xe5, 0x88, 0x1d, 0xf1, 0x4e, 0x9a, 0x63, 0xae, 0xd3, + 0xed, 0x0c, 0x2d, 0xf0, 0xb9, 0xc6, 0x37, 0xa0, 0x94, 0x6a, 0x55, 0x7c, 0x23, 0xdd, 0x52, 0x91, + 0xea, 0xaf, 0x56, 0x81, 0xa9, 0x86, 0x3f, 0x86, 0x42, 0xd2, 0x29, 0xe4, 0x95, 0xbb, 0x86, 0xa2, + 0xb2, 0xaa, 0xf0, 0xed, 0x0c, 0x05, 0x4c, 0x46, 0x73, 0xa7, 0xef, 0xf8, 0x2f, 0x07, 0xca, 0xfa, + 0x46, 0x68, 0xd9, 0x44, 0x9d, 0x43, 0x5e, 0xc0, 0xfe, 0x8a, 0x07, 0x93, 0x7c, 0x90, 0x5e, 0xe2, + 0xf5, 0x3f, 0x0e, 0x07, 0x1f, 0xbe, 0x21, 0xda, 0xbe, 0x6f, 0x5d, 0xc8, 0x27, 0x2f, 0x18, 0x79, + 0xb8, 0xe2, 0x69, 0x9b, 0x71, 0x57, 0x57, 0xce, 0xc7, 0x6c, 0xc7, 0x57, 0xb0, 0x9b, 0xac, 0x91, + 0xda, 0x5e, 0x0f, 0x72, 0x67, 0x22, 0xd2, 0xcf, 0x2c, 0xa9, 0x2d, 0x92, 0x2c, 0x5e, 0x91, 0x07, + 0x8b, 0x32, 0x16, 0xbc, 0x78, 0xe8, 0x7c, 0xe4, 0x9c, 0xdc, 0xf9, 0x71, 0x6d, 0xf2, 0xfc, 0x79, + 0xd6, 0xfc, 0x4e, 0x7d, 0xfc, 0x5f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x3d, 0x50, 0xc8, 0xa3, 0x9c, + 0x09, 0x00, 0x00, } type DRPCNodeGracefulExitClient interface { diff --git a/pkg/pb/gracefulexit.proto b/pkg/pb/gracefulexit.proto index b0455e8a1..cf866aca5 100644 --- a/pkg/pb/gracefulexit.proto +++ b/pkg/pb/gracefulexit.proto @@ -54,11 +54,11 @@ message TransferSucceeded { metainfo.AddressedOrderLimit addressed_order_limit = 1; orders.PieceHash original_piece_hash = 2; orders.PieceHash replacement_piece_hash = 3; - bytes piece_id = 4 [(gogoproto.customtype) = "PieceID", (gogoproto.nullable) = false]; // the original piece ID + bytes original_piece_id = 4 [(gogoproto.customtype) = "PieceID", (gogoproto.nullable) = false]; } message TransferFailed { - bytes piece_id = 1 [(gogoproto.customtype) = "PieceID", (gogoproto.nullable) = false]; // the original piece ID + bytes original_piece_id = 1 [(gogoproto.customtype) = "PieceID", (gogoproto.nullable) = false]; enum Error { NOT_FOUND = 0; STORAGE_NODE_UNAVAILABLE = 1; @@ -77,7 +77,7 @@ message StorageNodeMessage { message NotReady {} message TransferPiece { - bytes piece_id = 1 [(gogoproto.customtype) = "PieceID", (gogoproto.nullable) = false]; // the original piece ID + bytes original_piece_id = 1 [(gogoproto.customtype) = "PieceID", (gogoproto.nullable) = false]; bytes private_key = 2 [(gogoproto.customtype) = "PiecePrivateKey", (gogoproto.nullable) = false]; // addressed_order_limit contains the new piece id. @@ -85,7 +85,7 @@ message TransferPiece { } message DeletePiece { - bytes piece_id = 1 [(gogoproto.customtype) = "PieceID", (gogoproto.nullable) = false]; // the original piece ID + bytes original_piece_id = 1 [(gogoproto.customtype) = "PieceID", (gogoproto.nullable) = false]; } message ExitCompleted { diff --git a/proto.lock b/proto.lock index 9ac157bf6..793f5461b 100644 --- a/proto.lock +++ b/proto.lock @@ -988,7 +988,7 @@ }, { "id": 4, - "name": "piece_id", + "name": "original_piece_id", "type": "bytes", "options": [ { @@ -1008,7 +1008,7 @@ "fields": [ { "id": 1, - "name": "piece_id", + "name": "original_piece_id", "type": "bytes", "options": [ { @@ -1051,7 +1051,7 @@ "fields": [ { "id": 1, - "name": "piece_id", + "name": "original_piece_id", "type": "bytes", "options": [ { @@ -1091,7 +1091,7 @@ "fields": [ { "id": 1, - "name": "piece_id", + "name": "original_piece_id", "type": "bytes", "options": [ { diff --git a/satellite/gracefulexit/endpoint.go b/satellite/gracefulexit/endpoint.go index 40fe63cc4..04857a30e 100644 --- a/satellite/gracefulexit/endpoint.go +++ b/satellite/gracefulexit/endpoint.go @@ -357,7 +357,7 @@ func (endpoint *Endpoint) processIncomplete(ctx context.Context, stream processS transferMsg := &pb.SatelliteMessage{ Message: &pb.SatelliteMessage_TransferPiece{ TransferPiece: &pb.TransferPiece{ - PieceId: pieceID, // original piece ID + OriginalPieceId: pieceID, AddressedOrderLimit: limit, PrivateKey: privateKey, }, @@ -385,7 +385,7 @@ func (endpoint *Endpoint) handleSucceeded(ctx context.Context, pending *pendingM return Error.New("Original piece hash cannot be nil.") } - pieceID := message.Succeeded.PieceId + pieceID := message.Succeeded.OriginalPieceId endpoint.log.Debug("transfer succeeded.", zap.String("piece ID", pieceID.String())) // TODO validation @@ -424,8 +424,8 @@ func (endpoint *Endpoint) handleSucceeded(ctx context.Context, pending *pendingM func (endpoint *Endpoint) handleFailed(ctx context.Context, pending *pendingMap, nodeID storj.NodeID, message *pb.StorageNodeMessage_Failed) (err error) { defer mon.Task()(&ctx)(&err) - endpoint.log.Warn("transfer failed.", zap.String("piece ID", message.Failed.PieceId.String()), zap.String("transfer error", message.Failed.GetError().String())) - pieceID := message.Failed.PieceId + endpoint.log.Warn("transfer failed.", zap.String("piece ID", message.Failed.OriginalPieceId.String()), zap.String("transfer error", message.Failed.GetError().String())) + pieceID := message.Failed.OriginalPieceId transfer, ok := pending.get(pieceID) if !ok { endpoint.log.Debug("could not find transfer message in pending queue. skipping .", zap.String("piece ID", pieceID.String())) diff --git a/satellite/gracefulexit/endpoint_test.go b/satellite/gracefulexit/endpoint_test.go index d104ca94e..0cb45b1d6 100644 --- a/satellite/gracefulexit/endpoint_test.go +++ b/satellite/gracefulexit/endpoint_test.go @@ -48,15 +48,15 @@ func TestSuccess(t *testing.T) { // pick the first one to fail if pieceID.IsZero() { - pieceID = m.TransferPiece.PieceId + pieceID = m.TransferPiece.OriginalPieceId } - if failedCount > 0 || pieceID != m.TransferPiece.PieceId { + if failedCount > 0 || pieceID != m.TransferPiece.OriginalPieceId { success := &pb.StorageNodeMessage{ Message: &pb.StorageNodeMessage_Succeeded{ Succeeded: &pb.TransferSucceeded{ - PieceId: m.TransferPiece.PieceId, - OriginalPieceHash: &pb.PieceHash{PieceId: m.TransferPiece.PieceId}, + OriginalPieceId: m.TransferPiece.OriginalPieceId, + OriginalPieceHash: &pb.PieceHash{PieceId: m.TransferPiece.OriginalPieceId}, AddressedOrderLimit: &pb.AddressedOrderLimit{ Limit: &pb.OrderLimit{ PieceId: m.TransferPiece.AddressedOrderLimit.Limit.PieceId, @@ -72,8 +72,8 @@ func TestSuccess(t *testing.T) { failed := &pb.StorageNodeMessage{ Message: &pb.StorageNodeMessage_Failed{ Failed: &pb.TransferFailed{ - PieceId: m.TransferPiece.PieceId, - Error: pb.TransferFailed_UNKNOWN, + OriginalPieceId: m.TransferPiece.OriginalPieceId, + Error: pb.TransferFailed_UNKNOWN, }, }, } @@ -115,8 +115,8 @@ func TestFailure(t *testing.T) { failed := &pb.StorageNodeMessage{ Message: &pb.StorageNodeMessage_Failed{ Failed: &pb.TransferFailed{ - PieceId: m.TransferPiece.PieceId, - Error: pb.TransferFailed_UNKNOWN, + OriginalPieceId: m.TransferPiece.OriginalPieceId, + Error: pb.TransferFailed_UNKNOWN, }, }, }