LU-1014 mountconf: Revert "MGS should process parameter config"

This reverts commit 6cde8692384a1d3a6d0e8114629fa943c951fe40.

Previous commit is wrong, will fix it in another patch.

Signed-off-by: Lai Siyao <laisiyao@whamcloud.com>
Change-Id: I5868cb1908f9b123db5b8bd7be9e364ae9a51d6a
Reviewed-on: http://review.whamcloud.com/2843
Tested-by: Hudson
Reviewed-by: Andreas Dilger <adilger@whamcloud.com>
Reviewed-by: James Simmons <uja.ornl@gmail.com>
Tested-by: Maloo <whamcloud.maloo@gmail.com>

diff --git a/lustre/mgc/mgc_request.c b/lustre/mgc/mgc_request.c
index 9beed29..a7cd745 100644 (file)
--- a/lustre/mgc/mgc_request.c
+++ b/lustre/mgc/mgc_request.c
@@ -259,7 +259,7 @@ static struct config_llog_data *config_recover_log_add(struct obd_device *obd,
         struct config_llog_data *cld;
         char logname[32];
 
         struct config_llog_data *cld;
         char logname[32];
 

-        if ((lsi->lsi_flags & LSI_SERVER) && !IS_MDT(lsi->lsi_ldd))
+        if ((lsi->lsi_flags & LSI_SERVER) && IS_OST(lsi->lsi_ldd))

                 return NULL;
 
         /* we have to use different llog for clients and mdts for cmd
                 return NULL;
 
         /* we have to use different llog for clients and mdts for cmd

diff --git a/lustre/obdclass/obd_mount.c b/lustre/obdclass/obd_mount.c
index 85f0e67..890d409 100644 (file)
--- a/lustre/obdclass/obd_mount.c
+++ b/lustre/obdclass/obd_mount.c
@@ -1617,23 +1617,8 @@ static void server_put_super(struct super_block *sb)
            should have put it on a different device. */
         if (IS_MGS(lsi->lsi_ldd)) {
                 /* if MDS start with --nomgs, don't stop MGS then */
            should have put it on a different device. */
         if (IS_MGS(lsi->lsi_ldd)) {
                 /* if MDS start with --nomgs, don't stop MGS then */

-                if (!(lsi->lsi_lmd->lmd_flags & LMD_FLG_NOMGS)) {
-                        char *logname;
-
-                        OBD_ALLOC(logname, MGS_PARAM_MAXLEN);
-                        if (!logname) {
-                                LCONSOLE_WARN("Stopping mgs failed %d, please "
-                                              "try again.", -ENOMEM);
-                                return;
-                        }
-                        strcpy(logname, lsi->lsi_ldd->ldd_fsname);
-                        strcat(logname, "-params");
-                        /* tell the mgc to drop parameter config log */
-                        lustre_end_log(sb, logname, NULL);
-                        OBD_FREE(logname, MGS_PARAM_MAXLEN);
-
+                if (!(lsi->lsi_lmd->lmd_flags & LMD_FLG_NOMGS))

                         server_stop_mgs(sb);
                         server_stop_mgs(sb);

-                }

         }
 
         /* Clean the mgc and sb */
         }
 
         /* Clean the mgc and sb */


@@ -1846,25 +1831,6 @@ static int server_fill_super(struct super_block *sb)
            Client will not finish until all servers are connected.
            Note - MGS-only server does NOT get a client, since there is no
            lustre fs associated - the MGS is for all lustre fs's */
            Client will not finish until all servers are connected.
            Note - MGS-only server does NOT get a client, since there is no
            lustre fs associated - the MGS is for all lustre fs's */

-        } else if (IS_MGS(lsi->lsi_ldd) &&
-                   !(lsi->lsi_lmd->lmd_flags & LMD_FLG_NOMGS)){
-                struct config_llog_instance cfg;
-                char *logname;
-
-                OBD_ALLOC(logname, MGS_PARAM_MAXLEN);
-                if (logname == NULL)
-                        GOTO(out_mnt, rc = -ENOMEM);
-                strcpy(logname, lsi->lsi_ldd->ldd_fsname);
-                strcat(logname, "-params");
-
-                memset(&cfg, 0, sizeof(cfg));
-                rc = lustre_process_log(sb, logname, &cfg);
-                OBD_FREE(logname, MGS_PARAM_MAXLEN);
-                if (rc) {
-                        CERROR("failed to process parameters %s: %d\n",
-                               logname, rc);
-                        GOTO(out_mnt, rc);
-                }

         }
 
         rc = server_fill_super_common(sb);
         }
 
         rc = server_fill_super_common(sb);