X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fptlrpc%2Fpinger.c;h=77507ca0508b993e13f6bc7663c43ee811cba362;hb=859678cc6b075f7c81903e44b99bdbd18c635cbb;hp=ce1c682255e4a33b7a1a4d72e9613728d2747784;hpb=17aba1a77740e3aaa2e8a8ddabe68256f3f5db74;p=fs%2Flustre-release.git diff --git a/lustre/ptlrpc/pinger.c b/lustre/ptlrpc/pinger.c index ce1c682..77507ca 100644 --- a/lustre/ptlrpc/pinger.c +++ b/lustre/ptlrpc/pinger.c @@ -7,244 +7,171 @@ * Authors: Phil Schwan * Mike Shaver * - * This file is part of Lustre, http://www.lustre.org. + * This file is part of the Lustre file system, http://www.lustre.org + * Lustre is a trademark of Cluster File Systems, Inc. * - * Lustre is free software; you can redistribute it and/or - * modify it under the terms of version 2 of the GNU General Public - * License as published by the Free Software Foundation. + * You may have signed or agreed to another license before downloading + * this software. If so, you are bound by the terms and conditions + * of that agreement, and the following does not apply to you. See the + * LICENSE file included with this distribution for more information. * - * Lustre is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * If you did not agree to a different license, then this copy of Lustre + * is open source software; you can redistribute it and/or modify it + * under the terms of version 2 of the GNU General Public License as + * published by the Free Software Foundation. * - * You should have received a copy of the GNU General Public License - * along with Lustre; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + * In either case, Lustre is distributed in the hope that it will be + * useful, but WITHOUT ANY WARRANTY; without even the implied warranty + * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * license text for more details. */ #ifndef __KERNEL__ #include #else -#include -#include #define DEBUG_SUBSYSTEM S_RPC #endif -#include -#include +#include +#include #include "ptlrpc_internal.h" -#define PINGER_RATE 3 /* how many pings we'll do in obd_timeout period */ +struct semaphore pinger_sem; +static struct list_head pinger_imports = CFS_LIST_HEAD_INIT(pinger_imports); -static DECLARE_MUTEX(pinger_sem); -static struct list_head pinger_imports = LIST_HEAD_INIT(pinger_imports); - -static int ptlrpc_ping_interpret(struct ptlrpc_request *req, - void *data, int rc) -{ - struct obd_import *imp = req->rq_import; - DEBUG_REQ(D_HA, req, "ping reply"); - if (imp->imp_waiting_ping_reply == 0) - DEBUG_REQ(D_ERROR, req, "late ping reply?"); - if (imp->imp_last_ping_xid != req->rq_xid) - DEBUG_REQ(D_ERROR, req, "uh, wrong ping reply on x%lx", - imp->imp_last_ping_xid); - else - imp->imp_last_ping_xid = 0; - - /* if ping reply is an error, don't drop "replied" flag - * on import, so pinger will invalidate it */ - if (ptlrpc_client_replied(req) && req->rq_repmsg == NULL) - CWARN("replied (%d) w/o rep buffer?\n", req->rq_replied); - if (ptlrpc_client_replied(req) && req->rq_repmsg && - req->rq_repmsg->type == PTL_RPC_MSG_ERR) - return 0; - - imp->imp_waiting_ping_reply = 0; - return 0; -} - -int ptlrpc_ping(struct obd_import *imp) +int ptlrpc_ping(struct obd_import *imp) { struct ptlrpc_request *req; int rc = 0; ENTRY; - req = ptlrpc_prep_req(imp, LUSTRE_OBD_VERSION, OBD_PING, 0, NULL, NULL); + req = ptlrpc_prep_req(imp, LUSTRE_OBD_VERSION, OBD_PING, 1, NULL, NULL); if (req) { - DEBUG_REQ(D_HA, req, "pinging %s->%s", + DEBUG_REQ(D_INFO, req, "pinging %s->%s", imp->imp_obd->obd_uuid.uuid, - imp->imp_target_uuid.uuid); + obd2cli_tgt(imp->imp_obd)); req->rq_no_resend = req->rq_no_delay = 1; - req->rq_replen = lustre_msg_size(0, NULL); - req->rq_interpret_reply = ptlrpc_ping_interpret; - req->rq_timeout = obd_timeout / PINGER_RATE; - imp->imp_waiting_ping_reply = 1; - imp->imp_last_ping_xid = req->rq_xid; + ptlrpc_req_set_repsize(req, 1, NULL); ptlrpcd_add_req(req); } else { CERROR("OOM trying to ping %s->%s\n", imp->imp_obd->obd_uuid.uuid, - imp->imp_target_uuid.uuid); + obd2cli_tgt(imp->imp_obd)); rc = -ENOMEM; } RETURN(rc); } -#ifdef __KERNEL__ -static inline int ptlrpc_next_ping(struct obd_import *imp) -{ - return jiffies + (obd_timeout / PINGER_RATE * HZ); -} - -static inline int ptlrpc_next_reconnect(struct obd_import *imp) -{ - if (imp->imp_server_timeout) - return jiffies + (obd_timeout / 2 * HZ); - else - return jiffies + (obd_timeout * HZ); -} - -static atomic_t suspend_timeouts = ATOMIC_INIT(0); -static wait_queue_head_t suspend_timeouts_waitq; - -void ptlrpc_deactivate_timeouts(void) -{ - CDEBUG(D_HA, "deactivate timeouts\n"); - atomic_inc(&suspend_timeouts); -} - -void ptlrpc_activate_timeouts(void) -{ - CDEBUG(D_HA, "activate timeouts\n"); - LASSERT(atomic_read(&suspend_timeouts) > 0); - if (atomic_dec_and_test(&suspend_timeouts)) - wake_up(&suspend_timeouts_waitq); -} - -int ptlrpc_check_suspend(void) +static void ptlrpc_update_next_ping(struct obd_import *imp) { - if (atomic_read(&suspend_timeouts)) - return 1; - return 0; + imp->imp_next_ping = cfs_time_shift( + (imp->imp_state == LUSTRE_IMP_DISCON ? + RECONNECT_INTERVAL : PING_INTERVAL)); } -int ptlrpc_check_and_wait_suspend(struct ptlrpc_request *req) +void ptlrpc_ping_import_soon(struct obd_import *imp) { - struct l_wait_info lwi; - - if (atomic_read(&suspend_timeouts)) { - DEBUG_REQ(D_NET, req, "-- suspend %d regular timeout", - atomic_read(&suspend_timeouts)); - lwi = LWI_INTR(NULL, NULL); - l_wait_event(suspend_timeouts_waitq, - atomic_read(&suspend_timeouts) == 0, &lwi); - DEBUG_REQ(D_NET, req, "-- recharge regular timeout"); - return 1; - } - return 0; -} - -static void ptlrpc_pinger_process_import(struct obd_import *imp, - unsigned long this_ping) -{ - unsigned long flags; - int force, level; - - spin_lock_irqsave(&imp->imp_lock, flags); - level = imp->imp_state; - force = imp->imp_force_verify; - if (force) - imp->imp_force_verify = 0; - spin_unlock_irqrestore(&imp->imp_lock, flags); - - if (imp->imp_next_ping > this_ping && force == 0) - return; - - if (level == LUSTRE_IMP_DISCON && !imp->imp_deactive) { - /* wait at least a timeout before trying recovery again */ - imp->imp_next_ping = ptlrpc_next_reconnect(imp); - ptlrpc_initiate_recovery(imp); - } else if (level != LUSTRE_IMP_FULL || imp->imp_obd->obd_no_recov) { - CDEBUG(D_HA, "not pinging %s (in recovery " - " or recovery disabled: %s)\n", - imp->imp_target_uuid.uuid, - ptlrpc_import_state_name(level)); - } else if (level == LUSTRE_IMP_FULL && imp->imp_waiting_ping_reply && - imp->imp_next_ping >= this_ping && imp->imp_pingable) { - CDEBUG(D_HA, "%s: %s hasn't respond on ping x%lu\n", - imp->imp_obd->obd_uuid.uuid, - imp->imp_target_uuid.uuid, imp->imp_last_ping_xid); - CDEBUG(D_ERROR, "%s: %s hasn't respond on ping x%lu\n", - imp->imp_obd->obd_uuid.uuid, - imp->imp_target_uuid.uuid, imp->imp_last_ping_xid); - ptlrpc_fail_import(imp, 0); - } else if (imp->imp_pingable || force) { - imp->imp_next_ping = ptlrpc_next_ping(imp); - ptlrpc_ping(imp); - } + imp->imp_next_ping = cfs_time_current(); } +#ifdef __KERNEL__ static int ptlrpc_pinger_main(void *arg) { struct ptlrpc_svc_data *data = (struct ptlrpc_svc_data *)arg; struct ptlrpc_thread *thread = data->thread; - unsigned long flags; ENTRY; - lock_kernel(); - ptlrpc_daemonize(); - - SIGNAL_MASK_LOCK(current, flags); - sigfillset(¤t->blocked); - RECALC_SIGPENDING; - SIGNAL_MASK_UNLOCK(current, flags); - - LASSERTF(strlen(data->name) < sizeof(current->comm), - "name %d > len %d\n", - (int)strlen(data->name), (int)sizeof(current->comm)); - THREAD_NAME(current->comm, sizeof(current->comm) - 1, "%s", data->name); - unlock_kernel(); + cfs_daemonize(data->name); /* Record that the thread is running */ thread->t_flags = SVC_RUNNING; - wake_up(&thread->t_ctl_waitq); + cfs_waitq_signal(&thread->t_ctl_waitq); /* And now, loop forever, pinging as needed. */ while (1) { - unsigned long this_ping = jiffies; - long time_to_next_ping; - struct l_wait_info lwi = LWI_TIMEOUT(obd_timeout * HZ, - NULL, NULL); + cfs_time_t this_ping = cfs_time_current(); + struct l_wait_info lwi; + cfs_duration_t time_to_next_ping; struct list_head *iter; - time_to_next_ping = this_ping + (obd_timeout * HZ) - jiffies; - down(&pinger_sem); + mutex_down(&pinger_sem); list_for_each(iter, &pinger_imports) { struct obd_import *imp = list_entry(iter, struct obd_import, imp_pinger_chain); + int force, level; - ptlrpc_pinger_process_import(imp, this_ping); - - CDEBUG(D_OTHER, "%s: pingable %d, next_ping %lu(%lu)\n", - imp->imp_target_uuid.uuid, - imp->imp_pingable, imp->imp_next_ping, jiffies); + spin_lock(&imp->imp_lock); + level = imp->imp_state; + force = imp->imp_force_verify; + imp->imp_force_verify = 0; + spin_unlock(&imp->imp_lock); + + CDEBUG(level == LUSTRE_IMP_FULL ? D_INFO : D_HA, + "level %s/%u force %u deactive %u pingable %u\n", + ptlrpc_import_state_name(level), level, + force, imp->imp_deactive, imp->imp_pingable); + + if (force || + /* if the next ping is within, say, 5 jiffies from + now, go ahead and ping. See note below. */ + cfs_time_aftereq(this_ping, + imp->imp_next_ping - 5 * CFS_TICK)) { + if (level == LUSTRE_IMP_DISCON && + !imp->imp_deactive) { + /* wait at least a timeout before + trying recovery again. */ + imp->imp_next_ping = cfs_time_shift(obd_timeout); + ptlrpc_initiate_recovery(imp); + } else if (level != LUSTRE_IMP_FULL || + imp->imp_obd->obd_no_recov || + imp->imp_deactive) { + CDEBUG(D_HA, "not pinging %s " + "(in recovery: %s or recovery " + "disabled: %u/%u)\n", + obd2cli_tgt(imp->imp_obd), + ptlrpc_import_state_name(level), + imp->imp_deactive, + imp->imp_obd->obd_no_recov); + } else if (imp->imp_pingable || force) { + ptlrpc_ping(imp); + } + } else { + if (!imp->imp_pingable) + continue; + CDEBUG(D_INFO, + "don't need to ping %s ("CFS_TIME_T + " > "CFS_TIME_T")\n", + obd2cli_tgt(imp->imp_obd), + imp->imp_next_ping, this_ping); + } - if (imp->imp_pingable && imp->imp_next_ping && - imp->imp_next_ping - jiffies < time_to_next_ping && - imp->imp_next_ping > jiffies) - time_to_next_ping = imp->imp_next_ping - jiffies; + /* obd_timeout might have changed */ + if (cfs_time_after(imp->imp_next_ping, + cfs_time_add(this_ping, + cfs_time_seconds(PING_INTERVAL)))) + ptlrpc_update_next_ping(imp); } - up(&pinger_sem); + mutex_up(&pinger_sem); /* Wait until the next ping time, or until we're stopped. */ - CDEBUG(D_HA, "next ping in %lu (%lu)\n", time_to_next_ping, - this_ping + (obd_timeout * HZ)); + time_to_next_ping = cfs_time_sub(cfs_time_add(this_ping, + cfs_time_seconds(PING_INTERVAL)), + cfs_time_current()); + + /* The ping sent by ptlrpc_send_rpc may get sent out + say .01 second after this. + ptlrpc_pinger_eending_on_import will then set the + next ping time to next_ping + .01 sec, which means + we will SKIP the next ping at next_ping, and the + ping will get sent 2 timeouts from now! Beware. */ + CDEBUG(D_INFO, "next ping in "CFS_DURATION_T" ("CFS_TIME_T")\n", + time_to_next_ping, + cfs_time_add(this_ping, cfs_time_seconds(PING_INTERVAL))); if (time_to_next_ping > 0) { - lwi = LWI_TIMEOUT(time_to_next_ping, NULL, NULL); + lwi = LWI_TIMEOUT(max_t(cfs_duration_t, time_to_next_ping, cfs_time_seconds(1)), + NULL, NULL); l_wait_event(thread->t_ctl_waitq, thread->t_flags & (SVC_STOPPING|SVC_EVENT), &lwi); @@ -260,9 +187,9 @@ static int ptlrpc_pinger_main(void *arg) } thread->t_flags = SVC_STOPPED; - wake_up(&thread->t_ctl_waitq); + cfs_waitq_signal(&thread->t_ctl_waitq); - CDEBUG(D_NET, "pinger thread exiting, process %d\n", current->pid); + CDEBUG(D_NET, "pinger thread exiting, process %d\n", cfs_curproc_pid()); return 0; } @@ -278,32 +205,30 @@ int ptlrpc_start_pinger(void) #endif ENTRY; - LASSERT(obd_timeout > PINGER_RATE); - if (pinger_thread != NULL) RETURN(-EALREADY); OBD_ALLOC(pinger_thread, sizeof(*pinger_thread)); if (pinger_thread == NULL) RETURN(-ENOMEM); - init_waitqueue_head(&pinger_thread->t_ctl_waitq); - init_waitqueue_head(&suspend_timeouts_waitq); + cfs_waitq_init(&pinger_thread->t_ctl_waitq); d.name = "ll_ping"; d.thread = pinger_thread; /* CLONE_VM and CLONE_FILES just avoid a needless copy, because we * just drop the VM and FILES in ptlrpc_daemonize() right away. */ - rc = kernel_thread(ptlrpc_pinger_main, &d, CLONE_VM | CLONE_FILES); + rc = cfs_kernel_thread(ptlrpc_pinger_main, &d, CLONE_VM | CLONE_FILES); if (rc < 0) { CERROR("cannot start thread: %d\n", rc); OBD_FREE(pinger_thread, sizeof(*pinger_thread)); + pinger_thread = NULL; RETURN(rc); } l_wait_event(pinger_thread->t_ctl_waitq, pinger_thread->t_flags & SVC_RUNNING, &lwi); - RETURN(rc); + RETURN(0); } int ptlrpc_stop_pinger(void) @@ -317,10 +242,10 @@ int ptlrpc_stop_pinger(void) if (pinger_thread == NULL) RETURN(-EALREADY); - down(&pinger_sem); + mutex_down(&pinger_sem); pinger_thread->t_flags = SVC_STOPPING; - wake_up(&pinger_thread->t_ctl_waitq); - up(&pinger_sem); + cfs_waitq_signal(&pinger_thread->t_ctl_waitq); + mutex_up(&pinger_sem); l_wait_event(pinger_thread->t_ctl_waitq, (pinger_thread->t_flags & SVC_STOPPED), &lwi); @@ -332,9 +257,7 @@ int ptlrpc_stop_pinger(void) void ptlrpc_pinger_sending_on_import(struct obd_import *imp) { - down(&pinger_sem); - imp->imp_next_ping = ptlrpc_next_ping(imp); - up(&pinger_sem); + ptlrpc_update_next_ping(imp); } int ptlrpc_pinger_add_import(struct obd_import *imp) @@ -343,16 +266,16 @@ int ptlrpc_pinger_add_import(struct obd_import *imp) if (!list_empty(&imp->imp_pinger_chain)) RETURN(-EALREADY); - down(&pinger_sem); + mutex_down(&pinger_sem); CDEBUG(D_HA, "adding pingable import %s->%s\n", - imp->imp_obd->obd_uuid.uuid, imp->imp_target_uuid.uuid); - imp->imp_next_ping = jiffies + (obd_timeout * HZ); + imp->imp_obd->obd_uuid.uuid, obd2cli_tgt(imp->imp_obd)); + ptlrpc_update_next_ping(imp); /* XXX sort, blah blah */ list_add_tail(&imp->imp_pinger_chain, &pinger_imports); class_import_get(imp); ptlrpc_pinger_wake_up(); - up(&pinger_sem); + mutex_up(&pinger_sem); RETURN(0); } @@ -363,12 +286,12 @@ int ptlrpc_pinger_del_import(struct obd_import *imp) if (list_empty(&imp->imp_pinger_chain)) RETURN(-ENOENT); - down(&pinger_sem); + mutex_down(&pinger_sem); list_del_init(&imp->imp_pinger_chain); CDEBUG(D_HA, "removing pingable import %s->%s\n", - imp->imp_obd->obd_uuid.uuid, imp->imp_target_uuid.uuid); + imp->imp_obd->obd_uuid.uuid, obd2cli_tgt(imp->imp_obd)); class_import_put(imp); - up(&pinger_sem); + mutex_up(&pinger_sem); RETURN(0); } @@ -376,100 +299,288 @@ void ptlrpc_pinger_wake_up() { #ifdef ENABLE_PINGER pinger_thread->t_flags |= SVC_EVENT; - wake_up(&pinger_thread->t_ctl_waitq); + cfs_waitq_signal(&pinger_thread->t_ctl_waitq); #endif } +/* Ping evictor thread */ +#define PET_READY 1 +#define PET_TERMINATE 2 + +static int pet_refcount = 0; +static int pet_state; +static wait_queue_head_t pet_waitq; +static struct obd_export *pet_exp = NULL; +static spinlock_t pet_lock = SPIN_LOCK_UNLOCKED; + +int ping_evictor_wake(struct obd_export *exp) +{ + spin_lock(&pet_lock); + if (pet_exp) { + /* eventually the new obd will call here again. */ + spin_unlock(&pet_lock); + return 1; + } + + /* We have to make sure the obd isn't destroyed between now and when + * the ping evictor runs. We'll take a reference here, and drop it + * when we finish in the evictor. We don't really care about this + * export in particular; we just need one to keep the obd alive. */ + pet_exp = class_export_get(exp); + spin_unlock(&pet_lock); + + wake_up(&pet_waitq); + return 0; +} + +static int ping_evictor_main(void *arg) +{ + struct obd_device *obd; + struct obd_export *exp; + struct l_wait_info lwi = { 0 }; + time_t expire_time; + ENTRY; + + ptlrpc_daemonize("ll_evictor"); + + CDEBUG(D_HA, "Starting Ping Evictor\n"); + pet_exp = NULL; + pet_state = PET_READY; + while (1) { + l_wait_event(pet_waitq, pet_exp || + (pet_state == PET_TERMINATE), &lwi); + if (pet_state == PET_TERMINATE) + break; + + /* we only get here if pet_exp != NULL, and the end of this + * loop is the only place which sets it NULL again, so lock + * is not strictly necessary. */ + spin_lock(&pet_lock); + obd = pet_exp->exp_obd; + spin_unlock(&pet_lock); + + expire_time = CURRENT_SECONDS - (3 * obd_timeout / 2); + + CDEBUG(D_HA, "evicting all exports of obd %s older than %ld\n", + obd->obd_name, expire_time); + + /* Exports can't be deleted out of the list while we hold + * the obd lock (class_unlink_export), which means we can't + * lose the last ref on the export. If they've already been + * removed from the list, we won't find them here. */ + spin_lock(&obd->obd_dev_lock); + while (!list_empty(&obd->obd_exports_timed)) { + exp = list_entry(obd->obd_exports_timed.next, + struct obd_export,exp_obd_chain_timed); + if (expire_time > exp->exp_last_request_time) { + class_export_get(exp); + spin_unlock(&obd->obd_dev_lock); + LCONSOLE_WARN("%s: haven't heard from client %s" + " (at %s) in %ld seconds. I think" + " it's dead, and I am evicting" + " it.\n", obd->obd_name, + obd_uuid2str(&exp->exp_client_uuid), + obd_export_nid2str(exp), + (long)(CURRENT_SECONDS - + exp->exp_last_request_time)); + CDEBUG(D_HA, "Last request was at %ld\n", + exp->exp_last_request_time); + class_fail_export(exp); + class_export_put(exp); + spin_lock(&obd->obd_dev_lock); + } else { + /* List is sorted, so everyone below is ok */ + break; + } + } + spin_unlock(&obd->obd_dev_lock); + + class_export_put(pet_exp); + + spin_lock(&pet_lock); + pet_exp = NULL; + spin_unlock(&pet_lock); + } + CDEBUG(D_HA, "Exiting Ping Evictor\n"); + + RETURN(0); +} + +void ping_evictor_start(void) +{ + int rc; + + if (++pet_refcount > 1) + return; + + init_waitqueue_head(&pet_waitq); + + rc = cfs_kernel_thread(ping_evictor_main, NULL, CLONE_VM | CLONE_FILES); + if (rc < 0) { + pet_refcount--; + CERROR("Cannot start ping evictor thread: %d\n", rc); + } +} +EXPORT_SYMBOL(ping_evictor_start); + +void ping_evictor_stop(void) +{ + if (--pet_refcount > 0) + return; + + pet_state = PET_TERMINATE; + wake_up(&pet_waitq); +} +EXPORT_SYMBOL(ping_evictor_stop); #else /* !__KERNEL__ */ /* XXX * the current implementation of pinger in liblustre is not optimized */ +#ifdef ENABLE_PINGER static struct pinger_data { int pd_recursion; - unsigned long pd_this_ping; - unsigned long pd_next_ping; - int pd_force_check; + cfs_time_t pd_this_ping; /* jiffies */ + cfs_time_t pd_next_ping; /* jiffies */ + struct ptlrpc_request_set *pd_set; } pinger_args; static int pinger_check_rpcs(void *arg) { - unsigned long curtime = time(NULL); + cfs_time_t curtime = cfs_time_current(); + struct ptlrpc_request *req; + struct ptlrpc_request_set *set; struct list_head *iter; struct pinger_data *pd = &pinger_args; + int rc; /* prevent recursion */ if (pd->pd_recursion++) { CDEBUG(D_HA, "pinger: recursion! quit\n"); + LASSERT(pd->pd_set); pd->pd_recursion--; return 0; } /* have we reached ping point? */ - if (pd->pd_next_ping > curtime && !pd->pd_force_check) { + if (!pd->pd_set && time_before(curtime, pd->pd_next_ping)) { pd->pd_recursion--; return 0; } - if (pd->pd_force_check) - pd->pd_force_check = 0; + /* if we have rpc_set already, continue processing it */ + if (pd->pd_set) { + LASSERT(pd->pd_this_ping); + set = pd->pd_set; + goto do_check_set; + } pd->pd_this_ping = curtime; + pd->pd_set = ptlrpc_prep_set(); + if (pd->pd_set == NULL) + goto out; + set = pd->pd_set; /* add rpcs into set */ - down(&pinger_sem); + mutex_down(&pinger_sem); list_for_each(iter, &pinger_imports) { struct obd_import *imp = - list_entry(iter, struct obd_import, - imp_pinger_chain); - int level, force; - unsigned long flags; - - - spin_lock_irqsave(&imp->imp_lock, flags); - level = imp->imp_state; - force = imp->imp_force_verify; - if (force) - imp->imp_force_verify = 0; - spin_unlock_irqrestore(&imp->imp_lock, flags); - - if (imp->imp_next_ping <= pd->pd_this_ping || force) { - if (level == LUSTRE_IMP_DISCON) { - /* wait at least a timeout before - trying recovery again. */ - unsigned long timeout = obd_timeout; - if (imp->imp_server_timeout) - timeout = obd_timeout / 2; - imp->imp_next_ping = time(NULL) + - (timeout * HZ); - ptlrpc_initiate_recovery(imp); - } - else if (level != LUSTRE_IMP_FULL || - imp->imp_obd->obd_no_recov) { - CDEBUG(D_HA, - "not pinging %s (in recovery " - " or recovery disabled: %s)\n", - imp->imp_target_uuid.uuid, - ptlrpc_import_state_name(level)); - } - else if (imp->imp_pingable || force) { - ptlrpc_ping(imp); + list_entry(iter, struct obd_import, imp_pinger_chain); + int generation, level; + + if (cfs_time_aftereq(pd->pd_this_ping, + imp->imp_next_ping - 5 * CFS_TICK)) { + /* Add a ping. */ + spin_lock(&imp->imp_lock); + generation = imp->imp_generation; + level = imp->imp_state; + spin_unlock(&imp->imp_lock); + + if (level != LUSTRE_IMP_FULL) { + CDEBUG(D_HA, + "not pinging %s (in recovery)\n", + obd2cli_tgt(imp->imp_obd)); + continue; } - } else { - if (imp->imp_pingable) { - CDEBUG(D_HA, "don't need to ping %s " - "(%lu > %lu)\n", - imp->imp_target_uuid.uuid, - imp->imp_next_ping, pd->pd_this_ping); + req = ptlrpc_prep_req(imp, LUSTRE_OBD_VERSION, OBD_PING, + 1, NULL, NULL); + if (!req) { + CERROR("out of memory\n"); + break; } + req->rq_no_resend = 1; + ptlrpc_req_set_repsize(req, 1, NULL); + req->rq_send_state = LUSTRE_IMP_FULL; + req->rq_phase = RQ_PHASE_RPC; + req->rq_import_generation = generation; + ptlrpc_set_add_req(set, req); + } else { + CDEBUG(D_HA, "don't need to ping %s ("CFS_TIME_T" > " + CFS_TIME_T")\n", obd2cli_tgt(imp->imp_obd), + imp->imp_next_ping, pd->pd_this_ping); } } + pd->pd_this_ping = curtime; + mutex_up(&pinger_sem); - up(&pinger_sem); + /* Might be empty, that's OK. */ + if (set->set_remaining == 0) + CDEBUG(D_HA, "nothing to ping\n"); - pd->pd_next_ping = pd->pd_this_ping + (obd_timeout * HZ); + list_for_each(iter, &set->set_requests) { + struct ptlrpc_request *req = + list_entry(iter, struct ptlrpc_request, + rq_set_chain); + DEBUG_REQ(D_HA, req, "pinging %s->%s", + req->rq_import->imp_obd->obd_uuid.uuid, + obd2cli_tgt(req->rq_import->imp_obd)); + (void)ptl_send_rpc(req, 0); + } + +do_check_set: + rc = ptlrpc_check_set(set); + + /* not finished, and we are not expired, simply return */ + if (!rc && cfs_time_before(curtime, + cfs_time_add(pd->pd_this_ping, + cfs_time_seconds(PING_INTERVAL)))) { + CDEBUG(D_HA, "not finished, but also not expired\n"); + pd->pd_recursion--; + return 0; + } + + /* Expire all the requests that didn't come back. */ + mutex_down(&pinger_sem); + list_for_each(iter, &set->set_requests) { + req = list_entry(iter, struct ptlrpc_request, + rq_set_chain); + + if (req->rq_replied) + continue; + + req->rq_phase = RQ_PHASE_COMPLETE; + atomic_dec(&req->rq_import->imp_inflight); + set->set_remaining--; + /* If it was disconnected, don't sweat it. */ + if (list_empty(&req->rq_import->imp_pinger_chain)) { + ptlrpc_unregister_reply(req); + continue; + } + + CDEBUG(D_HA, "pinger initiate expire_one_request\n"); + ptlrpc_expire_one_request(req); + } + mutex_up(&pinger_sem); + + ptlrpc_set_destroy(set); + pd->pd_set = NULL; + +out: + pd->pd_next_ping = cfs_time_add(pd->pd_this_ping, + cfs_time_seconds(PING_INTERVAL)); + pd->pd_this_ping = 0; /* XXX for debug */ CDEBUG(D_HA, "finished a round ping\n"); pd->pd_recursion--; @@ -477,13 +588,15 @@ static int pinger_check_rpcs(void *arg) } static void *pinger_callback = NULL; +#endif /* ENABLE_PINGER */ int ptlrpc_start_pinger(void) { - memset(&pinger_args, 0, sizeof(pinger_args)); #ifdef ENABLE_PINGER - pinger_callback = - liblustre_register_wait_callback(&pinger_check_rpcs, &pinger_args); + memset(&pinger_args, 0, sizeof(pinger_args)); + pinger_callback = liblustre_register_wait_callback("pinger_check_rpcs", + &pinger_check_rpcs, + &pinger_args); #endif return 0; } @@ -499,14 +612,17 @@ int ptlrpc_stop_pinger(void) void ptlrpc_pinger_sending_on_import(struct obd_import *imp) { - down(&pinger_sem); - imp->imp_next_ping = time(NULL) + obd_timeout; - if (pinger_args.pd_next_ping > imp->imp_next_ping) { - CDEBUG(D_HA, "set next ping to %ld(cur %ld)\n", - imp->imp_next_ping, time(NULL)); +#ifdef ENABLE_PINGER + mutex_down(&pinger_sem); + ptlrpc_update_next_ping(imp); + if (pinger_args.pd_set == NULL && + time_before(imp->imp_next_ping, pinger_args.pd_next_ping)) { + CDEBUG(D_HA, "set next ping to "CFS_TIME_T"(cur "CFS_TIME_T")\n", + imp->imp_next_ping, cfs_time_current()); pinger_args.pd_next_ping = imp->imp_next_ping; } - up(&pinger_sem); + mutex_up(&pinger_sem); +#endif } int ptlrpc_pinger_add_import(struct obd_import *imp) @@ -516,13 +632,13 @@ int ptlrpc_pinger_add_import(struct obd_import *imp) RETURN(-EALREADY); CDEBUG(D_HA, "adding pingable import %s->%s\n", - imp->imp_obd->obd_uuid.uuid, imp->imp_target_uuid.uuid); + imp->imp_obd->obd_uuid.uuid, obd2cli_tgt(imp->imp_obd)); ptlrpc_pinger_sending_on_import(imp); - down(&pinger_sem); + mutex_down(&pinger_sem); list_add_tail(&imp->imp_pinger_chain, &pinger_imports); class_import_get(imp); - up(&pinger_sem); + mutex_up(&pinger_sem); RETURN(0); } @@ -533,17 +649,41 @@ int ptlrpc_pinger_del_import(struct obd_import *imp) if (list_empty(&imp->imp_pinger_chain)) RETURN(-ENOENT); - down(&pinger_sem); + mutex_down(&pinger_sem); list_del_init(&imp->imp_pinger_chain); CDEBUG(D_HA, "removing pingable import %s->%s\n", - imp->imp_obd->obd_uuid.uuid, imp->imp_target_uuid.uuid); + imp->imp_obd->obd_uuid.uuid, obd2cli_tgt(imp->imp_obd)); class_import_put(imp); - up(&pinger_sem); + mutex_up(&pinger_sem); RETURN(0); } void ptlrpc_pinger_wake_up() { - pinger_args.pd_force_check = 1; +#ifdef ENABLE_PINGER + ENTRY; + /* XXX force pinger to run, if needed */ + struct obd_import *imp; + list_for_each_entry(imp, &pinger_imports, imp_pinger_chain) { + CDEBUG(D_HA, "Checking that we need to do anything about import" + " %s->%s\n", imp->imp_obd->obd_uuid.uuid, + obd2cli_tgt(imp->imp_obd)); +#ifdef ENABLE_LIBLUSTRE_RECOVERY + if (imp->imp_state == LUSTRE_IMP_DISCON && !imp->imp_deactive) +#else + /*XXX only recover for the initial connection */ + if (!lustre_handle_is_used(&imp->imp_remote_handle) && + imp->imp_state == LUSTRE_IMP_DISCON && !imp->imp_deactive) +#endif + ptlrpc_initiate_recovery(imp); + else if (imp->imp_state != LUSTRE_IMP_FULL) + CDEBUG(D_HA, "Refused to recover import %s->%s " + "state %d, deactive %d\n", + imp->imp_obd->obd_uuid.uuid, + obd2cli_tgt(imp->imp_obd), imp->imp_state, + imp->imp_deactive); + } +#endif + EXIT; } #endif /* !__KERNEL__ */