From: Patrick Farrell <pfarrell@whamcloud.com>
Date: Fri, 8 Feb 2019 17:14:06 +0000 (-0500)
Subject: LU-11939 tgt: Do not assert during grant cleanup
X-Git-Tag: 2.13.52~32
X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=commitdiff_plain;h=af2d3ac30eafead6b47c5db20d76433c091d89de;hp=a8b9a123fea3762b999e80f56fdbbdf2ea10e280

LU-11939 tgt: Do not assert during grant cleanup

Client/server grant inconsistencies discovered during
cleanup are indicative of a bug, but any problems they
would cause have already occurred at this point.

So do not assert during this cleanup.

Signed-off-by: Patrick Farrell <pfarrell@whamcloud.com>
Change-Id: Ic9b827b1005bc321a290505a368349699ddf2f38
Reviewed-on: https://review.whamcloud.com/34215
Tested-by: jenkins <devops@whamcloud.com>
Tested-by: Maloo <maloo@whamcloud.com>
Reviewed-by: Andreas Dilger <adilger@whamcloud.com>
Reviewed-by: Alex Zhuravlev <bzzz@whamcloud.com>
Reviewed-by: Oleg Drokin <green@whamcloud.com>
---

diff --git a/lustre/target/tgt_grant.c b/lustre/target/tgt_grant.c
index 8facd60..3bcda7d 100644
--- a/lustre/target/tgt_grant.c
+++ b/lustre/target/tgt_grant.c
@@ -1089,22 +1089,25 @@ void tgt_grant_discard(struct obd_export *exp)
 
 	tgd = &lut->lut_tgd;
 	spin_lock(&tgd->tgd_grant_lock);
-	LASSERTF(tgd->tgd_tot_granted >= ted->ted_grant,
-		 "%s: tot_granted %llu cli %s/%p ted_grant %ld\n",
-		 obd->obd_name, tgd->tgd_tot_granted,
-		 exp->exp_client_uuid.uuid, exp, ted->ted_grant);
+	if (tgd->tgd_tot_granted < ted->ted_grant) {
+		CERROR("%s: tot_granted %llu < cli %s/%p ted_grant %ld\n",
+		       obd->obd_name, tgd->tgd_tot_granted,
+		       exp->exp_client_uuid.uuid, exp, ted->ted_grant);
+	}
 	tgd->tgd_tot_granted -= ted->ted_grant;
 	ted->ted_grant = 0;
-	LASSERTF(tgd->tgd_tot_pending >= ted->ted_pending,
-		 "%s: tot_pending %llu cli %s/%p ted_pending %ld\n",
-		 obd->obd_name, tgd->tgd_tot_pending,
-		 exp->exp_client_uuid.uuid, exp, ted->ted_pending);
+	if (tgd->tgd_tot_pending < ted->ted_pending) {
+		CERROR("%s: tot_pending %llu < cli %s/%p ted_pending %ld\n",
+		       obd->obd_name, tgd->tgd_tot_pending,
+		       exp->exp_client_uuid.uuid, exp, ted->ted_pending);
+	}
 	/* tgd_tot_pending is handled in tgt_grant_commit as bulk
 	 * commmits */
-	LASSERTF(tgd->tgd_tot_dirty >= ted->ted_dirty,
-		 "%s: tot_dirty %llu cli %s/%p ted_dirty %ld\n",
-		 obd->obd_name, tgd->tgd_tot_dirty,
-		 exp->exp_client_uuid.uuid, exp, ted->ted_dirty);
+	if (tgd->tgd_tot_dirty < ted->ted_dirty) {
+		CERROR("%s: tot_dirty %llu < cli %s/%p ted_dirty %ld\n",
+		       obd->obd_name, tgd->tgd_tot_dirty,
+		       exp->exp_client_uuid.uuid, exp, ted->ted_dirty);
+	}
 	tgd->tgd_tot_dirty -= ted->ted_dirty;
 	ted->ted_dirty = 0;
 	spin_unlock(&tgd->tgd_grant_lock);