diff --git a/include/util/tdef.h b/include/util/tdef.h
index 3d680de129..618a909f5d 100644
--- a/include/util/tdef.h
+++ b/include/util/tdef.h
@@ -421,7 +421,7 @@ typedef enum ELogicConditionType {
 #define TSDB_DEFAULT_S3_CHUNK_SIZE (256 * 1024)
 #define TSDB_MIN_S3_KEEP_LOCAL     (1 * 1440)  // unit minute
 #define TSDB_MAX_S3_KEEP_LOCAL     (365000 * 1440)
-#define TSDB_DEFAULT_S3_KEEP_LOCAL (30 * 1440)
+#define TSDB_DEFAULT_S3_KEEP_LOCAL (3650 * 1440)
 #define TSDB_MIN_S3_COMPACT        0
 #define TSDB_MAX_S3_COMPACT        1
 #define TSDB_DEFAULT_S3_COMPACT    0
@@ -540,12 +540,12 @@ enum {
   SND_WORKER_TYPE__UNIQUE,
 };
 
-#define DEFAULT_HANDLE    0
-#define MNODE_HANDLE      1
-#define QNODE_HANDLE      -1
-#define SNODE_HANDLE      -2
-#define VNODE_HANDLE      -3
-#define CLIENT_HANDLE     -5
+#define DEFAULT_HANDLE 0
+#define MNODE_HANDLE   1
+#define QNODE_HANDLE   -1
+#define SNODE_HANDLE   -2
+#define VNODE_HANDLE   -3
+#define CLIENT_HANDLE  -5
 
 #define TSDB_CONFIG_OPTION_LEN 32
 #define TSDB_CONFIG_VALUE_LEN  64
@@ -565,8 +565,8 @@ enum {
 // sort page size by default
 #define DEFAULT_PAGESIZE 4096
 
-#define VNODE_TIMEOUT_SEC      60
-#define MNODE_TIMEOUT_SEC      60
+#define VNODE_TIMEOUT_SEC 60
+#define MNODE_TIMEOUT_SEC 60
 
 #define MONITOR_TABLENAME_LEN   200
 #define MONITOR_TAG_NAME_LEN    100
diff --git a/tests/system-test/2-query/distribute_agg_apercentile.py b/tests/system-test/2-query/distribute_agg_apercentile.py
index 897580fbcc..23ca0b9fae 100644
--- a/tests/system-test/2-query/distribute_agg_apercentile.py
+++ b/tests/system-test/2-query/distribute_agg_apercentile.py
@@ -18,7 +18,7 @@ class TDTestCase:
     def prepare_datas_of_distribute(self, dbname="testdb"):
 
         # prepate datas for  20 tables distributed at different vgroups
-        tdSql.execute(f"create database if not exists {dbname} keep 3650 duration 1000 vgroups 5")
+        tdSql.execute(f"create database if not exists {dbname} keep 3650 duration 1000 s3_keeplocal 3000 vgroups 5")
         tdSql.execute(f" use {dbname} ")
         tdSql.execute(
             f'''create table {dbname}.stb1