upstream: hack - retry destroy until diskarb goes away

A more portable solution is perhaps desired. Signed-off-by: Jorgen Lundman <lundman@lundman.net>
openzfsonosx · May 31, 2021 · a7e70a3 · a7e70a3
1 parent f733445
commit a7e70a3
Showing 1 changed file with 17 additions and 0 deletions.
diff --git a/lib/libzfs/libzfs_dataset.c b/lib/libzfs/libzfs_dataset.c
@@ -3859,7 +3859,24 @@ zfs_destroy(zfs_handle_t *zhp, boolean_t defer)
 		error = lzc_destroy_snaps(nv, defer, NULL);
 		fnvlist_free(nv);
 	} else {
+
+#ifdef __APPLE__
+		/* DiskArbitrationd gets in the way a lot */
+		int retry = 0;
+		do {
+			if ((retry++) != 1) {
+				printf("retry\n");
+				sleep(1);
+			}
+#endif
+
 		error = lzc_destroy(zhp->zfs_name);
+
+#ifdef __APPLE__
+		} while ((error == EBUSY) && (retry <= 5));
+#endif
+
+
 	}
 
 	if (error != 0 && error != ENOENT) {