[To rel/0.13] [IOTDB-3943] Optimize session timeout feature

jdbc/src/test/java/org/apache/iotdb/jdbc/UtilsTest.java

@@ -19,6 +19,7 @@
 package org.apache.iotdb.jdbc;
 
 import org.apache.iotdb.rpc.RpcUtils;
+import org.apache.iotdb.rpc.SessionTimeoutException;
 import org.apache.iotdb.rpc.TSStatusCode;
 import org.apache.iotdb.service.rpc.thrift.TSStatus;
 
@@ -118,6 +119,16 @@ public void testVerifySuccess() {
       fail();
     }
 
+    try {
+      TSStatus errorStatus = new TSStatus(TSStatusCode.SESSION_TIMEOUT.getStatusCode());
+      RpcUtils.verifySuccess(errorStatus);
+      fail();
+    } catch (SessionTimeoutException e) {
+      assertTrue(true);
+    } catch (Exception e) {
+      fail();
+    }
+
     try {
       TSStatus errorStatus = new TSStatus(TSStatusCode.INTERNAL_SERVER_ERROR.getStatusCode());
       RpcUtils.verifySuccess(errorStatus);

server/src/main/java/org/apache/iotdb/db/query/control/SessionTimeoutManager.java

@@ -106,6 +106,13 @@ public static SessionTimeoutManager getInstance() {
     return SessionTimeoutManagerHelper.INSTANCE;
   }
 
+  public boolean isSessionAlive(long sessionId) {
+    if (SESSION_TIMEOUT == 0) {
+      return true;
+    }
+    return sessionIdToLastActiveTime.containsKey(sessionId);
+  }
+
   private static class SessionTimeoutManagerHelper {
 
     private static final SessionTimeoutManager INSTANCE = new SessionTimeoutManager();

server/src/main/java/org/apache/iotdb/db/service/basic/ServiceProvider.java

@@ -109,12 +109,26 @@ public boolean checkLogin(long sessionId) {
     boolean isLoggedIn = currSessionId != null && currSessionId == sessionId;
     if (!isLoggedIn) {
       LOGGER.info("{}: Not login. ", IoTDBConstant.GLOBAL_DB_NAME);
+      return false;
     } else {
       SessionTimeoutManager.getInstance().refresh(sessionId);
     }
     return isLoggedIn;
   }
 
+  /**
+   * Check whether current session is timeout.
+   *
+   * @param sessionId Session id.
+   * @return true: If session timeout; false: If not session timeout.
+   */
+  public boolean checkSessionTimeout(long sessionId) {
+    if (!SessionTimeoutManager.getInstance().isSessionAlive(sessionId)) {
+      return true;
+    }
+    return false;
+  }
+
   public boolean checkAuthorization(PhysicalPlan plan, String username) throws AuthException {
     if (!plan.isAuthenticationRequired()) {
       return true;
@@ -230,7 +244,9 @@ public TSStatus closeOperation(
           TSStatusCode.NOT_LOGIN_ERROR,
           "Log in failed. Either you are not authorized or the session has timed out.");
     }
-
+    if (checkSessionTimeout(sessionId)) {
+      return RpcUtils.getStatus(TSStatusCode.SESSION_TIMEOUT, "Session timeout");
+    }
     if (AUDIT_LOGGER.isDebugEnabled()) {
       AUDIT_LOGGER.debug(
           "{}: receive close operation from Session {}",

server/src/main/java/org/apache/iotdb/db/service/thrift/impl/InfluxDBServiceImpl.java

@@ -86,10 +86,10 @@ public TSStatus closeSession(TSCloseSessionReq req) {
 
   @Override
   public TSStatus writePoints(TSWritePointsReq req) {
-    if (!serviceProvider.checkLogin(req.sessionId)) {
-      return getNotLoggedInStatus();
+    TSStatus loginStatus = checkLoginStatus(req.sessionId);
+    if (isStatusNotSuccess(loginStatus)) {
+      return loginStatus;
     }
-
     List<TSStatus> tsStatusList = new ArrayList<>();
     int executeCode = TSStatusCode.SUCCESS_STATUS.getStatusCode();
     for (Point point :
@@ -114,10 +114,26 @@ public TSStatus writePoints(TSWritePointsReq req) {
     return new TSStatus().setCode(executeCode).setSubStatus(tsStatusList);
   }
 
+  private boolean isStatusNotSuccess(TSStatus tsStatus) {
+    return tsStatus.getCode() != TSStatusCode.SUCCESS_STATUS.getStatusCode();
+  }
+
+  private TSStatus checkLoginStatus(long sessionId) {
+    if (!serviceProvider.checkLogin(sessionId)) {
+      return getNotLoggedInStatus();
+    }
+    if (serviceProvider.checkSessionTimeout(sessionId)) {
+      return RpcUtils.getInfluxDBStatus(
+          TSStatusCode.SESSION_TIMEOUT.getStatusCode(), "Session timeout");
+    }
+    return RpcUtils.getInfluxDBStatus(TSStatusCode.SUCCESS_STATUS);
+  }
+
   @Override
   public TSStatus createDatabase(TSCreateDatabaseReq req) throws TException {
-    if (!serviceProvider.checkLogin(req.sessionId)) {
-      return getNotLoggedInStatus();
+    TSStatus loginStatus = checkLoginStatus(req.sessionId);
+    if (isStatusNotSuccess(loginStatus)) {
+      return loginStatus;
     }
     try {
       SetStorageGroupPlan setStorageGroupPlan =