X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fmds%2Flproc_mds.c;h=10365a67a9c67d4dfd87bccf3a166617c0e09e20;hb=a888a27ac14736d3df8e730a3909d026d6f40f49;hp=0fc96bdc4f6fe5bbe06447cd229784b52ff3e51e;hpb=6759c2cb63625eb517613a8cd52047de8747d99c;p=fs%2Flustre-release.git

diff --git a/lustre/mds/lproc_mds.c b/lustre/mds/lproc_mds.c
index 0fc96bd..10365a6 100644
--- a/lustre/mds/lproc_mds.c
+++ b/lustre/mds/lproc_mds.c
@@ -21,163 +21,176 @@
  */
 #define DEBUG_SUBSYSTEM S_CLASS
 
-#include <linux/lustre_lite.h>
+#include <linux/version.h>
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0))
+#include <asm/statfs.h>
+#endif
+#include <linux/obd.h>
+#include <linux/obd_class.h>
 #include <linux/lprocfs_status.h>
 
-int rd_uuid(char* page, char **start, off_t off, int count, int *eof, 
-            void *data)
+#ifndef LPROCFS
+struct lprocfs_vars lprocfs_mds_obd_vars[]  = { {0} };
+struct lprocfs_vars lprocfs_mds_module_vars[] = { {0} };
+struct lprocfs_vars lprocfs_mdt_obd_vars[] = { {0} };
+struct lprocfs_vars lprocfs_mdt_module_vars[] = { {0} };
+
+#else
+
+static int lprocfs_mds_rd_mntdev(char *page, char **start, off_t off, int count,
+                                 int *eof, void *data)
 {
-        struct obd_device* temp = (struct obd_device*)data;
-        int len = 0;
-        len += snprintf(page, count, "%s\n", temp->obd_uuid); 
-        return len;  
+        struct obd_device* obd = (struct obd_device *)data;
+
+        LASSERT(obd != NULL);
+        LASSERT(obd->u.mds.mds_vfsmnt->mnt_devname);
+        *eof = 1;
+
+        return snprintf(page, count, "%s\n",obd->u.mds.mds_vfsmnt->mnt_devname);
 }
-int rd_blksize(char* page, char **start, off_t off, int count, int *eof, 
-               void *data)
+
+static int lprocfs_mds_rd_filesopen(char *page, char **start, off_t off,
+                                    int count, int *eof, void *data)
 {
-        struct obd_device* temp = (struct obd_device*)data;
-        struct mds_obd *mds = &temp->u.mds;
-        struct statfs mystats;
-        int rc, len = 0;
-        
-        rc = vfs_statfs(mds->mds_sb, &mystats);
-        if (rc) {
-                CERROR("mds: statfs failed: rc %d\n", rc);
-                return 0;
-        }
-        len += snprintf(page, count, LPU64"\n", (__u64)(mystats.f_bsize)); 
-        return len;
+        struct obd_device *obd = data;
+        LASSERT(obd != NULL);
+        *eof = 1;
 
+        return snprintf(page, count, "%d\n",
+                        atomic_read(&obd->u.mds.mds_open_count));
 }
