pdxx
/
libfastcommon
mirror of https://github.com/happyfish100/libfastcommon.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

bug fixed: connection pool should NOT increase counter when connect fail

pull/1/head
yuqing 2014-06-27 15:12:41 +08:00
parent 28dcc9d099
commit 701bc391bc
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
HISTORY
View File

@ -1,5 +1,5 @@
Version 1.06 2014-06-24 Version 1.06 2014-06-27
* update source code from FastDFS V5.02 * update source code from FastDFS V5.02
* add function short2buff and buff2short * add function short2buff and buff2short
* add object memory pool (fast_mblock.h and fast_mblock.c) * add object memory pool (fast_mblock.h and fast_mblock.c)
@ -13,6 +13,7 @@ Version 1.06 2014-06-24
* #include <stdbool.h> to use C99 bool * #include <stdbool.h> to use C99 bool
* add libfastcommon.spec for building RPM * add libfastcommon.spec for building RPM
* logger can delete old rotated files * logger can delete old rotated files
* bug fixed: connection pool should NOT increase counter when connect fail
Version 1.05 2012-07-08 Version 1.05 2012-07-08
* update source code from FastDFS V3.09 * update source code from FastDFS V3.09

4
src/connection_pool.c
View File

@ -202,6 +202,10 @@ ConnectionInfo *conn_pool_get_connection(ConnectionPool *cp,
cp->connect_timeout); cp->connect_timeout);
if (*err_no != 0) if (*err_no != 0)
{ {
pthread_mutex_lock(&cm->lock);
cm->total_count--; //rollback
pthread_mutex_unlock(&cm->lock);
free(p); free(p);
return NULL; return NULL;
} }