2nd round of changes from Matt's review

Signed-off-by: Tony Hutter <hutter2@llnl.gov>
openzfs · Nov 7, 2018 · 194a7f5 · 194a7f5
1 parent 733a3ca
commit 194a7f5
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 16 deletions.
diff --git a/cmd/zpool/zpool_main.c b/cmd/zpool/zpool_main.c
@@ -365,7 +365,7 @@ get_usage(zpool_help_t idx)
 		return (gettext("\tresilver <pool> ...\n"));
 	case HELP_STATUS:
 		return (gettext("\tstatus [-c [script1,script2,...]] "
-		    "[-dgLpPvxD]  [-T d|u] [pool] ... \n"
+		    "[-gLpPsvxD]  [-T d|u] [pool] ... \n"
 		    "\t    [interval [count]]\n"));
 	case HELP_UPGRADE:
 		return (gettext("\tupgrade\n"
@@ -7165,7 +7165,7 @@ status_callback(zpool_handle_t *zhp, void *data)
 		    "CKSUM");
 
 		if (cbp->cb_print_slow_ios)
-			(void) printf(gettext("  SLOW"));
+			(void) printf(" %5s", gettext("SLOW"));
 
 		if (cbp->vcdl != NULL)
 			print_cmd_columns(cbp->vcdl, 0);

diff --git a/include/sys/zio.h b/include/sys/zio.h
@@ -158,11 +158,6 @@ enum zio_encrypt {
 	(compress) == ZIO_COMPRESS_ON ||		\
 	(compress) == ZIO_COMPRESS_OFF)
 
-/*
- * Default Linux timeout for a sd device.
- */
-#define	ZIO_SLOW_IO_MAX			(30 * MILLISEC)
-
 #define	ZIO_FAILURE_MODE_WAIT		0
 #define	ZIO_FAILURE_MODE_CONTINUE	1
 #define	ZIO_FAILURE_MODE_PANIC		2

diff --git a/man/man5/zfs-events.5 b/man/man5/zfs-events.5
@@ -694,9 +694,9 @@ full list of all the I/O stages.
 \fBzio_delay\fR
 .ad
 .RS 12n
-The time in nanoseconds required for the block layer to service the I/O.  Unlike
-\fBzio_delta\fR this does not include any vdev queuing time and is therefore
-solely a measure of the block layer performance.
+The time elapsed (in nanoseconds) waiting for the block layer to complete the
+I/O.  Unlike \fBzio_delta\fR this does not include any vdev queuing time and is
+therefore solely a measure of the block layer performance.
 .RE
 
 .sp

diff --git a/man/man5/zfs-module-parameters.5 b/man/man5/zfs-module-parameters.5
@@ -1141,10 +1141,10 @@ Default value: \fB500,000\fR.
 .sp
 .ne 2
 .na
-\fBzfs_slow_ios_per_second\fR (int)
+\fBzfs_low_ios_per_second\fR (int)
 .ad
 .RS 12n
-Rate limit slow I/O (delay) events to this many per second.
+Rate limit delay zevents (which report slow I/Os) to this many per second.
 .sp
 Default value: 20
 .RE

diff --git a/man/man8/zpool.8 b/man/man8/zpool.8
@@ -2218,9 +2218,10 @@ and referenced
 block counts and sizes by reference count.
 .It Fl s
 Display the number of leaf VDEV slow IOs.  This is the number of IOs that
-didn't complete in \fBzio_slow_io_ms\fR milliseconds.  This does not
-necessarily mean the IOs failed to complete, just took an unreasonably
-long amount of time.  This may indicate a problem with the underlying storage.
+didn't complete in \fBzio_slow_io_ms\fR milliseconds (default 30 seconds).
+This does not necessarily mean the IOs failed to complete, just took an
+unreasonably long amount of time.  This may indicate a problem with the
+underlying storage.
 .It Fl T Sy u Ns | Ns Sy d
 Display a time stamp.
 Specify

diff --git a/module/zfs/zio.c b/module/zfs/zio.c
@@ -77,7 +77,8 @@ uint64_t zio_buf_cache_allocs[SPA_MAXBLOCKSIZE >> SPA_MINBLOCKSHIFT];
 uint64_t zio_buf_cache_frees[SPA_MAXBLOCKSIZE >> SPA_MINBLOCKSHIFT];
 #endif
 
-int zio_slow_io_ms = ZIO_SLOW_IO_MAX;
+/* Mark IOs as "slow" if they take longer than 30 seconds */
+int zio_slow_io_ms = (30 * MILLISEC);
 
 #define	BP_SPANB(indblkshift, level) \
 	(((uint64_t)1) << ((level) * ((indblkshift) - SPA_BLKPTRSHIFT)))