LU-2395 ofd: Maintain per-export {read,write}_bytes counters

[fs/lustre-release.git] / lustre / ofd / ofd_internal.h

diff --git a/lustre/ofd/ofd_internal.h b/lustre/ofd/ofd_internal.h
index 5ab1e61..5b8cd32 100644 (file)
--- a/lustre/ofd/ofd_internal.h
+++ b/lustre/ofd/ofd_internal.h
@@ -27,7 +27,7 @@
  * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
  *
- * Copyright (c) 2011, 2012, Whamcloud, Inc.
+ * Copyright (c) 2012, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
@@ -49,6 +49,12 @@
 #define OFD_INCOMPAT_SUPP (OBD_INCOMPAT_GROUPS | OBD_INCOMPAT_OST | \
                           OBD_INCOMPAT_COMMON_LR)
 #define OFD_MAX_GROUPS 256
+#define OFD_PRECREATE_BATCH_DEFAULT (FILTER_SUBDIR_COUNT * 4)
+
+/* on small filesystems we should not precreate too many objects in
+ * a single transaction, otherwise we can overflow transactions */
+#define OFD_PRECREATE_SMALL_FS         (1024ULL * 1024 * 1024)
+#define OFD_PRECREATE_BATCH_SMALL      8
 
 /* Limit the returned fields marked valid to those that we actually might set */
 #define OFD_VALID_FLAGS (LA_TYPE | LA_MODE | LA_SIZE | LA_BLOCKS | \
@@ -88,6 +94,16 @@ static inline void ofd_counter_incr(struct obd_export *exp, int opcode,
        if (exp->exp_obd && exp->exp_obd->u.obt.obt_jobstats.ojs_hash &&
            (exp->exp_connect_flags & OBD_CONNECT_JOBSTATS))
                lprocfs_job_stats_log(exp->exp_obd, jobid, opcode, amount);
+
+       if (exp->exp_nid_stats != NULL &&
+           exp->exp_nid_stats->nid_stats != NULL) {
+               if (opcode == LPROC_OFD_STATS_READ)
+                       lprocfs_counter_add(exp->exp_nid_stats->nid_stats,
+                                           LPROC_OFD_READ_BYTES, amount);
+               else if (opcode == LPROC_OFD_STATS_WRITE)
+                       lprocfs_counter_add(exp->exp_nid_stats->nid_stats,
+                                           LPROC_OFD_WRITE_BYTES, amount);
+       }
 }
 
 struct ofd_device {
@@ -110,13 +126,14 @@ struct ofd_device {
 
        int                      ofd_max_group;
        obd_id                   ofd_last_objids[OFD_MAX_GROUPS];
-       cfs_mutex_t              ofd_create_locks[OFD_MAX_GROUPS];
+       struct mutex             ofd_create_locks[OFD_MAX_GROUPS];
        struct dt_object        *ofd_lastid_obj[OFD_MAX_GROUPS];
-       cfs_spinlock_t           ofd_objid_lock;
+       spinlock_t               ofd_objid_lock;
        unsigned long            ofd_destroys_in_progress;
+       int                      ofd_precreate_batch;
 
        /* protect all statfs-related counters */
-       cfs_spinlock_t           ofd_osfs_lock;
+       spinlock_t               ofd_osfs_lock;
        /* statfs optimization: we cache a bit  */
        struct obd_statfs        ofd_osfs;
        __u64                    ofd_osfs_age;
@@ -133,7 +150,7 @@ struct ofd_device {
 
        /* grants: all values in bytes */
        /* grant lock to protect all grant counters */
-       cfs_spinlock_t           ofd_grant_lock;
+       spinlock_t               ofd_grant_lock;
        /* total amount of dirty data reported by clients in incoming obdo */
        obd_size                 ofd_tot_dirty;
        /* sum of filesystem space granted to clients for async writes */
@@ -152,7 +169,7 @@ struct ofd_device {
        int                      ofd_fmd_max_num; /* per ofd ofd_mod_data */
        cfs_duration_t           ofd_fmd_max_age; /* time to fmd expiry */
 
-       cfs_spinlock_t           ofd_flags_lock;
+       spinlock_t               ofd_flags_lock;
        unsigned long            ofd_raid_degraded:1,
                                 /* sync journal on writes */
                                 ofd_syncjournal:1,
@@ -293,6 +310,7 @@ struct ofd_thread_info {
 
        /* Space used by the I/O, used by grant code */
        unsigned long                    fti_used;
+       struct ost_lvb                   fti_lvb;
 };
 
 extern void target_recovery_fini(struct obd_device *obd);
@@ -306,6 +324,7 @@ void ofd_free_capa_keys(struct ofd_device *ofd);
 
 /* ofd_dev.c */
 extern struct lu_context_key ofd_thread_key;
+int ofd_postrecov(const struct lu_env *env, struct ofd_device *ofd);
 
 /* ofd_obd.c */
 extern struct obd_ops ofd_obd_ops;
@@ -322,6 +341,7 @@ int ofd_group_load(const struct lu_env *env, struct ofd_device *ofd, int);
 int ofd_fs_setup(const struct lu_env *env, struct ofd_device *ofd,
                 struct obd_device *obd);
 void ofd_fs_cleanup(const struct lu_env *env, struct ofd_device *ofd);
+int ofd_precreate_batch(struct ofd_device *ofd, int batch);
 
 /* ofd_io.c */
 int ofd_preprw(const struct lu_env *env,int cmd, struct obd_export *exp,
@@ -370,8 +390,8 @@ struct ofd_object *ofd_object_find_or_create(const struct lu_env *env,
                                             const struct lu_fid *fid,
                                             struct lu_attr *attr);
 int ofd_object_ff_check(const struct lu_env *env, struct ofd_object *fo);
-int ofd_precreate_object(const struct lu_env *env, struct ofd_device *ofd,
-                        obd_id id, obd_seq seq);
+int ofd_precreate_objects(const struct lu_env *env, struct ofd_device *ofd,
+                         obd_id id, obd_seq group, int nr);
 
 void ofd_object_put(const struct lu_env *env, struct ofd_object *fo);
 int ofd_attr_set(const struct lu_env *env, struct ofd_object *fo,
@@ -460,7 +480,7 @@ extern struct ldlm_valblock_ops ofd_lvbo;
 
 /* ofd_dlm.c */
 int ofd_intent_policy(struct ldlm_namespace *ns, struct ldlm_lock **lockp,
-                     void *req_cookie, ldlm_mode_t mode, int flags,
+                     void *req_cookie, ldlm_mode_t mode, __u64 flags,
                      void *data);
 
 static inline struct ofd_thread_info * ofd_info(const struct lu_env *env)