fix(blobnode): fix blobnode hot change background mbps limit, it shou…

…ld less normal mbps . #22759812 Signed-off-by: mawei029 <[email protected]>
blissnmx · Nov 12, 2024 · 4224c19 · 4224c19
1 parent 7653daa
commit 4224c19
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 7 deletions.
diff --git a/blobstore/blobnode/base/qos/config.go b/blobstore/blobnode/base/qos/config.go
@@ -54,8 +54,17 @@ func InitAndFixQosConfig(raw *Config) {
 	defaulter.LessOrEqual(&raw.ReadDiscard, int32(defaultDiscardPercent))
 	defaulter.LessOrEqual(&raw.WriteDiscard, int32(defaultDiscardPercent))
 
-	// fix background
-	if raw.BackgroundMBPS > raw.WriteMBPS {
-		raw.BackgroundMBPS = raw.WriteMBPS
+	// fix background, it should be the minimum
+	raw.BackgroundMBPS = fixBackgroundMBPS(raw.BackgroundMBPS, raw.WriteMBPS, raw.ReadMBPS)
+}
+
+func fixBackgroundMBPS(background, writeMBPS, readMBPS int64) int64 {
+	return min(background, min(writeMBPS, readMBPS))
+}
+
+func min(a, b int64) int64 {
+	if a < b {
+		return a
 	}
+	return b
 }
diff --git a/blobstore/blobnode/base/qos/qos.go b/blobstore/blobnode/base/qos/qos.go
@@ -221,6 +221,7 @@ func (qos *IoQueueQos) Close() {
 func (qos *IoQueueQos) ResetQosLimit(conf Config) {
 	qos.resetConfLimiter(qos.bpsLimiters[LimitTypeRead], conf.ReadMBPS, &qos.conf.ReadMBPS)
 	qos.resetConfLimiter(qos.bpsLimiters[LimitTypeWrite], conf.WriteMBPS, &qos.conf.WriteMBPS)
+	conf.BackgroundMBPS = fixBackgroundMBPS(conf.BackgroundMBPS, qos.conf.WriteMBPS, qos.conf.ReadMBPS)
 	qos.resetConfLimiter(qos.bpsLimiters[LimitTypeBack], conf.BackgroundMBPS, &qos.conf.BackgroundMBPS)
 	qos.resetReadDiscard(conf.ReadDiscard, &qos.conf.ReadDiscard)
 	qos.resetWriteDiscard(conf.WriteDiscard, &qos.conf.WriteDiscard)

diff --git a/blobstore/blobnode/base/qos/qos_test.go b/blobstore/blobnode/base/qos/qos_test.go
@@ -171,6 +171,21 @@ func TestNewQosManager(t *testing.T) {
 		require.Equal(t, int64(defaultReadBandwidthMBPS*humanize.MiByte), int64(lmts[LimitTypeRead].Limit()))
 	}
 
+	{
+		// reset background
+		conf = Config{
+			ReadMBPS:       0,
+			WriteMBPS:      0,
+			BackgroundMBPS: 300,
+			ReadDiscard:    0,
+			WriteDiscard:   0,
+		}
+		qos.ResetQosLimit(conf)
+		lmts := qos.(*IoQueueQos).bpsLimiters
+		require.Equal(t, int64(defaultWriteBandwidthMBPS*humanize.MiByte), int64(lmts[LimitTypeBack].Limit()))
+
+	}
+
 	{
 		// reset discard
 		conf.ReadDiscard = 70

diff --git a/blobstore/blobnode/svr_test.go b/blobstore/blobnode/svr_test.go
@@ -898,10 +898,10 @@ func TestService_ConfigReload(t *testing.T) {
 		lmt := q1.(*qos.IoQueueQos).GetBpsLimiter()
 		require.NotEqual(t, 0, lmt[0].Burst())
 		require.Equal(t, 4*1024*1024*2, lmt[qos.LimitTypeWrite].Burst())
-		require.Equal(t, 10*1024*1024*2, lmt[qos.LimitTypeBack].Burst())
+		require.Equal(t, 4*1024*1024*2, lmt[qos.LimitTypeBack].Burst())
 		require.Equal(t, 4*1024*1024, int(q2.(*qos.IoQueueQos).GetBpsLimiter()[qos.LimitTypeRead].Limit()))
 		require.Equal(t, 4*1024*1024, int(q2.(*qos.IoQueueQos).GetBpsLimiter()[qos.LimitTypeWrite].Limit()))
-		require.Equal(t, 10*1024*1024, int(q2.(*qos.IoQueueQos).GetBpsLimiter()[qos.LimitTypeBack].Limit()))
+		require.Equal(t, 4*1024*1024, int(q2.(*qos.IoQueueQos).GetBpsLimiter()[qos.LimitTypeBack].Limit()))
 	}
 
 	{
@@ -919,13 +919,14 @@ func TestService_ConfigReload(t *testing.T) {
 		lmt1 := q1.(*qos.IoQueueQos).GetBpsLimiter()
 		lmt2 := q2.(*qos.IoQueueQos).GetBpsLimiter()
 		require.Equal(t, int(svr.Conf.DiskConfig.DataQos.WriteMBPS*1024*1024), lmt1[qos.LimitTypeWrite].Burst()/2)
-		require.Equal(t, int(10*1024*1024), lmt1[qos.LimitTypeBack].Burst()/2)
+		require.Equal(t, int(2*1024*1024), lmt1[qos.LimitTypeBack].Burst()/2)
 		require.Equal(t, int(svr.Conf.DiskConfig.DataQos.WriteMBPS*1024*1024), lmt2[qos.LimitTypeWrite].Burst()/2)
-		require.Equal(t, int(10*1024*1024), lmt2[qos.LimitTypeBack].Burst()/2)
+		require.Equal(t, int(2*1024*1024), lmt2[qos.LimitTypeBack].Burst()/2)
 	}
 
 	{
 		// write_mbps
+		svr.Conf.DiskConfig.DataQos.ReadMBPS = 10
 		ds1.EXPECT().GetIoQos().Return(q1).Times(1)
 		ds2.EXPECT().GetIoQos().Return(q2).Times(1)
 		totalUrl := testServer.URL + "/config/reload?key=write_mbps&value=20"