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

ahrens · behlendorf · commit 5511754b4fa6 · 2016-01-12T09:10:52.000-08:00
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 illumos/illumos-gate@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
@@ -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
@@ -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) {

Original file line number	Diff line number	Diff line change
`@@ -1164,6 +1164,8 @@ zio_write_bp_init(zio_t *zio)`
`1164`	`1164`	`zio->io_pipeline \|= ZIO_STAGE_DDT_WRITE;`
`1165`	`1165`	`return (ZIO_PIPELINE_CONTINUE);`
`1166`	`1166`	`}`
	`1167`	`+ zio->io_bp_override = NULL;`
	`1168`	`+ BP_ZERO(bp);`
`1167`	`1169`	`}`
`1168`	`1170`
`1169`	`1171`	`if (!BP_IS_HOLE(bp) && bp->blk_birth == zio->io_txg) {`