Illumos 6319 - assertion failed in zio_ddt_write: bp->blk_birth == txg

6319 assertion failed in zio_ddt_write: bp->blk_birth == txg
Reviewed by: George Wilson <george.wilson@delphix.com>
Approved by: Dan McDonald <danmcd@omniti.com>

References:
  https://www.illumos.org/issues/6319
  https://github.com/illumos/illumos-gate/commit/b39b744

Porting notes:
- Re-enabled ztest for CentOS test slaves.

Ported-by: kernelOfTruth kerneloftruth@gmail.com
Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
Closes #3449

diff --git a/TEST b/TEST
index eba35a37dcfda207c4124e6d41db7771c097f57c..dd599d119abad8af07780737793650a219e414d5 100644 (file)
--- a/TEST
+++ b/TEST
@@ -71,8 +71,6 @@ case "$BB_NAME" in
 Amazon*)
     ;;
 CentOS*)
-    # Sporadic segmentation faults
-    TEST_ZTEST_SKIP="yes"
     # Sporadic VERIFY(!zilog_is_dirty(zilog)) failed
     TEST_ZILTEST_SKIP="yes"
     ;;

diff --git a/module/zfs/zio.c b/module/zfs/zio.c
index 3271f820732c28142bf18eca7aadda0ce64d5dbd..9da7916e5b077637a7080f22b20fbbad4ba85a54 100644 (file)
--- a/module/zfs/zio.c
+++ b/module/zfs/zio.c
@@ -1164,6 +1164,8 @@ zio_write_bp_init(zio_t *zio)
                        zio->io_pipeline |= ZIO_STAGE_DDT_WRITE;
                        return (ZIO_PIPELINE_CONTINUE);
                }
+               zio->io_bp_override = NULL;
+               BP_ZERO(bp);
        }
 
        if (!BP_IS_HOLE(bp) && bp->blk_birth == zio->io_txg) {