You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@zeppelin.apache.org by zj...@apache.org on 2020/08/09 10:25:57 UTC
[zeppelin] branch branch-0.9 updated: [minor] property name change
of Flink Interprter
This is an automated email from the ASF dual-hosted git repository.
zjffdu pushed a commit to branch branch-0.9
in repository https://gitbox.apache.org/repos/asf/zeppelin.git
The following commit(s) were added to refs/heads/branch-0.9 by this push:
new 762b19e [minor] property name change of Flink Interprter
762b19e is described below
commit 762b19e9e9ade13f236db3b370890ef8b5031173
Author: Jeff Zhang <zj...@apache.org>
AuthorDate: Sun Aug 9 18:25:02 2020 +0800
[minor] property name change of Flink Interprter
---
docs/interpreter/flink.md | 8 ++++----
.../src/main/java/org/apache/zeppelin/flink/JobManager.java | 6 +++---
.../scala/org/apache/zeppelin/flink/FlinkScalaInterpreter.scala | 4 ++--
3 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/docs/interpreter/flink.md b/docs/interpreter/flink.md
index 3dfffa3..2eaea6d 100644
--- a/docs/interpreter/flink.md
+++ b/docs/interpreter/flink.md
@@ -452,17 +452,17 @@ In this section, we will list and explain all the supported local properties in
<td>Used in %flink.ssql & %flink.bsql to specify the flink sql job max parallelism in case you want to change parallelism later. For more details, refer this [link](https://ci.apache.org/projects/flink/flink-docs-release-1.10/dev/parallel.html#setting-the-maximum-parallelism) </td>
</tr>
<tr>
- <td>savePointDir</td>
+ <td>savepointDir</td>
<td></td>
<td>If you specify it, then when you cancel your flink job in Zeppelin, it would also do savepoint and store state in this directory. And when you resume your job, it would resume from this savepoint.</td>
</tr>
<tr>
- <td>resumeFromSavePoint</td>
+ <td>resumeFromSavepoint</td>
<td></td>
- <td>Resume flink job from savepoint if you specify savePointDir.</td>
+ <td>Resume flink job from savepoint if you specify savepointDir.</td>
</tr>
<tr>
- <td>resumeFromLatestCheckPoint</td>
+ <td>resumeFromLatestCheckpoint</td>
<td></td>
<td>Resume flink job from latest checkpoint if you enable checkpoint.</td>
</tr>
diff --git a/flink/interpreter/src/main/java/org/apache/zeppelin/flink/JobManager.java b/flink/interpreter/src/main/java/org/apache/zeppelin/flink/JobManager.java
index efceda1..78b0af8 100644
--- a/flink/interpreter/src/main/java/org/apache/zeppelin/flink/JobManager.java
+++ b/flink/interpreter/src/main/java/org/apache/zeppelin/flink/JobManager.java
@@ -40,9 +40,9 @@ public class JobManager {
private static Logger LOGGER = LoggerFactory.getLogger(JobManager.class);
public static final String LATEST_CHECKPOINT_PATH = "latest_checkpoint_path";
public static final String SAVEPOINT_PATH = "savepoint_path";
- public static final String RESUME_FROM_SAVEPOINT = "resumeFromSavePoint";
- public static final String RESUME_FROM_CHECKPOINT = "resumeFromLatestCheckPoint";
- public static final String SAVEPOINT_DIR = "savePointDir";
+ public static final String RESUME_FROM_SAVEPOINT = "resumeFromSavepoint";
+ public static final String RESUME_FROM_CHECKPOINT = "resumeFromLatestCheckpoint";
+ public static final String SAVEPOINT_DIR = "savepointDir";
private Map<String, JobClient> jobs = new HashMap<>();
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 81982db..46b8808 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
@@ -647,8 +647,8 @@ class FlinkScalaInterpreter(val properties: Properties) {
*/
def setSavePointPathIfNecessary(context: InterpreterContext): Unit = {
val savepointPath = context.getConfig.getOrDefault(JobManager.SAVEPOINT_PATH, "").toString
- val resumeFromSavePoint = context.getBooleanLocalProperty(JobManager.RESUME_FROM_SAVEPOINT, true)
- if (!StringUtils.isBlank(savepointPath) && resumeFromSavePoint){
+ val resumeFromSavepoint = context.getBooleanLocalProperty(JobManager.RESUME_FROM_SAVEPOINT, true)
+ if (!StringUtils.isBlank(savepointPath) && resumeFromSavepoint){
LOGGER.info("Resume job from savepoint , savepointPath = {}", savepointPath)
configuration.setString("execution.savepoint.path", savepointPath)
return