limit DEFAULT_CTX_ID of tenant_500 from 4G to 2G

src/share/cache/ob_kvcache_map.cpp

@@ -25,14 +25,13 @@ namespace common
 
 ObKVCacheMap::ObKVCacheMap()
     : is_inited_(false),
+      bucket_allocator_(ObMemAttr(OB_SERVER_TENANT_ID, "CACHE_MAP_BKT", ObCtxIds::UNEXPECTED_IN_500)),
       bucket_num_(0),
       bucket_size_(0),
       buckets_(NULL),
       store_(NULL),
       global_hazard_version_()
-{
-  bucket_allocator_.set_label("CACHE_MAP_BKT");
-}
+{}
 
 ObKVCacheMap::~ObKVCacheMap()
 {
@@ -49,7 +48,7 @@ int ObKVCacheMap::init(const int64_t bucket_num, ObKVCacheStore *store)
     ret = OB_INVALID_ARGUMENT;
     COMMON_LOG(WARN, "Invalid arguments, ", K(bucket_num), K(store), K(ret));
   } else if (OB_FAIL(bucket_lock_.init(bucket_num,
-      ObLatchIds::KV_CACHE_BUCKET_LOCK, "CACHE_MAP_LOCK"))) {
+      ObLatchIds::KV_CACHE_BUCKET_LOCK, ObMemAttr(OB_SERVER_TENANT_ID, "CACHE_MAP_LOCK", ObCtxIds::UNEXPECTED_IN_500)))) {
     COMMON_LOG(WARN, "Fail to init bucket lock, ", K(bucket_num), K(ret));
   } else if (OB_FAIL(global_hazard_version_.init(HAZARD_VERSION_THREAD_WAITING_THRESHOLD))) {
     COMMON_LOG(WARN, "Fail to init hazard version, ", K(ret));

src/share/cache/ob_kvcache_store.cpp

@@ -67,7 +67,8 @@ int ObKVCacheStore::init(ObKVCacheInstMap &insts,
     max_mb_num_ = max_cache_size / block_size
         + 2 * (WASH_THREAD_RETIRE_LIMIT + RETIRE_LIMIT * OB_MAX_THREAD_NUM);
     if (NULL == (mb_handles_ = static_cast<ObKVMemBlockHandle *>(buf = ob_malloc(
-            (sizeof(ObKVMemBlockHandle) + sizeof(ObKVMemBlockHandle*)) * max_mb_num_, "CACHE_MB_HANDLE")))) {
+            (sizeof(ObKVMemBlockHandle) + sizeof(ObKVMemBlockHandle*)) * max_mb_num_,
+             ObMemAttr(OB_SERVER_TENANT_ID, "CACHE_MB_HANDLE", ObCtxIds::UNEXPECTED_IN_500))))) {
       ret = OB_ALLOCATE_MEMORY_FAILED;
       COMMON_LOG(ERROR, "Fail to allocate memory for mb_handles_, ", K_(max_mb_num), K(ret));
     } else if (OB_FAIL(mb_handles_pool_.init(max_mb_num_,

src/share/config/ob_server_config.cpp

@@ -423,7 +423,7 @@ int ObServerMemoryConfig::set_500_tenant_limit(const int64_t limit_mode)
     auto ta = ma->get_tenant_ctx_allocator(OB_SERVER_TENANT_ID, ctx_id);
     const char *ctx_name = get_global_ctx_info().get_ctx_name(ctx_id);
     if (OB_NOT_NULL(ta)) {
-      int64_t ctx_limit = ObCtxIds::DEFAULT_CTX_ID == ctx_id ? (4LL<<30) : (50LL<<20);
+      int64_t ctx_limit = ObCtxIds::DEFAULT_CTX_ID == ctx_id ? (2LL<<30) : (50LL<<20);
       if (unlimited) {
         ctx_limit = INT64_MAX;
       }

tools/deploy/mysql_test/test_suite/pl/r/mysql/pl_dbt2_mysql.result

@@ -1412,3 +1412,5 @@ DROP PROCEDURE new_order;
 DROP PROCEDURE order_status;
 DROP PROCEDURE payment;
 DROP PROCEDURE stock_level;
+
+

tools/deploy/mysql_test/test_suite/pl/r/mysql/pl_exception_basic_mysql.result

@@ -1557,3 +1557,4 @@ select * from b;
 drop table a;
 drop table b;
 drop procedure p;
+

tools/deploy/mysql_test/test_suite/pl/r/mysql/sp-fib_mysql.result

@@ -42,3 +42,4 @@ select * from t3 order by f asc|
 drop table t3|
 drop procedure fib|
 set @@max_sp_recursion_depth= 0|
+

tools/deploy/mysql_test/test_suite/pl/t/pl_dbt2_mysql.test

@@ -1435,3 +1435,6 @@ DROP PROCEDURE new_order;
 DROP PROCEDURE order_status;
 DROP PROCEDURE payment;
 DROP PROCEDURE stock_level;
+
+
+

tools/deploy/mysql_test/test_suite/pl/t/pl_exception_basic_mysql.test

@@ -1489,3 +1489,4 @@ select * from b;
 drop table a;
 drop table b;
 drop procedure p;
+

tools/deploy/mysql_test/test_suite/pl/t/sp-fib_mysql.test

@@ -62,3 +62,4 @@ select * from t3 order by f asc|
 drop table t3|
 drop procedure fib|
 set @@max_sp_recursion_depth= 0|
+

tools/deploy/mysql_test/test_suite/static_engine/r/mysql/expr_lnnvl.result

@@ -58,3 +58,4 @@ select * from v1;
 |        0 |
 +----------+
 drop view v1;
+

tools/deploy/mysql_test/test_suite/static_engine/r/mysql/expr_repeat.result

@@ -106,3 +106,4 @@ select repeat(c1, 10),repeat(c2,10),repeat(c3,10) from t2;
 | aaaaaaaaaa     | bbbbbbbbbb    | cccccccccc    |
 +----------------+---------------+---------------+
 drop table t2;
+

tools/deploy/mysql_test/test_suite/static_engine/r/mysql/expr_trim.result

@@ -193,3 +193,4 @@ select TRIM(LEADING 'a' FROM TRIM(SUBSTR(REPEAT(NULL, 4 + 1), 1, LEAST(146, 20))
 +-----------------------------------------------------------------------------+
 | NULL                                                                        |
 +-----------------------------------------------------------------------------+
+