fix: handle except

This commit is contained in:
yihaoDeng 2022-06-22 11:06:46 +08:00
parent 772c04f36e
commit fa482840bf
1 changed files with 10 additions and 13 deletions

View File

@ -481,13 +481,11 @@ static SCliConn* getConnFromPool(void* pool, char* ip, uint32_t port) {
} }
queue* h = QUEUE_HEAD(&plist->conn); queue* h = QUEUE_HEAD(&plist->conn);
//QUEUE_REMOVE(h);
SCliConn* conn = QUEUE_DATA(h, SCliConn, conn); SCliConn* conn = QUEUE_DATA(h, SCliConn, conn);
conn->status = ConnNormal; conn->status = ConnNormal;
QUEUE_REMOVE(&conn->conn); QUEUE_REMOVE(&conn->conn);
tTrace("conn %p conn key: %s: ",conn, key); QUEUE_INIT(&conn->conn);
assert(h == &conn->conn); assert(h == &conn->conn);
//QUEUE_INIT(&conn->conn);
return conn; return conn;
} }
static void addConnToPool(void* pool, SCliConn* conn) { static void addConnToPool(void* pool, SCliConn* conn) {
@ -507,7 +505,6 @@ static void addConnToPool(void* pool, SCliConn* conn) {
SConnList* plist = taosHashGet((SHashObj*)pool, key, strlen(key)); SConnList* plist = taosHashGet((SHashObj*)pool, key, strlen(key));
// list already create before // list already create before
assert(plist != NULL); assert(plist != NULL);
tTrace("conn %p conn key: %s: ", conn, key);
// QUEUE_INIT(&conn->conn); // QUEUE_INIT(&conn->conn);
QUEUE_PUSH(&plist->conn, &conn->conn); QUEUE_PUSH(&plist->conn, &conn->conn);
assert(!QUEUE_IS_EMPTY(&plist->conn)); assert(!QUEUE_IS_EMPTY(&plist->conn));