diff --git a/include/common/tgrant.h b/include/common/tgrant.h
index b707045bd1..42adabd6f7 100644
--- a/include/common/tgrant.h
+++ b/include/common/tgrant.h
@@ -28,11 +28,13 @@ extern "C" {
 #define GRANTS_COL_MAX_LEN 196
 #endif
 
-#define GRANT_HEART_BEAT_MIN 2
-#define GRANT_ACTIVE_CODE    "activeCode"
-#define GRANT_FLAG_ALL       (0x01)
-#define GRANT_FLAG_AUDIT     (0x02)
-#define GRANT_FLAG_VIEW      (0x04)
+#define GRANT_HEART_BEAT_MIN      2
+#define GRANT_EXPIRE_VALUE        (31556995201)
+#define GRANT_EXPIRE_UNLIMITED(v) ((v) == GRANT_EXPIRE_VALUE)
+#define GRANT_ACTIVE_CODE         "activeCode"
+#define GRANT_FLAG_ALL            (0x01)
+#define GRANT_FLAG_AUDIT          (0x02)
+#define GRANT_FLAG_VIEW           (0x04)
 
 typedef enum {
   TSDB_GRANT_ALL,
diff --git a/source/common/src/systable.c b/source/common/src/systable.c
index 65c58abdda..1693e5c480 100644
--- a/source/common/src/systable.c
+++ b/source/common/src/systable.c
@@ -85,7 +85,7 @@ static const SSysDbTableSchema clusterSchema[] = {
     {.name = "uptime", .bytes = 4, .type = TSDB_DATA_TYPE_INT, .sysInfo = true},
     {.name = "create_time", .bytes = 8, .type = TSDB_DATA_TYPE_TIMESTAMP, .sysInfo = true},
     {.name = "version", .bytes = 10 + VARSTR_HEADER_SIZE, .type = TSDB_DATA_TYPE_VARCHAR, .sysInfo = true},
-    {.name = "expire_time", .bytes = 8, .type = TSDB_DATA_TYPE_TIMESTAMP, .sysInfo = true},
+    {.name = "expire_time", .bytes = 19 + VARSTR_HEADER_SIZE, .type = TSDB_DATA_TYPE_VARCHAR, .sysInfo = true},
 };
 
 static const SSysDbTableSchema userDBSchema[] = {
diff --git a/source/dnode/mnode/impl/inc/mndShow.h b/source/dnode/mnode/impl/inc/mndShow.h
index 5a3e487e3d..de7068e9ad 100644
--- a/source/dnode/mnode/impl/inc/mndShow.h
+++ b/source/dnode/mnode/impl/inc/mndShow.h
@@ -23,6 +23,14 @@
 extern "C" {
 #endif
 
+#define COL_DATA_SET_VAL_RET(pData, isNull, pObj)                              \
+  do {                                                                         \
+    if ((code = colDataSetVal(pColInfo, numOfRows, (pData), (isNull))) != 0) { \
+      if (pObj) sdbRelease(pSdb, (pObj));                                      \
+      return code;                                                             \
+    }                                                                          \
+  } while (0)
+
 int32_t mndInitShow(SMnode *pMnode);
 void    mndCleanupShow(SMnode *pMnode);
 void    mndAddShowRetrieveHandle(SMnode *pMnode, EShowType showType, ShowRetrieveFp fp);
diff --git a/source/dnode/mnode/impl/src/mndCluster.c b/source/dnode/mnode/impl/src/mndCluster.c
index f2b279276e..31ebc6609d 100644
--- a/source/dnode/mnode/impl/src/mndCluster.c
+++ b/source/dnode/mnode/impl/src/mndCluster.c
@@ -280,6 +280,7 @@ static int32_t mndCreateDefaultCluster(SMnode *pMnode) {
 static int32_t mndRetrieveClusters(SRpcMsg *pMsg, SShowObj *pShow, SSDataBlock *pBlock, int32_t rows) {
   SMnode      *pMnode = pMsg->info.node;
   SSdb        *pSdb = pMnode->pSdb;
+  int32_t      code = 0;
   int32_t      numOfRows = 0;
   int32_t      cols = 0;
   SClusterObj *pCluster = NULL;
@@ -290,31 +291,44 @@ static int32_t mndRetrieveClusters(SRpcMsg *pMsg, SShowObj *pShow, SSDataBlock *
 
     cols = 0;
     SColumnInfoData *pColInfo = taosArrayGet(pBlock->pDataBlock, cols++);
-    colDataSetVal(pColInfo, numOfRows, (const char *)&pCluster->id, false);
+    COL_DATA_SET_VAL_RET((const char *)&pCluster->id, false, pCluster);
 
     char buf[tListLen(pCluster->name) + VARSTR_HEADER_SIZE] = {0};
     STR_WITH_MAXSIZE_TO_VARSTR(buf, pCluster->name, pShow->pMeta->pSchemas[cols].bytes);
 
     pColInfo = taosArrayGet(pBlock->pDataBlock, cols++);
-    colDataSetVal(pColInfo, numOfRows, buf, false);
+    COL_DATA_SET_VAL_RET(buf, false, pCluster);
 
     int32_t upTime = mndGetClusterUpTimeImp(pCluster);
     pColInfo = taosArrayGet(pBlock->pDataBlock, cols++);
-    colDataSetVal(pColInfo, numOfRows, (const char *)&upTime, false);
+    COL_DATA_SET_VAL_RET((const char *)&upTime, false, pCluster);
 
     pColInfo = taosArrayGet(pBlock->pDataBlock, cols++);
-    colDataSetVal(pColInfo, numOfRows, (const char *)&pCluster->createdTime, false);
+    COL_DATA_SET_VAL_RET((const char *)&pCluster->createdTime, false, pCluster);
 
     char ver[12] = {0};
     STR_WITH_MAXSIZE_TO_VARSTR(ver, tsVersionName, pShow->pMeta->pSchemas[cols].bytes);
     pColInfo = taosArrayGet(pBlock->pDataBlock, cols++);
-    colDataSetVal(pColInfo, numOfRows, (const char *)ver, false);
+    COL_DATA_SET_VAL_RET((const char *)ver, false, pCluster);
 
-    pColInfo = taosArrayGet(pBlock->pDataBlock, cols++);
-    if (tsExpireTime <= 0) {
+    char expireTime[25] = {0};
+    pColInfo = taosArrayGet(pBlock->pDataBlock, cols);
+    if (GRANT_EXPIRE_UNLIMITED(tsExpireTime / 1000)) {
+      STR_WITH_MAXSIZE_TO_VARSTR(expireTime, "unlimited", pShow->pMeta->pSchemas[cols].bytes);
+      COL_DATA_SET_VAL_RET(expireTime, false, pCluster);
+    } else if (tsExpireTime <= 0) {
       colDataSetNULL(pColInfo, numOfRows);
     } else {
-      colDataSetVal(pColInfo, numOfRows, (const char *)&tsExpireTime, false);
+      char      ts[20] = {0};
+      time_t    expireSec = tsExpireTime / 1000;
+      struct tm ptm;
+      if (taosLocalTime(&expireSec, &ptm, ts) != NULL) {
+        strftime(ts, 20, "%Y-%m-%d %H:%M:%S", &ptm);
+      } else {
+        ts[0] = 0;
+      }
+      STR_WITH_MAXSIZE_TO_VARSTR(expireTime, ts, pShow->pMeta->pSchemas[cols].bytes);
+      COL_DATA_SET_VAL_RET(expireTime, false, pCluster);
     }
 
     sdbRelease(pSdb, pCluster);