LU-4569 hsm: Prevent copytool from importing existing file.

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

diff --git a/lustre/utils/lhsmtool_posix.c b/lustre/utils/lhsmtool_posix.c
index c057e68..8c8ac00 100644 (file)
--- a/lustre/utils/lhsmtool_posix.c
+++ b/lustre/utils/lhsmtool_posix.c
@@ -32,6 +32,11 @@
  *
  * This particular tool can also import an existing HSM archive.
  */
+
+#ifndef _GNU_SOURCE
+#define _GNU_SOURCE
+#endif
+#include <stdio.h>
 #include <stdint.h>
 #include <stdlib.h>
 #include <dirent.h>
@@ -153,9 +158,10 @@ static void usage(const char *name, int rc)
        "into a Lustre filesystem.\n"
        " Usage:\n"
        "   %s [options] --import <src> <dst> <lustre_mount_point>\n"
-       "      import an archived subtree at\n"
-       "       <src> (relative to hsm_root) into the Lustre filesystem at\n"
-       "       <dst> (absolute)\n"
+       "      import an archived subtree from\n"
+       "       <src> (FID or relative path to hsm_root) into the Lustre\n"
+       "             filesystem at\n"
+       "       <dst> (absolute path)\n"
        "   %s [options] --rebind <old_FID> <new_FID> <lustre_mount_point>\n"
        "      rebind an entry in the HSM to a new FID\n"
        "       <old_FID> old FID the HSM entry is bound to\n"
@@ -789,8 +795,9 @@ static int ct_begin(struct hsm_copyaction_private **phcp,
 static int ct_fini(struct hsm_copyaction_private **phcp,
                   const struct hsm_action_item *hai, int hp_flags, int ct_rc)
 {
-       char    lstr[PATH_MAX];
-       int     rc;
+       struct hsm_copyaction_private   *hcp;
+       char                             lstr[PATH_MAX];
+       int                              rc;
 
        CT_TRACE("Action completed, notifying coordinator "
                 "cookie="LPX64", FID="DFID", hp_flags=%d err=%d",
@@ -798,6 +805,17 @@ static int ct_fini(struct hsm_copyaction_private **phcp,
                 hp_flags, -ct_rc);
 
        ct_path_lustre(lstr, sizeof(lstr), opt.o_mnt, &hai->hai_fid);
+
+       if (phcp == NULL || *phcp == NULL) {
+               rc = llapi_hsm_action_begin(&hcp, ctdata, hai, -1, 0, true);
+               if (rc < 0) {
+                       CT_ERROR(rc, "llapi_hsm_action_begin() on '%s' failed",
+                                lstr);
+                       return rc;
+               }
+               phcp = &hcp;
+       }
+
        rc = llapi_hsm_action_end(phcp, &hai->hai_extent, hp_flags, abs(ct_rc));
        if (rc == -ECANCELED)
                CT_ERROR(rc, "completed action on '%s' has been canceled: "
@@ -1047,8 +1065,7 @@ out:
        if (!(dst_fd < 0))
                close(dst_fd);
 
-       if (hcp != NULL)
-               rc = ct_fini(&hcp, hai, hp_flags, rcf);
+       rc = ct_fini(&hcp, hai, hp_flags, rcf);
 
        return rc;
 }
@@ -1145,8 +1162,7 @@ static int ct_restore(const struct hsm_action_item *hai, const long hal_flags)
        CT_TRACE("data restore from '%s' to '%s' done", src, dst);
 
 fini:
-       if (hcp != NULL)
-               rc = ct_fini(&hcp, hai, hp_flags, rc);
+       rc = ct_fini(&hcp, hai, hp_flags, rc);
 
        /* object swaping is done by cdt at copy end, so close of volatile file
         * cannot be done before */
@@ -1196,23 +1212,7 @@ static int ct_remove(const struct hsm_action_item *hai, const long hal_flags)
        }
 
 fini:
-       if (hcp != NULL)
-               rc = ct_fini(&hcp, hai, 0, rc);
-
-       return rc;
-}
-
-static int ct_report_error(const struct hsm_action_item *hai, int flags,
-                          int errval)
-{
-       struct hsm_copyaction_private   *hcp;
-       int                              rc;
-
-       rc = llapi_hsm_action_begin(&hcp, ctdata, hai, -1, 0, true);
-       if (rc < 0)
-               return rc;
-
-       rc = llapi_hsm_action_end(&hcp, &hai->hai_extent, flags, abs(errval));
+       rc = ct_fini(&hcp, hai, 0, rc);
 
        return rc;
 }
@@ -1265,7 +1265,7 @@ static int ct_process_item(struct hsm_action_item *hai, const long hal_flags)
                CT_ERROR(rc, "unknown action %d, on '%s'", hai->hai_action,
                         opt.o_mnt);
                err_minor++;
-               ct_report_error(hai, 0, rc);
+               ct_fini(NULL, hai, 0, rc);
        }
 
        return 0;
