[incubator-dolphinscheduler] branch dev updated: fix: No operations allowed after statement closed when running sql task (#2265)

[lidongdai]

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

lidongdai pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/incubator-dolphinscheduler.git


The following commit(s) were added to refs/heads/dev by this push:
     new 85f55cd  fix: No operations allowed after statement closed when 
running sql task (#2265)
85f55cd is described below

commit 85f55cd5f927050fac10361a0d705344e2730b93
Author: songquanhe-gitstudy <1172417...@qq.com>
AuthorDate: Sun Mar 22 22:32:20 2020 +0800

    fix: No operations allowed after statement closed when running sql task 
(#2265)
    
    * sqlTask failed to run
    
    * get correct attribute value and logger content
    
    Co-authored-by: songqh <songqua...@foxmail.com>
---
 .../dolphinscheduler/common/utils/OSUtils.java     |  6 +++---
 .../server/worker/config/WorkerConfig.java         |  2 +-
 .../server/worker/task/sql/SqlTask.java            | 24 +++++++++++-----------
 3 files changed, 16 insertions(+), 16 deletions(-)

diff --git 
a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/utils/OSUtils.java
 
b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/utils/OSUtils.java
index b011c0b..a0fea8d 100644
--- 
a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/utils/OSUtils.java
+++ 
b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/utils/OSUtils.java
@@ -425,13 +425,13 @@ public class OSUtils {
    * @return check memory and cpu usage
    */
   public static Boolean checkResource(double systemCpuLoad, double 
systemReservedMemory){
-    // judging usage
+    // system load average
     double loadAverage = OSUtils.loadAverage();
-    //
+    // system available physical memory
     double availablePhysicalMemorySize = OSUtils.availablePhysicalMemorySize();
 
     if(loadAverage > systemCpuLoad || availablePhysicalMemorySize < 
systemReservedMemory){
-      logger.warn("load or availablePhysicalMemorySize(G) is too high, it's 
availablePhysicalMemorySize(G):{},loadAvg:{}", availablePhysicalMemorySize , 
loadAverage);
+      logger.warn("load is too high or availablePhysicalMemorySize(G) is too 
low, it's availablePhysicalMemorySize(G):{},loadAvg:{}", 
availablePhysicalMemorySize , loadAverage);
       return false;
     }else{
       return true;
diff --git 
a/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/config/WorkerConfig.java
 
b/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/config/WorkerConfig.java
index c4d4b61..aaaf5c7 100644
--- 
a/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/config/WorkerConfig.java
+++ 
b/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/config/WorkerConfig.java
@@ -34,7 +34,7 @@ public class WorkerConfig {
     @Value("${worker.max.cpuload.avg}")
     private int workerMaxCpuloadAvg;
 
-    @Value("${master.reserved.memory}")
+    @Value("${worker.reserved.memory}")
     private double workerReservedMemory;
 
     public int getWorkerExecThreads() {
diff --git 
a/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/task/sql/SqlTask.java
 
b/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/task/sql/SqlTask.java
index 71ab56b..f7070b1 100644
--- 
a/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/task/sql/SqlTask.java
+++ 
b/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/task/sql/SqlTask.java
@@ -363,20 +363,20 @@ public class SqlTask extends AbstractTask {
         // is the timeout set
         boolean timeoutFlag = taskProps.getTaskTimeoutStrategy() == 
TaskTimeoutStrategy.FAILED ||
                 taskProps.getTaskTimeoutStrategy() == 
TaskTimeoutStrategy.WARNFAILED;
-        try (PreparedStatement  stmt = 
connection.prepareStatement(sqlBinds.getSql())) {
-            if(timeoutFlag){
-                stmt.setQueryTimeout(taskProps.getTaskTimeout());
-            }
-            Map<Integer, Property> params = sqlBinds.getParamsMap();
-            if(params != null) {
-                for (Map.Entry<Integer, Property> entry : params.entrySet()) {
-                    Property prop = entry.getValue();
-                    ParameterUtils.setInParameter(entry.getKey(), stmt, 
prop.getType(), prop.getValue());
-                }
+        // prepare statement
+        PreparedStatement stmt = 
connection.prepareStatement(sqlBinds.getSql());
+        if(timeoutFlag){
+            stmt.setQueryTimeout(taskProps.getTaskTimeout());
+        }
+        Map<Integer, Property> params = sqlBinds.getParamsMap();
+        if(params != null) {
+            for (Map.Entry<Integer, Property> entry : params.entrySet()) {
+                Property prop = entry.getValue();
+                ParameterUtils.setInParameter(entry.getKey(), stmt, 
prop.getType(), prop.getValue());
             }
-            logger.info("prepare statement replace sql : {} ", stmt);
-            return stmt;
         }
+        logger.info("prepare statement replace sql : {} ", stmt);
+        return stmt;
     }
 
     /**