Unlink unit charm dir symlink for application deployed before 2.8 bec… #11539
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…ause we copy charm to unit charm dir now;
wallyworld
approved these changes
May 6, 2020
|
Sure, I was about to add one today actually. |
hpidcock
approved these changes
May 6, 2020
| @@ -291,6 +290,23 @@ func (op *caasOperator) makeAgentSymlinks(unitTag names.UnitTag) error { | |||
| } | |||
| } | |||
|
|
|||
| // Ensure legacy charm symlinks created before 2.8 getting unlinked. | |||
There was a problem hiding this comment.
I'd refactor this like to keep the success flow to the end of the function.
Makes it easier for the next person to add to the function.
// Ensure legacy charm symlinks created before 2.8 getting unlinked.
unitCharmDir := filepath.Join(op.config.DataDir, "agents", unitTag.String(), "charm")
isUnitCharmDirSymlink, err := jujusymlink.IsSymlink(unitCharmDir)
if os.IsNotExist(errors.Cause(err)) || os.IsPermission(errors.Cause(err)) {
// Ignore permission denied as this won't happen in production
// but may happen in testing depending on setup of /tmp
} else if err != nil {
return errors.Trace(err)
} else if isUnitCharmDirSymlink {
op.config.Logger.Debugf("unlinking legacy charm symlink for unit %q", unitTag)
if err := os.Remove(unitCharmDir); err != nil {
return errors.Trace(err)
}
}
|
This PR has been merged to #11544, so close it now |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Checklist
Checked if it requires a pylibjuju change?Added integration tests for the PR?Added or updated doc.go related to packages changed?Description of change
Unlink unit charm dir symlink for applications deployed before 2.8;
QA steps
Documentation changes
No
Bug reference
https://bugs.launchpad.net/juju/+bug/1877025