Make Active a non-terminal condition. (#2397)

Related to: #2394
knative · Nov 9, 2018 · 6a36566 · 6a36566
1 parent 2a6f37c
commit 6a36566
Show file tree

Hide file tree

Showing 5 changed files with 70 additions and 79 deletions.
diff --git a/pkg/apis/serving/v1alpha1/revision_types.go b/pkg/apis/serving/v1alpha1/revision_types.go
@@ -199,7 +199,6 @@ const (
 var revCondSet = duckv1alpha1.NewLivingConditionSet(
 	RevisionConditionResourcesAvailable,
 	RevisionConditionContainerHealthy,
-	RevisionConditionActive,
 	RevisionConditionBuildSucceeded,
 )
 

diff --git a/pkg/apis/serving/v1alpha1/revision_types_test.go b/pkg/apis/serving/v1alpha1/revision_types_test.go
@@ -501,7 +501,6 @@ func TestTypicalFlowWithSuspendResume(t *testing.T) {
 	checkConditionOngoingRevision(r.Status, RevisionConditionResourcesAvailable, t)
 	checkConditionOngoingRevision(r.Status, RevisionConditionContainerHealthy, t)
 	checkConditionOngoingRevision(r.Status, RevisionConditionReady, t)
-	checkConditionOngoingRevision(r.Status, RevisionConditionActive, t)
 
 	// Enter a Ready state.
 	r.Status.MarkActive()
@@ -527,9 +526,7 @@ func TestTypicalFlowWithSuspendResume(t *testing.T) {
 	if got := checkConditionFailedRevision(r.Status, RevisionConditionActive, t); got == nil || got.Reason != want {
 		t.Errorf("MarkInactive = %v, want %v", got, want)
 	}
-	if got := checkConditionFailedRevision(r.Status, RevisionConditionReady, t); got == nil || got.Reason != want {
-		t.Errorf("MarkInactive = %v, want %v", got, want)
-	}
+	checkConditionSucceededRevision(r.Status, RevisionConditionReady, t)
 
 	// From an Inactive state, start to activate the revision.
 	want = "Activating"
@@ -539,9 +536,7 @@ func TestTypicalFlowWithSuspendResume(t *testing.T) {
 	if got := checkConditionOngoingRevision(r.Status, RevisionConditionActive, t); got == nil || got.Reason != want {
 		t.Errorf("MarkInactive = %v, want %v", got, want)
 	}
-	if got := checkConditionOngoingRevision(r.Status, RevisionConditionReady, t); got == nil || got.Reason != want {
-		t.Errorf("MarkInactive = %v, want %v", got, want)
-	}
+	checkConditionSucceededRevision(r.Status, RevisionConditionReady, t)
 
 	// From the activating state, simulate the transition back to readiness.
 	r.Status.MarkActive()

diff --git a/pkg/reconciler/v1alpha1/revision/reconcile_resources.go b/pkg/reconciler/v1alpha1/revision/reconcile_resources.go
@@ -64,7 +64,7 @@ func (c *Reconciler) reconcileDeployment(ctx context.Context, rev *v1alpha1.Revi
 
 	// Now that we have a Deployment, determine whether there is any relevant
 	// status to surface in the Revision.
-	if hasDeploymentTimedOut(deployment) {
+	if hasDeploymentTimedOut(deployment) && !rev.Status.IsActivationRequired() {
 		rev.Status.MarkProgressDeadlineExceeded(fmt.Sprintf(
 			"Unable to create pods for more than %d seconds.", resources.ProgressDeadlineSeconds))
 		c.Recorder.Eventf(rev, corev1.EventTypeNormal, "ProgressDeadlineExceeded",
@@ -187,7 +187,7 @@ func (c *Reconciler) reconcileService(ctx context.Context, rev *v1alpha1.Revisio
 		// TODO(mattmoor): How to ensure this only fires once?
 		c.Recorder.Eventf(rev, corev1.EventTypeNormal, "RevisionReady",
 			"Revision becomes ready upon endpoint %q becoming ready", serviceName)
-	} else {
+	} else if !rev.Status.IsActivationRequired() {
 		// If the endpoints is NOT ready, then check whether it is taking unreasonably
 		// long to become ready and if so mark our revision as having timed out waiting
 		// for the Service to become ready.