From a19ea16e61ebd306579e244ca3e1425c86148a4a Mon Sep 17 00:00:00 2001
From: chejinge <945997690@qq.com>
Date: Wed, 7 Feb 2024 14:45:58 +0800
Subject: [PATCH] unstable->3.5 (#2396)

* fix: codis-dashboard uses 100% cpu(#2332) (#2393)

Co-authored-by: liuchengyu <liuchengyu@360.cn>

* fix: The role displayed on the first Server in the Group area of the codis-fe is incorrect (#2350) (#2387)

Co-authored-by: liuchengyu <liuchengyu@360.cn>

---------

Co-authored-by: Chengyu Liu <chengyu_l@126.com>
Co-authored-by: liuchengyu <liuchengyu@360.cn>
---
 codis/cmd/fe/assets/index.html | 5 ++++-
 codis/pkg/proxy/stats.go       | 8 +++++++-
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/codis/cmd/fe/assets/index.html b/codis/cmd/fe/assets/index.html
index 023bf98c49..2524aa1fa2 100644
--- a/codis/cmd/fe/assets/index.html
+++ b/codis/cmd/fe/assets/index.html
@@ -538,7 +538,10 @@ <h4 style="padding-left:30px; padding-right:20px; display: inline;">Group</h4>
                             </span>
                         </td>
                         <td>
-                            <a ng-href="http://[[codis_addr]]/api/topom/group/info/[[server.server]]" target="_blank" class="btn btn-default btn-xs active" role="button">S</a>
+                            <span ng-switch="$index">
+                                <a ng-switch-when="0" ng-href="http://[[codis_addr]]/api/topom/group/info/[[server.server]]" target="_blank" class="btn btn-default btn-xs active" role="button">Master</a>
+                                <a ng-switch-default ng-href="http://[[codis_addr]]/api/topom/group/info/[[server.server]]" target="_blank" class="btn btn-default btn-xs active" role="button">Slave</a>
+                            </span>
                             <span ng-switch="server.ha_status">
                                 <span ng-switch-when="ha_master" style="color: darkgreen"
                                     data-toggle="tooltip" data-placement="right" title="HA: MASTER">
diff --git a/codis/pkg/proxy/stats.go b/codis/pkg/proxy/stats.go
index 06a2b67aa2..e157e31270 100644
--- a/codis/pkg/proxy/stats.go
+++ b/codis/pkg/proxy/stats.go
@@ -85,7 +85,13 @@ func init() {
 	// Clear the accumulated maximum delay to 0
 	go func() {
 		for {
-			time.Sleep(time.Duration(RefreshPeriod.Int64()))
+			refreshPeriod := RefreshPeriod.Int64()
+			if refreshPeriod == 0 {
+				time.Sleep(15 * time.Second)
+			} else {
+				time.Sleep(time.Duration(refreshPeriod))
+			}
+
 			for _, s := range cmdstats.opmap {
 				s.maxDelay.Set(0)
 			}