upgrade: Run configuration upgrade under empty ccache collection #1725
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
tiran
requested changes
Mar 22, 2018
ipaserver/install/server/upgrade.py
Outdated
| os.environ['KRB5CCNAME'] = old_path | ||
| else: | ||
| del os.environ['KRB5CCNAME'] | ||
| for f in os.listdir(kpath_dir): |
There was a problem hiding this comment.
Use shutil.rmtree(), it removes the directory and all its children.
ipaserver/install/server/upgrade.py
Outdated
| # Bug https://bugzilla.redhat.com/show_bug.cgi?id=1558818 | ||
| kpath_dir = tempfile.mkdtemp(prefix="upgrade_ccaches", | ||
| dir=paths.IPA_CCACHES) | ||
| kpath = "DIR:{dir}s".format(dir=kpath_dir) |
There was a problem hiding this comment.
The extra s after the directory name looks like a mistake.
kpath = "DIR:{}".format(kpath) is shorter and easier to read.
abbra
force-pushed
the
f28-upgrade-kadmin.local
branch
from
9335783
to
137ac89
Compare
Use temporary empty DIR-based ccache collection to prevent upgrade failures in case KCM: or KEYRING: ccache type is used by default in krb5.conf and is not available. We don't need any user credentials during upgrade procedure but kadmin.local would attempt to resolve default ccache and if that's not available, kadmin.local will fail. Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1558818 Signed-off-by: Alexander Bokovoy <abokovoy@redhat.com>
abbra
force-pushed
the
f28-upgrade-kadmin.local
branch
from
137ac89
to
d2945b6
Compare
|
Updated to use shutil.rmtree() and simplify the formatting. |
tiran
approved these changes
Mar 22, 2018
|
Thanks, LGTM to me! |
|
Hi @abbra
|
|
master:
|
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.
Use temporary empty DIR-based ccache collection to prevent upgrade
failures in case KCM: or KEYRING: ccache type is used by default in
krb5.conf and is not available. We don't need any user credentials
during upgrade procedure but kadmin.local would attempt to resolve
default ccache and if that's not available, kadmin.local will fail.
This approach was successfully tested with OpenQA tests that upgrade from F27 to F28.
Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1558818