update the default value of oom-action(tidb) (#1341) (#1342)

pingcap · Jul 20, 2020 · 03af5db · 03af5db
1 parent 64c8a7a
commit 03af5db
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/conf/tidb.yml b/conf/tidb.yml
@@ -15,7 +15,7 @@ global:
 
   # Only print a log when out of memory quota.
   # Valid options: ["log", "cancel"]
-  # oom-action: "log"
+  # oom-action: "cancel"
 
   # Set the memory quota for a query in bytes. Default: 32GB
   # mem-quota-query: 34359738368

diff --git a/roles/tidb/vars/default.yml b/roles/tidb/vars/default.yml
@@ -27,7 +27,7 @@ global:
 
   # Only print a log when out of memory quota.
   # Valid options: ["log", "cancel"]
-  oom-action: "log"
+  oom-action: "cancel"
 
   # Set the memory quota for a query in bytes. Default: 32GB
   # mem-quota-query: 34359738368