From 6ae51e41f97727960dbc49255f338090e3217a87 Mon Sep 17 00:00:00 2001
From: Leonard Lyubich <leonard@nspcc.ru>
Date: Fri, 15 Jan 2021 13:18:03 +0300
Subject: [PATCH] [#312] control: Add health status field to health check
 response body

Signed-off-by: Leonard Lyubich <leonard@nspcc.ru>
---
 pkg/services/control/service.go      |  23 ++++++++++++++++++++++-
 pkg/services/control/service.pb.go   | Bin 29642 -> 30524 bytes
 pkg/services/control/service.proto   |   3 +++
 pkg/services/control/service_test.go |   4 +++-
 4 files changed, 28 insertions(+), 2 deletions(-)

diff --git a/pkg/services/control/service.go b/pkg/services/control/service.go
index 1ab9f6b85..f4ce62439 100644
--- a/pkg/services/control/service.go
+++ b/pkg/services/control/service.go
@@ -66,9 +66,17 @@ func (x *HealthCheckResponse_Body) SetNetmapStatus(v NetmapStatus) {
 	}
 }
 
+// SetHealthStatus sets health status of the storage node application.
+func (x *HealthCheckResponse_Body) SetHealthStatus(v HealthStatus) {
+	if x != nil {
+		x.HealthStatus = v
+	}
+}
+
 const (
 	_ = iota
 	healthRespBodyStatusFNum
+	healthRespBodyHealthStatusFNum
 )
 
 // StableMarshal reads binary representation of health check response body
@@ -89,7 +97,19 @@ func (x *HealthCheckResponse_Body) StableMarshal(buf []byte) ([]byte, error) {
 		buf = make([]byte, sz)
 	}
 
-	_, err := proto.EnumMarshal(healthRespBodyStatusFNum, buf, int32(x.NetmapStatus))
+	var (
+		offset, n int
+		err       error
+	)
+
+	n, err = proto.EnumMarshal(healthRespBodyStatusFNum, buf[offset:], int32(x.NetmapStatus))
+	if err != nil {
+		return nil, err
+	}
+
+	offset += n
+
+	_, err = proto.EnumMarshal(healthRespBodyHealthStatusFNum, buf[offset:], int32(x.HealthStatus))
 	if err != nil {
 		return nil, err
 	}
@@ -109,6 +129,7 @@ func (x *HealthCheckResponse_Body) StableSize() int {
 	size := 0
 
 	size += proto.EnumSize(healthRespBodyStatusFNum, int32(x.NetmapStatus))
+	size += proto.EnumSize(healthRespBodyHealthStatusFNum, int32(x.HealthStatus))
 
 	return size
 }
