modify code

Signed-off-by: joccau <[email protected]>

pkg/privilege/privileges/privileges.go

@@ -334,20 +334,6 @@ func (p *UserPrivileges) GetUserResources(user, host string) (int64, error) {
 	return 0, errors.New("Failed to get max user connections")
 }
 
-// GetEncodedPassword implements the Manager interface.
-func (p *UserPrivileges) GetEncodedPassword(user, host string) string {
-	mysqlPriv := p.Handle.Get()
-	record := mysqlPriv.connectionVerification(user, host)
-	if record == nil {
-		logutil.BgLogger().Error("get user privilege record fail",
-			zap.String("user", user), zap.String("host", host))
-		return ""
-	}
-	if p.isValidHash(record) {
-		return record.AuthenticationString
-	}
-	return ""
-}
 
 // GetAuthPluginForConnection gets the authentication plugin used in connection establishment.
 func (p *UserPrivileges) GetAuthPluginForConnection(ctx context.Context, user, host string) (string, error) {

pkg/server/conn.go

@@ -383,8 +383,7 @@ func (cc *clientConn) Close() error {
 	//
 	// TODO: avoid calling this function multiple times. It's not intuitive that a connection can be closed multiple
 	// times.
-	cc.decrementUserConnectionsCounter()
-
+
 	cc.server.rwlock.Lock()
 	delete(cc.server.clients, cc.connectionID)
 	cc.server.rwlock.Unlock()

pkg/server/server.go

@@ -720,6 +720,7 @@ func (s *Server) onConn(conn *clientConn) {
 	logutil.Logger(ctx).Debug("new connection", zap.String("remoteAddr", conn.bufReadConn.RemoteAddr().String()))
 
 	defer func() {
+		conn.decrementUserConnectionsCounter()
 		terror.Log(conn.Close())
 		logutil.Logger(ctx).Debug("connection closed")
 	}()