This is an automated email from the ASF dual-hosted git repository.
hxd pushed a commit to branch iotdb-832
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git
The following commit(s) were added to refs/heads/iotdb-832 by this push:
new 4847a1b add an error code for 'sg not ready'
4847a1b is described below
commit 4847a1b4a311adcb6d3fcffde1ff06b71b392a60
Author: xiangdong huang <[email protected]>
AuthorDate: Tue Aug 11 00:25:08 2020 +0800
add an error code for 'sg not ready'
---
docs/UserGuide/Client/Status Codes.md | 1 +
docs/zh/UserGuide/Client/Status Codes.md | 1 +
server/src/main/java/org/apache/iotdb/db/engine/StorageEngine.java | 4 +++-
service-rpc/src/main/java/org/apache/iotdb/rpc/TSStatusCode.java | 1 +
4 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/docs/UserGuide/Client/Status Codes.md
b/docs/UserGuide/Client/Status Codes.md
index 55245a4..bb85281 100644
--- a/docs/UserGuide/Client/Status Codes.md
+++ b/docs/UserGuide/Client/Status Codes.md
@@ -66,6 +66,7 @@ Here is a list of Status Code and related message:
|314|TSFILE_PROCESSOR_ERROR|TsFile processor related error|
|315|PATH_ILLEGAL|Illegal path|
|316|LOAD_FILE_ERROR|Meet error while loading file|
+|317|STORAGE_GROUP_NOT_READY| The storage group is in recovery mode, not ready
fore accepting read/write operation|
|400|EXECUTE_STATEMENT_ERROR|Execute statement error|
|401|SQL_PARSE_ERROR|Meet error while parsing SQL|
|402|GENERATE_TIME_ZONE_ERROR|Meet error while generating time zone|
diff --git a/docs/zh/UserGuide/Client/Status Codes.md
b/docs/zh/UserGuide/Client/Status Codes.md
index f509e63..a1ca981 100644
--- a/docs/zh/UserGuide/Client/Status Codes.md
+++ b/docs/zh/UserGuide/Client/Status Codes.md
@@ -66,6 +66,7 @@ try {
|314|TSFILE_PROCESSOR_ERROR|TsFile处理器相关错误|
|315|PATH_ILLEGAL|路径不合法|
|316|LOAD_FILE_ERROR|加载文件错误|
+|317|STORAGE_GROUP_NOT_READY| 存储组还在恢复中，还不能接受读写操作 |
|400|EXECUTE_STATEMENT_ERROR|执行语句错误|
|401|SQL_PARSE_ERROR|SQL语句分析错误|
|402|GENERATE_TIME_ZONE_ERROR|生成时区错误|
diff --git a/server/src/main/java/org/apache/iotdb/db/engine/StorageEngine.java
b/server/src/main/java/org/apache/iotdb/db/engine/StorageEngine.java
index a11e944..57f97ff 100644
--- a/server/src/main/java/org/apache/iotdb/db/engine/StorageEngine.java
+++ b/server/src/main/java/org/apache/iotdb/db/engine/StorageEngine.java
@@ -47,6 +47,7 @@ import org.apache.iotdb.db.service.ServiceType;
import org.apache.iotdb.db.utils.FilePathUtils;
import org.apache.iotdb.db.utils.TestOnly;
import org.apache.iotdb.db.utils.UpgradeUtils;
+import org.apache.iotdb.rpc.TSStatusCode;
import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType;
import org.apache.iotdb.tsfile.read.expression.impl.SingleSeriesExpression;
import org.slf4j.Logger;
@@ -293,7 +294,8 @@ public class StorageEngine implements IService {
}
} else {
// not finished recover, refuse the request
- throw new StorageEngineException("the sg " + storageGroupName + "
may not ready now, please wait and retry later");
+ throw new StorageEngineException("the sg " + storageGroupName + "
may not ready now, please wait and retry later",
+ TSStatusCode.STORAGE_GROUP_NOT_READY.getStatusCode());
}
}
return processor;
diff --git a/service-rpc/src/main/java/org/apache/iotdb/rpc/TSStatusCode.java
b/service-rpc/src/main/java/org/apache/iotdb/rpc/TSStatusCode.java
index 08aa3ad..ba3fdb6 100644
--- a/service-rpc/src/main/java/org/apache/iotdb/rpc/TSStatusCode.java
+++ b/service-rpc/src/main/java/org/apache/iotdb/rpc/TSStatusCode.java
@@ -43,6 +43,7 @@ public enum TSStatusCode {
TSFILE_PROCESSOR_ERROR(314),
PATH_ILLEGAL(315),
LOAD_FILE_ERROR(316),
+ STORAGE_GROUP_NOT_READY(317),
EXECUTE_STATEMENT_ERROR(400),
SQL_PARSE_ERROR(401),
