LLOG_LCM_FL_EXIT = 1 << 1
};
-/**
+/**
* Allocate new llcd from cache, init it and return to caller.
* Bumps number of objects allocated.
*/
struct llog_canceld_ctxt *llcd;
int llcd_size;
- /*
+ /*
* Payload of lustre_msg V2 is bigger.
*/
- llcd_size = CFS_PAGE_SIZE -
+ llcd_size = CFS_PAGE_SIZE -
lustre_msg_size(LUSTRE_MSG_MAGIC_V2, 1, NULL);
llcd_size += offsetof(struct llog_canceld_ctxt, llcd_cookies);
OBD_SLAB_ALLOC(llcd, llcd_cache, CFS_ALLOC_STD, llcd_size);
if (!llcd)
return NULL;
+ CFS_INIT_LIST_HEAD(&llcd->llcd_list);
llcd->llcd_size = llcd_size;
llcd->llcd_cookiebytes = 0;
atomic_inc(&llcd_count);
/**
* Copy passed @cookies to @llcd.
*/
-static void llcd_copy(struct llog_canceld_ctxt *llcd,
+static void llcd_copy(struct llog_canceld_ctxt *llcd,
struct llog_cookie *cookies)
{
- memcpy((char *)llcd->llcd_cookies + llcd->llcd_cookiebytes,
+ memcpy((char *)llcd->llcd_cookies + llcd->llcd_cookiebytes,
cookies, sizeof(*cookies));
llcd->llcd_cookiebytes += sizeof(*cookies);
}
static int llcd_fit(struct llog_canceld_ctxt *llcd,
struct llog_cookie *cookies)
{
- return (llcd->llcd_size -
+ return (llcd->llcd_size -
llcd->llcd_cookiebytes) >= sizeof(*cookies);
}
-static void llcd_print(struct llog_canceld_ctxt *llcd,
- const char *func, int line)
+static void llcd_print(struct llog_canceld_ctxt *llcd,
+ const char *func, int line)
{
CDEBUG(D_RPCTRACE, "Llcd (%p) at %s:%d:\n", llcd, func, line);
CDEBUG(D_RPCTRACE, " size: %d\n", llcd->llcd_size);
* sending result. Error is passed in @rc. Note, that this will be called
* in cleanup time when all inflight rpcs aborted.
*/
-static int
+static int
llcd_interpret(const struct lu_env *env,
struct ptlrpc_request *req, void *noused, int rc)
{
llcd_free(llcd);
return 0;
}
-
+
/**
* Send @llcd to remote node. Free llcd uppon completion or error. Sending
- * is performed in async style so this function will return asap without
+ * is performed in async style so this function will return asap without
* blocking.
*/
static int llcd_send(struct llog_canceld_ctxt *llcd)
ctxt = llcd->llcd_ctxt;
if (!ctxt) {
- CERROR("Invalid llcd with NULL ctxt found (%p)\n",
+ CERROR("Invalid llcd with NULL ctxt found (%p)\n",
llcd);
llcd_print(llcd, __FUNCTION__, __LINE__);
LBUG();
GOTO(exit, rc = 0);
lcm = llcd->llcd_lcm;
-
- /*
+
+ /*
* Check if we're in exit stage. Do not send llcd in
- * this case.
+ * this case.
*/
if (test_bit(LLOG_LCM_FL_EXIT, &lcm->lcm_flags))
GOTO(exit, rc = -ENODEV);
CDEBUG(D_RPCTRACE, "Sending llcd %p\n", llcd);
import = llcd->llcd_ctxt->loc_imp;
- if (!import || (import == LP_POISON) ||
+ if (!import || (import == LP_POISON) ||
(import->imp_client == LP_POISON)) {
- CERROR("Invalid import %p for llcd %p\n",
+ CERROR("Invalid import %p for llcd %p\n",
import, llcd);
GOTO(exit, rc = -ENODEV);
}
OBD_FAIL_TIMEOUT(OBD_FAIL_PTLRPC_DELAY_RECOV, 10);
/*
- * No need to get import here as it is already done in
+ * No need to get import here as it is already done in
* llog_receptor_accept().
*/
req = ptlrpc_request_alloc(import, &RQF_LOG_CANCEL);
if (req == NULL) {
- CERROR("Can't allocate request for sending llcd %p\n",
+ CERROR("Can't allocate request for sending llcd %p\n",
llcd);
GOTO(exit, rc = -ENOMEM);
}
LASSERT_SEM_LOCKED(&ctxt->loc_sem);
LASSERT(ctxt->loc_llcd == NULL);
lcm = ctxt->loc_lcm;
+ spin_lock(&lcm->lcm_lock);
atomic_inc(&lcm->lcm_count);
+ list_add_tail(&llcd->llcd_list, &lcm->lcm_llcds);
+ spin_unlock(&lcm->lcm_lock);
CDEBUG(D_RPCTRACE, "Attach llcd %p to ctxt %p (%d)\n",
llcd, ctxt, atomic_read(&lcm->lcm_count));
llcd->llcd_ctxt = llog_ctxt_get(ctxt);
llcd_print(llcd, __FUNCTION__, __LINE__);
LBUG();
}
+ spin_lock(&lcm->lcm_lock);
+ LASSERT(!list_empty(&llcd->llcd_list));
+ list_del_init(&llcd->llcd_list);
atomic_dec(&lcm->lcm_count);
+ spin_unlock(&lcm->lcm_lock);
ctxt->loc_llcd = NULL;
-
- CDEBUG(D_RPCTRACE, "Detach llcd %p from ctxt %p (%d)\n",
+
+ CDEBUG(D_RPCTRACE, "Detach llcd %p from ctxt %p (%d)\n",
llcd, ctxt, atomic_read(&lcm->lcm_count));
llog_ctxt_put(ctxt);
llcd = llcd_detach(ctxt);
if (llcd)
llcd_free(llcd);
-
- if (atomic_read(&lcm->lcm_count) == 0)
- cfs_waitq_signal(&lcm->lcm_waitq);
}
/**
int rc;
/*
- * Make sure that this llcd will not be sent again as we detach
+ * Make sure that this llcd will not be sent again as we detach
* it from ctxt.
*/
llcd = llcd_detach(ctxt);
llcd_print(llcd, __FUNCTION__, __LINE__);
LBUG();
}
-
+
rc = llcd_send(llcd);
if (rc)
CERROR("Couldn't send llcd %p (%d)\n", llcd, rc);
rc = ptlrpcd_start(lcm->lcm_name, &lcm->lcm_pc);
if (rc) {
- CERROR("Error %d while starting recovery thread %s\n",
+ CERROR("Error %d while starting recovery thread %s\n",
rc, lcm->lcm_name);
RETURN(rc);
}
- lcm->lcm_set = lcm->lcm_pc.pc_set;
RETURN(rc);
}
EXPORT_SYMBOL(llog_recov_thread_start);
*/
void llog_recov_thread_stop(struct llog_commit_master *lcm, int force)
{
- struct l_wait_info lwi = LWI_INTR(LWI_ON_SIGNAL_NOOP, NULL);
ENTRY;
- /**
- * Let all know that we're stopping. This will also make
+ /*
+ * Let all know that we're stopping. This will also make
* llcd_send() refuse any new llcds.
*/
set_bit(LLOG_LCM_FL_EXIT, &lcm->lcm_flags);
- /**
+ /*
* Stop processing thread. No new rpcs will be accepted for
* for processing now.
*/
ptlrpcd_stop(&lcm->lcm_pc, force);
/*
- * Wait for llcd number == 0. Note, this is infinite wait.
- * All other parts should make sure that no lost llcd is left.
+ * By this point no alive inflight llcds should be left. Only
+ * those forgotten in sync may still be attached to ctxt. Let's
+ * print them.
*/
- l_wait_event(lcm->lcm_waitq,
- atomic_read(&lcm->lcm_count) == 0, &lwi);
+ if (atomic_read(&lcm->lcm_count) != 0) {
+ struct llog_canceld_ctxt *llcd;
+ struct list_head *tmp;
+
+ CERROR("Busy llcds found (%d) on lcm %p\n",
+ atomic_read(&lcm->lcm_count) == 0, lcm);
+
+ spin_lock(&lcm->lcm_lock);
+ list_for_each(tmp, &lcm->lcm_llcds) {
+ llcd = list_entry(tmp, struct llog_canceld_ctxt,
+ llcd_list);
+ llcd_print(llcd, __FUNCTION__, __LINE__);
+ }
+ spin_unlock(&lcm->lcm_lock);
+ }
EXIT;
}
EXPORT_SYMBOL(llog_recov_thread_stop);
/*
* Try to create threads with unique names.
*/
- snprintf(lcm->lcm_name, sizeof(lcm->lcm_name),
+ snprintf(lcm->lcm_name, sizeof(lcm->lcm_name),
"ll_log_commit_%s", name);
strncpy(lcm->lcm_name, name, sizeof(lcm->lcm_name));
- cfs_waitq_init(&lcm->lcm_waitq);
atomic_set(&lcm->lcm_count, 0);
+ spin_lock_init(&lcm->lcm_lock);
+ CFS_INIT_LIST_HEAD(&lcm->lcm_llcds);
rc = llog_recov_thread_start(lcm);
if (rc) {
CERROR("Can't start commit thread, rc %d\n", rc);
}
EXPORT_SYMBOL(llog_recov_thread_fini);
-static int llog_recov_thread_replay(struct llog_ctxt *ctxt,
+static int llog_recov_thread_replay(struct llog_ctxt *ctxt,
void *cb, void *arg)
{
struct obd_device *obd = ctxt->loc_obd;
OBD_FREE_PTR(lpca);
RETURN(-ENODEV);
}
- rc = cfs_kernel_thread(llog_cat_process_thread, lpca,
+ rc = cfs_kernel_thread(llog_cat_process_thread, lpca,
CLONE_VM | CLONE_FILES);
if (rc < 0) {
CERROR("Error starting llog_cat_process_thread(): %d\n", rc);
RETURN(rc);
}
-int llog_obd_repl_connect(struct llog_ctxt *ctxt, int count,
+int llog_obd_repl_connect(struct llog_ctxt *ctxt,
struct llog_logid *logid, struct llog_gen *gen,
struct obd_uuid *uuid)
{
int rc;
ENTRY;
- /*
+ /*
* Send back cached llcd from llog before recovery if we have any.
* This is void is nothing cached is found there.
*/
llog_sync(ctxt, NULL);
- /*
- * Start recovery in separate thread.
+ /*
+ * Start recovery in separate thread.
*/
mutex_down(&ctxt->loc_sem);
ctxt->loc_gen = *gen;
}
EXPORT_SYMBOL(llog_obd_repl_connect);
-/**
+/**
* Deleted objects have a commit callback that cancels the MDS
* log record for the deletion. The commit callback calls this
* function.
mutex_down(&ctxt->loc_sem);
lcm = ctxt->loc_lcm;
-
+
/*
* Let's check if we have all structures alive. We also check for
* possible shutdown. Do nothing if we're stopping.
GOTO(out, rc = -ENODEV);
}
- if (ctxt->loc_obd->obd_stopping) {
- CDEBUG(D_RPCTRACE, "Obd is stopping for ctxt %p\n", ctxt);
- GOTO(out, rc = -ENODEV);
- }
-
if (test_bit(LLOG_LCM_FL_EXIT, &lcm->lcm_flags)) {
- CDEBUG(D_RPCTRACE, "Commit thread is stopping for ctxt %p\n",
+ CDEBUG(D_RPCTRACE, "Commit thread is stopping for ctxt %p\n",
ctxt);
GOTO(out, rc = -ENODEV);
}
if (count > 0 && cookies != NULL) {
/*
- * Get new llcd from ctxt if required.
+ * Get new llcd from ctxt if required.
*/
if (!llcd) {
llcd = llcd_get(ctxt);
}
/*
- * Llcd does not have enough room for @cookies. Let's push
- * it out and allocate new one.
+ * Llcd does not have enough room for @cookies. Let's push
+ * it out and allocate new one.
*/
if (!llcd_fit(llcd, cookies)) {
rc = llcd_push(ctxt);
}
/*
- * Copy cookies to @llcd, no matter old or new allocated one.
+ * Copy cookies to @llcd, no matter old or new allocated
+ * one.
*/
llcd_copy(llcd, cookies);
}
/*
- * Let's check if we need to send copied @cookies asap. If yes - do it.
+ * Let's check if we need to send copied @cookies asap. If yes
+ * then do it.
*/
if (llcd && (flags & OBD_LLOG_FL_SENDNOW)) {
rc = llcd_push(ctxt);
int rc = 0;
ENTRY;
+ /*
+ * Flush any remaining llcd.
+ */
mutex_down(&ctxt->loc_sem);
if (exp && (ctxt->loc_imp == exp->exp_imp_reverse)) {
- CDEBUG(D_RPCTRACE, "Reverse import disconnect\n");
/*
- * Check for llcd which might be left attached to @ctxt.
- * Let's kill it.
+ * This is ost->mds connection, we can't be sure that mds
+ * can still receive cookies, let's killed the cached llcd.
*/
+ CDEBUG(D_RPCTRACE, "Kill cached llcd\n");
llcd_put(ctxt);
mutex_up(&ctxt->loc_sem);
} else {
+ /*
+ * This is either llog_sync() from generic llog code or sync
+ * on client disconnect. In either way let's do it and send
+ * llcds to the target with waiting for completion.
+ */
+ CDEBUG(D_RPCTRACE, "Sync cached llcd\n");
mutex_up(&ctxt->loc_sem);
rc = llog_cancel(ctxt, NULL, 0, NULL, OBD_LLOG_FL_SENDNOW);
}
{
int llcd_size;
- llcd_size = CFS_PAGE_SIZE -
+ llcd_size = CFS_PAGE_SIZE -
lustre_msg_size(LUSTRE_MSG_MAGIC_V2, 1, NULL);
llcd_size += offsetof(struct llog_canceld_ctxt, llcd_cookies);
llcd_cache = cfs_mem_cache_create("llcd_cache", llcd_size, 0, 0);
void llog_recov_fini(void)
{
/*
- * Kill llcd cache when thread is stopped and we're sure no
+ * Kill llcd cache when thread is stopped and we're sure no
* llcd in use left.
*/
if (llcd_cache) {
* In 2.6.22 cfs_mem_cache_destroy() will not return error
* for busy resources. Let's check it another way.
*/
- LASSERTF(atomic_read(&llcd_count) == 0,
+ LASSERTF(atomic_read(&llcd_count) == 0,
"Can't destroy llcd cache! Number of "
"busy llcds: %d\n", atomic_read(&llcd_count));
cfs_mem_cache_destroy(llcd_cache);
git://git.whamcloud.com / fs / lustre-release.git / blobdiff