This is an automated email from the ASF dual-hosted git repository. wangyang0918 pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/flink-kubernetes-operator.git
The following commit(s) were added to refs/heads/main by this push: new 021aec1 [FLINK-26649] Add startTime in JobStatus 021aec1 is described below commit 021aec1152358d5baa9394fa6f2ce69154c3cbf0 Author: SteNicholas <programg...@163.com> AuthorDate: Tue Mar 15 22:35:29 2022 +0800 [FLINK-26649] Add startTime in JobStatus This closes #65. --- docs/content/docs/custom-resource/reference.md | 3 ++- .../org/apache/flink/kubernetes/operator/crd/status/JobStatus.java | 3 +++ .../org/apache/flink/kubernetes/operator/observer/JobObserver.java | 4 ++-- .../apache/flink/kubernetes/operator/observer/JobObserverTest.java | 5 +++++ helm/flink-operator/crds/flinkdeployments.flink.apache.org-v1.yml | 2 ++ 5 files changed, 14 insertions(+), 3 deletions(-) diff --git a/docs/content/docs/custom-resource/reference.md b/docs/content/docs/custom-resource/reference.md index 614b959..82ccd36 100644 --- a/docs/content/docs/custom-resource/reference.md +++ b/docs/content/docs/custom-resource/reference.md @@ -148,7 +148,8 @@ This page serves as a full reference for FlinkDeployment custom resource definit | jobName | java.lang.String | Name of the job. | | jobId | java.lang.String | Flink JobId of the Job. | | state | java.lang.String | Last observed state of the job. | -| updateTime | java.lang.String | Start time of the job. | +| startTime | java.lang.String | Start time of the job. | +| updateTime | java.lang.String | Update time of the job. | | savepointInfo | org.apache.flink.kubernetes.operator.crd.status.SavepointInfo | Information about pending and last savepoint for the job. | ### ReconciliationStatus diff --git a/flink-kubernetes-operator/src/main/java/org/apache/flink/kubernetes/operator/crd/status/JobStatus.java b/flink-kubernetes-operator/src/main/java/org/apache/flink/kubernetes/operator/crd/status/JobStatus.java index f226bd5..b4fcd82 100644 --- a/flink-kubernetes-operator/src/main/java/org/apache/flink/kubernetes/operator/crd/status/JobStatus.java +++ b/flink-kubernetes-operator/src/main/java/org/apache/flink/kubernetes/operator/crd/status/JobStatus.java @@ -41,6 +41,9 @@ public class JobStatus { private String state; /** Start time of the job. */ + private String startTime; + + /** Update time of the job. */ private String updateTime; /** Information about pending and last savepoint for the job. */ diff --git a/flink-kubernetes-operator/src/main/java/org/apache/flink/kubernetes/operator/observer/JobObserver.java b/flink-kubernetes-operator/src/main/java/org/apache/flink/kubernetes/operator/observer/JobObserver.java index 026ad01..69c64e5 100644 --- a/flink-kubernetes-operator/src/main/java/org/apache/flink/kubernetes/operator/observer/JobObserver.java +++ b/flink-kubernetes-operator/src/main/java/org/apache/flink/kubernetes/operator/observer/JobObserver.java @@ -96,8 +96,8 @@ public class JobObserver extends BaseObserver { status.setState(newJob.getJobState().name()); status.setJobName(newJob.getJobName()); status.setJobId(newJob.getJobId().toHexString()); - // track the start time, changing timestamp would cause busy reconciliation - status.setUpdateTime(String.valueOf(newJob.getStartTime())); + status.setStartTime(String.valueOf(newJob.getStartTime())); + status.setUpdateTime(String.valueOf(System.currentTimeMillis())); } private void observeSavepointStatus(FlinkDeployment flinkApp, Configuration effectiveConfig) { diff --git a/flink-kubernetes-operator/src/test/java/org/apache/flink/kubernetes/operator/observer/JobObserverTest.java b/flink-kubernetes-operator/src/test/java/org/apache/flink/kubernetes/operator/observer/JobObserverTest.java index c3869a4..226ed8e 100644 --- a/flink-kubernetes-operator/src/test/java/org/apache/flink/kubernetes/operator/observer/JobObserverTest.java +++ b/flink-kubernetes-operator/src/test/java/org/apache/flink/kubernetes/operator/observer/JobObserverTest.java @@ -96,6 +96,11 @@ public class JobObserverTest { assertEquals( deployment.getMetadata().getName(), deployment.getStatus().getJobStatus().getJobName()); + assertEquals( + Long.valueOf(deployment.getStatus().getJobStatus().getUpdateTime()) + .compareTo( + Long.valueOf(deployment.getStatus().getJobStatus().getStartTime())), + 1); // Test listing failure flinkService.clear(); diff --git a/helm/flink-operator/crds/flinkdeployments.flink.apache.org-v1.yml b/helm/flink-operator/crds/flinkdeployments.flink.apache.org-v1.yml index 4ab435f..88a0ce8 100644 --- a/helm/flink-operator/crds/flinkdeployments.flink.apache.org-v1.yml +++ b/helm/flink-operator/crds/flinkdeployments.flink.apache.org-v1.yml @@ -9074,6 +9074,8 @@ spec: type: string state: type: string + startTime: + type: string updateTime: type: string savepointInfo: