diff options
| author | LAPTOP-CUUVN8AS\wk <[email protected]> | 2022-06-13 14:14:40 +0800 |
|---|---|---|
| committer | LAPTOP-CUUVN8AS\wk <[email protected]> | 2022-06-13 14:14:40 +0800 |
| commit | 035638fce7dad38eaec6263be814cc35ac593420 (patch) | |
| tree | 3d64f5d0909947ba26738aa76d2733437f2acc45 | |
| parent | 386fe585fd676ebb6bf701a4c058fc8d6b889dbd (diff) | |
对schema不含有表ttl的错误情况进行特殊处理
| -rw-r--r-- | galaxy-job-executor/src/main/java/com/mesalab/executor/jobhandler/LogStorageTtlJob.java | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/galaxy-job-executor/src/main/java/com/mesalab/executor/jobhandler/LogStorageTtlJob.java b/galaxy-job-executor/src/main/java/com/mesalab/executor/jobhandler/LogStorageTtlJob.java index 3218471..d6dfc79 100644 --- a/galaxy-job-executor/src/main/java/com/mesalab/executor/jobhandler/LogStorageTtlJob.java +++ b/galaxy-job-executor/src/main/java/com/mesalab/executor/jobhandler/LogStorageTtlJob.java @@ -224,10 +224,9 @@ public class LogStorageTtlJob { if (schemaobj.containsKey("doc")) { Map<String, Object> schemaHasDoc = (Map<String, Object>) schemaobj.get("doc"); - if (schemaHasDoc.containsKey("partition_key")) { - - if (schemaHasDoc.containsKey("ttl")) { + if (schemaHasDoc.containsKey("partition_key") && schemaHasDoc.containsKey("ttl")) { + if (schemaHasDoc.get("ttl")!=null && schemaHasDoc.get("partition_key")!=null) { ttltime = schemaHasDoc.get("ttl").toString().trim(); partitionKey = schemaHasDoc.get("partition_key").toString().trim(); } else { @@ -236,8 +235,8 @@ public class LogStorageTtlJob { } } else { - logger.error("table " + tablename + " schema not containsKey partition_key error "); - XxlJobLogger.log("table " + tablename + " schema not containsKey partition_key error "); + logger.error("table " + tablename + " schema not containsKey partition_key or ttl error "); + XxlJobLogger.log("table " + tablename + " schema not containsKey partition_key or ttl error "); } } else { logger.error("table " + tablename + " schema not containsKey doc error "); @@ -289,7 +288,6 @@ public class LogStorageTtlJob { } } catch (RuntimeException be) { - logger.error(" getChangeTtltables foreach table " + tablename + " error " + be.getMessage()); XxlJobLogger.log(" getChangeTtltables foreach table " + tablename + " error " + be.getMessage()); @@ -367,7 +365,7 @@ public class LogStorageTtlJob { return null; } } else { - logger.error("table " + tablename + " schema not exist "); + logger.warn("table " + tablename + " schema not exist "); XxlJobLogger.log(tablename + " table is not exist in schema !"); return null; } |