store/tikv: add 1PC grafana panel and lower 1PC log level (#22943)

pingcap · Feb 26, 2021 · 5d8b99f · 5d8b99f
1 parent 4a413a4
commit 5d8b99f
Show file tree

Hide file tree

Showing 2 changed files with 51 additions and 49 deletions.
diff --git a/metrics/grafana/tidb.json b/metrics/grafana/tidb.json
@@ -3591,19 +3591,19 @@
           },
           "type": "heatmap",
           "xAxis": {
-              "show": true
-            },
+            "show": true
+          },
           "xBucketNumber": null,
           "xBucketSize": null,
           "yAxis": {
             "decimals": 0,
-              "format": "short",
-              "logBase": 1,
-              "max": null,
-              "min": null,
+            "format": "short",
+            "logBase": 1,
+            "max": null,
+            "min": null,
             "show": true,
             "splitFactor": null
-        },
+          },
           "yBucketBound": "auto",
           "yBucketNumber": null,
           "yBucketSize": null
@@ -3658,19 +3658,19 @@
           },
           "type": "heatmap",
           "xAxis": {
-              "show": true
-            },
+            "show": true
+          },
           "xBucketNumber": null,
           "xBucketSize": null,
           "yAxis": {
             "decimals": 0,
-              "format": "short",
-              "logBase": 1,
-              "max": null,
-              "min": null,
+            "format": "short",
+            "logBase": 1,
+            "max": null,
+            "min": null,
             "show": true,
             "splitFactor": null
-        },
+          },
           "yBucketBound": "auto",
           "yBucketNumber": null,
           "yBucketSize": null
@@ -4129,19 +4129,19 @@
           },
           "type": "heatmap",
           "xAxis": {
-              "show": true
-            },
+            "show": true
+          },
           "xBucketNumber": null,
           "xBucketSize": null,
           "yAxis": {
             "decimals": 0,
-              "format": "short",
-              "logBase": 1,
-              "max": null,
-              "min": null,
+            "format": "short",
+            "logBase": 1,
+            "max": null,
+            "min": null,
             "show": true,
             "splitFactor": null
-        },
+          },
           "yBucketBound": "auto",
           "yBucketNumber": null,
           "yBucketSize": null
@@ -4306,16 +4306,16 @@
           },
           "type": "heatmap",
           "xAxis": {
-              "show": true
-            },
+            "show": true
+          },
           "xBucketNumber": null,
           "xBucketSize": null,
           "yAxis": {
             "decimals": 0,
             "format": "short",
-              "logBase": 1,
-              "max": null,
-              "min": null,
+            "logBase": 1,
+            "max": null,
+            "min": null,
             "show": true,
             "splitFactor": null
           },
@@ -4374,19 +4374,19 @@
           },
           "type": "heatmap",
           "xAxis": {
-              "show": true
-            },
+            "show": true
+          },
           "xBucketNumber": null,
           "xBucketSize": null,
           "yAxis": {
             "decimals": 0,
-              "format": "short",
-              "logBase": 1,
-              "max": null,
-              "min": null,
+            "format": "short",
+            "logBase": 1,
+            "max": null,
+            "min": null,
             "show": true,
             "splitFactor": null
-        },
+          },
           "yBucketBound": "auto",
           "yBucketNumber": null,
           "yBucketSize": null
@@ -5040,16 +5040,16 @@
           },
           "type": "heatmap",
           "xAxis": {
-              "show": true
-            },
+            "show": true
+          },
           "xBucketNumber": null,
           "xBucketSize": null,
           "yAxis": {
             "decimals": 0,
-              "format": "short",
-              "logBase": 1,
-              "max": null,
-              "min": null,
+            "format": "short",
+            "logBase": 1,
+            "max": null,
+            "min": null,
             "show": true,
             "splitFactor": null
           },
@@ -5107,8 +5107,15 @@
               "expr": "sum(rate(tidb_tikvclient_async_commit_txn_counter{tidb_cluster=\"$tidb_cluster\"}[1m])) by (type)",
               "format": "time_series",
               "intervalFactor": 1,
-              "legendFormat": "{{type}}",
+              "legendFormat": "async commit-{{type}}",
               "refId": "A"
+            },
+            {
+              "refId": "B",
+              "expr": "sum(rate(tidb_tikvclient_one_pc_txn_counter{tidb_cluster=\"$tidb_cluster\"}[1m])) by (type)",
+              "intervalFactor": 1,
+              "format": "time_series",
+              "legendFormat": "1PC-{{type}}"
             }
           ],
           "thresholds": [],
@@ -11937,25 +11944,20 @@
     "list": [
       {
         "allValue": null,
-        "current": {
-        },
+        "current": {},
         "datasource": "${DS_TEST-CLUSTER}",
         "hide": 2,
         "includeAll": false,
         "label": "tidb_cluster",
         "multi": false,
         "name": "tidb_cluster",
-        "options": [
-
-        ],
+        "options": [],
         "query": "label_values(pd_cluster_status, tidb_cluster)",
         "refresh": 2,
         "regex": "",
         "sort": 1,
         "tagValuesQuery": "",
-        "tags": [
-
-        ],
+        "tags": [],
         "tagsQuery": "",
         "type": "query",
         "useTags": false

diff --git a/store/tikv/2pc.go b/store/tikv/2pc.go
@@ -1189,7 +1189,7 @@ func (c *twoPhaseCommitter) execute(ctx context.Context) (err error) {
 		}
 		c.commitTS = c.onePCCommitTS
 		c.txn.commitTS = c.commitTS
-		logutil.Logger(ctx).Info("1PC protocol is used to commit this txn",
+		logutil.Logger(ctx).Debug("1PC protocol is used to commit this txn",
 			zap.Uint64("startTS", c.startTS), zap.Uint64("commitTS", c.commitTS),
 			zap.Uint64("session", c.sessionID))
 		return nil