diff options
| author | zhanghongqing <[email protected]> | 2020-09-29 15:23:41 +0800 |
|---|---|---|
| committer | zhanghongqing <[email protected]> | 2020-09-29 15:23:41 +0800 |
| commit | e15af5e12a4671cfaa87791c43b0fd24837b2e58 (patch) | |
| tree | e957e854722a1c004af154c46ce7040aac4fbcac | |
| parent | 6ddce5d8a5fb8f77ee9c7f4c4bee823ab6374fbf (diff) | |
1.修改http超时时间为120s，修改日志显示
4 files changed, 6 insertions, 8 deletions
diff --git a/galaxy-job-admin/pom.xml b/galaxy-job-admin/pom.xml index ddf97e0..5d4f1b1 100644 --- a/galaxy-job-admin/pom.xml +++ b/galaxy-job-admin/pom.xml @@ -87,7 +87,7 @@ <JAR_FILE>${project.build.finalName}.jar</JAR_FILE> </buildArgs> <imageTags> - <imageTag>v1.1.20200924</imageTag> + <imageTag>v1.1.20200925</imageTag> </imageTags> <!--将构建jar拷贝到/target/docker 目录下与dockerfile一起--> diff --git a/galaxy-job-executor/pom.xml b/galaxy-job-executor/pom.xml index 6084d9a..c2ccdf1 100644 --- a/galaxy-job-executor/pom.xml +++ b/galaxy-job-executor/pom.xml @@ -99,7 +99,7 @@ <JAR_FILE>${project.build.finalName}.jar</JAR_FILE> </buildArgs> <imageTags> - <imageTag>v1.1.20200924</imageTag> + <imageTag>v1.1.20200927</imageTag> </imageTags> <resources> <resource> diff --git a/galaxy-job-executor/src/main/java/com/mesalab/executor/jobhandler/LogStorageQuotaJob.java b/galaxy-job-executor/src/main/java/com/mesalab/executor/jobhandler/LogStorageQuotaJob.java index e15f3ee..f312a4c 100644 --- a/galaxy-job-executor/src/main/java/com/mesalab/executor/jobhandler/LogStorageQuotaJob.java +++ b/galaxy-job-executor/src/main/java/com/mesalab/executor/jobhandler/LogStorageQuotaJob.java @@ -295,12 +295,10 @@ public class LogStorageQuotaJob { for (ListAllMyBucketsResult.Buckets.Bucket bucket : bucketList) { try { HttpClientUtils.httpPut(Joiner.on("").join(filesServer, "/hos/", bucket.getName(), "?lifecycle"), XmlUtil.converToXml(lc), headers); - //调用合并接口 - // HttpClientUtils.httpDelete(Joiner.on("").join(filesServer, "/hos/", bucket.getName(), "?compact"), headers); } catch (Exception e) { failCount++; - logger.error("reset storage files ttl failCount = {}, endpoint = {}, bucket = {}, fail message = {}", failCount, endpoint, bucket, e.getMessage()); - XxlJobLogger.log("reset storage files ttl failCount = {}, endpoint = {}, bucket = {}, fail message = {}", failCount, endpoint, bucket, e.getMessage()); + logger.error("reset storage files ttl failCount = {}, endpoint = {}, bucket = {}, fail message = {}", failCount, endpoint, bucket, JobUtil.getErrorMsg(e)); + XxlJobLogger.log("reset storage files ttl failCount = {}, endpoint = {}, bucket = {}, fail message = {}", failCount, endpoint, bucket, JobUtil.getErrorMsg(e)); } } } diff --git a/galaxy-job-executor/src/main/resources/application.properties b/galaxy-job-executor/src/main/resources/application.properties index 6012006..9244631 100644 --- a/galaxy-job-executor/src/main/resources/application.properties +++ b/galaxy-job-executor/src/main/resources/application.properties @@ -28,9 +28,9 @@ xxl.job.executor.logretentiondays=30 ### max connection number http.pool.max.connection=500 -http.pool.request.timeout=20000 +http.pool.request.timeout=120000 -http.pool.response.timeout=20000 +http.pool.response.timeout=120000 http.pool.max.per.route=300 |