LU-8454 mountconf: delay FS default stripe config setting

Previously http://review.whamcloud.com/21612 disabled filesystem
default stripe config setting after 2.10, this is too aggressive,
now delay this feature till > 2.13.53.

Also #ifdef more unused functions in this feature.

Signed-off-by: Lai Siyao <lai.siyao@intel.com>
Change-Id: Ic4d8c9abc837f4d9c9c7992b1f297dbb361beb47
Reviewed-on: http://review.whamcloud.com/22580
Tested-by: Jenkins
Reviewed-by: Andreas Dilger <andreas.dilger@intel.com>
Reviewed-by: Jian Yu <jian.yu@intel.com>
Tested-by: Maloo <hpdd-maloo@intel.com>

diff --git a/lustre/include/lustre/lustre_idl.h b/lustre/include/lustre/lustre_idl.h
index ffa2020..09ffad8 100644 (file)
--- a/lustre/include/lustre/lustre_idl.h
+++ b/lustre/include/lustre/lustre_idl.h
@@ -2880,12 +2880,14 @@ typedef enum {
 } mgs_cmd_t;
 #define MGS_FIRST_OPC MGS_CONNECT
 
+#if LUSTRE_VERSION_CODE < OBD_OCD_VERSION(2, 13, 53, 0)
 #define MGS_PARAM_MAXLEN 1024
 #define KEY_SET_INFO "set_info"
 
 struct mgs_send_param {
         char             mgs_param[MGS_PARAM_MAXLEN];
 };
+#endif
 
 /* We pass this info to the MGS so it can write config logs */
 #define MTI_NAME_MAXLEN  64

diff --git a/lustre/llite/dir.c b/lustre/llite/dir.c
index 5939468..5c5495d 100644 (file)
--- a/lustre/llite/dir.c
+++ b/lustre/llite/dir.c
@@ -416,6 +416,7 @@ out:
        RETURN(rc);
 }
 
+#if LUSTRE_VERSION_CODE < OBD_OCD_VERSION(2, 13, 53, 0)
 static int ll_send_mgc_param(struct obd_export *mgc, char *string)
 {
         struct mgs_send_param *msp;
@@ -434,6 +435,7 @@ static int ll_send_mgc_param(struct obd_export *mgc, char *string)
 
         return rc;
 }
+#endif
 
 /**
  * Create striped directory with specified stripe(@lump)
@@ -545,8 +547,10 @@ int ll_dir_setstripe(struct inode *inode, struct lov_user_md *lump,
         struct md_op_data *op_data;
         struct ptlrpc_request *req = NULL;
         int rc = 0;
+#if LUSTRE_VERSION_CODE < OBD_OCD_VERSION(2, 13, 53, 0)
         struct lustre_sb_info *lsi = s2lsi(inode->i_sb);
         struct obd_device *mgc = lsi->lsi_mgc;
+#endif
         int lum_size;
        ENTRY;
 
@@ -601,7 +605,7 @@ int ll_dir_setstripe(struct inode *inode, struct lov_user_md *lump,
        if (rc)
                RETURN(rc);
 
-#if LUSTRE_VERSION_CODE < OBD_OCD_VERSION(2, 9, 50, 0)
+#if LUSTRE_VERSION_CODE < OBD_OCD_VERSION(2, 13, 53, 0)
        /*
         * 2.9 server has stored filesystem default stripe in ROOT xattr,
         * and it's stored into system config for backward compatibility.

diff --git a/lustre/mgc/mgc_request.c b/lustre/mgc/mgc_request.c
index bbfdd9f..0b66815 100644 (file)
--- a/lustre/mgc/mgc_request.c
+++ b/lustre/mgc/mgc_request.c
@@ -1039,6 +1039,7 @@ static int mgc_blocking_ast(struct ldlm_lock *lock, struct ldlm_lock_desc *desc,
 #define  MGC_TARGET_REG_LIMIT 10
 #define  MGC_SEND_PARAM_LIMIT 10
 
+#if LUSTRE_VERSION_CODE < OBD_OCD_VERSION(2, 13, 53, 0)
 /* Send parameter to MGS*/
 static int mgc_set_mgs_param(struct obd_export *exp,
                              struct mgs_send_param *msp)
@@ -1075,6 +1076,7 @@ static int mgc_set_mgs_param(struct obd_export *exp,
 
         RETURN(rc);
 }
