make fsck benchmarking be optional

2 files changed, 12 insertions, 2 deletions

diff --git a/NEWS b/NEWS
index 027a407..85bbbac 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,12 @@
 NEWS for seivot, a backup benchmarking program
 ==============================================
 
+Version 1.16, released UNRELEASED
+---------------------------------
+
+* Benchmarking of fsck is now optional, because fsck is so bloody slow
+  in Obnam.
+
 Version 1.15, released 2011-12-18
 ---------------------------------
 
diff --git a/seivot b/seivot
index f2097f5..ebcaa2d 100755
--- a/seivot
+++ b/seivot
@@ -391,6 +391,8 @@ class Seivot(cliapp.Application):
                                 'all SFTP transfers')
 
         self.settings.boolean(['verify'], 'verify restored data')
+
+        self.settings.boolean(['benchmark-fsck'], 'benchmark fsck?')
         
         self.settings.string(['obnam-config'], 
                              'use FILE as an Obnam configuration file',
@@ -435,7 +437,8 @@ class Seivot(cliapp.Application):
         if self.settings['verify']:
             self.summain(self.live_data, 'backup-0.summain')
         self.measure(prog.backup, 0, amount)
-        self.measure(prog.fsck, 0, amount)
+        if self.settings['benchmark-fsck']:
+            self.measure(prog.fsck, 0, amount)
         self.measure(prog.verify, 0, amount)
 
         for i in range(1, generations):
@@ -444,7 +447,8 @@ class Seivot(cliapp.Application):
             if self.settings['verify']:
                 self.summain(self.live_data, 'backup-%d.summain' % i)
             self.measure(prog.backup, i, self.settings['incremental-data'])
-            self.measure(prog.fsck, i, self.settings['incremental-data'])
+            if self.settings['benchmark-fsck']:
+                self.measure(prog.fsck, i, self.settings['incremental-data'])
             self.measure(prog.verify, i, self.settings['incremental-data'])
 
         for i in range(generations):