From 7fb15fa1d0df0f7102c257b1d776a19780f867be Mon Sep 17 00:00:00 2001
From: Evgenii Stratonikov <evgeniy@nspcc.ru>
Date: Mon, 31 Jan 2022 18:15:33 +0300
Subject: [PATCH] [#1118] services/control: allow to reset error counter in
 `SetShardMode`

Signed-off-by: Evgenii Stratonikov <evgeniy@nspcc.ru>
---
 cmd/neofs-cli/modules/control.go              |   9 +++++++--
 pkg/local_object_storage/engine/error_test.go |   6 ++++++
 pkg/local_object_storage/engine/shards.go     |   5 ++++-
 pkg/services/control/server/set_shard_mode.go |   2 +-
 pkg/services/control/service.go               |  16 +++++++++++++++-
 pkg/services/control/service.pb.go            | Bin 88777 -> 89362 bytes
 pkg/services/control/service.proto            |   3 +++
 7 files changed, 36 insertions(+), 5 deletions(-)

diff --git a/cmd/neofs-cli/modules/control.go b/cmd/neofs-cli/modules/control.go
index 6e424bb6..146f21b1 100644
--- a/cmd/neofs-cli/modules/control.go
+++ b/cmd/neofs-cli/modules/control.go
@@ -71,8 +71,9 @@ const (
 	netmapStatusOffline     = "offline"
 	netmapStatusMaintenance = "maintenance"
 
-	shardModeFlag = "mode"
-	shardIDFlag   = "id"
+	shardModeFlag        = "mode"
+	shardIDFlag          = "id"
+	shardClearErrorsFlag = "clear-errors"
 
 	shardModeReadOnly  = "read-only"
 	shardModeReadWrite = "read-write"
@@ -127,6 +128,7 @@ func initControlSetShardModeCmd() {
 			shardModeReadOnly,
 		),
 	)
+	flags.Bool(shardClearErrorsFlag, false, "Set shard error count to 0")
 }
 
 func initControlShardsListCmd() {
@@ -510,6 +512,9 @@ func setShardMode(cmd *cobra.Command, _ []string) {
 	body.SetMode(mode)
 	body.SetShardID(rawID)
 
+	reset, _ := cmd.Flags().GetBool(shardClearErrorsFlag)
+	body.ClearErrorCounter(reset)
+
 	err = controlSvc.SignMessage(key, req)
 	exitOnErr(cmd, errf("could not sign request: %w", err))
 
diff --git a/pkg/local_object_storage/engine/error_test.go b/pkg/local_object_storage/engine/error_test.go
index 13d8a63f..b968a373 100644
--- a/pkg/local_object_storage/engine/error_test.go
+++ b/pkg/local_object_storage/engine/error_test.go
@@ -114,6 +114,12 @@ func TestErrorReporting(t *testing.T) {
 			checkShardState(t, e, id[0], errThreshold+i, shard.ModeReadOnly)
 			checkShardState(t, e, id[1], 0, shard.ModeReadWrite)
 		}
+
+		require.NoError(t, e.SetShardMode(id[0], shard.ModeReadWrite, false))
+		checkShardState(t, e, id[0], errThreshold+1, shard.ModeReadWrite)
+
+		require.NoError(t, e.SetShardMode(id[0], shard.ModeReadWrite, true))
+		checkShardState(t, e, id[0], 0, shard.ModeReadWrite)
 	})
 }
 
