fix: 355 cherrypick 40 (#3062)

* fix: Reduced ReadCache tags for some commands (#3034)

* fix: Fixed an issue with asynchronous loading (#3037)

* summary different stages duration && add rocksdb perfcontext (#3036)

* fix: The number of element updates in RedisCache is configurable (#3043)

* The number of element updates in RedisCache is configurable

Co-authored-by: wuxianrong <[email protected]>

* fix: fix replication on pika node recovering (#3038)

* fix: Fix problems found during testing (#3039)

* Example Modify the policy for updating big keys except String to Redis-Cache (#3047)

Co-authored-by: wuxianrong <[email protected]>

* add auth command to admin-thread-pool (#3048)

Co-authored-by: wuxianrong <[email protected]>

* fix: Example Repair the subjective and objective offline logic of noeds (#3049)

* Example Repair the subjective and objective offline logic of primary and secondary nodes

* fix comment

---------

Co-authored-by: wuxianrong <[email protected]>

* fix: Fixed version information for Pika, Pika_exporter, Codis (#3054)

* Fixed version information for Pika, Pika_exporter, Codis

* Delete redundant logic

---------

Co-authored-by: wuxianrong <[email protected]>

* fix: Fixed versions of Pika, Pika_exporter, Codis (#3057)

* Resolve conflict differences

* Resolve conflict differences

* Resolve conflict differences

* fix string test

* change by review

---------

Co-authored-by: wangshao1 <[email protected]>
Co-authored-by: wuxianrong <[email protected]>

Author: 3 people

CMakeLists.txt

@@ -738,8 +738,8 @@ endif()
 aux_source_directory(src DIR_SRCS)
 
 # # generate version
-string(TIMESTAMP TS "%Y-%m-%d %H:%M:%S" UTC)
-set(PIKA_BUILD_DATE "${TS}" CACHE STRING "the time we first built pika")
+string(TIMESTAMP TS "%Y-%m-%d %H:%M:%S")
+set(PIKA_BUILD_DATE "${TS}")
 
 find_package(Git)
 

codis/Makefile

@@ -2,14 +2,16 @@
 
 export GO111MODULE=on
 
-build-all: codis-dashboard codis-proxy codis-admin codis-ha codis-fe
+build-all: generate-version codis-dashboard codis-proxy codis-admin codis-ha codis-fe
 
 PRJ_ROOT=${CURDIR}
 
+generate-version:
+	$(info generate version)
+	@mkdir -p ./bin && ./version
 
 codis-deps:
-	@mkdir -p ./bin && go version
-
+	@go version
 codis-dashboard: codis-deps
 	$(info build codis-dashboard)
 	@cd ${PRJ_ROOT}/cmd/dashboard && go mod tidy && go build -buildvcs=false -o ${PRJ_ROOT}/bin/codis-dashboard .

codis/cmd/dashboard/main.go

@@ -48,8 +48,11 @@ Options:
 		return
 
 	case d["--version"].(bool):
-		fmt.Println("version:", utils.Version)
-		fmt.Println("compile:", utils.Compile)
+		fmt.Printf("-----------Codis Dashboard----------\n")
+		fmt.Println("codis_version:", utils.Version)
+		fmt.Println("codis_git_sha:", utils.Gitsha)
+		fmt.Println("codis_build_compile_date:", utils.Compile)
+		fmt.Println("go version:", utils.GoVersion)
 		return
 
 	}

codis/cmd/fe/main.go

@@ -72,8 +72,11 @@ Options:
 	}
 
 	if d["--version"].(bool) {
-		fmt.Println("version:", utils.Version)
-		fmt.Println("compile:", utils.Compile)
+		fmt.Printf("-----------Codis FE----------\n")
+		fmt.Println("codis_version:", utils.Version)
+		fmt.Println("codis_git_sha:", utils.Gitsha)
+		fmt.Println("codis_build_compile_date:", utils.Compile)
+		fmt.Println("go version:", utils.GoVersion)
 		return
 	}
 

codis/cmd/ha/main.go

@@ -33,8 +33,11 @@ Options:
 	}
 
 	if d["--version"].(bool) {
-		fmt.Println("version:", utils.Version)
-		fmt.Println("compile:", utils.Compile)
+		fmt.Printf("-----------Codis HA----------\n")
+		fmt.Println("codis_version:", utils.Version)
+		fmt.Println("codis_git_sha:", utils.Gitsha)
+		fmt.Println("codis_build_compile_date:", utils.Compile)
+		fmt.Println("go version:", utils.GoVersion)
 		return
 	}
 

codis/cmd/proxy/main.go

@@ -55,8 +55,11 @@ Options:
 		return
 
 	case d["--version"].(bool):
-		fmt.Println("version:", utils.Version)
-		fmt.Println("compile:", utils.Compile)
+		fmt.Printf("-----------Codis Proxy----------\n")
+		fmt.Println("codis_version:", utils.Version)
+		fmt.Println("codis_git_sha:", utils.Gitsha)
+		fmt.Println("codis_build_compile_date:", utils.Compile)
+		fmt.Println("go version:", utils.GoVersion)
 		return
 
 	}

codis/pkg/topom/topom_group.go

@@ -381,14 +381,11 @@ func (s *Topom) tryFixReplicationRelationship(group *models.Group, groupServer *
 			}
 		}
 	} else {
-		// skip if it has right replication relationship
-		if state.Replication.GetMasterAddr() == curMasterAddr {
-			return nil
-		}
-
-		// current server is slave, execute the command `slaveof [new master ip] [new master port] force`
-		if err = updateMasterToNewOneForcefully(groupServer.Addr, curMasterAddr, s.config.ProductAuth); err != nil {
-			return err
+		if state.Replication.GetMasterAddr() != curMasterAddr {
+			// current server is slave, execute the command `slaveof [new master ip] [new master port]`
+			if err = updateMasterToNewOne(groupServer.Addr, curMasterAddr, s.config.ProductAuth); err != nil {
+				return err
+			}
 		}
 	}
 

codis/pkg/topom/topom_sentinel.go

@@ -74,17 +74,36 @@ func (s *Topom) checkAndUpdateGroupServerState(conf *Config, group *models.Group
 			}
 
 			// Start the election master node
-			if groupServer.State == models.GroupServerStateOffline && isGroupMaster(state, group) {
-				*masterOfflineGroups = append(*masterOfflineGroups, group)
-			} else {
-				*slaveOfflineGroups = append(*slaveOfflineGroups, group)
+			// Currently, both primary and secondary nodes have subjective and objective logics.
+			// If it is subjective, we will not perform any operation. If more than 10 probe counts
+			// fail, it is defined as objective logics, If it is an objective offline, we will add the
+			// node to masterOfflineGroups or slaveOfflineGroups respectively, and then notify the Proxy
+			// to change the meta information
+			if groupServer.State == models.GroupServerStateOffline {
+				if isGroupMaster(state, group) {
+					*masterOfflineGroups = append(*masterOfflineGroups, group)
+				} else {
+					*slaveOfflineGroups = append(*slaveOfflineGroups, group)
+				}
 			}
 		}
 	} else {
 		if groupServer.State == models.GroupServerStateOffline {
 			*recoveredGroupServers = append(*recoveredGroupServers, state)
 			// update GroupServer to GroupServerStateNormal state later
 		} else {
+			// This may contains any of following condition:
+			// 1. groupServer.State is Normal
+			// 2. groupServer.State is GroupServerStateSubjectiveOffline and is Master
+			// 3. groupServer.State is GroupServerStateSubjectiveOffline and is Slave
+			// for condition 3, if current server's previous state is SubjectiveOffline
+			// and has been added to slaveofflinegroups before,
+			// should also resync mappings to proxy to enable replicationgroup
+			if groupServer.State == models.GroupServerStateSubjectiveOffline &&
+				!isGroupMaster(state, group) &&
+				group.OutOfSync {
+				*recoveredGroupServers = append(*recoveredGroupServers, state)
+			}
 			// Update the offset information of the state and role nodes
 			groupServer.State = models.GroupServerStateNormal
 			groupServer.ReCallTimes = 0

codis/pkg/utils/redis/sentinel.go

@@ -106,8 +106,8 @@ func (i *InfoReplication) UnmarshalJSON(b []byte) error {
 	}
 
 	i.Role = kvmap["role"]
-	i.MasterPort = kvmap["master_host"]
-	i.MasterHost = kvmap["master_port"]
+	i.MasterPort = kvmap["master_port"]
+	i.MasterHost = kvmap["master_host"]
 	i.MasterLinkStatus = kvmap["master_link_status"]
 	i.IsEligibleForMasterElection = kvmap["is_eligible_for_master_election"] == "true"
 

codis/pkg/utils/version.go

@@ -1,6 +1,8 @@
 package utils
 
 const (
-	Version = "2018-11-04 16:22:35 +0800 @de1ad026e329561c22e2a3035fbfe89dc7fef764 @3.2.2-12-gde1ad026"
-	Compile = "2023-02-23 11:25:09 +0800 by go version go1.19.6 linux/amd64"
+	Version   = "3.5.4"
+	Gitsha    = "5c5d89d5478138d64bd071840beab30a64105075"
+	Compile   = "2025-03-26 11:30:14 CST"
+	GoVersion = "go1.23.4 darwin/amd64"
 )