X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Fobdclass%2Fsysctl.c;h=4a7728eedcab5859759acb1a738b0001e8dee783;hp=080dc1b5e5243fe61b9c577930eb8942cf7218d6;hb=a74d5df65aa887939138ea07dc7a23d0d293f7e0;hpb=b09e7f4d94ef26de03dd56a1a75cca0830288cde diff --git a/lustre/obdclass/sysctl.c b/lustre/obdclass/sysctl.c index 080dc1b..4a7728e 100644 --- a/lustre/obdclass/sysctl.c +++ b/lustre/obdclass/sysctl.c @@ -1,9 +1,37 @@ +/* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*- + * vim:expandtab:shiftwidth=8:tabstop=8: + * + * Copyright (C) 2001, 2002 Cluster File Systems, Inc. + * + * This file is part of Lustre, http://www.lustre.org. + * + * 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. + * + * 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. + * + * 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. + * + */ + +#include +#include +#include #include #include #include +#include +#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)) #include +#endif #include -#include +#include #include #include #include @@ -11,96 +39,88 @@ #include #include +#define DEBUG_SUBSYSTEM S_CLASS + #include struct ctl_table_header *obd_table_header = NULL; -static int vars[2]; -static int index = 0; - -static int obd_sctl_vars( ctl_table * table, int write, struct file * - filp, void * buffer, size_t * lenp ); -static int obd_sctl_reset( ctl_table * table, int write, struct file - * filp, void * buffer, size_t * lenp ); - - +#define OBD_SYSCTL 300 -#define OBD_SYSCTL 1 - -#define OBD_DEBUG 1 /* control debugging */ -#define OBD_ENTRY 2 /* control enter/leave pattern */ -#define OBD_TIMEOUT 3 /* timeout on upcalls to become intrble */ -#define OBD_HARD 4 /* mount type "hard" or "soft" */ -#define OBD_VARS 5 -#define OBD_INDEX 6 -#define OBD_RESET 7 - -#define OBD_VARS_SLOT 2 +enum { + OBD_FAIL_LOC = 1, /* control test failures instrumentation */ + OBD_TIMEOUT, /* RPC timeout before recovery/intr */ + OBD_DUMP_ON_TIMEOUT, /* dump kernel debug log upon eviction */ + OBD_UPCALL, /* path to recovery upcall */ + OBD_MEMUSED, /* bytes currently OBD_ALLOCated */ + OBD_SYNCFILTER, /* XXX temporary, as we play with sync osts.. */ + OBD_LDLM_TIMEOUT, /* LDLM timeout for ASTs before client eviction */ +}; +#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,9)) +int proc_fail_loc(ctl_table *table, int write, struct file *filp, + void *buffer, size_t *lenp); +#else +int proc_fail_loc(ctl_table *table, int write, struct file *filp, + void *buffer, size_t *lenp, loff_t *ppos); +#endif static ctl_table obd_table[] = { - {OBD_DEBUG, "debug", &obd_debug_level, sizeof(int), 0644, NULL, &proc_dointvec}, - {OBD_ENTRY, "trace", &obd_print_entry, sizeof(int), 0644, NULL, &proc_dointvec}, - {OBD_VARS, "vars", &vars[0], sizeof(int), 0644, NULL, &proc_dointvec}, - {OBD_INDEX, "index", &index, sizeof(int), 0644, NULL, &obd_sctl_vars}, - {OBD_RESET, "reset", NULL, 0, 0644, NULL, &obd_sctl_reset}, - { 0 } + {OBD_FAIL_LOC, "fail_loc", &obd_fail_loc, sizeof(int), 0644, NULL, + &proc_dointvec}, + {OBD_TIMEOUT, "timeout", &obd_timeout, sizeof(int), 0644, NULL, + &proc_fail_loc}, + {OBD_DUMP_ON_TIMEOUT, "dump_on_timeout", &obd_dump_on_timeout, + sizeof(int), 0644, NULL, &proc_dointvec}, + /* XXX need to lock so we avoid update races with recovery upcall! */ + {OBD_UPCALL, "upcall", obd_lustre_upcall, 128, 0644, NULL, + &proc_dostring, &sysctl_string }, + {OBD_MEMUSED, "memused", (int *)&obd_memory.counter, + sizeof(int), 0644, NULL, &proc_dointvec}, + {OBD_SYNCFILTER, "filter_sync_on_commit", &obd_sync_filter, sizeof(int), + 0644, NULL, &proc_dointvec}, + {OBD_LDLM_TIMEOUT, "ldlm_timeout", &ldlm_timeout, sizeof(int), 0644, + NULL, &proc_dointvec}, + { 0 } }; -#if 0 -static ctl_table jukebox_table[] = { - {OBD_SYSCTL, "obd", NULL, 0, 0555, obd_table}, +static ctl_table parent_table[] = { + {OBD_SYSCTL, "lustre", NULL, 0, 0555, obd_table}, {0} }; -#endif void obd_sysctl_init (void) { #ifdef CONFIG_SYSCTL - if ( !obd_table_header ) - obd_table_header = register_sysctl_table(jukebox_table, 0); + if ( !obd_table_header ) + obd_table_header = register_sysctl_table(parent_table, 0); #endif } void obd_sysctl_clean (void) { #ifdef CONFIG_SYSCTL - if ( obd_table_header ) - unregister_sysctl_table(obd_table_header); - obd_table_header = NULL; + if ( obd_table_header ) + unregister_sysctl_table(obd_table_header); + obd_table_header = NULL; #endif } - -int obd_sctl_reset (ctl_table * table, int write, - struct file * filp, void * buffer, - size_t * lenp) -{ - if ( write ) { - /* do something here */ - vars[0]=0; - vars[1]=0; - } - - *lenp = 0; - return 0; -} - -int obd_sctl_vars (ctl_table * table, int write, - struct file * filp, void * buffer, - size_t * lenp) +#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,9)) +int proc_fail_loc(ctl_table *table, int write, struct file *filp, + void *buffer, size_t *lenp) +#else +int proc_fail_loc(ctl_table *table, int write, struct file *filp, + void *buffer, size_t *lenp, loff_t *ppos) +#endif { - int rc; - - rc = proc_dointvec(table, write, filp, buffer, lenp); - - if ( rc ) - return rc; + int rc; + int old_fail_loc = obd_fail_loc; - if ( index < 0 || index > 1 ) { - printk(KERN_WARNING __FUNCTION__ "Illegal index %d!\n", index); - index = 0; - } else { - obd_table[OBD_VARS_SLOT].data = &vars[index]; - } - - return rc; +#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,9)) + rc = proc_dointvec(table,write,filp,buffer,lenp); +#else + rc = proc_dointvec(table,write,filp,buffer,lenp, ppos); +#endif + if (old_fail_loc != obd_fail_loc) + wake_up(&obd_race_waitq); + return rc; }