LU-7638 recovery: do not abort update recovery.

[fs/lustre-release.git] / lustre / include / lu_target.h

diff --git a/lustre/include/lu_target.h b/lustre/include/lu_target.h
index 6d20d2f..5da2544 100644 (file)
--- a/lustre/include/lu_target.h
+++ b/lustre/include/lu_target.h
@@ -27,7 +27,7 @@
  * Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
  *
- * Copyright (c) 2011, 2014, Intel Corporation.
+ * Copyright (c) 2011, 2015, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
@@ -54,10 +54,16 @@ struct distribute_txn_replay_req {
        /* linked to the distribute transaction replay
         * list (tdtd_replay_list) */
        struct list_head        dtrq_list;
+       __u64                   dtrq_master_transno;
+       __u64                   dtrq_batchid;
+       __u64                   dtrq_xid;
 
        /* all of sub updates are linked here */
        struct list_head        dtrq_sub_list;
        spinlock_t              dtrq_sub_list_lock;
+
+       /* If the local update has been executed during replay */
+       __u32                   dtrq_local_update_executed:1;
 };
 
 /* Each one represents a sub replay item under a distribute
@@ -99,11 +105,14 @@ struct target_distribute_txn_data {
        /* recovery update */
        distribute_txn_replay_handler_t tdtd_replay_handler;
        struct list_head                tdtd_replay_list;
+       struct list_head                tdtd_replay_finish_list;
        spinlock_t                      tdtd_replay_list_lock;
        /* last replay update transno */
-       __u64                           tdtd_last_update_transno;
        __u32                           tdtd_replay_ready:1;
 
+       /* Manage the llog recovery threads */
+       atomic_t                tdtd_recovery_threads_count;
+       wait_queue_head_t       tdtd_recovery_threads_waitq;
 };
 
 struct lu_target {
@@ -214,6 +223,11 @@ struct tgt_session_info {
        bool                     tsi_preprocessed;
        /* request JobID */
        char                    *tsi_jobid;
+
+       /* update replay */
+       __u64                   tsi_xid;
+       __u32                   tsi_result;
+       __u32                   tsi_client_gen;
 };
 
 static inline struct tgt_session_info *tgt_ses_info(const struct lu_env *env)
@@ -362,6 +376,7 @@ int tgt_sec_ctx_init(struct tgt_session_info *tsi);
 int tgt_sec_ctx_init_cont(struct tgt_session_info *tsi);
 int tgt_sec_ctx_fini(struct tgt_session_info *tsi);
 int tgt_sendpage(struct tgt_session_info *tsi, struct lu_rdpg *rdpg, int nob);
+int tgt_send_buffer(struct tgt_session_info *tsi, struct lu_rdbuf *rdbuf);
 int tgt_validate_obdo(struct tgt_session_info *tsi, struct obdo *oa);
 int tgt_sync(const struct lu_env *env, struct lu_target *tgt,
             struct dt_object *obj, __u64 start, __u64 end);
@@ -372,12 +387,12 @@ void tgt_io_thread_done(struct ptlrpc_thread *thread);
 int tgt_extent_lock(struct ldlm_namespace *ns, struct ldlm_res_id *res_id,
                    __u64 start, __u64 end, struct lustre_handle *lh,
                    int mode, __u64 *flags);
-void tgt_extent_unlock(struct lustre_handle *lh, ldlm_mode_t mode);
+void tgt_extent_unlock(struct lustre_handle *lh, enum ldlm_mode mode);
 int tgt_brw_lock(struct ldlm_namespace *ns, struct ldlm_res_id *res_id,
                 struct obd_ioobj *obj, struct niobuf_remote *nb,
-                struct lustre_handle *lh, int mode);
+                struct lustre_handle *lh, enum ldlm_mode mode);
 void tgt_brw_unlock(struct obd_ioobj *obj, struct niobuf_remote *niob,
-                   struct lustre_handle *lh, int mode);
+                   struct lustre_handle *lh, enum ldlm_mode mode);
 int tgt_brw_read(struct tgt_session_info *tsi);
 int tgt_brw_write(struct tgt_session_info *tsi);
 int tgt_hpreq_handler(struct ptlrpc_request *req);
@@ -390,6 +405,7 @@ void tgt_register_lfsck_query(int (*query)(const struct lu_env *,
                                           struct lfsck_request *));
 bool req_can_reconstruct(struct ptlrpc_request *req, struct tg_reply_data *trd);
 
+extern struct tgt_handler tgt_sec_ctx_handlers[];
 extern struct tgt_handler tgt_lfsck_handlers[];
 extern struct tgt_handler tgt_obd_handlers[];
 extern struct tgt_handler tgt_dlm_handlers[];
@@ -435,6 +451,11 @@ int tgt_truncate_last_rcvd(const struct lu_env *env, struct lu_target *tg,
                           loff_t off);
 int tgt_reply_data_init(const struct lu_env *env, struct lu_target *tgt);
 bool tgt_lookup_reply(struct ptlrpc_request *req, struct tg_reply_data *trd);
+int tgt_add_reply_data(const struct lu_env *env, struct lu_target *tgt,
+                      struct tg_export_data *ted, struct tg_reply_data *trd,
+                      struct thandle *th, bool update_lrd_file);
+struct tg_reply_data *tgt_lookup_reply_by_xid(struct tg_export_data *ted,
+                                              __u64 xid);
 
 /* target/update_trans.c */
 int distribute_txn_init(const struct lu_env *env,
@@ -460,7 +481,10 @@ distribute_txn_get_next_req(struct target_distribute_txn_data *tdtd);
 void dtrq_destroy(struct distribute_txn_replay_req *dtrq);
 struct distribute_txn_replay_req_sub *
 dtrq_sub_lookup(struct distribute_txn_replay_req *dtrq, __u32 mdt_index);
-
+struct distribute_txn_replay_req *
+distribute_txn_lookup_finish_list(struct target_distribute_txn_data *tdtd,
+                                 __u64 transno);
+bool is_req_replayed_by_update(struct ptlrpc_request *req);
 enum {
        ESERIOUS = 0x0001000
 };