@@ -1381,29 +1381,53 @@ static int ct_import_one(const char *src, const char *dst)
 static char *path_concat(const char *dirname, const char *basename)
 {
        char    *result;
-       int      dirlen = strlen(dirname);
+       int      rc;
 
-       result = malloc(dirlen + strlen(basename) + 2);
-       if (result == NULL)
+       rc = asprintf(&result, "%s/%s", dirname, basename);
+       if (rc < 0)
                return NULL;
 
-       memcpy(result, dirname, dirlen);
-       result[dirlen] = '/';
-       strcpy(result + dirlen + 1, basename);
-
        return result;
 }
 
+static int ct_import_fid(const lustre_fid *import_fid)
+{
+       char    fid_path[PATH_MAX];
+       int     rc;
+
+       ct_path_lustre(fid_path, sizeof(fid_path), opt.o_mnt, import_fid);
+       rc = access(fid_path, F_OK);
+       if (rc == 0 || errno != ENOENT) {
+               rc = (errno == 0) ? -EEXIST : -errno;
+               CT_ERROR(rc, "cannot import '"DFID"'", PFID(import_fid));
+               return rc;
+       }
+
+       ct_path_archive(fid_path, sizeof(fid_path), opt.o_hsm_root,
+                       import_fid);
+
+       CT_TRACE("Resolving "DFID" to %s", PFID(import_fid), fid_path);
+
+       return ct_import_one(fid_path, opt.o_dst);
+}
+
 static int ct_import_recurse(const char *relpath)
 {
        DIR             *dir;
        struct dirent    ent, *cookie = NULL;
        char            *srcpath, *newpath;
+       lustre_fid       import_fid;
        int              rc;
 
        if (relpath == NULL)
                return -EINVAL;
 
+       /* Is relpath a FID? In which case SFID should expand to three
+        * elements. */
+       rc = sscanf(relpath, SFID, RFID(&import_fid));
+       if (rc == 3)
+               return ct_import_fid(&import_fid);
+
        srcpath = path_concat(opt.o_hsm_root, relpath);
        if (srcpath == NULL) {
                err_major++;
@@ -1508,7 +1532,7 @@ static int ct_rebind_one(const lustre_fid *old_fid, const lustre_fid *new_fid)
                strncat(src, ".lov", sizeof(src) - strlen(src) - 1);
                strncat(dst, ".lov", sizeof(dst) - strlen(dst) - 1);
                if (rename(src, dst))
-                       CT_ERROR(errno, "cannot '%s' rename to '%s'", src, dst);
+                       CT_ERROR(errno, "cannot rename '%s' to '%s'", src, dst);
 
        }
        return 0;
@@ -1683,7 +1707,7 @@ static int ct_max_sequence(void)
                sprintf(path + strlen(path), "/%04x", subseq);
        }
 
-       printf("max_sequence: %016Lx\n", seq);
+       printf("max_sequence: "LPX64"\n", seq);
 
        return 0;
 }
@@ -1762,7 +1786,8 @@ static int ct_run(void)
                         hal->hal_fsname, hal->hal_archive_id, hal->hal_count);
 
                if (strcmp(hal->hal_fsname, fs_name) != 0) {
-                       CT_ERROR(EINVAL, "'%s' invalid fs name, expecting: %s",
+                       rc = -EINVAL;
+                       CT_ERROR(rc, "'%s' invalid fs name, expecting: %s",
                                 hal->hal_fsname, fs_name);
                        err_major++;
                        if (opt.o_abort_on_error)