part 1 of 3: force remove app / unit.

hatched · Apr 1, 2019 · 9844a63 · 9844a63
1 parent 1a837fb
commit 9844a63
Show file tree

Hide file tree

Showing 14 changed files with 624 additions and 172 deletions.
diff --git a/apiserver/common/remove.go b/apiserver/common/remove.go
@@ -54,6 +54,7 @@ func (r *Remover) removeEntity(tag names.Tag) error {
 			return err
 		}
 	}
+	// TODO (anastasiamac) this needs to work with force if needed
 	return remover.Remove()
 }
 

diff --git a/apiserver/facades/client/application/application.go b/apiserver/facades/client/application/application.go
@@ -1370,9 +1370,13 @@ func (api *APIBase) DestroyUnit(args params.DestroyUnitsParams) (params.DestroyU
 		}
 		op := unit.DestroyOperation()
 		op.DestroyStorage = arg.DestroyStorage
+		op.Force = arg.Force
 		if err := api.backend.ApplyOperation(op); err != nil {
 			return nil, errors.Trace(err)
 		}
+		// TODO (anastasiamac 2019-03-29) we want to return errors and info when forced..
+		//  maybe always, so that we can report how many errors we are getting/got.
+		// At the moment, this only returns the intent not the actual result.
 		return &info, nil
 	}
 	results := make([]params.DestroyUnitResult, len(args.Units))
@@ -1495,9 +1499,13 @@ func (api *APIBase) DestroyApplication(args params.DestroyApplicationsParams) (p
 		}
 		op := app.DestroyOperation()
 		op.DestroyStorage = arg.DestroyStorage
+		op.Force = arg.Force
 		if err := api.backend.ApplyOperation(op); err != nil {
 			return nil, err
 		}
+		// TODO (anastasiamac 2019-03-29) we want to return errors and info when forced..
+		//  maybe always, so that we can report how many errors we are getting/got.
+		// At the moment, this only returns the intent not the actual result.
 		return &info, nil
 	}
 	results := make([]params.DestroyApplicationResult, len(args.Applications))
@@ -1532,6 +1540,8 @@ func (api *APIBase) DestroyConsumedApplications(args params.DestroyConsumedAppli
 			results[i].Error = common.ServerError(err)
 			continue
 		}
+		// TODO (anastasiamac 2019-03-29) This may need to be forced too.
+		// see https://bugs.launchpad.net/juju/+bug/1822050
 		err = app.Destroy()
 		if err != nil {
 			results[i].Error = common.ServerError(err)

diff --git a/apiserver/facades/client/application/application_unit_test.go b/apiserver/facades/client/application/application_unit_test.go
@@ -466,9 +466,18 @@ func (s *ApplicationSuite) TestDestroyRelationIdRelationNotFound(c *gc.C) {
 }
 
 func (s *ApplicationSuite) TestDestroyApplication(c *gc.C) {
+	s.assertDestroyApplication(c, false)
+}
+
+func (s *ApplicationSuite) TestForceDestroyApplication(c *gc.C) {
+	s.assertDestroyApplication(c, true)
+}
+
+func (s *ApplicationSuite) assertDestroyApplication(c *gc.C, force bool) {
 	results, err := s.api.DestroyApplication(params.DestroyApplicationsParams{
 		Applications: []params.DestroyApplicationParams{{
 			ApplicationTag: "application-postgresql",
+			Force:          force,
 		}},
 	})
 	c.Assert(err, jc.ErrorIsNil)
@@ -498,7 +507,7 @@ func (s *ApplicationSuite) TestDestroyApplication(c *gc.C) {
 		"UnitStorageAttachments",
 		"ApplyOperation",
 	)
-	s.backend.CheckCall(c, 7, "ApplyOperation", &state.DestroyApplicationOperation{})
+	s.backend.CheckCall(c, 7, "ApplyOperation", &state.DestroyApplicationOperation{Force: force})
 }
 
 func (s *ApplicationSuite) TestDestroyApplicationDestroyStorage(c *gc.C) {
@@ -582,10 +591,20 @@ func (s *ApplicationSuite) TestDestroyConsumedApplicationNotFound(c *gc.C) {
 }
 
 func (s *ApplicationSuite) TestDestroyUnit(c *gc.C) {
+	s.assertDestroyUnit(c, false)
+}
+
+func (s *ApplicationSuite) TestForceDestroyUnit(c *gc.C) {
+	s.assertDestroyUnit(c, true)
+}
+
+func (s *ApplicationSuite) assertDestroyUnit(c *gc.C, force bool) {
 	results, err := s.api.DestroyUnit(params.DestroyUnitsParams{
 		Units: []params.DestroyUnitParams{
-			{UnitTag: "unit-postgresql-0"},
 			{
+				UnitTag: "unit-postgresql-0",
+				Force:   force,
+			}, {
 				UnitTag:        "unit-postgresql-1",
 				DestroyStorage: true,
 			},
@@ -619,7 +638,7 @@ func (s *ApplicationSuite) TestDestroyUnit(c *gc.C) {
 		"UnitStorageAttachments",
 		"ApplyOperation",
 	)
-	s.backend.CheckCall(c, 6, "ApplyOperation", &state.DestroyUnitOperation{})
+	s.backend.CheckCall(c, 6, "ApplyOperation", &state.DestroyUnitOperation{Force: force})
 	s.backend.CheckCall(c, 9, "ApplyOperation", &state.DestroyUnitOperation{
 		DestroyStorage: true,
 	})
-Original file line number
+Diff line change
@@ Expand Up / @@ -54,6 +54,7 @@ func (r *Remover) removeEntity(tag names.Tag) error { @@
     			return err
     		}
     	}
+    	// TODO (anastasiamac) this needs to work with force if needed
     	return remover.Remove()
     }
@@ Expand Down @@