[zeppelin] branch master updated: [hotfix] Remove execution.savepoint.path when savepointPath is empty

[zj...@apache.org]

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

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


The following commit(s) were added to refs/heads/master by this push:
     new 567fce2  [hotfix] Remove execution.savepoint.path when savepointPath is empty
567fce2 is described below

commit 567fce2f1559338688f3cea5126749c0dbcff418
Author: Jeff Zhang <zj...@apache.org>
AuthorDate: Tue Jun 30 13:09:34 2020 +0800

    [hotfix] Remove execution.savepoint.path when savepointPath is empty
---
 .../scala/org/apache/zeppelin/flink/FlinkScalaInterpreter.scala    | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/flink/interpreter/src/main/scala/org/apache/zeppelin/flink/FlinkScalaInterpreter.scala b/flink/interpreter/src/main/scala/org/apache/zeppelin/flink/FlinkScalaInterpreter.scala
index 1307108..ec87206 100644
--- a/flink/interpreter/src/main/scala/org/apache/zeppelin/flink/FlinkScalaInterpreter.scala
+++ b/flink/interpreter/src/main/scala/org/apache/zeppelin/flink/FlinkScalaInterpreter.scala
@@ -653,6 +653,10 @@ class FlinkScalaInterpreter(val properties: Properties) {
       LOGGER.info("savepointPath has been setup by user , savepointPath = {}", savepointPath)
       configuration.setString("execution.savepoint.path", savepointPath)
       return
+    } else if ("".equals(savepointPath)) {
+      LOGGER.info("savepointPath is empty, remove execution.savepoint.path")
+      configuration.removeConfig(SavepointConfigOptions.SAVEPOINT_PATH);
+      return;
     }
 
     if (!StringUtils.isBlank(savepointDir)) {
@@ -665,9 +669,6 @@ class FlinkScalaInterpreter(val properties: Properties) {
         LOGGER.info("Set savepointPath to: " + savepointPath.toString)
         configuration.setString("execution.savepoint.path", savepointPath.toString)
       }
-    } else {
-      // remove the SAVEPOINT_PATH which may be set by last job.
-      configuration.removeConfig(SavepointConfigOptions.SAVEPOINT_PATH)
     }
   }