Whamcloud - gitweb
LU-8872 quota: incorrect LASSERT 24/24024/5
authorNiu Yawei <yawei.niu@intel.com>
Wed, 30 Nov 2016 03:43:56 +0000 (22:43 -0500)
committerOleg Drokin <oleg.drokin@intel.com>
Sun, 26 Mar 2017 06:48:56 +0000 (06:48 +0000)
Remove an incorrect LASSERT in qsd_add_deferred().

Signed-off-by: Niu Yawei <yawei.niu@intel.com>
Change-Id: I7ea0274032ac67e3a039a0a0982d5945498fd434
Reviewed-on: https://review.whamcloud.com/24024
Reviewed-by: Lai Siyao <lai.siyao@intel.com>
Reviewed-by: Fan Yong <fan.yong@intel.com>
Tested-by: Jenkins
Tested-by: Maloo <hpdd-maloo@intel.com>
Reviewed-by: Oleg Drokin <oleg.drokin@intel.com>
lustre/quota/qsd_writeback.c

index 8352e59..9b12c2c 100644 (file)
@@ -121,9 +121,14 @@ static void qsd_add_deferred(struct qsd_instance *qsd, struct list_head *list,
                 * updates. We should just delete the legacy record in such
                 * case. */
                if (upd->qur_ver == tmp->qur_ver) {
-                       LASSERT(tmp->qur_lqe);
-                       LQUOTA_ERROR(tmp->qur_lqe, "Found a conflict record "
-                                    "with ver:%llu", tmp->qur_ver);
+                       if (tmp->qur_lqe)
+                               LQUOTA_WARN(tmp->qur_lqe, "Found a conflict "
+                                           "record with ver:%llu",
+                                           tmp->qur_ver);
+                       else
+                               CWARN("%s: Found a conflict record with ver: "
+                                     "%llu\n", qsd->qsd_svname, tmp->qur_ver);
+
                        list_del_init(&tmp->qur_link);
                        qsd_upd_free(tmp);
                } else if (upd->qur_ver < tmp->qur_ver) {