[iotdb] branch master updated: [IOTDB-3505] Fix NPE when regionCleaner deletes schema regions after restart. (#6316)

[tanxinyu]

This is an automated email from the ASF dual-hosted git repository.

tanxinyu pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/iotdb.git


The following commit(s) were added to refs/heads/master by this push:
     new aabba8b548 [IOTDB-3505] Fix NPE when regionCleaner deletes schema 
regions after restart. (#6316)
aabba8b548 is described below

commit aabba8b54807fa3e64f4fde6331b9974bafac4f0
Author: cmlmakahts <82880298+cmlmaka...@users.noreply.github.com>
AuthorDate: Fri Jun 17 11:09:43 2022 +0800

    [IOTDB-3505] Fix NPE when regionCleaner deletes schema regions after 
restart. (#6316)
    
    Co-authored-by: luming 30005373 <lumin...@huawei.com>
---
 .../java/org/apache/iotdb/db/metadata/schemaregion/SchemaEngine.java  | 4 ++++
 1 file changed, 4 insertions(+)

diff --git 
a/server/src/main/java/org/apache/iotdb/db/metadata/schemaregion/SchemaEngine.java
 
b/server/src/main/java/org/apache/iotdb/db/metadata/schemaregion/SchemaEngine.java
index 77f9d8a791..30edd2bc31 100644
--- 
a/server/src/main/java/org/apache/iotdb/db/metadata/schemaregion/SchemaEngine.java
+++ 
b/server/src/main/java/org/apache/iotdb/db/metadata/schemaregion/SchemaEngine.java
@@ -330,6 +330,10 @@ public class SchemaEngine {
   public synchronized void deleteSchemaRegion(SchemaRegionId schemaRegionId)
       throws MetadataException {
     ISchemaRegion schemaRegion = schemaRegionMap.get(schemaRegionId);
+    if (schemaRegion == null) {
+      logger.warn("SchemaRegion(id = {}) has been deleted, skiped", 
schemaRegionId);
+      return;
+    }
     schemaRegion.deleteSchemaRegion();
     schemaRegionMap.remove(schemaRegionId);