LU-5700 llite: handle concurrent use of cob_transient_pages

[fs/lustre-release.git] / lustre / utils / lhsmtool_posix.c

diff --git a/lustre/utils/lhsmtool_posix.c b/lustre/utils/lhsmtool_posix.c
index ff157dc..0702b9c 100644 (file)
--- a/lustre/utils/lhsmtool_posix.c
+++ b/lustre/utils/lhsmtool_posix.c
@@ -41,7 +41,9 @@
 #include <stdlib.h>
 #include <dirent.h>
 #include <errno.h>
+#include <time.h>
 #include <utime.h>
+#include <sys/time.h>
 #include <sys/xattr.h>
 #include <sys/syscall.h>
 #include <sys/types.h>
@@ -85,6 +87,7 @@ struct options {
        enum ct_action           o_action;
        char                    *o_event_fifo;
        char                    *o_mnt;
+       int                      o_mnt_fd;
        char                    *o_hsm_root;
        char                    *o_src; /* for import, or rebind */
        char                    *o_dst; /* for import, or rebind */
@@ -115,27 +118,34 @@ static char fs_name[MAX_OBD_NAME + 1];
 
 static struct hsm_copytool_private *ctdata;
 
+static inline double ct_now(void)
+{
+       struct timeval tv;
+
+       gettimeofday(&tv, NULL);
+
+       return tv.tv_sec + 0.000001 * tv.tv_usec;
+}
 
-#define CT_ERROR(_rc, _format, ...) \
+#define CT_ERROR(_rc, _format, ...)                                    \
        llapi_error(LLAPI_MSG_ERROR, _rc,                               \
-                   "%s[%ld]: "_format,                                 \
-                   cmd_name, syscall(SYS_gettid), ## __VA_ARGS__)
-#define CT_DEBUG(_format, ...) \
+                   "%f %s[%ld]: "_format,                              \
+                   ct_now(), cmd_name, syscall(SYS_gettid), ## __VA_ARGS__)
+
+#define CT_DEBUG(_format, ...)                                         \
        llapi_error(LLAPI_MSG_DEBUG | LLAPI_MSG_NO_ERRNO, 0,            \
-                   "%s[%ld]: "_format,                                 \
-                   cmd_name, syscall(SYS_gettid), ## __VA_ARGS__)
+                   "%f %s[%ld]: "_format,                              \
+                   ct_now(), cmd_name, syscall(SYS_gettid), ## __VA_ARGS__)
+
 #define CT_WARN(_format, ...) \
        llapi_error(LLAPI_MSG_WARN | LLAPI_MSG_NO_ERRNO, 0,             \
-                   "%s[%ld]: "_format,                                 \
-                   cmd_name, syscall(SYS_gettid), ## __VA_ARGS__)
-#define CT_TRACE(_format, ...) \
+                   "%f %s[%ld]: "_format,                              \
+                   ct_now(), cmd_name, syscall(SYS_gettid), ## __VA_ARGS__)
+
+#define CT_TRACE(_format, ...)                                         \
        llapi_error(LLAPI_MSG_INFO | LLAPI_MSG_NO_ERRNO, 0,             \
-                   "%s[%ld]: "_format,                                 \
-                   cmd_name, syscall(SYS_gettid), ## __VA_ARGS__)
-#define CT_PRINTF(_format, ...) \
-       llapi_printf(LLAPI_MSG_NORMAL,                                  \
-                    "%s[%ld]: "_format,                                \
-                    cmd_name, syscall(SYS_gettid), ## __VA_ARGS__)
+                   "%f %s[%ld]: "_format,                              \
+                   ct_now(), cmd_name, syscall(SYS_gettid), ## __VA_ARGS__)
 
 static void usage(const char *name, int rc)
 {
@@ -331,6 +341,7 @@ static int ct_parseopts(int argc, char * const *argv)
        }
 
        opt.o_mnt = argv[optind];
+       opt.o_mnt_fd = -1;
 
        CT_TRACE("action=%d src=%s dst=%s mount_point=%s",
                 opt.o_action, opt.o_src, opt.o_dst, opt.o_mnt);
@@ -538,11 +549,10 @@ static int ct_copy_data(struct hsm_copyaction_private *hcp, const char *src,
        char                    *buf = NULL;
        __u64                    write_total = 0;
        __u64                    length;
+       double                   start_time = ct_now();
        time_t                   last_print_time = time(NULL);
        int                      rc = 0;
 
-       CT_TRACE("going to copy data from '%s' to '%s'", src, dst);
-
        if (fstat(src_fd, &src_st) < 0) {
                rc = -errno;
                CT_ERROR(rc, "cannot stat '%s'", src);
@@ -598,7 +608,8 @@ static int ct_copy_data(struct hsm_copyaction_private *hcp, const char *src,
                goto out;
        }
 
-       CT_DEBUG("Going to copy "LPU64" bytes %s -> %s\n", length, src, dst);
+       CT_TRACE("start copy of "LPU64" bytes from '%s' to '%s'",
+                length, src, dst);
 
        while (write_total < length) {
                ssize_t rsize;
@@ -671,6 +682,9 @@ out:
        if (buf != NULL)
                free(buf);
 
+       CT_TRACE("copied "LPU64" bytes in %f seconds",
+                length, ct_now() - start_time);
+
        return rc;
 }
 
@@ -1084,7 +1098,7 @@ static int ct_restore(const struct hsm_action_item *hai, const long hal_flags)
        int                              hp_flags = 0;
        int                              src_fd = -1;
        int                              dst_fd = -1;
-       int                              mdt_index = -1; /* Not implemented */
+       int                              mdt_index = -1;
        int                              open_flags = 0;
        bool                             set_lovea;
        struct lu_fid                    dfid;
@@ -1096,6 +1110,13 @@ static int ct_restore(const struct hsm_action_item *hai, const long hal_flags)
        /* build backend file name from released file FID */
        ct_path_archive(src, sizeof(src), opt.o_hsm_root, &hai->hai_fid);
 
+       rc = llapi_get_mdt_index_by_fid(opt.o_mnt_fd, &hai->hai_fid,
+                                       &mdt_index);
+       if (rc < 0) {
+               CT_ERROR(rc, "cannot get mdt index "DFID"",
+                        PFID(&hai->hai_fid));
+               return rc;
+       }
        /* restore loads and sets the LOVEA w/o interpreting it to avoid
         * dependency on the structure format. */
        rc = ct_load_stripe(src, lov_buf, &lov_size);
@@ -1861,6 +1882,14 @@ static int ct_setup(void)
                return rc;
        }
 
+       opt.o_mnt_fd = open(opt.o_mnt, O_RDONLY);
+       if (opt.o_mnt_fd < 0) {
+               rc = -errno;
+               CT_ERROR(rc, "cannot open mount point at '%s'",
+                        opt.o_mnt);
+               return rc;
+       }
+
        return rc;
 }
 
@@ -1868,13 +1897,22 @@ static int ct_cleanup(void)
 {
        int     rc;
 
-       if (arc_fd < 0)
-               return 0;
+       if (opt.o_mnt_fd >= 0) {
+               rc = close(opt.o_mnt_fd);
+               if (rc < 0) {
+                       rc = -errno;
+                       CT_ERROR(rc, "cannot close mount point");
+                       return rc;
+               }
+       }
 
-       if (close(arc_fd) < 0) {
-               rc = -errno;
-               CT_ERROR(rc, "cannot close archive root directory");
-               return rc;
+       if (arc_fd >= 0) {
+               rc = close(arc_fd);
+               if (rc < 0) {
+                       rc = -errno;
+                       CT_ERROR(rc, "cannot close archive root directory");
+                       return rc;
+               }
        }
 
        return 0;