sql memory tracker using hard memory limit

obdev · footka · gaopy3 · ob-robot · commit a27dea9515bb · 2026-01-26T02:39:54.000Z
Co-authored-by: footka &lt;672528926@qq.com&gt;
Co-authored-by: gaopy3 &lt;gao.panyu@qq.com&gt;
diff --git a/src/sql/executor/ob_memory_tracker.cpp b/src/sql/executor/ob_memory_tracker.cpp
@@ -29,13 +29,13 @@ thread_local ObMemTracker ObMemTrackerGuard::mem_tracker_;
 void ObMemTrackerGuard::update_mem_limit()
 {
   int ret = common::OB_SUCCESS;
-  int64_t tenant_mem_limit = lib::get_tenant_memory_limit(MTL_ID());
+  int64_t hard_memory_limit = lib::get_hard_memory_limit();
   int64_t mem_quota_pct = 100;
   omt::ObTenantConfigGuard tenant_config(TENANT_CONF(MTL_ID()));
   if (OB_UNLIKELY(tenant_config.is_valid())) {
     mem_quota_pct = tenant_config->query_memory_limit_percentage;
   }
-  mem_tracker_.cache_mem_limit_ = tenant_mem_limit / 100 * mem_quota_pct;
+  mem_tracker_.cache_mem_limit_ = hard_memory_limit / 100 * mem_quota_pct;
 }
 int ObMemTrackerGuard::check_status()
 {

Original file line number	Diff line number	Diff line change
`@@ -29,13 +29,13 @@ thread_local ObMemTracker ObMemTrackerGuard::mem_tracker_;`
`29`	`29`	`void ObMemTrackerGuard::update_mem_limit()`
`30`	`30`	`{`
`31`	`31`	`int ret = common::OB_SUCCESS;`
`32`		`- int64_t tenant_mem_limit = lib::get_tenant_memory_limit(MTL_ID());`
	`32`	`+ int64_t hard_memory_limit = lib::get_hard_memory_limit();`
`33`	`33`	`int64_t mem_quota_pct = 100;`
`34`	`34`	`omt::ObTenantConfigGuard tenant_config(TENANT_CONF(MTL_ID()));`
`35`	`35`	`if (OB_UNLIKELY(tenant_config.is_valid())) {`
`36`	`36`	`mem_quota_pct = tenant_config->query_memory_limit_percentage;`
`37`	`37`	`}`
`38`		`- mem_tracker_.cache_mem_limit_ = tenant_mem_limit / 100 * mem_quota_pct;`
	`38`	`+ mem_tracker_.cache_mem_limit_ = hard_memory_limit / 100 * mem_quota_pct;`
`39`	`39`	`}`
`40`	`40`	`int ObMemTrackerGuard::check_status()`
`41`	`41`	`{`