diff --git a/pkg/local_object_storage/engine/shards.go b/pkg/local_object_storage/engine/shards.go
index d4c4fcde..8fb4a135 100644
--- a/pkg/local_object_storage/engine/shards.go
+++ b/pkg/local_object_storage/engine/shards.go
@@ -118,12 +118,15 @@ func (e *StorageEngine) iterateOverUnsortedShards(handler func(hashedShard) (sto
 // SetShardMode sets mode of the shard with provided identifier.
 //
 // Returns an error if shard mode was not set, or shard was not found in storage engine.
-func (e *StorageEngine) SetShardMode(id *shard.ID, m shard.Mode) error {
+func (e *StorageEngine) SetShardMode(id *shard.ID, m shard.Mode, resetErrorCounter bool) error {
 	e.mtx.RLock()
 	defer e.mtx.RUnlock()
 
 	for shID, sh := range e.shards {
 		if id.String() == shID {
+			if resetErrorCounter {
+				sh.errorCount.Store(0)
+			}
 			return sh.SetMode(m)
 		}
 	}
diff --git a/pkg/services/control/server/set_shard_mode.go b/pkg/services/control/server/set_shard_mode.go
index 86e9c7dc..01edcfdb 100644
--- a/pkg/services/control/server/set_shard_mode.go
+++ b/pkg/services/control/server/set_shard_mode.go
@@ -33,7 +33,7 @@ func (s *Server) SetShardMode(_ context.Context, req *control.SetShardModeReques
 		return nil, status.Error(codes.Internal, fmt.Sprintf("unknown shard mode: %s", requestedMode))
 	}
 
-	err = s.s.SetShardMode(requestedShard, mode)
+	err = s.s.SetShardMode(requestedShard, mode, false)
 	if err != nil {
 		return nil, status.Error(codes.Internal, err.Error())
 	}
diff --git a/pkg/services/control/service.go b/pkg/services/control/service.go
index d1460491..7f0b0d7a 100644
--- a/pkg/services/control/service.go
+++ b/pkg/services/control/service.go
@@ -761,10 +761,16 @@ func (x *SetShardModeRequest_Body) SetMode(v ShardMode) {
 	x.Mode = v
 }
 
+// ClearErrorCounter sets flag signifying whether error counter for shard should be cleared.
+func (x *SetShardModeRequest_Body) ClearErrorCounter(reset bool) {
+	x.ResetErrorCounter = reset
+}
+
 const (
 	_ = iota
 	setShardModeReqBodyShardIDFNum
 	setShardModeReqBodyModeFNum
+	setShardModeReqBodyResetCounterFNum
 )
 
 // StableMarshal reads binary representation of set shard mode request body
@@ -797,7 +803,14 @@ func (x *SetShardModeRequest_Body) StableMarshal(buf []byte) ([]byte, error) {
 
 	offset += n
 
-	_, err = proto.EnumMarshal(setShardModeReqBodyModeFNum, buf[offset:], int32(x.Mode))
+	n, err = proto.EnumMarshal(setShardModeReqBodyModeFNum, buf[offset:], int32(x.Mode))
+	if err != nil {
+		return nil, err
+	}
+
+	offset += n
+
+	_, err = proto.BoolMarshal(setShardModeReqBodyResetCounterFNum, buf[offset:], x.ResetErrorCounter)
 	if err != nil {
 		return nil, err
 	}
@@ -818,6 +831,7 @@ func (x *SetShardModeRequest_Body) StableSize() int {
 
 	size += proto.BytesSize(setShardModeReqBodyShardIDFNum, x.Shard_ID)
 	size += proto.EnumSize(setShardModeReqBodyModeFNum, int32(x.Mode))
+	size += proto.BoolSize(setShardModeReqBodyResetCounterFNum, x.ResetErrorCounter)
 
 	return size
 }
diff --git a/pkg/services/control/service.pb.go b/pkg/services/control/service.pb.go
index b6d8e046c1d007db11bf93c37dabcd2058f6c1b3..87e8913a591042833014f06d276b38a763c30764 100644
GIT binary patch
delta 1711
zcma)6ZERCz6waCbyuJO{+=pRXce^d@6WVU0qY%ajZp4Xm^J35lI5s-KjkR_qVl-j=
zG5#=s9Of~B;QWIoBv7qiQGt>90SSsA+Za$cCoob#mM{WgW%GUSt$;2j{<*pD`FP%Q
zp69&h#OK;wUu(m^?`bePol<T4+VxWB#`PT=TVLPUv0i#@gD<qf7nFR#pg$<J_&0Zi
z*r{`ae{=gfso5uW`a)93FS+Il#^-$OP{ZSvs$ppTD9;`Ix3x47^oRWAxza10{*DE?
zGyE9H%ZiNeIi$hv+N@oB^_k0jp&8JHMN+fh-;R#z?Bp3veCjJtq_-!(HmS8Ta^;Hn
zSW;yrZu_+)k`vnvsqV5;$+e}dg@0XZ`Pc2n?HAGwo_YLGS%KLTImLp}wWXq*8$7Lw
zS#f%NYKUT2!^`lc_*{qEtvJd`d0qlY&3*`)TlD_`83ulGO-9$4m?Rjf$pjhr@{|Ju
z{d#P?o{DQOiCBHcgwDIgxc|C@fkBbBS|AyZp4Xw}YAH*!N7@E{fsA!(lS*xgR$Uyu
z>2@}5ohZbSJG0mg_{L2cM@|}(+&-$d!V_cz$fr{x%%*cDu;JqSW)_)^QzJ&Sov}xz
zqm6)F_sV%{LF`4W9@J=BIPBZ8DqJz?;P#qZ4t#&IO8u3wB+gsG{kLR%Cobv~l6<)D
zPC7a!ycR_Q&R<0ZhmmeB#?@02Pna5BhOX0TN$%GFsLX|3Q)w8uAx0K{w-T^ncn(hs
z+>x<&SR}gzoER80pzf|6r-ua0JY9lqeHPlM1t*aaQm}VOi#bzi^sNQ*v3^XX<$6d@
zwCZ9xDI9NP;2CT>pMqU6Ej~F|hi^`&;DJALvFUO-_Dn0SZMi37RZPU|qXNpYIh+){
zdO<|{qy;}n*guP<Fn+wa>Xx9H&pUnfSSEfkIiDF6jQFICht=QJaT)CsiuDNl4c`?p
z9M{lN5lR?0d3+WG52uXD%79LvTf!6+*f^x(qG%!Quz>e(@n%p|tS#qr+Fby0GDE0T
za6DdSVxvpTb&%hE2ug8pZ$hYMI;ew1*n2|2kNZ+NA6-YCc%x5XQ(>py1kgc?Do-y!
z6+H{U>n1S?WG<~bcrG8WGkiP)dwxj6=<#BM`VJqRIjlcB8(k+CKE!=Q_Jq?%D>TrE
z<{w3T>#U8AX`qHS3CfKLbT1x^>KTNAOPNJGwBSYC_kv~~D}VwTn8%VcadE$q#`T~>
z>!n=ArjAzYU=DUg70R~_&7x0rERXf9QD$<@#cWE~g9pPyBCRrmK+Sr18atGD`bG~j
z?KG)<XBpUGy9i4tYyb&IMvETwL)k`1#gTrI4x3qNhYa9gei3)xHsYyaE4B?3Dz%(6
zLIG`MT`3xpRe&07h>CPg$1avk@H~zV=WyodqjXtBVZer#F*c?u6g8NjfNcy#1&0|j
zsmH`3*@F<d#0lQL*f_X=eik7Uo#V9>6+llR11oP))QN2qWnAYEFP0Ij<#DPv1A8<U
z5Hb1wTzb#U@Dp37mD;tCM}G)V&e+n?E+gAk|9Di>aY3VOop*nlMFuNlbyHsky<mkp
jJ{{_=WIL9L6Sjhk2aYIpC)?ENsdPP9tX~Fgu(Iwi9kXG!

delta 1426
zcmb_cUrd`-6wfKp()OeOq!il$t;G#Uv0qzOTc;bSY!0Wv5KYv;K!f@~vL?$CUKa7m
z7?Vl*3%PL<!<IPp!3Yv#G+Us~8Nmz|;{pr^bbt<Zg%TiRgW|nkJK@1cU%uS?-E;1_
zzdz?hzsni=I;S^&1}EJ{3>?<u%WesypPBH*lMnPyesm%mbML$G%xS|{=L!z0UJv8q
zx~<=PYgI*6i2P>nKk(Oif@`Y;j)Wg=3vNUb`&BwElD}KgIah(jgcBu$HdOy8p?blC
zrbUZ5ZsE~4Mzk0iD;3+CI}NCxHNpLN2}~n;G%p3%=MtGA&w6lmsT55c4?$j0<B16w
zN0M4er<L2~7LQYI_sQ&-flAPk3}SY|Mt+!MK5Qimm6(8EiD^Y_cpsXU?d+6+4nn@E
zjZUi3d`}X^<6}jTV>)zR4n>nTL`FmC9Jgd%U5CN(Dqgx$0kz>p^MV#^WslgJZ&>l>
zrk(%NVSQz{_?4fk#Ph5E^wNvIRaq=gq`a`K$^0rC+EQk0q_ntj+X~~F8mHE*YJtY*
zyN{!cbC@sElKlQ~d_O*(lyXE!fax_<gT`ftfKkrF+!+!jq{ejk@aJ0eUKac^mx>%2
zBof~JqdY^Tgx2r(q2p36swav?PPU&Dgm2dyy56HAEXDGpF%zD<>*Qy8{JB+u?jH>3
zy;}^&q8Y!gKaH6+i5)i)SK~g1a{sycFkxupSscDqz_|&aakG%GZJZQ8N>YUizF-JF
zcih<83<+rGR}Y~hRVbF4wL>s0={PY4vF*F<%<!T?*_NO68R-$`G?NvJQw|JX$)#XM
zVHXk!ElNkKy6Q=h=bhx9|AiA_8WvGegLuzl19mp8qS`{CKya_HQ!t=>UsJ5*XDxbq
z7&F7W*vTx)<tdD^$cyW-ifBxombQh(jpRe*nu%3rlN}3}nv8pWo^2D$t(X~l5cO9q
zY&x4N6zlr7t^1;Q2o1ly<3dS8)p+}wBYjfKaoY{sFBG}#j5>|LwQi06l*4oys^t#M
zVUax2<H*=ctldOzHm;#CdVgtSuNtX>eVR)id~&^v-OHu0xch^t8VpPnvkMy9#paDv
zsh~(`6{I*j<>jXZ|5d$JM-3VDO7jiJ4beG^ut@Z#%#P~0KaWk7L-}1Sx+>?<0B3|x
zh7hw#q%>H~qMt=1UUO!y085ja%mgV!e6XA~>q*Tj^T;nI#ZerXFJ(Qsq+ttr6yk0+
zv1udUg$z_Da9msq2z#@cEHY6Gibfvi<6t-I(UBU?O?}sC@}|=ZB(gAOBm-U<)^)u_
zE_T((Etj5QYTg6K|E=uV*%jy>D`PL1Da@9$$i~i^scwfL!8f=d>*ll|Qv)^JFIIg}
SQCJQN*o}kEZ$>TjRNX&fHZdpw

diff --git a/pkg/services/control/service.proto b/pkg/services/control/service.proto
index c34b2cf7..3446e262 100644
--- a/pkg/services/control/service.proto
+++ b/pkg/services/control/service.proto
@@ -186,6 +186,9 @@ message SetShardModeRequest {
 
         // Mode that requested to be set.
         ShardMode mode = 2;
+
+        // Flag signifying whether error counter should be set to 0.
+        bool resetErrorCounter = 3;
     }
 
     // Body of set shard mode request message.