Merge branch 'master' of github.com:jthornber/thin-provisioning-tools

CHANGES

@@ -1,3 +1,76 @@
+v0.7.4
+======
+
+- Update this file ;)
+
+v0.7.3
+======
+
+- Improve error messages if XML given as input to tools that expect metadata.
+  There seems to be some confusion between XML and the metadata.
+
+- Add --override-mapping-root debug option to thin_dump.  This can be useful
+  when investigating damaged metadata.
+
+- More functional tests.
+
+v0.7.2
+======
+
+- Fix segfault in restore tools when given a tiny metadata file (< 4k).
+
+- Lots more work on the functional tests.
+
+- Fix a couple of unit test regressions
+
+- Man page updates.
+
+- Rewrite man pages in a text format.  Simpler than writing directly in nroff.
+
+v0.7.1
+======
+
+- Fix a few bugs in block_cache.
+
+- Ditch Ruby/Cucumber for the functional tests.  Now written in Scheme.
+
+- Be more aggressive about flushing dirty blocks from the block cache.  Very
+  little performance impact.
+
+- Optimisations in space_map_disk (small performance improvement for restore
+  tools).
+
+v0.7.0
+======
+
+- switch to C++11.  This may cause problems with v. old versions of g++.
+
+- support cache metadata format 2
+
+- support custom emitter plugins for thin_dump.
+
+- thin_dump --dev-id; allows the user to dump just the devices they're
+  interested in.
+
+- cache_writeback; Use for offline decommission of a cache.
+
+- thin_scan/thin_ll_dump/restore dev tools.
+
+- --enable-dev-tools configure option.  Use this for the extra tools.
+
+- thin_delta, various bug fixes.
+
+- various changes to the block cache.
+
+- thin_show_duplicates; a development only tool that scans block devices to
+  calculate the level of data duplication.  Uses either fixed block sizes or
+  context sensitive.
+
+v0.6.3
+======
+
+- Improve error messages if output file doesn't exist or is tiny.
+
 v0.6.2
 ======
 
@@ -61,4 +134,4 @@ v0.4
 - Tools rolled into a single executable to save space.
 
 - Fixed some bugs when walking bitsets (possibly effecting cache_dump
-  and cache_check).
+  and cache_check).

era/superblock.cc

@@ -332,6 +332,7 @@ era::check_superblock(persistent_data::block_manager<>::ptr bm,
 
 	try {
 		sb = read_superblock(bm, SUPERBLOCK_LOCATION);
+		check_superblock(sb, nr_metadata_blocks, visitor);
 
 	} catch (std::exception const &e) {
 
@@ -341,8 +342,6 @@ era::check_superblock(persistent_data::block_manager<>::ptr bm,
 
 		visitor.visit(superblock_corrupt(e.what()));
 	}
-
-	check_superblock(sb, nr_metadata_blocks, visitor);
 }
 
 

functional-tests/cache-functional-tests.scm

@@ -134,9 +134,9 @@
         (run-fail "cache_check" md))))
 
   (define-scenario (cache-check tiny-metadata)
-    "Prints helpful message in case XML metadata given"
-    (with-cache-xml (xml)
-      (receive (_ stderr) (run-fail "cache_check" xml)
+    "Prints helpful message in case tiny metadata given"
+    (with-temp-file-sized ((md "cache.bin" 1024))
+      (receive (_ stderr) (run-fail "cache_check" md)
         (assert-starts-with "Metadata device/file too small.  Is this binary metadata?" stderr))))
 
   (define-scenario (cache-check spot-accidental-xml-data)

functional-tests/device-mapper/ioctl.scm

@@ -194,11 +194,15 @@
             (map foreign-free acc)
             (loop (ftype-ref Target (next) t) (cons t acc)))))
 
