Add addtional debug messages

Signed-off-by: Don Brady <[email protected]>
openzfs · Apr 26, 2024 · a301fb6 · a301fb6
1 parent 525a5a2
commit a301fb6
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/module/zfs/mmp.c b/module/zfs/mmp.c
@@ -664,12 664,13 @@ mmp_thread(void *arg)
  (gethrtime() - mmp->mmp_last_write) > mmp_fail_ns) {
  zfs_dbgmsg("MMP suspending pool '%s': gethrtime %llu "
  "mmp_last_write %llu mmp_interval %llu "
- "mmp_fail_intervals %llu mmp_fail_ns %llu",
  "mmp_fail_intervals %llu mmp_fail_ns %llu txg %llu",
  spa_name(spa), (u_longlong_t)gethrtime(),
  (u_longlong_t)mmp->mmp_last_write,
  (u_longlong_t)mmp_interval,
  (u_longlong_t)mmp_fail_intervals,
- (u_longlong_t)mmp_fail_ns);
  (u_longlong_t)mmp_fail_ns,
  (u_longlong_t)spa->spa_uberblock.ub_txg);
  cmn_err(CE_WARN, "MMP writes to pool '%s' have not "
  "succeeded in over %llu ms; suspending pool. "
  "Hrtime %llu",

diff --git a/module/zfs/spa.c b/module/zfs/spa.c
@@ -278,7 278,7 @@ uint64_t zfs_max_missing_tvds_cachefile = SPA_DVAS_PER_BP - 1;
 uint64_t zfs_max_missing_tvds_scan = 0;
 
 /*
- * Debugginr aid that pauses spa_sync() towards the end.
  * Debugging aid that pauses spa_sync() towards the end.
  */
 static const boolean_t zfs_pause_spa_sync = B_FALSE;
 
@@ -3787,6 3787,12 @@ spa_mmp_remote_host_activity(spa_t *spa)
 
  if (best_ub.ub_txg != spa->spa_uberblock.ub_txg ||
  best_ub.ub_timestamp != spa->spa_uberblock.ub_timestamp) {
  zfs_dbgmsg("txg mismatch detected during clear"
  "txg %llu ub_txg %llu timestamp %llu ub_timestamp %llu",
  (u_longlong_t)spa->spa_uberblock.ub_txg,
  (u_longlong_t)best_ub.ub_txg,
  (u_longlong_t)spa->spa_uberblock.ub_timestamp,
  (u_longlong_t)best_ub.ub_timestamp);
  return (B_TRUE);
  }