50 lines
1.6 KiB
Diff
50 lines
1.6 KiB
Diff
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||
|
|
From: "John L. Hammond" <35266395+jhammond-intel@users.noreply.github.com>
|
||
|
|
Date: Wed, 17 Jan 2018 14:24:42 -0600
|
||
|
|
Subject: [PATCH] Emit an error message before MMP suspends pool
|
||
|
|
MIME-Version: 1.0
|
||
|
|
Content-Type: text/plain; charset=UTF-8
|
||
|
|
Content-Transfer-Encoding: 8bit
|
||
|
|
|
||
|
|
In mmp_thread(), emit an MMP specific error message before calling
|
||
|
|
zio_suspend() so that the administrator will understand why the pool
|
||
|
|
is being suspended.
|
||
|
|
|
||
|
|
Reviewed-by: Olaf Faaland <faaland1@llnl.gov>
|
||
|
|
Reviewed-by: Giuseppe Di Natale <dinatale2@llnl.gov>
|
||
|
|
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
|
||
|
|
Signed-off-by: John L. Hammond <john.hammond@intel.com>
|
||
|
|
Closes #7048
|
||
|
|
(cherry picked from commit ecc972c7f009e1fa75900e276a4c1306c55b5722)
|
||
|
|
Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
|
||
|
|
---
|
||
|
|
module/zfs/mmp.c | 5 +++++
|
||
|
|
1 file changed, 5 insertions(+)
|
||
|
|
|
||
|
|
diff --git a/module/zfs/mmp.c b/module/zfs/mmp.c
|
||
|
|
index 6f2aa3f59..e91ae628a 100644
|
||
|
|
--- a/module/zfs/mmp.c
|
||
|
|
+++ b/module/zfs/mmp.c
|
||
|
|
@@ -26,6 +26,7 @@
|
||
|
|
#include <sys/mmp.h>
|
||
|
|
#include <sys/spa.h>
|
||
|
|
#include <sys/spa_impl.h>
|
||
|
|
+#include <sys/time.h>
|
||
|
|
#include <sys/vdev.h>
|
||
|
|
#include <sys/vdev_impl.h>
|
||
|
|
#include <sys/zfs_context.h>
|
||
|
|
@@ -428,6 +429,10 @@ mmp_thread(spa_t *spa)
|
||
|
|
*/
|
||
|
|
if (!suspended && mmp_fail_intervals && multihost &&
|
||
|
|
(start - mmp->mmp_last_write) > max_fail_ns) {
|
||
|
|
+ cmn_err(CE_WARN, "MMP writes to pool '%s' have not "
|
||
|
|
+ "succeeded in over %llus; suspending pool",
|
||
|
|
+ spa_name(spa),
|
||
|
|
+ NSEC2SEC(start - mmp->mmp_last_write));
|
||
|
|
zio_suspend(spa, NULL);
|
||
|
|
}
|
||
|
|
|
||
|
|
--
|
||
|
|
2.14.2
|
||
|
|
|