@@ -205,10 +205,7 @@ func (bc *BuildController) nextBuildPhase(build *buildapi.Build) error {

 		build.Status.Reason = buildapi.StatusReasonCannotCreateBuildPod

 		return fmt.Errorf("failed to create build pod: %v", err)

 	}

-	if build.Annotations == nil {

-		build.Annotations = make(map[string]string)

-	}

-	build.Annotations[buildapi.BuildPodNameAnnotation] = podSpec.Name

+	setBuildPodNameAnnotation(build, podSpec.Name)

 	glog.V(4).Infof("Created pod for build: %#v", podSpec)

 	// Set the build phase, which will be persisted.

@@ -326,7 +323,8 @@ func (bc *BuildPodController) HandlePod(pod *kapi.Pod) error {

 	// Update the build object when it progress to a next state or the reason for

 	// the current state changed.

-	if build.Status.Phase != nextStatus && !buildutil.IsBuildComplete(build) {

+	if (!hasBuildPodNameAnnotation(build) || build.Status.Phase != nextStatus) && !buildutil.IsBuildComplete(build) {

+		setBuildPodNameAnnotation(build, pod.Name)

 		reason := ""

 		if len(build.Status.Reason) > 0 {

 			reason = " (" + string(build.Status.Reason) + ")"

@@ -441,3 +439,20 @@ func buildKey(pod *kapi.Pod) *buildapi.Build {

 		},

 	}

 }

+

+func hasBuildPodNameAnnotation(build *buildapi.Build) bool {

+	if build.Annotations == nil {

+		return false

+	}

+	_, hasAnnotation := build.Annotations[buildapi.BuildPodNameAnnotation]

+	return hasAnnotation

+}

+

+func setBuildPodNameAnnotation(build *buildapi.Build, podName string) {

+	if build.Annotations == nil {

+		build.Annotations = map[string]string{}

+	}

+	if _, hasAnnotation := build.Annotations[buildapi.BuildPodNameAnnotation]; !hasAnnotation {

+		build.Annotations[buildapi.BuildPodNameAnnotation] = podName

+	}

+}

@@ -542,7 +542,9 @@ func TestHandlePod(t *testing.T) {

 		if build.Status.Phase != tc.outStatus {

 			t.Errorf("(%d) Expected %s, got %s!", i, tc.outStatus, build.Status.Phase)

 		}

-

+		if tc.inStatus != buildapi.BuildPhaseCancelled && tc.inStatus != buildapi.BuildPhaseComplete && !hasBuildPodNameAnnotation(build) {

+			t.Errorf("(%d) Build does not have pod name annotation.", i)

+		}

 		if tc.startTimestamp == nil && build.Status.StartTimestamp != nil {

 			t.Errorf("(%d) Expected nil start timestamp, got %v!", i, build.Status.StartTimestamp)

 		}