fix: alter minReservedMemorySize error code. (#31510)

Author: xiao-77

docs/en/14-reference/09-error-code.md

@@ -295,6 +295,7 @@ This document details the server error codes that may be encountered when using
 | 0x8000073A | Query memory exhausted               | Query memory in dnode is exhausted                           | Limit concurrent queries or add more physical memory         |
 | 0x8000073B | Timeout for long time no fetch       | Query without fetch for a long time                          | Correct application to fetch data asap                       |
 | 0x8000073C | Memory pool not initialized          | Memory pool not initialized in dnode                         | Confirm if the switch queryUseMemoryPool is enabled; if queryUseMemoryPool is already enabled, check if the server meets the basic conditions for enabling the memory pool: 1. The total available system memory is not less than 5GB; 2. The available system memory after deducting the reserved portion is not less than 4GB. |
+| 0x8000073D | Alter minReservedMemorySize failed since no enough system available memory | Failed to update minReservedMemorySize | Check current system memory: 1. Total available system memory should not be less than 5G; 2. Available system memory after deducting reserved portion should not be less than 4G |
 
 ## grant
 

docs/zh/14-reference/09-error-code.md

@@ -307,6 +307,7 @@ description: TDengine 服务端的错误码列表和详细说明
 | 0x8000073A | Query memory exhausted               | dnode 查询内存到达使用上限                  | 设置合理的内存上限或调整并发查询量或增大系统内存       |
 | 0x8000073B | Timeout for long time no fetch       | 查询被长时间中断未恢复                     | 调整应用实现尽快 fetch 数据                            |
 | 0x8000073C | Memory pool not initialized          | 内存池没有初始化                          | 确认开关 queryUseMemoryPool 是否打开；如果 queryUseMemoryPool 已经打开，检查服务器是否达到了开启内存池的基本条件：1. 系统的可用内存总量不低于 5G；2. 扣除预留部分后系统的可用内存不低于 4G |
+| 0x8000073D | Alter minReservedMemorySize failed since no enough system available memory   | 更新 minReservedMemorySize 失败 | 确认当前的系统内存：1. 系统的可用内存总量不低于 5G；2. 扣除预留部分后系统的可用内存不低于 4G |
 
 ## grant
 

include/util/taoserror.h

@@ -668,6 +668,7 @@ int32_t  taosGetErrSize();
 #define TSDB_CODE_QRY_QUERY_MEM_EXHAUSTED       TAOS_DEF_ERROR_CODE(0, 0x073A)
 #define TSDB_CODE_QRY_NO_FETCH_TIMEOUT          TAOS_DEF_ERROR_CODE(0, 0x073B)
 #define TSDB_CODE_QRY_MEMORY_POOL_NOT_INITIALIZED TAOS_DEF_ERROR_CODE(0, 0x073C)
+#define TSDB_CODE_QRY_MEMORY_POOL_MEMORY_NOT_ENOUGH     TAOS_DEF_ERROR_CODE(0, 0x073D)
 
 // grant
 #define TSDB_CODE_GRANT_EXPIRED                 TAOS_DEF_ERROR_CODE(0, 0x0800)

source/util/src/terror.c

@@ -532,6 +532,7 @@ TAOS_DEFINE_ERROR(TSDB_CODE_QRY_QUERY_MEM_EXHAUSTED,      "Query memory exhauste
 TAOS_DEFINE_ERROR(TSDB_CODE_QRY_NO_FETCH_TIMEOUT,         "Timeout for long time no fetch")
 TAOS_DEFINE_ERROR(TSDB_CODE_QRY_TASK_SUCC_TO_PARTSUSS,    "Change task status from success to partial success")
 TAOS_DEFINE_ERROR(TSDB_CODE_QRY_MEMORY_POOL_NOT_INITIALIZED, "Memory pool not initialized")
+TAOS_DEFINE_ERROR(TSDB_CODE_QRY_MEMORY_POOL_MEMORY_NOT_ENOUGH, "Alter minReservedMemorySize failed since no enough system available memory")
 
 // grant
 TAOS_DEFINE_ERROR(TSDB_CODE_GRANT_EXPIRED,                "License expired")

source/util/src/tmempool.c

@@ -1782,15 +1782,15 @@ static int32_t mpUpdateReservedSize(SMemPool* pPool, int32_t newReservedSizeMB)
   int64_t sysAvailSize = 0;
   code = taosGetSysAvailMemory(&sysAvailSize);
   if (code || sysAvailSize < MP_MIN_MEM_POOL_SIZE) {
-    uInfo("memory pool disabled since no enough system available memory, size: %" PRId64, sysAvailSize);
-    return TSDB_CODE_INVALID_PARA;
+    uInfo("failed to update reserved size since no enough system available memory, size: %" PRId64, sysAvailSize);
+    MP_ERR_RET(TSDB_CODE_QRY_MEMORY_POOL_MEMORY_NOT_ENOUGH);
   }
 
   int64_t freeSizeAfterRes = sysAvailSize - newReservedSizeMB * 1048576UL;
   if (freeSizeAfterRes < MP_MIN_FREE_SIZE_AFTER_RESERVE) {
-    uInfo("memory pool disabled since no enough system available memory after reservied, size: %" PRId64,
+    uInfo("failed to update reserved size since no enough system available memory after reservied, size: %" PRId64,
           freeSizeAfterRes);
-    return TSDB_CODE_INVALID_PARA;
+    MP_ERR_RET(TSDB_CODE_QRY_MEMORY_POOL_MEMORY_NOT_ENOUGH);
   }
 
   MP_LOCK(MP_WRITE, &pPool->cfgLock);
@@ -1806,11 +1806,11 @@ int32_t taosMemoryPoolCfgUpdateReservedSize(int32_t newReservedSizeMB) {
   }
   int32_t code = TSDB_CODE_SUCCESS;
   if (NULL == gMemPoolHandle) {
-    uError("memory pool not initialized");
+    uError("failed to update reserved size since memory pool not initialized");
     MP_ERR_RET(TSDB_CODE_QRY_MEMORY_POOL_NOT_INITIALIZED);
   }
   if (newReservedSizeMB < 0) {
-    uError("newReservedSizeMB:%d is invalid", newReservedSizeMB);
+    uError("failed to update reserved size since newReservedSizeMB:%d is invalid", newReservedSizeMB);
     MP_ERR_RET(TSDB_CODE_INVALID_PARA);
   }
 

test/ci/container_build.sh

@@ -82,7 +82,7 @@ docker run \
     -v ${REP_REAL_PATH}/community/contrib/pcre2/:${REP_DIR}/community/contrib/pcre2 \
     -v ${REP_REAL_PATH}/community/contrib/zlib/:${REP_DIR}/community/contrib/zlib \
     -v ${REP_REAL_PATH}/community/contrib/zstd/:${REP_DIR}/community/contrib/zstd \
-    --rm --ulimit core=-1 taos_test:v1.0 sh -c "cd $REP_DIR;rm -rf debug;mkdir -p debug;cd debug;cmake .. -DBUILD_HTTP=tdinternal -DBUILD_TOOLS=true -DBUILD_TEST=true -DWEBSOCKET=true -DBUILD_TAOSX=false -DJEMALLOC_ENABLED=0 -DCMAKE_EXPORT_COMPILE_COMMANDS=1 -DTAOSADAPTER_GIT_TAG:STRING=${branch_taosadapter} ;make -j|| exit 1"
+    --rm --ulimit core=-1 tdengine-ci:0.1 sh -c "cd $REP_DIR;rm -rf debug;mkdir -p debug;cd debug;cmake .. -DBUILD_HTTP=tdinternal -DBUILD_TOOLS=true -DBUILD_TEST=true -DWEBSOCKET=true -DBUILD_TAOSX=false -DJEMALLOC_ENABLED=0 -DCMAKE_EXPORT_COMPILE_COMMANDS=1 -DTAOSADAPTER_GIT_TAG:STRING=${branch_taosadapter} ;make -j|| exit 1"
  # -v ${REP_REAL_PATH}/community/contrib/jemalloc/:${REP_DIR}/community/contrib/jemalloc \
 
 if [[ -d ${WORKDIR}/debugNoSan  ]] ;then
@@ -134,7 +134,7 @@ docker run \
     -v ${REP_REAL_PATH}/community/contrib/pcre2/:${REP_DIR}/community/contrib/pcre2 \
     -v ${REP_REAL_PATH}/community/contrib/zlib/:${REP_DIR}/community/contrib/zlib \
     -v ${REP_REAL_PATH}/community/contrib/zstd/:${REP_DIR}/community/contrib/zstd \
-    --rm --ulimit core=-1 taos_test:v1.0 sh -c "cd $REP_DIR;rm -rf debug;mkdir -p debug;cd debug;cmake .. -DBUILD_HTTP=false -DBUILD_TOOLS=true -DBUILD_TEST=false -DWEBSOCKET=true   -DBUILD_SANITIZER=1  -DTOOLS_SANITIZE=true -DCMAKE_BUILD_TYPE=Debug -DTOOLS_BUILD_TYPE=Debug -DBUILD_TAOSX=false -DJEMALLOC_ENABLED=0 -DTAOSADAPTER_GIT_TAG:STRING=${branch_taosadapter};make -j|| exit 1 "
+    --rm --ulimit core=-1 tdengine-ci:0.1 sh -c "cd $REP_DIR;rm -rf debug;mkdir -p debug;cd debug;cmake .. -DBUILD_HTTP=false -DBUILD_TOOLS=true -DBUILD_TEST=false -DWEBSOCKET=true   -DBUILD_SANITIZER=1  -DTOOLS_SANITIZE=true -DCMAKE_BUILD_TYPE=Debug -DTOOLS_BUILD_TYPE=Debug -DBUILD_TAOSX=false -DJEMALLOC_ENABLED=0 -DTAOSADAPTER_GIT_TAG:STRING=${branch_taosadapter};make -j|| exit 1 "
 
 mv  ${REP_REAL_PATH}/debug  ${WORKDIR}/debugSan
 

test/ci/container_build_newmachine.sh

@@ -61,7 +61,7 @@ docker run \
     -v /root/go/pkg/mod:/root/go/pkg/mod \
     -v /root/.cache/go-build:/root/.cache/go-build \
     -v /root/.cos-local.1:/root/.cos-local.2 \
-    --rm --ulimit core=-1 taos_test:v1.0 sh -c "pip uninstall taospy -y;pip3 install taospy==2.8.1;cd $REP_DIR;rm -rf debug;mkdir -p debug;cd debug;cmake .. -DBUILD_HTTP=false -DBUILD_TOOLS=true -DBUILD_TEST=true -DWEBSOCKET=true   -DBUILD_SANITIZER=1  -DTOOLS_SANITIZE=true $CMAKE_BUILD_TYPE -DTOOLS_BUILD_TYPE=Debug -DBUILD_TAOSX=false -DJEMALLOC_ENABLED=0;make -j 10|| exit 1 "
+    --rm --ulimit core=-1 tdengine-ci:0.1 sh -c "pip uninstall taospy -y;pip3 install taospy==2.8.1;cd $REP_DIR;rm -rf debug;mkdir -p debug;cd debug;cmake .. -DBUILD_HTTP=false -DBUILD_TOOLS=true -DBUILD_TEST=true -DWEBSOCKET=true   -DBUILD_SANITIZER=1  -DTOOLS_SANITIZE=true $CMAKE_BUILD_TYPE -DTOOLS_BUILD_TYPE=Debug -DBUILD_TAOSX=false -DJEMALLOC_ENABLED=0;make -j 10|| exit 1 "
  # -v ${REP_REAL_PATH}/community/contrib/jemalloc/:${REP_DIR}/community/contrib/jemalloc \
 
 if [[ -d ${WORKDIR}/debugNoSan  ]] ;then

test/ci/run_check_assert_container.sh

@@ -42,11 +42,11 @@ ulimit -c unlimited
 cat << EOF
 docker run \
     -v $REP_MOUNT_PARAM \
-    --rm --ulimit core=-1 taos_test:v1.0 python3  $check_assert_scripts
+    --rm --ulimit core=-1 tdengine-ci:0.1 python3  $check_assert_scripts
 EOF
 docker run \
     -v "$REP_MOUNT_PARAM" \
-    --rm --ulimit core=-1 taos_test:v1.0 python3  $check_assert_scripts
+    --rm --ulimit core=-1 tdengine-ci:0.1 python3  $check_assert_scripts
 
 ret=$?
 exit $ret

test/ci/run_check_void_container.sh

@@ -44,12 +44,12 @@ ulimit -c unlimited
 cat << EOF
 docker run \
     -v $REP_MOUNT_PARAM \
-    --rm --ulimit core=-1 taos_test:v1.0  "$check_assert_scripts" -c $func_list_file -f $source_file_path
+    --rm --ulimit core=-1 tdengine-ci:0.1  "$check_assert_scripts" -c $func_list_file -f $source_file_path
 EOF
 
 docker run \
     -v "$REP_MOUNT_PARAM" \
-    --rm --ulimit core=-1 taos_test:v1.0  $check_assert_scripts -c $func_list_file -f $source_file_path
+    --rm --ulimit core=-1 tdengine-ci:0.1  $check_assert_scripts -c $func_list_file -f $source_file_path
 
 ret=$?
 exit $ret

test/ci/run_container.sh

@@ -139,6 +139,6 @@ docker run \
     -v ${SOURCEDIR}:/usr/local/src/ \
     -v "$TMP_DIR/thread_volume/$thread_no/sim:${SIM_DIR}" \
     -v ${TMP_DIR}/thread_volume/$thread_no/coredump:$coredump_dir \
-    --rm --ulimit core=-1 taos_test:v1.0 $CONTAINER_TESTDIR/test/ci/run_case.sh -d "$exec_dir" -c "$cmd" $extra_param
+    --rm --ulimit core=-1 tdengine-ci:0.1 $CONTAINER_TESTDIR/test/ci/run_case.sh -d "$exec_dir" -c "$cmd" $extra_param
 ret=$?
 exit $ret

test/ci/run_scan_container.sh

@@ -84,15 +84,15 @@ docker run \
     -v $REP_MOUNT_DEBUG \
     -v $scan_changefile_temp_path:$docker_can_changefile_temp_path \
     -v $scan_log_temp_path:$docker_scan_log_temp_path \
-    --rm --ulimit core=-1 taos_test:v1.0 python3  $scan_scripts -b "${branch_name_id}"  -f "${scan_file_name}" -w ${web_server}
+    --rm --ulimit core=-1 tdengine-ci:0.1 python3  $scan_scripts -b "${branch_name_id}"  -f "${scan_file_name}" -w ${web_server}
 EOF
 docker run \
     -v /root/.cos-local.1:/root/.cos-local.2 \
     -v $REP_MOUNT_PARAM \
     -v $REP_MOUNT_DEBUG \
     -v $scan_changefile_temp_path:$docker_can_changefile_temp_path \
     -v $scan_log_temp_path:$docker_scan_log_temp_path \
-    --rm --ulimit core=-1 taos_test:v1.0 python3  $scan_scripts -b "${branch_name_id}"  -f "${scan_file_name}" -w ${web_server}
+    --rm --ulimit core=-1 tdengine-ci:0.1 python3  $scan_scripts -b "${branch_name_id}"  -f "${scan_file_name}" -w ${web_server}
 
 
 ret=$?

test/new_test_framework/taostest/util/common.py

@@ -61,7 +61,7 @@ class TDCom:
     # docker image name variable
     docker_image_name_variable = "DOCKER_IMAGE_NAME"
     # default docker image name
-    docker_image_name_default = "taos_test:v1.0"
+    docker_image_name_default = "tdengine-ci:0.1"
     # container test root
     container_test_root = "/home/test_root"
     # entry point file name