Merge pull request #12057 from mmilata/bz1300949-buildconfig-deletion

Merged by openshift-bot

Author: OpenShift Bot

pkg/build/api/types.go

@@ -309,6 +309,10 @@ const (
 	// StatusReasonDockerBuildFailed indicates that the docker build strategy has
 	// failed.
 	StatusReasonDockerBuildFailed StatusReason = "DockerBuildFailed"
+
+	// StatusReasonBuildPodExists indicates that the build tried to create a
+	// build pod but one was already present.
+	StatusReasonBuildPodExists = "BuildPodExists"
 )
 
 // NOTE: These messages might change.
@@ -326,6 +330,7 @@ const (
 	StatusMessageFetchSourceFailed         = "Failed to fetch the input source"
 	StatusMessageCancelledBuild            = "The build was cancelled by the user"
 	StatusMessageDockerBuildFailed         = "Docker build strategy has failed"
+	StatusMessageBuildPodExists            = "The pod for this build already exists and is older than the build"
 )
 
 // BuildSource is the input used for the build.

pkg/build/controller/controller.go

@@ -210,6 +210,14 @@ func (bc *BuildController) nextBuildPhase(build *buildapi.Build) error {
 		if errors.IsAlreadyExists(err) {
 			bc.Recorder.Eventf(build, kapi.EventTypeWarning, "FailedCreate", "Pod already exists: %s/%s", podSpec.Namespace, podSpec.Name)
 			glog.V(4).Infof("Build pod already existed: %#v", podSpec)
+
+			// If the existing pod was created before this build, switch to Error state.
+			existingPod, err := bc.PodManager.GetPod(podSpec.Namespace, podSpec.Name)
+			if err == nil && existingPod.CreationTimestamp.Before(build.CreationTimestamp) {
+				build.Status.Phase = buildapi.BuildPhaseError
+				build.Status.Reason = buildapi.StatusReasonBuildPodExists
+				build.Status.Message = buildapi.StatusMessageBuildPodExists
+			}
 			return nil
 		}
 		// Log an event if the pod is not created (most likely due to quota denial).