Set max idle connections when connect TiDB; Fix log print when delete. (

#53)
journeymidnight · Dec 21, 2018 · 41bdc2b · 41bdc2b
1 parent 7bf351c
commit 41bdc2b
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/meta/client/tidbclient/client.go b/meta/client/tidbclient/client.go
@@ -7,6 +7,8 @@ import (
 	"os"
 )
 
+const MAX_OPEN_CONNS = 1024
+
 type TidbClient struct {
 	Client *sql.DB
 }
@@ -17,6 +19,8 @@ func NewTidbClient() *TidbClient {
 	if err != nil {
 		os.Exit(1)
 	}
+	conn.SetMaxIdleConns(0)
+	conn.SetMaxOpenConns(MAX_OPEN_CONNS)
 	cli.Client = conn
 	return cli
 }
diff --git a/tools/delete.go b/tools/delete.go
@@ -47,10 +47,10 @@ func deleteFromCeph(index int) {
 				Remove(garbage.Pool, garbage.ObjectId)
 			if err != nil {
 				if strings.Contains(err.Error(), "ret=-2") {
+					helper.Logger.Println(5, "failed delete", garbage.BucketName, ":", garbage.ObjectName, ":",
+						garbage.Location, ":", garbage.Pool, ":", garbage.ObjectId, " error:", err)
 					goto release
 				}
-				helper.Logger.Println(5, "failed delete", garbage.BucketName, ":", garbage.ObjectName, ":",
-					garbage.Location, ":", garbage.Pool, ":", garbage.ObjectId, " error:", err)
 			} else {
 				helper.Logger.Println(5, "success delete", garbage.BucketName, ":", garbage.ObjectName, ":",
 					garbage.Location, ":", garbage.Pool, ":", garbage.ObjectId)
@@ -61,9 +61,9 @@ func deleteFromCeph(index int) {
 					Remove(garbage.Pool, p.ObjectId)
 				if err != nil {
 					if strings.Contains(err.Error(), "ret=-2") {
+						helper.Logger.Println(5, "failed delete part", garbage.Location, ":", garbage.Pool, ":", p.ObjectId, " error:", err)
 						goto release
 					}
-					helper.Logger.Println(5, "failed delete part", garbage.Location, ":", garbage.Pool, ":", p.ObjectId, " error:", err)
 				} else {
 					helper.Logger.Println(5, "success delete part", garbage.Location, ":", garbage.Pool, ":", p.ObjectId)
 				}