-
Notifications
You must be signed in to change notification settings - Fork 456
[FLINK-33634] Add Conditions to Flink CRD's Status field #957
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
base: main
Are you sure you want to change the base?
Changes from all commits
afdf40b
1d84164
727bb4b
c66fd1f
c623f33
196c494
32294f4
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -18,17 +18,22 @@ | |
package org.apache.flink.kubernetes.operator.api.status; | ||
|
||
import org.apache.flink.annotation.Experimental; | ||
import org.apache.flink.api.common.JobStatus; | ||
import org.apache.flink.kubernetes.operator.api.spec.FlinkDeploymentSpec; | ||
import org.apache.flink.kubernetes.operator.api.utils.ConditionUtils; | ||
|
||
import com.fasterxml.jackson.annotation.JsonIgnoreProperties; | ||
import io.fabric8.kubernetes.api.model.Condition; | ||
import lombok.AllArgsConstructor; | ||
import lombok.Data; | ||
import lombok.EqualsAndHashCode; | ||
import lombok.NoArgsConstructor; | ||
import lombok.ToString; | ||
import lombok.experimental.SuperBuilder; | ||
|
||
import java.util.ArrayList; | ||
import java.util.HashMap; | ||
import java.util.List; | ||
import java.util.Map; | ||
|
||
/** Last observed status of the Flink deployment. */ | ||
|
@@ -55,4 +60,188 @@ public class FlinkDeploymentStatus extends CommonStatus<FlinkDeploymentSpec> { | |
|
||
/** Information about the TaskManagers for the scale subresource. */ | ||
private TaskManagerInfo taskManager; | ||
|
||
/** Condition of the CR . */ | ||
private List<Condition> conditions = new ArrayList<>(); | ||
|
||
private String phase; | ||
|
||
public List<Condition> getConditions() { | ||
if (reconciliationStatus != null | ||
&& reconciliationStatus.deserializeLastReconciledSpec() != null | ||
&& reconciliationStatus.deserializeLastReconciledSpec().getJob() == null) { | ||
// Populate conditions for SessionMode deployment | ||
switch (jobManagerDeploymentStatus) { | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. can we have a datastructure, keyed off the jobManagerDeploymentStatus, that we interrogate to get the inserts for the updateConditions. Maybe a map with the key of the status and the value of an object RunningCondition, that has 2 fields the boolean and the description. Something like :
then the code just loops through the map updating conditions using the map values. Similar for jobstatus There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Wondering will that add any value?. Any way to build the Map , we have to call There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I think you have pre built the map now - with map.of - looks good - thanks. |
||
case READY: | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. instead of this switch can we just issue
|
||
updateCondition( | ||
conditions, | ||
ConditionUtils.crCondition( | ||
ConditionUtils.SESSION_MODE_CONDITION.get( | ||
JobManagerDeploymentStatus.READY.name()))); | ||
break; | ||
case MISSING: | ||
updateCondition( | ||
conditions, | ||
ConditionUtils.crCondition( | ||
ConditionUtils.SESSION_MODE_CONDITION.get( | ||
JobManagerDeploymentStatus.MISSING.name()))); | ||
break; | ||
case DEPLOYING: | ||
updateCondition( | ||
conditions, | ||
ConditionUtils.crCondition( | ||
ConditionUtils.SESSION_MODE_CONDITION.get( | ||
JobManagerDeploymentStatus.DEPLOYING.name()))); | ||
break; | ||
case DEPLOYED_NOT_READY: | ||
updateCondition( | ||
conditions, | ||
ConditionUtils.crCondition( | ||
ConditionUtils.SESSION_MODE_CONDITION.get( | ||
JobManagerDeploymentStatus.DEPLOYED_NOT_READY.name()))); | ||
break; | ||
case ERROR: | ||
updateCondition( | ||
conditions, | ||
ConditionUtils.crCondition( | ||
ConditionUtils.SESSION_MODE_CONDITION.get( | ||
JobManagerDeploymentStatus.ERROR.name()))); | ||
} | ||
} else if (getJobStatus() != null && getJobStatus().getState() != null) { | ||
// Populate conditions for ApplicationMode deployment | ||
switch (getJobStatus().getState()) { | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. can this switch as-is be replaced with
|
||
case RECONCILING: | ||
updateCondition( | ||
conditions, | ||
ConditionUtils.crCondition( | ||
ConditionUtils.APPLICATION_MODE_CONDITION.get( | ||
JobStatus.RECONCILING.name()))); | ||
break; | ||
case CREATED: | ||
updateCondition( | ||
conditions, | ||
ConditionUtils.crCondition( | ||
ConditionUtils.APPLICATION_MODE_CONDITION.get( | ||
JobStatus.CREATED.name()))); | ||
break; | ||
case RUNNING: | ||
updateCondition( | ||
conditions, | ||
ConditionUtils.crCondition( | ||
ConditionUtils.APPLICATION_MODE_CONDITION.get( | ||
JobStatus.RUNNING.name()))); | ||
break; | ||
case FAILING: | ||
updateCondition( | ||
conditions, | ||
ConditionUtils.crCondition( | ||
ConditionUtils.APPLICATION_MODE_CONDITION.get( | ||
JobStatus.FAILING.name()))); | ||
break; | ||
case RESTARTING: | ||
updateCondition( | ||
conditions, | ||
ConditionUtils.crCondition( | ||
ConditionUtils.APPLICATION_MODE_CONDITION.get( | ||
JobStatus.RESTARTING.name()))); | ||
break; | ||
case FAILED: | ||
updateCondition( | ||
conditions, | ||
ConditionUtils.crCondition( | ||
ConditionUtils.APPLICATION_MODE_CONDITION.get( | ||
JobStatus.FAILED.name()))); | ||
break; | ||
case FINISHED: | ||
updateCondition( | ||
conditions, | ||
ConditionUtils.crCondition( | ||
ConditionUtils.APPLICATION_MODE_CONDITION.get( | ||
JobStatus.FINISHED.name()))); | ||
break; | ||
|
||
case CANCELED: | ||
updateCondition( | ||
conditions, | ||
ConditionUtils.crCondition( | ||
ConditionUtils.APPLICATION_MODE_CONDITION.get( | ||
JobStatus.CANCELED.name()))); | ||
break; | ||
case SUSPENDED: | ||
updateCondition( | ||
conditions, | ||
ConditionUtils.crCondition( | ||
ConditionUtils.APPLICATION_MODE_CONDITION.get( | ||
JobStatus.SUSPENDED.name()))); | ||
break; | ||
} | ||
} | ||
return conditions; | ||
} | ||
|
||
public String getPhase() { | ||
if (reconciliationStatus != null | ||
&& reconciliationStatus.deserializeLastReconciledSpec() != null | ||
&& reconciliationStatus.deserializeLastReconciledSpec().getJob() == null) { | ||
// populate phase for SessionMode deployment | ||
switch (jobManagerDeploymentStatus) { | ||
case READY: | ||
phase = "Running"; | ||
break; | ||
case MISSING: | ||
case DEPLOYING: | ||
phase = "Pending"; | ||
break; | ||
case ERROR: | ||
phase = "Failed"; | ||
break; | ||
} | ||
} else if (getJobStatus() != null && getJobStatus().getState() != null) { | ||
// populate phase for ApplicationMode deployment | ||
switch (getJobStatus().getState()) { | ||
case RECONCILING: | ||
phase = "Pending"; | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. why is this one not RECONCILING like the pattern the others follow others? I suggest a comment, also a constant is better then a an inline literal. There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Right, as mentioned here , As when FlinkDeployment applied in Application Mode, in the initial phase, as the JM brining up , job state would be in |
||
break; | ||
case CREATED: | ||
phase = JobStatus.CREATED.name(); | ||
break; | ||
case RUNNING: | ||
phase = JobStatus.RUNNING.name(); | ||
break; | ||
case FAILING: | ||
phase = JobStatus.FAILING.name(); | ||
break; | ||
case RESTARTING: | ||
phase = JobStatus.RESTARTING.name(); | ||
break; | ||
case FAILED: | ||
phase = JobStatus.FAILED.name(); | ||
break; | ||
case FINISHED: | ||
phase = JobStatus.FINISHED.name(); | ||
break; | ||
case CANCELED: | ||
phase = JobStatus.CANCELED.name(); | ||
break; | ||
case SUSPENDED: | ||
phase = JobStatus.SUSPENDED.name(); | ||
break; | ||
} | ||
} | ||
return phase; | ||
} | ||
|
||
private static void updateCondition(List<Condition> conditions, Condition condition) { | ||
if (conditions.isEmpty()) { | ||
conditions.add(condition); | ||
return; | ||
} | ||
// If new condition is same as last condition, ignore | ||
Condition existingCondition = conditions.get(conditions.size() - 1); | ||
if (existingCondition.getType().equals(condition.getType()) | ||
&& existingCondition.getMessage().equals(condition.getMessage())) { | ||
return; | ||
} | ||
conditions.add(condition); | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. It's maybe just me, just don't get how this list is truncated eventually, in other words, how is it prevented from growing indefinitely? There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Thanks for review @csviri . Right now it's not preventing from growing indefinitely. As conditions reflects the different transitions state of Job/Deployment , thinking what could be the use case where can grow indefinitely?. There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I think there should only ever be a single condition of type There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Thanks @gyfora for review , If I read correctly , you meant that we need to have only condition in the list at right now as we have only one type There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. @lajith2006 you say |
||
} | ||
} |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,143 @@ | ||
/* | ||
* Licensed to the Apache Software Foundation (ASF) under one or more | ||
* contributor license agreements. See the NOTICE file distributed with | ||
* this work for additional information regarding copyright ownership. | ||
* The ASF licenses this file to You under the Apache License, Version 2.0 | ||
* (the "License"); you may not use this file except in compliance with | ||
* the License. You may obtain a copy of the License at | ||
* | ||
* http://www.apache.org/licenses/LICENSE-2.0 | ||
* | ||
* Unless required by applicable law or agreed to in writing, software | ||
* distributed under the License is distributed on an "AS IS" BASIS, | ||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
* See the License for the specific language governing permissions and | ||
* limitations under the License. | ||
*/ | ||
|
||
package org.apache.flink.kubernetes.operator.api.utils; | ||
|
||
import org.apache.flink.api.common.JobStatus; | ||
import org.apache.flink.kubernetes.operator.api.status.JobManagerDeploymentStatus; | ||
|
||
import io.fabric8.kubernetes.api.model.Condition; | ||
import io.fabric8.kubernetes.api.model.ConditionBuilder; | ||
|
||
import java.text.SimpleDateFormat; | ||
import java.util.Date; | ||
import java.util.Map; | ||
|
||
/** Creates a condition object with the type, status, message and reason. */ | ||
public class ConditionUtils { | ||
public static Condition crCondition(Condition condition) { | ||
return new ConditionBuilder(condition) | ||
.withLastTransitionTime( | ||
new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'Z'").format(new Date())) | ||
.build(); | ||
} | ||
|
||
public static final Map<String, Condition> SESSION_MODE_CONDITION = | ||
Map.of( | ||
JobManagerDeploymentStatus.READY.name(), | ||
new ConditionBuilder() | ||
.withType("Running") | ||
.withStatus("True") | ||
.withMessage("Ready") | ||
.withReason("JobManager is running and ready to receive REST API calls") | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. isn't the reason - how it got to this state, not a description of the state itself? |
||
.build(), | ||
JobManagerDeploymentStatus.MISSING.name(), | ||
new ConditionBuilder() | ||
.withType("Running") | ||
.withStatus("False") | ||
.withMessage("Missing") | ||
.withReason("JobManager deployment not found") | ||
.build(), | ||
JobManagerDeploymentStatus.DEPLOYING.name(), | ||
new ConditionBuilder() | ||
.withType("Running") | ||
.withStatus("False") | ||
.withMessage("Deploying") | ||
.withReason("JobManager process is starting up") | ||
.build(), | ||
JobManagerDeploymentStatus.DEPLOYED_NOT_READY.name(), | ||
new ConditionBuilder() | ||
.withType("Running") | ||
.withStatus("False") | ||
.withMessage("DeployedNotReady") | ||
.withReason( | ||
"JobManager is running but not ready yet to receive REST API calls") | ||
.build(), | ||
JobManagerDeploymentStatus.ERROR.name(), | ||
new ConditionBuilder() | ||
.withType("Running") | ||
.withStatus("False") | ||
.withMessage("Error") | ||
.withReason("JobManager deployment failed") | ||
.build()); | ||
|
||
public static final Map<String, Condition> APPLICATION_MODE_CONDITION = | ||
Map.of( | ||
JobStatus.RECONCILING.name(), | ||
new ConditionBuilder() | ||
.withType("Running") | ||
.withStatus("False") | ||
.withMessage("Reconciling") | ||
.withReason("Job is currently reconciling") | ||
.build(), | ||
JobStatus.CREATED.name(), | ||
new ConditionBuilder() | ||
.withType("Running") | ||
.withStatus("False") | ||
.withMessage("JobCreated") | ||
.withReason("Job is created") | ||
.build(), | ||
JobStatus.RUNNING.name(), | ||
new ConditionBuilder() | ||
.withType("Running") | ||
.withStatus("True") | ||
.withMessage("JobRunning") | ||
.withReason("Job is running") | ||
.build(), | ||
JobStatus.FAILING.name(), | ||
new ConditionBuilder() | ||
.withType("Running") | ||
.withStatus("False") | ||
.withMessage("JobFailing") | ||
.withReason("Job has failed") | ||
.build(), | ||
JobStatus.RESTARTING.name(), | ||
new ConditionBuilder() | ||
.withType("Running") | ||
.withStatus("False") | ||
.withMessage("JobRestarting") | ||
.withReason("The job is currently restarting") | ||
.build(), | ||
JobStatus.FAILED.name(), | ||
new ConditionBuilder() | ||
.withType("Running") | ||
.withStatus("False") | ||
.withMessage("JobFailed") | ||
.withReason("The job has failed with a non-recoverable task failure") | ||
.build(), | ||
JobStatus.FINISHED.name(), | ||
new ConditionBuilder() | ||
.withType("Running") | ||
.withStatus("False") | ||
.withMessage("JobFinished") | ||
.withReason("Job's tasks have successfully finished") | ||
.build(), | ||
JobStatus.CANCELED.name(), | ||
new ConditionBuilder() | ||
.withType("Running") | ||
.withStatus("False") | ||
.withMessage("JobCancelled") | ||
.withReason("Job has been cancelled") | ||
.build(), | ||
JobStatus.SUSPENDED.name(), | ||
new ConditionBuilder() | ||
.withType("Running") | ||
.withStatus("False") | ||
.withMessage("JobSuspended") | ||
.withReason("The job has been suspended") | ||
.build()); | ||
} |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I am curious which parts of the code refer to application mode and which are session cluster. It would be good to have some comments to detail this and maybe use the mode name in method name or variable names to make this more intuitive to read.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I will add comments in the respective code.