Construct *Unit properly for destroying;

sdg0919 · Oct 22, 2020 · f33c58f · f33c58f
1 parent ea0aafb
commit f33c58f
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/state/cleanup.go b/state/cleanup.go
@@ -706,7 +706,6 @@ func (st *State) cleanupUnitsForDyingApplication(applicationname string, cleanup
 	units, closer := st.db().GetCollection(unitsC)
 	defer closer()
 
-	unit := Unit{st: st}
 	sel := bson.D{{"application", applicationname}}
 	// If we're forcing then include dying and dead units, since we
 	// still want the opportunity to schedule fallback cleanups if the
@@ -716,7 +715,14 @@ func (st *State) cleanupUnitsForDyingApplication(applicationname string, cleanup
 	}
 	iter := units.Find(sel).Iter()
 	defer closeIter(iter, &err, "reading unit document")
-	for iter.Next(&unit.doc) {
+
+	m, err := st.Model()
+	if err != nil {
+		return errors.Trace(err)
+	}
+	var unitDoc unitDoc
+	for iter.Next(&unitDoc) {
+		unit := newUnit(st, m.Type(), &unitDoc)
 		op := unit.DestroyOperation()
 		op.DestroyStorage = destroyStorage
 		op.Force = force

diff --git a/state/unit.go b/state/unit.go
@@ -129,7 +129,7 @@ func (u *Unit) ContainerInfo() (CloudContainer, error) {
 // ShouldBeAssigned returns whether the unit should be assigned to a machine.
 // IAAS models require units to be assigned.
 func (u *Unit) ShouldBeAssigned() bool {
-	return u.modelType == ModelTypeIAAS
+	return u.modelType != ModelTypeCAAS
 }
 
 // Application returns the application.