utils: fix value out of range for getting server_id (pingcap#537)

lichunzhu · Apr 7, 2020 · a38e8ff · a38e8ff
1 parent fd19e12
commit a38e8ff
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/pkg/utils/db.go b/pkg/utils/db.go
@@ -303,7 +303,7 @@ func GetServerID(db *sql.DB) (uint32, error) {
 		return 0, err
 	}
 
-	serverID, err := strconv.ParseInt(serverIDStr, 10, 32)
+	serverID, err := strconv.ParseUint(serverIDStr, 10, 32)
 	return uint32(serverID), terror.ErrInvalidServerID.Delegate(err, serverIDStr)
 }
 

diff --git a/pkg/utils/db_test.go b/pkg/utils/db_test.go
@@ -32,6 +32,9 @@ func (t *testUtilsSuite) TestGetAllServerID(c *C) {
 		}, {
 			2,
 			[]uint32{},
+		}, {
+			4294967295, // max server-id.
+			[]uint32{},
 		},
 	}
-Original file line number
+Diff line change
@@ Expand Up / @@ -32,6 +32,9 @@ func (t *testUtilsSuite) TestGetAllServerID(c *C) { @@
     		}, {
 ,
     			[]uint32{},
+    		}, {
+    			4294967295, // max server-id.
+    			[]uint32{},
     		},
     	}
@@ Expand Down @@