@@ -305,8 +305,9 @@ func (c *MasterConfig) RunDeploymentController() {

 // RunDeployerPodController starts the deployer pod controller process.

 func (c *MasterConfig) RunDeployerPodController() {

-	_, kclient := c.DeployerPodControllerClients()

+	osclient, kclient := c.DeployerPodControllerClients()

 	factory := deployerpodcontroller.DeployerPodControllerFactory{

+		Client:     osclient,

 		KubeClient: kclient,

 		Codec:      c.EtcdHelper.Codec(),

 	}

@@ -2,6 +2,7 @@ package deployerpod

 import (

 	"fmt"

+	"strconv"

 	"github.com/golang/glog"

@@ -10,6 +11,7 @@ import (

 	"k8s.io/kubernetes/pkg/client/cache"

 	kclient "k8s.io/kubernetes/pkg/client/unversioned"

+	osclient "github.com/openshift/origin/pkg/client"

 	deployapi "github.com/openshift/origin/pkg/deploy/api"

 	deployutil "github.com/openshift/origin/pkg/deploy/util"

 )

@@ -20,6 +22,7 @@ import (

 // Use the DeployerPodControllerFactory to create this controller.

 type DeployerPodController struct {

 	store   cache.Store

+	client  osclient.Interface

 	kClient kclient.Interface

 	// decodeConfig knows how to decode the deploymentConfig from a deployment's annotations.

@@ -94,14 +97,8 @@ func (c *DeployerPodController) Handle(pod *kapi.Pod) error {

 			nextStatus = deployapi.DeploymentStatusRunning

 		}

 	case kapi.PodSucceeded:

-		// Detect failure based on the container state

 		nextStatus = deployapi.DeploymentStatusComplete

-		for _, info := range pod.Status.ContainerStatuses {

-			if info.State.Terminated != nil && info.State.Terminated.ExitCode != 0 {

-				nextStatus = deployapi.DeploymentStatusFailed

-				break

-			}

-		}

+

 		// Sync the internal replica annotation with the target so that we can

 		// distinguish deployer updates from other scaling events.

 		deployment.Annotations[deployapi.DeploymentReplicasAnnotation] = deployment.Annotations[deployapi.DesiredReplicasAnnotation]

@@ -131,6 +128,27 @@ func (c *DeployerPodController) Handle(pod *kapi.Pod) error {

 			return fmt.Errorf("couldn't update Deployment %s to status %s: %v", deployutil.LabelForDeployment(deployment), nextStatus, err)

 		}

 		glog.V(4).Infof("Updated deployment %s status from %s to %s (scale: %d)", deployutil.LabelForDeployment(deployment), currentStatus, nextStatus, deployment.Spec.Replicas)

+

+		// If the deployment was canceled, trigger a reconcilation of its deployment config

+		// so that the latest complete deployment can immediately rollback in place of the

+		// canceled deployment.

+		if nextStatus == deployapi.DeploymentStatusFailed && deployutil.IsDeploymentCancelled(deployment) {

+			// If we are unable to get the deployment config, then the deploymentconfig controller will

+			// perform its duties once the resync interval forces the deploymentconfig to be reconciled.

+			name := deployutil.DeploymentConfigNameFor(deployment)

+			kclient.RetryOnConflict(kclient.DefaultRetry, func() error {

+				config, err := c.client.DeploymentConfigs(deployment.Namespace).Get(name)

+				if err != nil {

+					return err

+				}

+				if config.Annotations == nil {

+					config.Annotations = make(map[string]string)

+				}

+				config.Annotations[deployapi.DeploymentCancelledAnnotation] = strconv.Itoa(config.Status.LatestVersion)

+				_, err = c.client.DeploymentConfigs(config.Namespace).Update(config)

+				return err

+			})

+		}

 	}

 	return nil

@@ -10,12 +10,65 @@ import (

 	"k8s.io/kubernetes/pkg/runtime"

 	"k8s.io/kubernetes/pkg/util/sets"

+	"github.com/openshift/origin/pkg/client/testclient"

 	deployapi "github.com/openshift/origin/pkg/deploy/api"

 	_ "github.com/openshift/origin/pkg/deploy/api/install"

 	deploytest "github.com/openshift/origin/pkg/deploy/api/test"

 	deployutil "github.com/openshift/origin/pkg/deploy/util"

 )

+func okPod(deployment *kapi.ReplicationController) *kapi.Pod {

+	return &kapi.Pod{

+		ObjectMeta: kapi.ObjectMeta{

+			Name: deployutil.DeployerPodNameForDeployment(deployment.Name),

+			Labels: map[string]string{

+				deployapi.DeployerPodForDeploymentLabel: deployment.Name,

+			},

+			Annotations: map[string]string{

+				deployapi.DeploymentAnnotation: deployment.Name,

+			},

+		},

+		Status: kapi.PodStatus{

+			ContainerStatuses: []kapi.ContainerStatus{

+				{},

+			},

+		},

+	}

+}

+

+func succeededPod(deployment *kapi.ReplicationController) *kapi.Pod {

+	p := okPod(deployment)

+	p.Status.Phase = kapi.PodSucceeded

+	return p

+}

+

+func failedPod(deployment *kapi.ReplicationController) *kapi.Pod {

+	p := okPod(deployment)

+	p.Status.Phase = kapi.PodFailed

+	p.Status.ContainerStatuses = []kapi.ContainerStatus{

+		{

+			State: kapi.ContainerState{

+				Terminated: &kapi.ContainerStateTerminated{

+					ExitCode: 1,

+				},

+			},

+		},

+	}

+	return p

+}

+

+func terminatedPod(deployment *kapi.ReplicationController) *kapi.Pod {

+	p := okPod(deployment)

+	p.Status.Phase = kapi.PodFailed

+	return p

+}

+

+func runningPod(deployment *kapi.ReplicationController) *kapi.Pod {

+	p := okPod(deployment)

+	p.Status.Phase = kapi.PodRunning

+	return p

+}

+

 // TestHandle_uncorrelatedPod ensures that pods uncorrelated with a deployment

 // are ignored.

 func TestHandle_uncorrelatedPod(t *testing.T) {

@@ -355,54 +408,63 @@ func TestHandle_cleanupDesiredReplicasAnnotation(t *testing.T) {

 	}

 }

-func okPod(deployment *kapi.ReplicationController) *kapi.Pod {

-	return &kapi.Pod{

-		ObjectMeta: kapi.ObjectMeta{

-			Name: deployutil.DeployerPodNameForDeployment(deployment.Name),

-			Labels: map[string]string{

-				deployapi.DeployerPodForDeploymentLabel: deployment.Name,

-			},

-			Annotations: map[string]string{

-				deployapi.DeploymentAnnotation: deployment.Name,

-			},

-		},

-		Status: kapi.PodStatus{

-			ContainerStatuses: []kapi.ContainerStatus{

-				{},

-			},

+// TestHandle_canceledDeploymentTrigger ensures that a canceled deployment

+// will trigger a reconcilation of its deploymentconfig (via an annotation

+// update) so that rolling back can happen on the spot and not rely on the

+// deploymentconfig cache resync interval.

+func TestHandle_canceledDeploymentTriggerTest(t *testing.T) {

+	var (

+		updatedDeployment *kapi.ReplicationController

+		updatedConfig     *deployapi.DeploymentConfig

+	)

+

+	initial := deploytest.OkDeploymentConfig(1)

+	// Canceled deployment

+	deployment, _ := deployutil.MakeDeployment(deploytest.TestDeploymentConfig(initial), kapi.Codecs.LegacyCodec(deployapi.SchemeGroupVersion))

+	deployment.Annotations[deployapi.DeploymentCancelledAnnotation] = deployapi.DeploymentCancelledAnnotationValue

+

+	kFake := &ktestclient.Fake{}

+	kFake.PrependReactor("get", "replicationcontrollers", func(action ktestclient.Action) (handled bool, ret runtime.Object, err error) {

+		return true, deployment, nil

+	})

+	kFake.PrependReactor("update", "replicationcontrollers", func(action ktestclient.Action) (handled bool, ret runtime.Object, err error) {

+		updatedDeployment = deployment

+		return true, deployment, nil

+	})

+	fake := &testclient.Fake{}

+	fake.PrependReactor("get", "deploymentconfigs", func(action ktestclient.Action) (handled bool, ret runtime.Object, err error) {

+		config := initial

+		return true, config, nil

+	})

+	fake.PrependReactor("update", "deploymentconfigs", func(action ktestclient.Action) (handled bool, ret runtime.Object, err error) {

+		updated := action.(ktestclient.UpdateAction).GetObject().(*deployapi.DeploymentConfig)

+		updatedConfig = updated

+		return true, updated, nil

+	})

+

+	controller := &DeployerPodController{

+		decodeConfig: func(deployment *kapi.ReplicationController) (*deployapi.DeploymentConfig, error) {

+			return deployutil.DecodeDeploymentConfig(deployment, kapi.Codecs.UniversalDecoder())

 		},

+		store:   cache.NewStore(cache.MetaNamespaceKeyFunc),

+		client:  fake,

+		kClient: kFake,

 	}

-}

-func succeededPod(deployment *kapi.ReplicationController) *kapi.Pod {

-	p := okPod(deployment)

-	p.Status.Phase = kapi.PodSucceeded

-	return p

-}

+	err := controller.Handle(terminatedPod(deployment))

+	if err != nil {

+		t.Fatalf("unexpected error: %v", err)

+	}

-func failedPod(deployment *kapi.ReplicationController) *kapi.Pod {

-	p := okPod(deployment)

-	p.Status.Phase = kapi.PodFailed

-	p.Status.ContainerStatuses = []kapi.ContainerStatus{

-		{

-			State: kapi.ContainerState{

-				Terminated: &kapi.ContainerStateTerminated{

-					ExitCode: 1,

-				},

-			},

-		},

+	if updatedDeployment == nil {

+		t.Fatalf("expected deployment update")

 	}

-	return p

-}

-func terminatedPod(deployment *kapi.ReplicationController) *kapi.Pod {

-	p := okPod(deployment)

-	p.Status.Phase = kapi.PodFailed

-	return p

-}

+	if e, a := deployapi.DeploymentStatusFailed, deployutil.DeploymentStatusFor(updatedDeployment); e != a {

+		t.Fatalf("expected updated deployment status %s, got %s", e, a)

+	}

-func runningPod(deployment *kapi.ReplicationController) *kapi.Pod {

-	p := okPod(deployment)

-	p.Status.Phase = kapi.PodRunning

-	return p

+	if updatedConfig == nil {

+		t.Fatalf("expected config update")

+	}

 }

@@ -11,6 +11,7 @@ import (

 	utilruntime "k8s.io/kubernetes/pkg/util/runtime"

 	"k8s.io/kubernetes/pkg/watch"

+	osclient "github.com/openshift/origin/pkg/client"

 	controller "github.com/openshift/origin/pkg/controller"

 	deployapi "github.com/openshift/origin/pkg/deploy/api"

 	deployutil "github.com/openshift/origin/pkg/deploy/util"

@@ -19,6 +20,8 @@ import (

 // DeployerPodControllerFactory can create a DeployerPodController which

 // handles processing deployer pods.

 type DeployerPodControllerFactory struct {

+	// Client is an OpenShift client.

+	Client osclient.Interface

 	// KubeClient is a Kubernetes client.

 	KubeClient kclient.Interface

 	// Codec is used for encoding/decoding.

@@ -58,6 +61,7 @@ func (factory *DeployerPodControllerFactory) Create() controller.RunnableControl

 	podController := &DeployerPodController{

 		store:   deploymentStore,

+		client:  factory.Client,

 		kClient: factory.KubeClient,

 		decodeConfig: func(deployment *kapi.ReplicationController) (*deployapi.DeploymentConfig, error) {

 			return deployutil.DecodeDeploymentConfig(deployment, factory.Codec)

@@ -96,7 +96,7 @@ func (factory *DeploymentControllerFactory) Create() controller.RunnableControll

 		decodeConfig: func(deployment *kapi.ReplicationController) (*deployapi.DeploymentConfig, error) {

 			return deployutil.DecodeDeploymentConfig(deployment, factory.Codec)

 		},

-		recorder: eventBroadcaster.NewRecorder(kapi.EventSource{Component: "deployer"}),

+		recorder: eventBroadcaster.NewRecorder(kapi.EventSource{Component: "deployment-controller"}),

 	}

 	return &controller.RetryController{