+#endif
 
 /* Take a config lock so we can get cancel notifications */
 static int mgc_enqueue(struct obd_export *exp, enum ldlm_type type,
@@ -1238,6 +1240,7 @@ static int mgc_set_info_async(const struct lu_env *env, struct obd_export *exp,
                rc = mgc_fs_cleanup(env, exp->exp_obd);
                RETURN(rc);
        }
+#if LUSTRE_VERSION_CODE < OBD_OCD_VERSION(2, 13, 53, 0)
         if (KEY_IS(KEY_SET_INFO)) {
                 struct mgs_send_param *msp;
 
@@ -1245,6 +1248,7 @@ static int mgc_set_info_async(const struct lu_env *env, struct obd_export *exp,
                 rc =  mgc_set_mgs_param(exp, msp);
                 RETURN(rc);
         }
+#endif
         if (KEY_IS(KEY_MGSSEC)) {
                 struct client_obd     *cli = &exp->exp_obd->u.cli;
                 struct sptlrpc_flavor  flvr;

diff --git a/lustre/mgs/mgs_handler.c b/lustre/mgs/mgs_handler.c
index 2c9b9f3..1eacc1f 100644 (file)
--- a/lustre/mgs/mgs_handler.c
+++ b/lustre/mgs/mgs_handler.c
@@ -99,6 +99,7 @@ static inline bool str_starts_with(const char *str, const char *prefix)
        return strncmp(str, prefix, strlen(prefix)) == 0;
 }
 
+#if LUSTRE_VERSION_CODE < OBD_OCD_VERSION(2, 13, 53, 0)
 static int mgs_set_info(struct tgt_session_info *tsi)
 {
        struct mgs_thread_info  *mgi;
@@ -156,6 +157,7 @@ out_cfg:
        lustre_cfg_free(lcfg);
        return rc;
 }
+#endif
 
 enum ast_type {
                AST_CONFIG = 1,
@@ -1040,7 +1042,9 @@ TGT_RPC_HANDLER(MGS_FIRST_OPC,
                0,                      MGS_DISCONNECT,  mgs_disconnect,
                &RQF_MDS_DISCONNECT, LUSTRE_OBD_VERSION),
 TGT_MGS_HDL_VAR(0,                     MGS_EXCEPTION,   mgs_exception),
+#if LUSTRE_VERSION_CODE < OBD_OCD_VERSION(2, 13, 53, 0)
 TGT_MGS_HDL    (HABEO_REFERO | MUTABOR,        MGS_SET_INFO,    mgs_set_info),
+#endif
 TGT_MGS_HDL    (HABEO_REFERO | MUTABOR,        MGS_TARGET_REG,  mgs_target_reg),
 TGT_MGS_HDL_VAR(0,                     MGS_TARGET_DEL,  mgs_target_del),
 TGT_MGS_HDL    (HABEO_REFERO,          MGS_CONFIG_READ, mgs_config_read),

diff --git a/lustre/ptlrpc/layout.c b/lustre/ptlrpc/layout.c
index 37a4474..c7fca53 100644 (file)
--- a/lustre/ptlrpc/layout.c
+++ b/lustre/ptlrpc/layout.c
@@ -80,10 +80,12 @@ static const struct req_msg_field *mgs_target_info_only[] = {
         &RMF_MGS_TARGET_INFO
 };
 
+#if LUSTRE_VERSION_CODE < OBD_OCD_VERSION(2, 13, 53, 0)
 static const struct req_msg_field *mgs_set_info[] = {
         &RMF_PTLRPC_BODY,
         &RMF_MGS_SEND_PARAM
 };
+#endif
 
 static const struct req_msg_field *mgs_config_read_client[] = {
         &RMF_PTLRPC_BODY,
@@ -739,7 +741,9 @@ static struct req_format *req_formats[] = {
        &RQF_OBD_IDX_READ,
         &RQF_SEC_CTX,
         &RQF_MGS_TARGET_REG,
+#if LUSTRE_VERSION_CODE < OBD_OCD_VERSION(2, 13, 53, 0)
         &RQF_MGS_SET_INFO,
+#endif
         &RQF_MGS_CONFIG_READ,
         &RQF_SEQ_QUERY,
         &RQF_FLD_QUERY,
@@ -883,11 +887,13 @@ struct req_msg_field RMF_MGS_TARGET_INFO =
                     lustre_swab_mgs_target_info, NULL);
 EXPORT_SYMBOL(RMF_MGS_TARGET_INFO);
 
+#if LUSTRE_VERSION_CODE < OBD_OCD_VERSION(2, 13, 53, 0)
 struct req_msg_field RMF_MGS_SEND_PARAM =
         DEFINE_MSGF("mgs_send_param", 0,
                     sizeof(struct mgs_send_param),
                     NULL, NULL);
 EXPORT_SYMBOL(RMF_MGS_SEND_PARAM);
+#endif
 
 struct req_msg_field RMF_MGS_CONFIG_BODY =
         DEFINE_MSGF("mgs_config_read request", 0,
@@ -1309,10 +1315,12 @@ struct req_format RQF_MGS_TARGET_REG =
                          mgs_target_info_only);
 EXPORT_SYMBOL(RQF_MGS_TARGET_REG);
 
+#if LUSTRE_VERSION_CODE < OBD_OCD_VERSION(2, 13, 53, 0)
 struct req_format RQF_MGS_SET_INFO =
         DEFINE_REQ_FMT0("MGS_SET_INFO", mgs_set_info,
                          mgs_set_info);
 EXPORT_SYMBOL(RQF_MGS_SET_INFO);
+#endif
 
 struct req_format RQF_MGS_CONFIG_READ =
         DEFINE_REQ_FMT0("MGS_CONFIG_READ", mgs_config_read_client,

diff --git a/lustre/utils/wirecheck.c b/lustre/utils/wirecheck.c
index fcaa88a..e192359 100644 (file)
--- a/lustre/utils/wirecheck.c
+++ b/lustre/utils/wirecheck.c
@@ -1436,6 +1436,7 @@ check_ldlm_gl_lquota_desc(void)
 }
 
 
+#if LUSTRE_VERSION_CODE < OBD_OCD_VERSION(2, 13, 53, 0)
 static void
 check_mgs_send_param(void)
 {
@@ -1444,6 +1445,7 @@ check_mgs_send_param(void)
        CHECK_CVALUE(MGS_PARAM_MAXLEN);
        CHECK_MEMBER(mgs_send_param, mgs_param[MGS_PARAM_MAXLEN]);
 }
+#endif
 
 static void
 check_cfg_marker(void)
@@ -2658,7 +2660,9 @@ main(int argc, char **argv)
        check_ldlm_ost_lvb();
        check_ldlm_lquota_lvb();
        check_ldlm_gl_lquota_desc();
+#if LUSTRE_VERSION_CODE < OBD_OCD_VERSION(2, 13, 53, 0)
        check_mgs_send_param();
+#endif
        check_cfg_marker();
        check_llog_logid();
        check_llog_catid();