[#315] client/status: Add NodeUnderMaintenance status
Signed-off-by: Evgenii Stratonikov <evgeniy@nspcc.ru>
This commit is contained in:
parent
f75a5feba3
commit
4662d39886
7 changed files with 95 additions and 3 deletions
|
@ -35,6 +35,7 @@ import (
|
||||||
// All possible responses are documented in methods, however, some may be
|
// All possible responses are documented in methods, however, some may be
|
||||||
// returned from all of them (pay attention to the presence of the pointer sign):
|
// returned from all of them (pay attention to the presence of the pointer sign):
|
||||||
// - *apistatus.ServerInternal on internal server error;
|
// - *apistatus.ServerInternal on internal server error;
|
||||||
|
// - *apistatus.NodeUnderMaintenance if a server is under maintenance;
|
||||||
// - *apistatus.SuccessDefaultV2 on default success.
|
// - *apistatus.SuccessDefaultV2 on default success.
|
||||||
//
|
//
|
||||||
// Client MUST NOT be copied by value: use pointer to Client instead.
|
// Client MUST NOT be copied by value: use pointer to Client instead.
|
||||||
|
|
|
@ -174,3 +174,48 @@ func (x *SignatureVerification) SetMessage(v string) {
|
||||||
func (x SignatureVerification) Message() string {
|
func (x SignatureVerification) Message() string {
|
||||||
return x.v2.Message()
|
return x.v2.Message()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// NodeUnderMaintenance describes failure status for nodes being under maintenance.
|
||||||
|
// Instances provide Status and StatusV2 interfaces.
|
||||||
|
type NodeUnderMaintenance struct {
|
||||||
|
v2 status.Status
|
||||||
|
}
|
||||||
|
|
||||||
|
// Error implements the error interface.
|
||||||
|
func (x NodeUnderMaintenance) Error() string {
|
||||||
|
return errMessageStatusV2(
|
||||||
|
globalizeCodeV2(status.NodeUnderMaintenance, status.GlobalizeCommonFail),
|
||||||
|
x.v2.Message(),
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
func (x *NodeUnderMaintenance) fromStatusV2(st *status.Status) {
|
||||||
|
x.v2 = *st
|
||||||
|
}
|
||||||
|
|
||||||
|
// ToStatusV2 implements StatusV2 interface method.
|
||||||
|
// If the value was returned by FromStatusV2, returns the source message.
|
||||||
|
// Otherwise, returns message with
|
||||||
|
// - code: NODE_UNDER_MAINTENANCE;
|
||||||
|
// - string message: written message via SetMessage;
|
||||||
|
// - details: empty.
|
||||||
|
func (x NodeUnderMaintenance) ToStatusV2() *status.Status {
|
||||||
|
x.v2.SetCode(globalizeCodeV2(status.NodeUnderMaintenance, status.GlobalizeCommonFail))
|
||||||
|
return &x.v2
|
||||||
|
}
|
||||||
|
|
||||||
|
// SetMessage writes signature verification failure message.
|
||||||
|
// Message should be used for debug purposes only.
|
||||||
|
//
|
||||||
|
// See also Message.
|
||||||
|
func (x *NodeUnderMaintenance) SetMessage(v string) {
|
||||||
|
x.v2.SetMessage(v)
|
||||||
|
}
|
||||||
|
|
||||||
|
// Message returns status message. Zero status returns empty message.
|
||||||
|
// Message should be used for debug purposes only.
|
||||||
|
//
|
||||||
|
// See also SetMessage.
|
||||||
|
func (x NodeUnderMaintenance) Message() string {
|
||||||
|
return x.v2.Message()
|
||||||
|
}
|
||||||
|
|
|
@ -89,3 +89,42 @@ func TestSignatureVerification(t *testing.T) {
|
||||||
require.Equal(t, msg, stV2.Message())
|
require.Equal(t, msg, stV2.Message())
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func TestNodeUnderMaintenance(t *testing.T) {
|
||||||
|
t.Run("default", func(t *testing.T) {
|
||||||
|
var st apistatus.NodeUnderMaintenance
|
||||||
|
|
||||||
|
require.Empty(t, st.Message())
|
||||||
|
})
|
||||||
|
|
||||||
|
t.Run("custom message", func(t *testing.T) {
|
||||||
|
var st apistatus.NodeUnderMaintenance
|
||||||
|
msg := "some message"
|
||||||
|
|
||||||
|
st.SetMessage(msg)
|
||||||
|
|
||||||
|
stV2 := st.ToStatusV2()
|
||||||
|
|
||||||
|
require.Equal(t, msg, st.Message())
|
||||||
|
require.Equal(t, msg, stV2.Message())
|
||||||
|
})
|
||||||
|
|
||||||
|
t.Run("empty to V2", func(t *testing.T) {
|
||||||
|
var st apistatus.NodeUnderMaintenance
|
||||||
|
|
||||||
|
stV2 := st.ToStatusV2()
|
||||||
|
|
||||||
|
require.Empty(t, "", stV2.Message())
|
||||||
|
})
|
||||||
|
|
||||||
|
t.Run("non-empty to V2", func(t *testing.T) {
|
||||||
|
var st apistatus.NodeUnderMaintenance
|
||||||
|
msg := "some other msg"
|
||||||
|
|
||||||
|
st.SetMessage(msg)
|
||||||
|
|
||||||
|
stV2 := st.ToStatusV2()
|
||||||
|
|
||||||
|
require.Equal(t, msg, stV2.Message())
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
4
go.mod
4
go.mod
|
@ -9,7 +9,7 @@ require (
|
||||||
github.com/mr-tron/base58 v1.2.0
|
github.com/mr-tron/base58 v1.2.0
|
||||||
github.com/nspcc-dev/hrw v1.0.9
|
github.com/nspcc-dev/hrw v1.0.9
|
||||||
github.com/nspcc-dev/neo-go v0.99.2
|
github.com/nspcc-dev/neo-go v0.99.2
|
||||||
github.com/nspcc-dev/neofs-api-go/v2 v2.13.2-0.20220827080658-9e17cdfc7647
|
github.com/nspcc-dev/neofs-api-go/v2 v2.13.2-0.20220916145053-f3e1f8ae7ae3
|
||||||
github.com/nspcc-dev/neofs-contract v0.15.3
|
github.com/nspcc-dev/neofs-contract v0.15.3
|
||||||
github.com/nspcc-dev/tzhash v1.6.1
|
github.com/nspcc-dev/tzhash v1.6.1
|
||||||
github.com/stretchr/testify v1.7.0
|
github.com/stretchr/testify v1.7.0
|
||||||
|
@ -38,7 +38,7 @@ require (
|
||||||
golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a // indirect
|
golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a // indirect
|
||||||
golang.org/x/text v0.3.7 // indirect
|
golang.org/x/text v0.3.7 // indirect
|
||||||
google.golang.org/genproto v0.0.0-20200825200019-8632dd797987 // indirect
|
google.golang.org/genproto v0.0.0-20200825200019-8632dd797987 // indirect
|
||||||
google.golang.org/grpc v1.41.0 // indirect
|
google.golang.org/grpc v1.48.0 // indirect
|
||||||
google.golang.org/protobuf v1.28.1 // indirect
|
google.golang.org/protobuf v1.28.1 // indirect
|
||||||
gopkg.in/yaml.v3 v3.0.1 // indirect
|
gopkg.in/yaml.v3 v3.0.1 // indirect
|
||||||
)
|
)
|
||||||
|
|
BIN
go.sum
BIN
go.sum
Binary file not shown.
|
@ -810,7 +810,8 @@ func (c *clientStatusMonitor) handleError(st apistatus.Status, err error) error
|
||||||
switch err.(type) {
|
switch err.(type) {
|
||||||
case apistatus.ServerInternal, *apistatus.ServerInternal,
|
case apistatus.ServerInternal, *apistatus.ServerInternal,
|
||||||
apistatus.WrongMagicNumber, *apistatus.WrongMagicNumber,
|
apistatus.WrongMagicNumber, *apistatus.WrongMagicNumber,
|
||||||
apistatus.SignatureVerification, *apistatus.SignatureVerification:
|
apistatus.SignatureVerification, *apistatus.SignatureVerification,
|
||||||
|
apistatus.NodeUnderMaintenance, *apistatus.NodeUnderMaintenance:
|
||||||
c.incErrorRate()
|
c.incErrorRate()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -588,6 +588,12 @@ func TestHandleError(t *testing.T) {
|
||||||
expectedError: true,
|
expectedError: true,
|
||||||
countError: true,
|
countError: true,
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
status: apistatus.NodeUnderMaintenance{},
|
||||||
|
err: nil,
|
||||||
|
expectedError: true,
|
||||||
|
countError: true,
|
||||||
|
},
|
||||||
} {
|
} {
|
||||||
t.Run(strconv.Itoa(i), func(t *testing.T) {
|
t.Run(strconv.Itoa(i), func(t *testing.T) {
|
||||||
errCount := monitor.currentErrorRate()
|
errCount := monitor.currentErrorRate()
|
||||||
|
|
Loading…
Reference in a new issue