Whamcloud - gitweb
git://git.whamcloud.com
/
fs
/
lustre-release.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
LU-7079 ptlrpc: imp_peer_committed_transno should increase
[fs/lustre-release.git]
/
lustre
/
osp
/
osp_sync.c
diff --git
a/lustre/osp/osp_sync.c
b/lustre/osp/osp_sync.c
index
f0d785a
..
4b6d68a
100644
(file)
--- a/
lustre/osp/osp_sync.c
+++ b/
lustre/osp/osp_sync.c
@@
-937,7
+937,6
@@
static void osp_sync_process_committed(const struct lu_env *env,
spin_unlock(&d->opd_syn_lock);
while (!list_empty(&list)) {
spin_unlock(&d->opd_syn_lock);
while (!list_empty(&list)) {
- struct llog_cookie *lcookie = NULL;
struct osp_job_req_args *jra;
jra = list_entry(list.next, struct osp_job_req_args, jra_link);
struct osp_job_req_args *jra;
jra = list_entry(list.next, struct osp_job_req_args, jra_link);
@@
-949,18
+948,18
@@
static void osp_sync_process_committed(const struct lu_env *env,
body = req_capsule_client_get(&req->rq_pill,
&RMF_OST_BODY);
LASSERT(body);
body = req_capsule_client_get(&req->rq_pill,
&RMF_OST_BODY);
LASSERT(body);
- lcookie = &body->oa.o_lcookie;
/* import can be closing, thus all commit cb's are
* called we can check committness directly */
/* import can be closing, thus all commit cb's are
* called we can check committness directly */
- if (req->rq_transno <= imp->imp_peer_committed_transno) {
- rc = llog_cat_cancel_records(env, llh, 1, lcookie);
+ if (req->rq_import_generation == imp->imp_generation) {
+ rc = llog_cat_cancel_records(env, llh, 1,
+ &body->oa.o_lcookie);
if (rc)
CERROR("%s: can't cancel record: %d\n",
obd->obd_name, rc);
} else {
if (rc)
CERROR("%s: can't cancel record: %d\n",
obd->obd_name, rc);
} else {
- DEBUG_REQ(D_HA, req, "not committed");
+ DEBUG_REQ(D_ERROR, req, "imp_committed = "LPU64,
+ imp->imp_peer_committed_transno);
}
}
-
ptlrpc_req_finished(req);
done++;
}
ptlrpc_req_finished(req);
done++;
}