aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKonstantin Ryabitsev <konstantin@linuxfoundation.org>2020-11-06 09:20:18 -0500
committerKonstantin Ryabitsev <konstantin@linuxfoundation.org>2020-11-06 09:20:18 -0500
commitab953ca5093746a21872756118df2228904d0d28 (patch)
tree75e03e8655d2bed61a9846ba5ca59b71f689cbe1
parentdadbcb45c094ed84323c16b1ad40c002b2e3687a (diff)
downloadgrokmirror-ab953ca5093746a21872756118df2228904d0d28.tar.gz
Clean up some of the preload UI strings
Be more clear which bundle we're operating on. Signed-off-by: Konstantin Ryabitsev <konstantin@linuxfoundation.org>
-rwxr-xr-xgrokmirror/pull.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/grokmirror/pull.py b/grokmirror/pull.py
index 0cdbdee..c241d1f 100755
--- a/grokmirror/pull.py
+++ b/grokmirror/pull.py
@@ -250,7 +250,7 @@ def objstore_repo_preload(config, obstrepo):
sess = grokmirror.get_requests_session()
resp = sess.get(burl, stream=True)
resp.raise_for_status()
- logger.info(' objstore: getting preload bundle for %s', bname)
+ logger.info(' objstore: downloading %s.bundle', bname)
with open(bfile, 'wb') as fh:
for chunk in resp.iter_content(chunk_size=8192):
fh.write(chunk)
@@ -265,17 +265,17 @@ def objstore_repo_preload(config, obstrepo):
# Now we clone from it into the objstore repo
ecode, out, err = grokmirror.run_git_command(obstrepo, ['remote', 'add', '--mirror=fetch', '_preload', bfile])
if ecode == 0:
- logger.info(' objstore: preloading %s from the bundle', bname)
+ logger.info(' objstore: preloading %s.bundle', bname)
args = ['remote', 'update', '_preload']
ecode, out, err = grokmirror.run_git_command(obstrepo, args)
if ecode > 0:
- logger.info(' objstore: not able to preload, will clone repo-by-repo')
+ logger.info(' objstore: failed to preload from %s.bundle', bname)
else:
# now pack refs and generate a commit graph
grokmirror.run_git_command(obstrepo, ['pack-refs', '--all'])
if grokmirror.git_newer_than('2.18.0'):
grokmirror.run_git_command(obstrepo, ['commit-graph', 'write'])
- logger.info(' objstore: successful preload')
+ logger.info(' objstore: successful preload from %s.bundle', bname)
# Regardless of what happened, we remove _preload and the bundle, then move on
grokmirror.run_git_command(obstrepo, ['remote', 'rm', '_preload'])
os.unlink(bfile)