Fix error handling in IO case during pool open failure (openzfs#492)

Signed-off-by: Paul Dagnelie <[email protected]>
pcd1193182 · Oct 6, 2021 · e8ccdbc · e8ccdbc
1 parent 401276f
commit e8ccdbc
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/include/sys/vdev_object_store.h b/include/sys/vdev_object_store.h
@@ -80,6 +80,7 @@
 #define	AGENT_TOTAL_DATA_OBJECTS	"total_data_objects"
 #define	AGENT_DESTROYED_OBJECTS		"destroyed_objects"
 #define	AGENT_POOLS			"pools"
+#define	AGENT_MESSAGE			"message"
 
 typedef struct vdev_object_store_stats {
 	uint64_t voss_blocks_count;

diff --git a/module/os/linux/zfs/vdev_object_store.c b/module/os/linux/zfs/vdev_object_store.c
@@ -1111,8 +1111,11 @@ agent_reader(void *arg)
 			mutex_enter(&vos->vos_outstanding_lock);
 			vos->vos_result = SET_ERROR(EREMOTEIO);
 		} else if (strcmp(cause, "IO") == 0) {
+			char *message = fnvlist_lookup_string(nv,
+			    AGENT_MESSAGE);
+			zfs_dbgmsg("message=\"%s\"", message);
 			mutex_enter(&vos->vos_outstanding_lock);
-			if (strstr(cause, "does not exist") != NULL) {
+			if (strstr(message, "does not exist") != NULL) {
 				vos->vos_result = SET_ERROR(ENOENT);
 			} else {
 				vos->vos_result = SET_ERROR(EIO);