Generate uniter params via copying rather than referencing from templ…

…ate;
benhoyt · Oct 13, 2020 · a28e841 · a28e841
1 parent 5919eae
commit a28e841
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/worker/caasoperator/caasoperator.go b/worker/caasoperator/caasoperator.go
@@ -576,7 +576,7 @@ func (op *caasOperator) loop() (err error) {
 				if err := op.makeAgentSymlinks(unitTag); err != nil {
 					return errors.Trace(err)
 				}
-				params := op.config.UniterParams
+				params := *op.config.UniterParams
 				params.ModelType = model.CAAS
 				params.UnitTag = unitTag
 				params.Downloader = op.config.Downloader // TODO(caas): write a cache downloader
@@ -603,7 +603,7 @@ func (op *caasOperator) loop() (err error) {
 					}
 					params.NewRemoteRunnerExecutor = getNewRunnerExecutor(logger, execClient)
 				}
-				if err := op.config.StartUniterFunc(op.runner, params); err != nil {
+				if err := op.config.StartUniterFunc(op.runner, &params); err != nil {
 					return errors.Trace(err)
 				}
 			}

diff --git a/worker/uniter/operation/executor.go b/worker/uniter/operation/executor.go
@@ -85,7 +85,7 @@ func (x *executor) Run(op Operation, remoteStateChange <-chan remotestate.Snapsh
 	if op.NeedsGlobalMachineLock() {
 		releaser, err := x.acquireMachineLock(op.String())
 		if err != nil {
-			return errors.Annotate(err, "could not acquire lock")
+			return errors.Annotatef(err, "could not acquire lock for %q", op)
 		}
 		defer x.logger.Debugf("lock released")
 		defer releaser()

diff --git a/worker/uniter/uniter.go b/worker/uniter/uniter.go
@@ -209,7 +209,7 @@ func NewUniter(uniterParams *UniterParams) (*Uniter, error) {
 // StartUniter creates a new Uniter and starts it using the specified runner.
 func StartUniter(runner *worker.Runner, params *UniterParams) error {
 	startFunc := newUniter(params)
-	params.Logger.Debugf("starting uniter for  %q", params.UnitTag.Id())
+	params.Logger.Debugf("starting uniter for %q", params.UnitTag.Id())
 	err := runner.StartWorker(params.UnitTag.Id(), startFunc)
 	return errors.Annotate(err, "error starting uniter worker")
 }
@@ -273,12 +273,12 @@ func (u *Uniter) loop(unitTag names.UnitTag) (err error) {
 			err = nil
 		}
 		if u.runListener != nil {
-			u.runListener.UnregisterRunner(u.unit.Name())
+			u.runListener.UnregisterRunner(unitTag.Id())
 		}
 		if u.localRunListener != nil {
-			u.localRunListener.UnregisterRunner(u.unit.Name())
+			u.localRunListener.UnregisterRunner(unitTag.Id())
 		}
-		u.logger.Infof("unit %q shutting down: %s", u.unit, err)
+		u.logger.Infof("unit %q shutting down: %s", unitTag.Id(), err)
 	}()
 
 	if err := u.init(unitTag); err != nil {