diff --git a/pkg/services/control/service.pb.go b/pkg/services/control/service.pb.go
index fa6dae39491fff2fe0094615df5507225e67f06f..a253b35917d732bca6a0daf6fe85c74f37c4c57b 100644
GIT binary patch
delta 1232
zcmah}O>7%Q7?tBV?QWgggxWD~-K-s}YKWV7*8AhX*xn@GwL}`!Y%a8vXq#?GAlSii
zP$Y!JjRTjWcR)x*q!OSCRHeuVB%p-@r%L5VLPDHKPY5J(fddx=Gqa{L5)zkBGvD{V
zH}8A1v-f`TeRk-({a$KLn4XpzuCv)$m$o}jXJ=b#t<hDh?L6yB&DK>{a<;ZMH&&g_
zMyoj`3Le(>pxy>!smIcCrnS|{G@TdRnRQOL;?ZTE+io>`DLkDz8Sf`ZNvv8-c^%z1
zQtd(femaUT#)nT^Zl@o5cA_WKI~w6=VzR$33a^Ml+wJVMoBsl?H0s8}a-(~A=DX0q
zn%n(S3;G9i7k?O&-9HN(zCj{qB>Yu~;Fgj;qON76?5>W(;y6M^WIz<KTeKj}Phqx{
z4yzQK-OaADsO4$jN6P4sD6kDGr8!)w$1q$wk7vvi2&*Cn%T?@EgLq31GOEjE3r!07
z(KIL|5s=*s%^nouxL(WQgZv1t7p4(5B)p>w$C$9}u7`OrW8ttCV<d)VA7>&QE=Bo=
z;ZEfo?wcd1mWCKANmW$z5iTy5M?xWZz8J;ZdJuQ2M;YS5jEuWxk~RndjSKnJwDEF{
zD<#T_o+f^#Q#eEINHSUYekO#Y@&pd_0A4aq;+o1K9~xGi$>jz<6h||P%p?*eg5<1>
zy^;W>Jc-w4&tcz;;oWiqKhI`ZYmU$BT;+2S9v#*?J!jzwITE0L(A_n<J5WMBcgPi%
zyD|S1zEb$y-{caIbdlOC1t=$3g;Rc%+cqa*%NW8B^GS;3lBIke3-yps!sYrXeyNz=
zw{W*U+TYOg2>YcFOMhM($3-(un_e~l4|mE+v%#nXY&?xcm0w$qU)x2CTc+n&LC><N
z@imR~q))xF#vRoZURGJ89@FxvhK1oAALND{@4nf%83^@1h>5dVe0@GPLb63^wbksj
zTbol}9oi!Ck?#89jvt>a3}gSvV@Iae`J=_&g+#2MMHC3V3i^+rG}yGq@Y@C1Pl^&A
zc`=I0Qq?c_){Ax+?=PuP?KrASLHKONuRN^Pf^;y-a*5=MM8&su0w3GQgC6xILW(3u
dlaKc&2u(zhSdRWzQpCz~#K$4s*O#kfe*;wmcE|t#

delta 791
zcmZ8eOH31C5KehCZP^GKN|j1nz#!3<{=4mNx2^2<L0=djMA`<8NJY>PLgEcha`U7R
zzeHoAk&6l5O7==LUOjQ-Mm%{i5srF*IJ1;!yv#rI&HOXpe6#)2_4T`}@nOJT8k}yk
z7luD~w#=&b6+>!mi>V<Qhw&l1o?3JvVFp`#UaXZ<*t9OPJEI3MQ}kiiG-2k?L$&gF
zpYOv#)`L%FiOR$&pI0pFT1Xbl@hEj$(Qot5cey_N(6j6wk-Ib+#!B4J;pvo&M%-fe
zUM2vK(T`V|ODL2IkaG@!4I}6>uxIADW;GkY<Ixy)O5IpAucIs5&G1$tg3h#Hw?AWH
zH7!d_BuWd3Wkp4OG)V)49tPtv;`KH@<pk>d@yZZsH-3+W-A;wTH)8~M@?mcHr4+?>
zJ~a5ZVf`Vu6^di)j-6v0dwF#TO5toTm+A?IbQ0l25QXKPEfn!I(dFTQs68NR_pwv-
zqfzj}DjpM1W(h9imLVacyP1Td4dR&*?a)q!5*8^1uu;BDvIpC#9U<$4tS8UlNb4bm
zWUN`!UZqYMnlw)>Q%y8Oy2%bpJ~`>6v(=ncqAX8%yy&F)hNPHa+gydO`l6ZENj*x?
zkCPo8J@?0pj*jX)_Ouau;o4?9CMSlGoan&KiraoZG1rP;H@eWMyYX>S!jsC7OW>e#
z4qFuyuPeRqR>!bU@1ttk6{XBDcB(=mvXO{<S5cEn3|qAx4AlG*k#j(iq(d_}RqOs2
V6a>n6Q<MG&HJVBF_F>Js@CPO}=rsTU

diff --git a/pkg/services/control/service.proto b/pkg/services/control/service.proto
index 10652e257..50c23eeb3 100644
--- a/pkg/services/control/service.proto
+++ b/pkg/services/control/service.proto
@@ -34,6 +34,9 @@ message HealthCheckResponse {
     message Body {
         // Status of the storage node in NeoFS network map.
         NetmapStatus netmap_status = 1;
+
+        // Health status of storage node application.
+        HealthStatus health_status = 2;
     }
 
     // Body of health check response message.
diff --git a/pkg/services/control/service_test.go b/pkg/services/control/service_test.go
index 8943a1bfb..3c9bb6012 100644
--- a/pkg/services/control/service_test.go
+++ b/pkg/services/control/service_test.go
@@ -22,12 +22,14 @@ func TestHealthCheckResponse_Body_StableMarshal(t *testing.T) {
 func generateHealthCheckResponseBody() *control.HealthCheckResponse_Body {
 	body := new(control.HealthCheckResponse_Body)
 	body.SetNetmapStatus(control.NetmapStatus_ONLINE)
+	body.SetHealthStatus(control.HealthStatus_SHUTTING_DOWN)
 
 	return body
 }
 
 func equalHealthCheckResponseBodies(b1, b2 *control.HealthCheckResponse_Body) bool {
-	return b1.GetNetmapStatus() == b2.GetNetmapStatus()
+	return b1.GetNetmapStatus() == b2.GetNetmapStatus() &&
+		b1.GetHealthStatus() == b2.GetHealthStatus()
 }
 
 func TestNetmapSnapshotResponse_Body_StableMarshal(t *testing.T) {