summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLars Wirzenius <liw@liw.fi>2015-11-02 18:36:48 +0200
committerLars Wirzenius <liw@liw.fi>2015-11-02 18:36:48 +0200
commit3e87ae5c8ced6d78aea6a37a4caa403909e71051 (patch)
tree1ed2d9dfe7bea519e9389f2cdec23d88d825442d
parentb9e1b2c374e073869bc176620c69d5619c9da465 (diff)
downloadobnam-3e87ae5c8ced6d78aea6a37a4caa403909e71051.tar.gz
Avoid referring to B-trees in backup progress
-rw-r--r--obnamlib/plugins/backup_plugin.py18
1 files changed, 10 insertions, 8 deletions
diff --git a/obnamlib/plugins/backup_plugin.py b/obnamlib/plugins/backup_plugin.py
index 977ae366..62790b28 100644
--- a/obnamlib/plugins/backup_plugin.py
+++ b/obnamlib/plugins/backup_plugin.py
@@ -243,10 +243,10 @@ class BackupPlugin(obnamlib.ObnamPlugin):
def finish_generation(self):
prefix = 'committing changes to repository: '
- self.progress.what(prefix + 'locking shared B-trees')
+ self.progress.what(prefix + 'locking shared chunk indexes')
self.repo.lock_chunk_indexes()
- self.progress.what(prefix + 'adding chunks to shared B-trees')
+ self.progress.what(prefix + 'adding chunks to shared chunk indexes')
self.add_chunks_to_shared()
self.progress.what(prefix + 'updating generation metadata')
@@ -268,7 +268,7 @@ class BackupPlugin(obnamlib.ObnamPlugin):
self.repo.commit_client(self.client_name)
self.repo.unlock_client(self.client_name)
- self.progress.what(prefix + 'committing shared B-trees')
+ self.progress.what(prefix + 'committing shared chunk indexes')
self.repo.commit_chunk_indexes()
self.repo.unlock_chunk_indexes()
@@ -290,7 +290,7 @@ class BackupPlugin(obnamlib.ObnamPlugin):
self.repo.commit_client(self.client_name)
self.repo.unlock_client(self.client_name)
- self.progress.what(prefix + ': commiting shared B-trees')
+ self.progress.what(prefix + ': commiting shared chunk indexes')
self.repo.commit_chunk_indexes()
self.repo.unlock_chunk_indexes()
@@ -515,15 +515,16 @@ class BackupPlugin(obnamlib.ObnamPlugin):
self.progress.what('making checkpoint: backing up parents')
self.backup_parents('.')
- self.progress.what('making checkpoint: locking shared B-trees')
+ self.progress.what(
+ 'making checkpoint: locking shared chunk indexes')
self.repo.lock_chunk_indexes()
self.progress.what(
- 'making checkpoint: adding chunks to shared B-trees')
+ 'making checkpoint: adding chunks to shared chunk indexes')
self.add_chunks_to_shared()
self.progress.what(
- 'making checkpoint: committing per-client B-tree')
+ 'making checkpoint: committing per-client data')
self.repo.set_generation_key(
self.new_generation,
obnamlib.REPO_GENERATION_IS_CHECKPOINT, 1)
@@ -531,7 +532,8 @@ class BackupPlugin(obnamlib.ObnamPlugin):
self.repo.commit_client(self.client_name)
self.repo.unlock_client(self.client_name)
- self.progress.what('making checkpoint: committing shared B-trees')
+ self.progress.what(
+ 'making checkpoint: committing shared chunk indexes')
self.repo.commit_chunk_indexes()
self.repo.unlock_chunk_indexes()
self.last_checkpoint = self.repo.get_fs().bytes_written