Fix cleaner not running when the model is dying.

juju · Jul 6, 2023 · 257edc0 · 257edc0
1 parent 8a3f697
commit 257edc0
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/cmd/jujud/agent/model/manifolds.go b/cmd/jujud/agent/model/manifolds.go
@@ -457,7 +457,7 @@ func IAASManifolds(config ManifoldsConfig) dependency.Manifolds {
 			NewCredentialValidatorFacade: common.NewCredentialInvalidatorFacade,
 			Logger:                       config.LoggingContext.GetLogger("juju.worker.machineundertaker"),
 		})),
-		environUpgraderName: ifAlive(ifCredentialValid(environupgrader.Manifold(environupgrader.ManifoldConfig{
+		environUpgraderName: ifNotDead(ifCredentialValid(environupgrader.Manifold(environupgrader.ManifoldConfig{
 			APICallerName:                apiCallerName,
 			EnvironName:                  environTrackerName,
 			GateName:                     environUpgradeGateName,
@@ -587,7 +587,7 @@ func CAASManifolds(config ManifoldsConfig) dependency.Manifolds {
 				Logger:    config.LoggingContext.GetLogger("juju.worker.caasunitprovisioner"),
 			},
 		)),
-		environUpgraderName: ifAlive(ifCredentialValid(caasenvironupgrader.Manifold(caasenvironupgrader.ManifoldConfig{
+		environUpgraderName: ifNotDead(ifCredentialValid(caasenvironupgrader.Manifold(caasenvironupgrader.ManifoldConfig{
 			APICallerName: apiCallerName,
 			GateName:      environUpgradeGateName,
 			ModelTag:      modelTag,

diff --git a/cmd/jujud/agent/model/manifolds_test.go b/cmd/jujud/agent/model/manifolds_test.go
@@ -377,10 +377,10 @@ var expectedCAASModelManifoldsWithDependencies = map[string][]string{
 
 	"environ-upgrader": {
 		"agent",
-		"alive-flag",
 		"api-caller",
 		"environ-upgrade-gate",
 		"is-responsible-flag",
+		"not-dead-flag",
 		"valid-credential-flag",
 	},
 
@@ -616,11 +616,11 @@ var expectedIAASModelManifoldsWithDependencies = map[string][]string{
 
 	"environ-upgrader": {
 		"agent",
-		"alive-flag",
 		"api-caller",
 		"environ-tracker",
 		"environ-upgrade-gate",
 		"is-responsible-flag",
+		"not-dead-flag",
 		"valid-credential-flag",
 	},