From 03af5db1b822bdfe9aea1eec5e5171a8903390dc Mon Sep 17 00:00:00 2001
From: liubo <liubo@pingcap.com>
Date: Mon, 20 Jul 2020 16:51:51 +0800
Subject: [PATCH] update the default value of oom-action(tidb) (#1341) (#1342)

---
 conf/tidb.yml               | 2 +-
 roles/tidb/vars/default.yml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/conf/tidb.yml b/conf/tidb.yml
index 584c23463..5cfa2e45d 100644
--- 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
index 56edbef30..5d279da1e 100644
--- 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