* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
+#ifndef __KERNEL__
+#include <liblustre.h>
+#else
#include <linux/version.h>
#include <asm/semaphore.h>
-
#define DEBUG_SUBSYSTEM S_RPC
+#endif
+
#include <linux/obd_support.h>
#include <linux/obd_class.h>
#include "ptlrpc_internal.h"
+#ifdef __KERNEL__
+
static struct ptlrpc_thread *pinger_thread = NULL;
static DECLARE_MUTEX(pinger_sem);
static struct list_head pinger_imports = LIST_HEAD_INIT(pinger_imports);
-int ptlrpc_start_pinger(void);
-int ptlrpc_stop_pinger(void);
-
-void ptlrpc_pinger_sending_on_import(struct obd_import *imp)
-{
- down(&pinger_sem);
- imp->imp_next_ping = jiffies + (obd_timeout * HZ);
- up(&pinger_sem);
-}
-
-int ptlrpc_pinger_add_import(struct obd_import *imp)
-{
-#ifndef ENABLE_PINGER
- return 0;
-#else
- int rc;
- ENTRY;
-
- if (!list_empty(&imp->imp_pinger_chain))
- RETURN(-EALREADY);
-
- down(&pinger_sem);
- if (list_empty(&pinger_imports)) {
- up(&pinger_sem);
- rc = ptlrpc_start_pinger();
- if (rc < 0)
- RETURN(rc);
- 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);
- list_add_tail(&imp->imp_pinger_chain, &pinger_imports); /* XXX sort, blah blah */
- class_import_get(imp);
- up(&pinger_sem);
- RETURN(0);
-#endif
-}
-
-int ptlrpc_pinger_del_import(struct obd_import *imp)
-{
-#ifndef ENABLE_PINGER
- return 0;
-#else
- int rc;
- ENTRY;
-
- if (list_empty(&imp->imp_pinger_chain))
- RETURN(-ENOENT);
-
- 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);
- class_import_put(imp);
- if (list_empty(&pinger_imports)) {
- up(&pinger_sem);
- rc = ptlrpc_stop_pinger();
- if (rc)
- RETURN(rc);
- down(&pinger_sem);
- }
- up(&pinger_sem);
- RETURN(0);
-#endif
-}
-
static int ptlrpc_pinger_main(void *arg)
{
struct ptlrpc_svc_data *data = (struct ptlrpc_svc_data *)arg;
while (1) {
unsigned long this_ping = jiffies;
long time_to_next_ping;
- struct l_wait_info lwi = LWI_TIMEOUT(10 * HZ, NULL, NULL);
+ struct l_wait_info lwi = LWI_TIMEOUT(obd_timeout * HZ,
+ NULL, NULL);
struct ptlrpc_request_set *set;
struct ptlrpc_request *req;
struct list_head *iter;
/* Add a ping. */
spin_lock_irqsave(&imp->imp_lock, flags);
generation = imp->imp_generation;
- level = imp->imp_level;
+ level = imp->imp_state;
spin_unlock_irqrestore(&imp->imp_lock, flags);
- if (level != LUSTRE_CONN_FULL) {
+ if (level != LUSTRE_IMP_FULL) {
CDEBUG(D_HA,
"not pinging %s (in recovery)\n",
imp->imp_target_uuid.uuid);
}
req->rq_no_resend = 1;
req->rq_replen = lustre_msg_size(0, NULL);
- req->rq_level = LUSTRE_CONN_FULL;
+ 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 (%lu > %lu)\n",
- imp->imp_target_uuid.uuid, imp->imp_next_ping,
- this_ping);
+ CDEBUG(D_HA, "don't need to ping %s (%lu > "
+ "%lu)\n", imp->imp_target_uuid.uuid,
+ imp->imp_next_ping, this_ping);
}
}
up(&pinger_sem);
CDEBUG(D_HA, "nothing to ping\n");
list_for_each(iter, &set->set_requests) {
struct ptlrpc_request *req =
- list_entry(iter, struct ptlrpc_request, rq_set_chain);
+ 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,
req->rq_import->imp_target_uuid.uuid);
init_waitqueue_entry(&set_wait, current);
add_wait_queue(&set->set_waitq, &set_wait);
rc = l_wait_event(thread->t_ctl_waitq,
- thread->t_flags & SVC_STOPPING || ptlrpc_check_set(set),
+ thread->t_flags & SVC_STOPPING ||
+ ptlrpc_check_set(set),
&lwi);
remove_wait_queue(&set->set_waitq, &set_wait);
CDEBUG(D_HA, "ping complete (%lu)\n", jiffies);
/* Expire all the requests that didn't come back. */
down(&pinger_sem);
list_for_each(iter, &set->set_requests) {
- req = list_entry(iter, struct ptlrpc_request, rq_set_chain);
+ req = list_entry(iter, struct ptlrpc_request,
+ rq_set_chain);
if (req->rq_replied)
continue;
req->rq_phase = RQ_PHASE_COMPLETE;
set->set_remaining--;
/* If it was disconnected, don't sweat it. */
- if (list_empty(&req->rq_import->imp_pinger_chain))
+ if (list_empty(&req->rq_import->imp_pinger_chain)) {
+ ptlrpc_unregister_reply(req);
continue;
+ }
ptlrpc_expire_one_request(req);
}
this_ping + (obd_timeout * HZ));
if (time_to_next_ping > 0) {
lwi = LWI_TIMEOUT(time_to_next_ping, NULL, NULL);
- l_wait_event(thread->t_ctl_waitq, thread->t_flags & SVC_STOPPING,
+ l_wait_event(thread->t_ctl_waitq,
+ thread->t_flags & (SVC_STOPPING|SVC_EVENT),
&lwi);
if (thread->t_flags & SVC_STOPPING) {
thread->t_flags &= ~SVC_STOPPING;
EXIT;
break;
+ } else if (thread->t_flags & SVC_EVENT) {
+ /* woken after adding import to reset timer */
+ thread->t_flags &= ~SVC_EVENT;
}
}
}
struct l_wait_info lwi = { 0 };
struct ptlrpc_svc_data d;
int rc;
+#ifndef ENABLE_PINGER
+ return 0;
+#endif
ENTRY;
- down(&pinger_sem);
if (pinger_thread != NULL)
- GOTO(out, rc = -EALREADY);
+ RETURN(-EALREADY);
OBD_ALLOC(pinger_thread, sizeof(*pinger_thread));
if (pinger_thread == NULL)
- GOTO(out, rc = -ENOMEM);
+ RETURN(-ENOMEM);
init_waitqueue_head(&pinger_thread->t_ctl_waitq);
d.name = "ll_ping";
if (rc < 0) {
CERROR("cannot start thread: %d\n", rc);
OBD_FREE(pinger_thread, sizeof(*pinger_thread));
- GOTO(out, rc);
+ RETURN(rc);
}
l_wait_event(pinger_thread->t_ctl_waitq,
pinger_thread->t_flags & SVC_RUNNING, &lwi);
- out:
- up(&pinger_sem);
RETURN(rc);
}
{
struct l_wait_info lwi = { 0 };
int rc = 0;
+#ifndef ENABLE_PINGER
+ return 0;
+#endif
ENTRY;
- down(&pinger_sem);
if (pinger_thread == NULL)
- GOTO(out, rc = -EALREADY);
-
+ RETURN(-EALREADY);
+ down(&pinger_sem);
pinger_thread->t_flags = SVC_STOPPING;
wake_up(&pinger_thread->t_ctl_waitq);
+ up(&pinger_sem);
+
l_wait_event(pinger_thread->t_ctl_waitq,
(pinger_thread->t_flags & SVC_STOPPED), &lwi);
OBD_FREE(pinger_thread, sizeof(*pinger_thread));
+ pinger_thread = NULL;
+ RETURN(rc);
+}
- out:
+void ptlrpc_pinger_sending_on_import(struct obd_import *imp)
+{
+ down(&pinger_sem);
+ imp->imp_next_ping = jiffies + (obd_timeout * HZ);
up(&pinger_sem);
- RETURN(rc);
}
+
+int ptlrpc_pinger_add_import(struct obd_import *imp)
+{
+ ENTRY;
+ if (!list_empty(&imp->imp_pinger_chain))
+ RETURN(-EALREADY);
+
+ 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);
+ /* XXX sort, blah blah */
+ list_add_tail(&imp->imp_pinger_chain, &pinger_imports);
+ class_import_get(imp);
+
+#ifdef ENABLE_PINGER
+ pinger_thread->t_flags |= SVC_EVENT;
+ wake_up(&pinger_thread->t_ctl_waitq);
+#endif
+ up(&pinger_sem);
+
+ RETURN(0);
+}
+
+int ptlrpc_pinger_del_import(struct obd_import *imp)
+{
+ ENTRY;
+ if (list_empty(&imp->imp_pinger_chain))
+ RETURN(-ENOENT);
+
+ 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);
+ class_import_put(imp);
+ up(&pinger_sem);
+ RETURN(0);
+}
+
+#else /* !__KERNEL__ */
+
+int ptlrpc_start_pinger(void)
+{
+ return 0;
+}
+
+int ptlrpc_stop_pinger(void)
+{
+ return 0;
+}
+
+int ptlrpc_pinger_add_import(struct obd_import *imp)
+{
+ return 0;
+}
+
+int ptlrpc_pinger_del_import(struct obd_import *imp)
+{
+ return 0;
+}
+
+void ptlrpc_pinger_sending_on_import(struct obd_import *imp)
+{
+}
+
+#endif
git://git.whamcloud.com / fs / lustre-release.git / blobdiff