-int rd_kbtotal(char* page, char **start, off_t off, int count, int *eof, 
-               void *data)
+
+static int lprocfs_mds_rd_recovery_status(char *page, char **start, off_t off,
+                                          int count, int *eof, void *data)
 {
-        struct obd_device* temp = (struct obd_device*)data;
-        struct mds_obd *mds = &temp->u.mds;
-        struct statfs mystats;
-        int rc, len = 0;
-        __u32 blk_size;
-        __u64 result;
-        
-        rc = vfs_statfs(mds->mds_sb, &mystats);
-        if (rc) {
-                CERROR("mds: statfs failed: rc %d\n", rc);
-                return 0;
-        }
-        
-        blk_size = mystats.f_bsize;
-        blk_size >>= 10;
-        result = mystats.f_blocks;
-        while(blk_size >>= 1){
-                result <<= 1;
+        struct obd_device *obd = data;
+        int len = 0, n,
+                connected = obd->obd_connected_clients,
+                max_recoverable = obd->obd_max_recoverable_clients,
+                recoverable = obd->obd_recoverable_clients,
+                completed = max_recoverable - recoverable,
+                queue_len = obd->obd_requests_queued_for_recovery,
+                replayed = obd->obd_replayed_requests;
+        __u64 next_transno = obd->obd_next_recovery_transno;
+
+        LASSERT(obd != NULL);
+        *eof = 1;
+
+        n = snprintf(page, count, "status: ");
+        page += n; len += n; count -= n;
+        if (obd->obd_max_recoverable_clients == 0) {
+                n = snprintf(page, count, "INACTIVE\n");
+                return len + n;
         }
-        len += snprintf(page, count, LPU64"\n", result); 
-        return len;  
-        
-}
 
-int rd_kbfree(char* page, char **start, off_t off, int count, int *eof, 
-              void *data)
-{
-        struct obd_device* temp = (struct obd_device*)data;
-        struct mds_obd *mds = &temp->u.mds;
-        struct statfs mystats;
-        int rc, len = 0;
-        __u32 blk_size;
-        __u64 result;
-        
-
-        rc = vfs_statfs(mds->mds_sb, &mystats);
-        if (rc) {
-                CERROR("mds: statfs failed: rc %d\n", rc);
-                return 0;
+        if (obd->obd_recoverable_clients == 0) {
+                n = snprintf(page, count, "COMPLETE\n");
+                page += n; len += n; count -= n;
+                n = snprintf(page, count, "recovered_clients: %d\n",
+                             max_recoverable);
+                page += n; len += n; count -= n;
+                n = snprintf(page, count, "last_transno: "LPD64"\n",
+                             next_transno - 1);
+                page += n; len += n; count -= n;
+                n = snprintf(page, count, "replayed_requests: %d\n", replayed);
+                return len + n;
         }
-        blk_size = mystats.f_bsize;
-        blk_size >>= 10;
-        result = mystats.f_blocks;
-        while(blk_size >>= 1){
-                result <<= 1;
+
+        /* sampled unlocked, but really... */
+        if (obd->obd_recovering == 0) {
+                n = snprintf(page, count, "ABORTED\n");
+                return len + n;
         }
-        len += snprintf(page, count, LPU64"\n", result);
-        return len;  
-        
-}
 
-int rd_fstype(char* page, char **start, off_t off, int count, int *eof, 
-              void *data)
-{               
-        struct obd_device* temp = (struct obd_device*)data;
-        struct mds_obd *mds = &temp->u.mds;
-        int len = 0;
-        len += snprintf(page, count, "%s\n", mds->mds_fstype); 
-        return len;  
- 
+        n = snprintf(page, count, "RECOVERING\n");
+        page += n; len += n; count -= n;
+        n = snprintf(page, count, "connected_clients: %d/%d\n",
+                     connected, max_recoverable);
+        page += n; len += n; count -= n;
+        n = snprintf(page, count, "completed_clients: %d/%d\n",
+                     completed, max_recoverable);
+        page += n; len += n; count -= n;
+        n = snprintf(page, count, "replayed_requests: %d/??\n", replayed);
+        page += n; len += n; count -= n;
+        n = snprintf(page, count, "queued_requests: %d\n", queue_len);
+        page += n; len += n; count -= n;
+        n = snprintf(page, count, "next_transno: "LPD64"\n", next_transno);
+        return len + n;
 }
 
-int rd_filestotal(char* page, char **start, off_t off, int count, int *eof, 
-                  void *data)
+static int lprocfs_mds_wr_evict_client(struct file *file, const char *buffer,
+                                       unsigned long count, void *data)
 {
-        struct obd_device* temp = (struct obd_device*)data;
-        struct mds_obd *mds = &temp->u.mds;
-        struct statfs mystats;
-        int rc, len = 0;
-        
-        rc = vfs_statfs(mds->mds_sb, &mystats);
-        if (rc) {
-                CERROR("mds: statfs failed: rc %d\n", rc);
-                return 0;
-        }
-        
-        len += snprintf(page, count, LPU64"\n", (__u64)(mystats.f_files));
-        return len;  
+        struct obd_device *obd = data;
+        struct obd_export *doomed_exp = NULL;
+        struct obd_uuid doomed;
+        struct list_head *p;
+        char tmpbuf[sizeof(doomed)];
 
-        
-}
+        sscanf(buffer, "%40s", tmpbuf);
+        obd_str2uuid(&doomed, tmpbuf);
 
-int rd_filesfree(char* page, char **start, off_t off, int count, int *eof, 
-                  void *data)
-{
-        struct obd_device* temp = (struct obd_device*)data;
-        struct mds_obd *mds = &temp->u.mds;
-        struct statfs mystats;
-        int rc, len = 0;
-        
-        rc = vfs_statfs(mds->mds_sb, &mystats);
-        if (rc) {
-                CERROR("mds: statfs failed: rc %d\n", rc);
-                return 0;
+        spin_lock(&obd->obd_dev_lock);
+        list_for_each(p, &obd->obd_exports) {
+                doomed_exp = list_entry(p, struct obd_export, exp_obd_chain);
+                if (obd_uuid_equals(&doomed, &doomed_exp->exp_client_uuid)) {
+                        class_export_get(doomed_exp);
+                        break;
+                }
+                doomed_exp = NULL;
         }
-        
-        len += snprintf(page, count, LPU64"\n", (__u64)(mystats.f_ffree));
-        return len; 
-}
+        spin_unlock(&obd->obd_dev_lock);
 
-int rd_filegroups(char* page, char **start, off_t off, int count, int *eof, 
-                  void *data)
-{
-        return 0;
+        if (doomed_exp == NULL) {
+                CERROR("can't disconnect %s: no export found\n",
+                       doomed.uuid);
+        } else {
+                CERROR("evicting %s at adminstrative request\n",
+                       doomed.uuid);
+                ptlrpc_fail_export(doomed_exp);
+                class_export_put(doomed_exp);
+        }
+        return count;
 }
-struct lprocfs_vars status_var_nm_1[]={
-        {"status/uuid", rd_uuid, 0, 0},
-        {"status/blocksize",rd_blksize, 0, 0},
-        {"status/kbytestotal",rd_kbtotal, 0, 0},
-        {"status/kbytesfree", rd_kbfree, 0, 0},
-        {"status/fstype", rd_fstype, 0, 0},
-        {"status/filestotal", rd_filestotal, 0, 0},
-        {"status/filesfree", rd_filesfree, 0, 0},
-        {"status/filegroups", rd_filegroups, 0, 0},
-        {0}
+
+struct lprocfs_vars lprocfs_mds_obd_vars[] = {
+        { "uuid",         lprocfs_rd_uuid,        0, 0 },
+        { "blocksize",    lprocfs_rd_blksize,     0, 0 },
+        { "kbytestotal",  lprocfs_rd_kbytestotal, 0, 0 },
+        { "kbytesfree",   lprocfs_rd_kbytesfree,  0, 0 },
+        { "kbytesavail",  lprocfs_rd_kbytesavail, 0, 0 },
+        { "fstype",       lprocfs_rd_fstype,      0, 0 },
+        { "filestotal",   lprocfs_rd_filestotal,  0, 0 },
+        { "filesfree",    lprocfs_rd_filesfree,   0, 0 },
+        { "filesopen",    lprocfs_mds_rd_filesopen,   0, 0 },
+        //{ "filegroups",   lprocfs_rd_filegroups,  0, 0 },
+        { "mntdev",       lprocfs_mds_rd_mntdev,  0, 0 },
+        { "recovery_status", lprocfs_mds_rd_recovery_status, 0, 0 },
+        { "evict_client", 0, lprocfs_mds_wr_evict_client, 0 },
+        { 0 }
+};
+
+struct lprocfs_vars lprocfs_mds_module_vars[] = {
+        { "num_refs",     lprocfs_rd_numrefs,     0, 0 },
+        { 0 }
 };
-int rd_numrefs(char* page, char **start, off_t off, int count, int *eof, 
-               void *data)
-{
-        struct obd_type* class = (struct obd_type*)data;
-        int len = 0;
-        len += snprintf(page, count, "%d\n", class->typ_refcnt);
-        return len;
-}
 
-struct lprocfs_vars status_class_var[]={
-        {"status/num_refs", rd_numrefs, 0, 0},
-        {0}
+struct lprocfs_vars lprocfs_mdt_obd_vars[] = {
+        { "uuid",         lprocfs_rd_uuid,        0, 0 },
+        { 0 }
 };
+
+struct lprocfs_vars lprocfs_mdt_module_vars[] = {
+        { "num_refs",     lprocfs_rd_numrefs,     0, 0 },
+        { 0 }
+};
+
+#endif
+struct lprocfs_static_vars lprocfs_array_vars[] = { {lprocfs_mds_module_vars,
+                                                     lprocfs_mds_obd_vars},
+                                                    {lprocfs_mdt_module_vars,
+                                                     lprocfs_mdt_obd_vars}};
+
+LPROCFS_INIT_MULTI_VARS(lprocfs_array_vars,
+                        (sizeof(lprocfs_array_vars) /
+                         sizeof(struct lprocfs_static_vars)))