LU-14090 mgs: no local logs flag

[fs/lustre-release.git] / lustre / mgc / mgc_request.c

diff --git a/lustre/mgc/mgc_request.c b/lustre/mgc/mgc_request.c
index 0d06d75..ecce505 100644 (file)
--- a/lustre/mgc/mgc_request.c
+++ b/lustre/mgc/mgc_request.c
@@ -1924,21 +1924,32 @@ static int mgc_process_cfg_log(struct obd_device *mgc,
            cli->cl_mgc_configs_dir != NULL &&
            lu2dt_dev(cli->cl_mgc_configs_dir->do_lu.lo_dev) ==
            lsi->lsi_dt_dev) {
-               if (!local_only && !lsi->lsi_dt_dev->dd_rdonly)
+               if (!local_only && !lsi->lsi_dt_dev->dd_rdonly) {
                        /* Only try to copy log if we have the lock. */
+                       CDEBUG(D_INFO, "%s: copy local log %s\n",
+                              mgc->obd_name, cld->cld_logname);
+
                        rc = mgc_llog_local_copy(env, mgc, ctxt, lctxt,
                                                 cld->cld_logname);
+                       if (!rc)
+                               lsi->lsi_flags &= ~LDD_F_NO_LOCAL_LOGS;
+               }
                if (local_only || rc) {
+                       if (unlikely(lsi->lsi_flags & LDD_F_NO_LOCAL_LOGS)
+                           || rc) {
+                               CWARN("%s: local log %s are not valid and/or remote logs are not accessbile rc = %d\n",
+                                     mgc->obd_name, cld->cld_logname, rc);
+                               GOTO(out_pop, rc = -EIO);
+                       }
+
                        if (strcmp(cld->cld_logname, PARAMS_FILENAME) != 0 &&
                            llog_is_empty(env, lctxt, cld->cld_logname)) {
-                               LCONSOLE_ERROR_MSG(0x13a, "Failed to get MGS "
-                                                  "log %s and no local copy."
-                                                  "\n", cld->cld_logname);
+                               LCONSOLE_ERROR_MSG(0x13a, "Failed to get MGS log %s and no local copy.\n",
+                                                  cld->cld_logname);
                                GOTO(out_pop, rc = -ENOENT);
                        }
-                       CDEBUG(D_MGC, "Failed to get MGS log %s, using local "
-                              "copy for now, will try to update later.\n",
-                              cld->cld_logname);
+                       CDEBUG(D_MGC, "%s: Failed to get MGS log %s, using local copy for now, will try to update later.\n",
+                              mgc->obd_name, cld->cld_logname);
                        rc = 0;
                }
                /* Now, whether we copied or not, start using the local llog.