telemetry: fix err check (pingcap#23006)

denimyftiu · Mar 16, 2021 · 7e067b2 · 7e067b2
1 parent 5bafb32
commit 7e067b2
Show file tree

Hide file tree

Showing 4 changed files with 40 additions and 15 deletions.
diff --git a/telemetry/data_cluster_hardware.go b/telemetry/data_cluster_hardware.go
@@ -86,7 +86,10 @@ L:
 		instance := row.GetString(1)
 		activeItem, ok := itemsByInstance[instance]
 		if !ok {
-			hostHash, port := parseAddressAndHash(instance)
+			hostHash, port, err := parseAddressAndHash(instance)
+			if err != nil {
+				return nil, err
+			}
 			activeItem = &clusterHardwareItem{
 				InstanceType:   row.GetString(0),
 				ListenHostHash: hostHash,
@@ -127,7 +130,10 @@ L:
 				// Use plain text only when it is in a list that we know safe.
 				hashedDeviceName = normalizedDiskName
 			} else {
-				hashedDeviceName = hashString(normalizedDiskName)
+				hashedDeviceName, err = hashString(normalizedDiskName)
+				if err != nil {
+					return nil, err
+				}
 			}
 			activeDiskItem, ok := activeItem.Disk[hashedDeviceName]
 			if !ok {
@@ -141,7 +147,10 @@ L:
 					// Use plain text only when it is in a list that we know safe.
 					path = fieldValue
 				} else {
-					path = hashString(fieldValue)
+					path, err = hashString(fieldValue)
+					if err != nil {
+						return nil, err
+					}
 				}
 				activeDiskItem[normalizeFieldName("path")] = path
 			} else if sortedStringContains(sortedDiskAllowedFieldNames, fieldName) {

diff --git a/telemetry/data_cluster_info.go b/telemetry/data_cluster_info.go
@@ -49,8 +49,14 @@ func getClusterInfo(ctx sessionctx.Context) ([]*clusterInfoItem, error) {
 		if row.Len() < 7 {
 			continue
 		}
-		listenHostHash, listenPort := parseAddressAndHash(row.GetString(1))
-		statusHostHash, statusPort := parseAddressAndHash(row.GetString(2))
+		listenHostHash, listenPort, err := parseAddressAndHash(row.GetString(1))
+		if err != nil {
+			return nil, err
+		}
+		statusHostHash, statusPort, err := parseAddressAndHash(row.GetString(2))
+		if err != nil {
+			return nil, err
+		}
 		r = append(r, &clusterInfoItem{
 			InstanceType:   row.GetString(0),
 			ListenHostHash: listenHostHash,

diff --git a/telemetry/util.go b/telemetry/util.go
@@ -22,15 +22,18 @@ import (
 )
 
 // hashString returns the SHA1 checksum in hex of the string.
-func hashString(text string) string {
+func hashString(text string) (string, error) {
 	hash := sha1.New()
-	hash.Write([]byte(text))
+	_, err := hash.Write([]byte(text))
+	if err != nil {
+		return "", err
+	}
 	hashed := hash.Sum(nil)
-	return fmt.Sprintf("%x", hashed)
+	return fmt.Sprintf("%x", hashed), nil
 }
 
 // parseAddressAndHash parses an address in HOST:PORT format, returns the hashed host and the port.
-func parseAddressAndHash(address string) (string, string) {
+func parseAddressAndHash(address string) (string, string, error) {
 	var host, port string
 	if !strings.Contains(address, ":") {
 		host = address
@@ -48,8 +51,11 @@ func parseAddressAndHash(address string) (string, string) {
 			port = lastPart
 		}
 	}
-
-	return hashString(host), port
+	res, err := hashString(host)
+	if err != nil {
+		return "", "", err
+	}
+	return res, port, err
 }
 
 // See https://stackoverflow.com/a/58026884

diff --git a/telemetry/util_test.go b/telemetry/util_test.go
@@ -29,8 +29,9 @@ func TestT(t *testing.T) {
 
 func (s *testUtilSuite) TestHashString(c *C) {
 	c.Parallel()
-
-	c.Assert(hashString("127.0.0.1"), Equals, "4b84b15bff6ee5796152495a230e45e3d7e947d9")
+	actual, err := hashString("127.0.0.1")
+	c.Assert(err, IsNil)
+	c.Assert(actual, Equals, "4b84b15bff6ee5796152495a230e45e3d7e947d9")
 }
 
 func (s *testUtilSuite) TestParseAddress(c *C) {
@@ -53,8 +54,11 @@ func (s *testUtilSuite) TestParseAddress(c *C) {
 		{"[2001:db8:85a3:8d3:1319:8a2e:370:7348]:443", "[2001:db8:85a3:8d3:1319:8a2e:370:7348]", "443"},
 	}
 	for _, tt := range cases {
-		host, port := parseAddressAndHash(tt.src)
-		c.Assert(host, Equals, hashString(tt.expectedHost))
+		host, port, err := parseAddressAndHash(tt.src)
+		c.Assert(err, IsNil)
+		exp, err := hashString(tt.expectedHost)
+		c.Assert(err, IsNil)
+		c.Assert(host, Equals, exp)
 		c.Assert(port, Equals, tt.expectedPort)
 	}
 }