Add logging on stop to distinguish between actions

[#158202290]

Co-authored-by: Christopher Brown <cbrown@pivotal.io>

Author: 2 people

src/bpm/commands/run.go

@@ -94,7 +94,7 @@ func run(cmd *cobra.Command, _ []string) error {
 		return nil
 	case models.ProcessStateFailed:
 		logger.Info("removing-stopped-process")
-		if err := runcLifecycle.RemoveProcess(bpmCfg); err != nil {
+		if err := runcLifecycle.RemoveProcess(logger, bpmCfg); err != nil {
 			logger.Error("failed-to-cleanup", err)
 			return fmt.Errorf("failed to clean up stale job-process: %s", err)
 		}

src/bpm/commands/start.go

@@ -92,7 +92,7 @@ func start(cmd *cobra.Command, _ []string) error {
 		return nil
 	case models.ProcessStateFailed:
 		logger.Info("removing-stopped-process")
-		if err := runcLifecycle.RemoveProcess(bpmCfg); err != nil {
+		if err := runcLifecycle.RemoveProcess(logger, bpmCfg); err != nil {
 			logger.Error("failed-to-cleanup", err)
 			return fmt.Errorf("failed to clean up stale job-process: %s", err)
 		}

src/bpm/commands/stop.go

@@ -78,7 +78,7 @@ func stop(cmd *cobra.Command, _ []string) error {
 		logger.Error("failed-to-stop", err)
 	}
 
-	if err := runcLifecycle.RemoveProcess(bpmCfg); err != nil {
+	if err := runcLifecycle.RemoveProcess(logger, bpmCfg); err != nil {
 		logger.Error("failed-to-cleanup", err)
 		return fmt.Errorf("failed to cleanup job-process: %s", err)
 	}

src/bpm/runc/lifecycle/lifecycle.go

@@ -276,12 +276,14 @@ func (j *RuncLifecycle) StopProcess(logger lager.Logger, cfg *config.BPMConfig,
 	}
 }
 
-func (j *RuncLifecycle) RemoveProcess(cfg *config.BPMConfig) error {
+func (j *RuncLifecycle) RemoveProcess(logger lager.Logger, cfg *config.BPMConfig) error {
+	logger.Info("forcefully-deleting-container")
 	err := j.runcClient.DeleteContainer(cfg.ContainerID())
 	if err != nil {
 		return err
 	}
 
+	logger.Info("destroying-bundle")
 	return j.runcClient.DestroyBundle(cfg.BundlePath())
 }
 

src/bpm/runc/lifecycle/lifecycle_test.go

@@ -496,7 +496,7 @@ var _ = Describe("RuncJobLifecycle", func() {
 
 	Describe("RemoveProcess", func() {
 		It("deletes the container", func() {
-			err := runcLifecycle.RemoveProcess(bpmCfg)
+			err := runcLifecycle.RemoveProcess(logger, bpmCfg)
 			Expect(err).NotTo(HaveOccurred())
 
 			Expect(fakeRuncClient.DeleteContainerCallCount()).To(Equal(1))
@@ -505,7 +505,7 @@ var _ = Describe("RuncJobLifecycle", func() {
 		})
 
 		It("destroys the bundle", func() {
-			err := runcLifecycle.RemoveProcess(bpmCfg)
+			err := runcLifecycle.RemoveProcess(logger, bpmCfg)
 			Expect(err).NotTo(HaveOccurred())
 
 			Expect(fakeRuncClient.DestroyBundleCallCount()).To(Equal(1))
@@ -519,7 +519,7 @@ var _ = Describe("RuncJobLifecycle", func() {
 			})
 
 			It("simplifies the container id", func() {
-				err := runcLifecycle.RemoveProcess(bpmCfg)
+				err := runcLifecycle.RemoveProcess(logger, bpmCfg)
 				Expect(err).NotTo(HaveOccurred())
 
 				Expect(fakeRuncClient.DeleteContainerCallCount()).To(Equal(1))
@@ -537,7 +537,7 @@ var _ = Describe("RuncJobLifecycle", func() {
 			})
 
 			It("returns an error", func() {
-				err := runcLifecycle.RemoveProcess(bpmCfg)
+				err := runcLifecycle.RemoveProcess(logger, bpmCfg)
 				Expect(err).To(Equal(expectedErr))
 			})
 		})
@@ -546,7 +546,7 @@ var _ = Describe("RuncJobLifecycle", func() {
 			It("returns an error", func() {
 				expectedErr := errors.New("an error2")
 				fakeRuncClient.DestroyBundleReturns(expectedErr)
-				err := runcLifecycle.RemoveProcess(bpmCfg)
+				err := runcLifecycle.RemoveProcess(logger, bpmCfg)
 				Expect(err).To(Equal(expectedErr))
 			})
 		})