From e27d76e80400fe9532b1d765e8fe9ea33cbd28f9 Mon Sep 17 00:00:00 2001
From: Alex Vanin <alexey@nspcc.ru>
Date: Tue, 26 Jan 2021 21:32:33 +0300
Subject: [PATCH] [#250] v2/container: Add epoch field to size announce body

Signed-off-by: Alex Vanin <alexey@nspcc.ru>
---
 v2/container/convert.go          |   4 ++++
 v2/container/grpc/service.go     |   7 +++++++
 v2/container/grpc/service.pb.go  | Bin 123969 -> 124372 bytes
 v2/container/marshal.go          |  13 +++++++++++--
 v2/container/marshal_test.go     |   1 +
 v2/container/test/client_test.go |   2 ++
 v2/container/types.go            |  16 ++++++++++++++++
 7 files changed, 41 insertions(+), 2 deletions(-)

diff --git a/v2/container/convert.go b/v2/container/convert.go
index d40813f6..386eb8e3 100644
--- a/v2/container/convert.go
+++ b/v2/container/convert.go
@@ -857,6 +857,8 @@ func UsedSpaceAnnouncementToGRPCMessage(a *UsedSpaceAnnouncement) *container.Ann
 
 	m := new(container.AnnounceUsedSpaceRequest_Body_Announcement)
 
+	m.SetEpoch(a.GetEpoch())
+
 	m.SetContainerId(
 		refs.ContainerIDToGRPCMessage(a.GetContainerID()),
 	)
@@ -873,6 +875,8 @@ func UsedSpaceAnnouncementFromGRPCMessage(m *container.AnnounceUsedSpaceRequest_
 
 	a := new(UsedSpaceAnnouncement)
 
+	a.SetEpoch(m.GetEpoch())
+
 	a.SetContainerID(
 		refs.ContainerIDFromGRPCMessage(m.GetContainerId()),
 	)
diff --git a/v2/container/grpc/service.go b/v2/container/grpc/service.go
index 98c5cc69..644ca3ab 100644
--- a/v2/container/grpc/service.go
+++ b/v2/container/grpc/service.go
@@ -354,6 +354,13 @@ func (m *GetExtendedACLResponse) SetVerifyHeader(v *session.ResponseVerification
 	}
 }
 
+// SetEpoch sets epoch of the size estimation.
+func (m *AnnounceUsedSpaceRequest_Body_Announcement) SetEpoch(v uint64) {
+	if m != nil {
+		m.Epoch = v
+	}
+}
+
 // SetContainerId sets identifier of the container.
 func (m *AnnounceUsedSpaceRequest_Body_Announcement) SetContainerId(v *refs.ContainerID) {
 	if m != nil {
diff --git a/v2/container/grpc/service.pb.go b/v2/container/grpc/service.pb.go
index 2951a95b95a5c4e5e531dcfc69610ae7e3da896b..88dbb48ee00dc6cdb83dbfc52a8b86a2e1150de2 100644
GIT binary patch
delta 1420
zcmZ8gTTEP46wM|xFn6#F(19QW<uIL4r;c=($L)aBftGg}!lQ+LDCIKTNvAk-r}GeM
zEaHbhrb*Eg*fH^eAAXpSNYW3!G*lB~Lsgm>(WD6_sV0P~rP^BS1NXU<s{Oe+XYaMw
zUVH6(E`6T!^-|94(#y>WEqsc_GqGVc$s$^kjh%{8AgsmHN;FQfRP;rasi|}{rlg}<
zoQ)|dmPl$NnXo!iZI-s{Gtqcj_OT&Kq_yEpq|W|=lBAfc#-%0FuDB9Y52>P)OGkL^
z>~u<t*V)y4J*dT^X*HHepS2Hh_iGHQ`P{UJZv}Jt`gF5XI&gp;PpKm;l~BSei>8>u
zQkfXjB1{`Tt%lPqp`3kQQ%3lerAhE!3|;xuVAOT-xvN!$`pGPvGfPP|ok_--n=6<1
z^To@%F6Lg<!dVf|!b?6dWt$>i7juuhYq)Z2_rkk%a6Zc#co5PPivA7bxq1kBYdqps
z<NHs>FV3>xWtQCI2i^K5qJMP~Ie<OIuoowS@EF^HQo$ogQ7i{|=lUUZTVYSOe)r)#
zgC}`t%gxyj<$U>eIsR;geK^<x`S{^8VB=qG7V@c;N~5oq+GAD_ocLytlJ!BT$}&s*
z%x^Z)InN+EV$Cs-@v|T?yyXL#@;FO49F;-hY{P(yA#fUf2L)BNANKP3n+Cr4yA|_I
zP=qTDVBuY>bvV_zBjIm9#moA@fm4l8BKUe_Dic(!fDV>BMM6a5_vJHLu%CZ<Q^(9#
z!P7V^K{0-G81jg6T%bLC>TU^6njwO>k3bb)zGs;+fCUp0l<*Jk<YFk7`pnva;jAB?
z;Owq~TL$prt=b2zcS9>*{!`+s_bh^^m{+W4<4?`R!5m=2$6LT=6t?=XvJw0kZ-IS6
za#shG;(QCi#yX&opICE{*=1tNdOmqgBFOX^8gtnM<!A{(4!+S!p2a(1(ByY-FCAY8
z2;lV)NO-ahY+~jMzm(#18##7jO*i^d2d(CMJIH+3h9C1okd0&Q+dL-?KH>OQJ2)S1
z0pDo>(He)S?op01p15C%X&LMf1qCp_5keHV^1p6WV|NGXEa?Q7pt#TqeKY-Fz=j+!
z@zqWH%u&kDnMiV^9SX2G1f{(D*HIC2h*g+ydJl0YyP*)@FM_88$zlbG{jM7-dBe9Q
z{Hu*#yw*jQP4q&auqF?kRrK5G{%rJs2j`o}vtt$TiIH9m)hD`Xe$4?5+a%PE#1>#)
zmu{D!_x@`!4CC8v@ahi2i?uFj!9RLwi$4ZoP|_*g<DL;zJkW}>T~LqDHd4d;L2wAQ
zK^gqyrCm4Lpb7!6G(nSCstxCk(sO*S5v&5fU%>zW3djM6S%2pKfT;ZVI5@@ok@<T!
zO3=^`rJ|;yp9ZqmQq#eHs1%V&itzCjecfwxo|eFCR1`sRcmSOA<HiO^*2Jc7;hO;%
GJ^v4Yj=Pxv

delta 947
zcmZ8gTS${(80J}Xy0tm;P|FS7!o+!)b8e}r<&@Ao{?3I)l-cyc3N$2;!dfAn2%|pq
zg^)0)iw;Dhu&ZJcL8KQeLJSPWvWxOu-UJ=qU(1Vbem>s!d7tO`p7;CTjfRiB3Lh91
zX9Gr2+<j54&dfBQ?r3Rl6!~K&jeIh9v^V)$#Gx@i97B_1FO)-ux5s^o=3{|w7a~-O
zW?!HuANLh>#snRF)bE9h^m||sH<vA<XVoUAm$MZbb+3ecA+03I$3f)Z`lc7bl{hM@
zg;RvSYUxf9EZn1D5zp%qpcT`fqv*>XXq9>CT(`L4f|(lJu+jrBj!;Jxa*;zLiAWPA
zvnh1E7<zi1iQQs;u8?#&h@{`eP|2KwE|ikwhKkyAprxZFPz7GvU{ccdojhc*z(kKr
zVN{y!olbFgCYcf=u!R(5NM^~@GFW96Z6!*De?d*5ZP1JE_bK$G94fIi8z=meS`nI#
z?#qLQ#w)Rx2C@+)7Um*20OwzXhJqD{6l32_;?YkX{oc<8pOqt;%;hl9r8=Awsq>Md
z|N9QoZ$s=F*QN?&P^cP>e_IJ+aWzFm&8o;z#*>@8{E4jOEAaRYaq@?rT^MOmLOARc
zW#n74S0lA6&_egBkWH5TxDw{{$$<u|5KDeNbh2CmElC{D!)nA+R}5_OTsFNfz-Ag&
zBT2SyrLG#N<sdHC@QUnSb{(vRJ}k>2)1C65js^-i-V+CqLTwVex>Li%4Aj!+t?Y#*
z;%UMPr_7$wJI7(QN{HKlt?_Bs7FK~=SuUCk9>mENn};>eCqhl1YGC=_<LydbSE2#?
zWN2+2Lw`v~rM6@YZ=_B=UXJ2J0a9g<I|mMA(cu_gu*9#8>=kIFYlWPfxrA|32Vh`a
z9~)hZ1});v$27WHh6Y+HW*h(BV3x+|NauIs%1t+urykZYjoRM1i=KKoUd}^FRF8O8
z8R8x@il&)ZTCRtMOR){>r3({o@;7i+^539rYGS7G^;X|OxWv><Lhm%T23il|#PvTY
CCNkIn

diff --git a/v2/container/marshal.go b/v2/container/marshal.go
index f86d964e..ae190bd2 100644
--- a/v2/container/marshal.go
+++ b/v2/container/marshal.go
@@ -41,8 +41,9 @@ const (
 	getEACLRespBodyTableField     = 1
 	getEACLRespBodySignatureField = 2
 
-	usedSpaceAnnounceCIDField       = 1
-	usedSpaceAnnounceUsedSpaceField = 2
+	usedSpaceAnnounceEpochField     = 1
+	usedSpaceAnnounceCIDField       = 2
+	usedSpaceAnnounceUsedSpaceField = 3
 
 	usedSpaceReqBodyAnnouncementsField = 1
 )
@@ -554,6 +555,13 @@ func (a *UsedSpaceAnnouncement) StableMarshal(buf []byte) ([]byte, error) {
 		err       error
 	)
 
+	n, err = protoutil.UInt64Marshal(usedSpaceAnnounceEpochField, buf[offset:], a.epoch)
+	if err != nil {
+		return nil, err
+	}
+
+	offset += n
+
 	n, err = protoutil.NestedStructureMarshal(usedSpaceAnnounceCIDField, buf[offset:], a.cid)
 	if err != nil {
 		return nil, err
@@ -574,6 +582,7 @@ func (a *UsedSpaceAnnouncement) StableSize() (size int) {
 		return 0
 	}
 
+	size += protoutil.UInt64Size(usedSpaceAnnounceEpochField, a.epoch)
 	size += protoutil.NestedStructureSize(usedSpaceAnnounceCIDField, a.cid)
 	size += protoutil.UInt64Size(usedSpaceAnnounceUsedSpaceField, a.usedSpace)
 
diff --git a/v2/container/marshal_test.go b/v2/container/marshal_test.go
index 5a86e88e..dd6599f8 100644
--- a/v2/container/marshal_test.go
+++ b/v2/container/marshal_test.go
@@ -455,6 +455,7 @@ func generateAnnounceRequestBody(n int) *container.AnnounceUsedSpaceRequestBody
 		cid.SetValue(buf)
 
 		a := new(container.UsedSpaceAnnouncement)
+		a.SetEpoch(rand.Uint64())
 		a.SetContainerID(cid)
 		a.SetUsedSpace(rand.Uint64())
 	}
diff --git a/v2/container/test/client_test.go b/v2/container/test/client_test.go
index da7cad00..177b9c95 100644
--- a/v2/container/test/client_test.go
+++ b/v2/container/test/client_test.go
@@ -418,10 +418,12 @@ func testAnnounceRequest() *container.AnnounceUsedSpaceRequest {
 	cid2.SetValue([]byte{4, 5, 6})
 
 	a1 := new(container.UsedSpaceAnnouncement)
+	a1.SetEpoch(20)
 	a1.SetUsedSpace(10)
 	a1.SetContainerID(cid1)
 
 	a2 := new(container.UsedSpaceAnnouncement)
+	a2.SetEpoch(20)
 	a2.SetUsedSpace(20)
 	a2.SetContainerID(cid2)
 
diff --git a/v2/container/types.go b/v2/container/types.go
index 07b65e6a..004ddd70 100644
--- a/v2/container/types.go
+++ b/v2/container/types.go
@@ -94,6 +94,8 @@ type GetExtendedACLResponseBody struct {
 }
 
 type UsedSpaceAnnouncement struct {
+	epoch uint64
+
 	cid *refs.ContainerID
 
 	usedSpace uint64
@@ -917,6 +919,20 @@ func (r *GetExtendedACLResponse) SetVerificationHeader(v *session.ResponseVerifi
 	}
 }
 
+func (a *UsedSpaceAnnouncement) GetEpoch() uint64 {
+	if a != nil {
+		return a.epoch
+	}
+
+	return 0
+}
+
+func (a *UsedSpaceAnnouncement) SetEpoch(v uint64) {
+	if a != nil {
+		a.epoch = v
+	}
+}
+
 func (a *UsedSpaceAnnouncement) GetUsedSpace() uint64 {
 	if a != nil {
 		return a.usedSpace