+  ;; targets should be dlambdas with 'size, 'type and 'format methods
   (define (load-table dm name targets)
     (define load
       (foreign-procedure "dm_load" ((* DMIoctlInterface) string (* Target)) int))
 
-    (let* ((ctargets (build-c-targets targets))
+    (define (dlambda->target t)
+      (make-target (t 'size) (t 'type) (t 'format)))
+
+    (let* ((ctargets (build-c-targets (map dlambda->target targets)))
            (r (load dm name ctargets)))
       (free-c-targets ctargets)
       (unless (zero? r)

functional-tests/device-mapper/targets.scm

@@ -0,0 +1,36 @@
+(library
+  (device-mapper targets)
+
+  (export linear-target)
+
+  (import (chezscheme)
+          (fmt fmt)
+          (list-utils))
+
+  (define-record-type segment
+    (fields (mutable dev) (mutable begin) (mutable end)))
+
+  (define (segment-size s)
+          (- (segment-end s)
+             (segment-begin s)))
+
+  (define (join docs)
+          (cat (intersperse (dsp " ") docs)))
+
+  (define (format-segment s)
+          (join (dsp (segment-dev s))))
+
+  (define (linear-target seg)
+    (dlambda
+      (type () 'linear)
+      (size () (segment-size seg))
+      (format () (fmt #f (format-segment s)))))
+
+  (define (stripe-target segments)
+    (unless (apply = (map segment-size segments))
+            (fail "stripe segments must all be the same size")
+    (dlambda
+      (type () 'stripe)
+      (size () (fold-right + 0 (map segment-size segments)))
+      (format () (fmt #f (join (map format-segment segments)))))))
+  )

functional-tests/era-functional-tests.scm

@@ -108,9 +108,9 @@
         (assert-eof stderr))))
 
   (define-scenario (era-check tiny-metadata)
-    "Prints helpful message in case XML metadata given"
-    (with-era-xml (xml)
-      (receive (_ stderr) (run-fail "era_check" xml)
+    "Prints helpful message in case tiny metadata given"
+    (with-temp-file-sized ((md "era.bin" 1024))
+      (receive (_ stderr) (run-fail "era_check" md)
         (assert-starts-with "Metadata device/file too small.  Is this binary metadata?" stderr))))
 
   (define-scenario (era-check spot-accidental-xml-data)

functional-tests/fail.scm

@@ -0,0 +1,9 @@
+(library
+  (fail)
+  (export fail)
+  (import (chezscheme))
+
+  (define (fail msg)
+    (raise (condition
+             (make-error)
+             (make-message-condition msg)))))

functional-tests/functional-tests.scm

@@ -93,7 +93,8 @@
       (fmt #t (cat (fn keys) nl))
       (flush))
 
-    (for-each describe (cons '() (reverse (cdr (reverse keys)))) keys))
+    (unless (null? keys)
+        (for-each describe (cons '() (reverse (cdr (reverse keys)))) keys)))
 
   (define (describe-scenarios keys)
     (fmt-scenarios keys

functional-tests/process.scm

@@ -6,6 +6,7 @@
           run-fail)
 
   (import (chezscheme)
+          (fail)
           (fmt fmt)
           (logging)
           (list-utils)
@@ -19,11 +20,6 @@
   ;;; we need for testing.  So we use system, and redirect stderr and stdout to
   ;;; temporary files, and subsequently read them in.  Messy, but fine for tests.
 
-  (define (fail msg)
-    (raise (condition
-             (make-error)
-             (make-message-condition msg))))
-
   (define (build-command-line cmd-and-args)
     (apply fmt #f (map dsp (intersperse " " cmd-and-args))))
 

functional-tests/thin-functional-tests.scm

@@ -114,9 +114,9 @@
       (thin-check "--clear-needs-check-flag" md)))
 
   (define-scenario (thin-check tiny-metadata)
-    "Prints helpful message in case XML metadata given"
-    (with-thin-xml (xml)
-      (receive (_ stderr) (run-fail "thin_check" xml)
+    "Prints helpful message in case tiny metadata given"
+    (with-temp-file-sized ((md "thin.bin" 1024))
+      (receive (_ stderr) (run-fail "thin_check" md)
         (assert-starts-with "Metadata device/file too small.  Is this binary metadata?" stderr))))
 
   (define-scenario (thin-check spot-accidental-xml-data)