From: John L. Hammond <john.hammond@intel.com>
Date: Fri, 8 Dec 2017 19:59:43 +0000 (-0600)
Subject: LU-10357 hsm: open file to be archived before starting
X-Git-Tag: 2.10.57~41
X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=commitdiff_plain;h=77cd1a21e312ca00b37b33689091734a12eec048

LU-10357 hsm: open file to be archived before starting

In the archive case of llapi_hsm_action_begin(), open the file to be
archived before calling the LL_IOC_HSM_COPY_START ioctl. Store the
open FD in struct hsm_copyaction_private, return a dup of it
llapi_hsm_action_get_fd(), and close it in
llapi_hsm_action_end(). Calling open() first avoids 3 extra RPCs
(MDS_GETATTR, LDLM_ENQUEUE for layout to get data version,
LDLM_ENQUEUE for fstat()) when archiving.

Signed-off-by: John L. Hammond <john.hammond@intel.com>
Change-Id: Idea0a7f4cb63bd9d712ff2ce9fcb59a3b278d0f2
Reviewed-on: https://review.whamcloud.com/30456
Tested-by: Jenkins
Tested-by: Maloo <hpdd-maloo@intel.com>
Reviewed-by: Quentin Bouget <quentin.bouget@cea.fr>
Reviewed-by: Dmitry Eremin <dmitry.eremin@intel.com>
Reviewed-by: Oleg Drokin <oleg.drokin@intel.com>
---

diff --git a/lustre/utils/liblustreapi_hsm.c b/lustre/utils/liblustreapi_hsm.c
index 486be87..8061d76 100644
--- a/lustre/utils/liblustreapi_hsm.c
+++ b/lustre/utils/liblustreapi_hsm.c
@@ -78,6 +78,7 @@ struct hsm_copytool_private {
 #define CP_PRIV_MAGIC 0x19880429
 struct hsm_copyaction_private {
 	__u32					 magic;
+	__u32					 source_fd;
 	__s32					 data_fd;
 	const struct hsm_copytool_private	*ct_priv;
 	struct hsm_copy				 copy;
@@ -1099,13 +1100,15 @@ int llapi_hsm_action_begin(struct hsm_copyaction_private **phcp,
 			   int restore_mdt_index, int restore_open_flags,
 			   bool is_error)
 {
-	struct hsm_copyaction_private	*hcp;
-	int				 rc;
+	struct hsm_copyaction_private *hcp;
+	int fd;
+	int rc;
 
 	hcp = calloc(1, sizeof(*hcp));
 	if (hcp == NULL)
 		return -ENOMEM;
 
+	hcp->source_fd = -1;
 	hcp->data_fd = -1;
 	hcp->ct_priv = ct;
 	hcp->copy.hc_hai = *hai;
@@ -1114,7 +1117,16 @@ int llapi_hsm_action_begin(struct hsm_copyaction_private **phcp,
 	if (is_error)
 		goto ok_out;
 
-	if (hai->hai_action == HSMA_RESTORE) {
+	if (hai->hai_action == HSMA_ARCHIVE) {
+		fd = ct_open_by_fid(hcp->ct_priv, &hai->hai_dfid,
+				O_RDONLY | O_NOATIME | O_NOFOLLOW | O_NONBLOCK);
+		if (fd < 0) {
+			rc = fd;
+			goto err_out;
+		}
+
+		hcp->source_fd = fd;
+	} else if (hai->hai_action == HSMA_RESTORE) {
 		rc = ct_md_getattr(hcp->ct_priv, &hai->hai_fid, &hcp->stat);
 		if (rc < 0)
 			goto err_out;
@@ -1123,12 +1135,11 @@ int llapi_hsm_action_begin(struct hsm_copyaction_private **phcp,
 					     restore_open_flags);
 		if (rc < 0)
 			goto err_out;
-	}
-
-	/* Since remove is atomic there is no need to send an initial
-	 * MDS_HSM_PROGRESS RPC. */
-	if (hai->hai_action == HSMA_REMOVE)
+	} else if (hai->hai_action == HSMA_REMOVE) {
+		/* Since remove is atomic there is no need to send an
+		 * initial MDS_HSM_PROGRESS RPC. */
 		goto out_log;
+	}
 
 	rc = ioctl(ct->mnt_fd, LL_IOC_HSM_COPY_START, &hcp->copy);
 	if (rc < 0) {
@@ -1145,6 +1156,9 @@ ok_out:
 	return 0;
 
 err_out:
+	if (!(hcp->source_fd < 0))
+		close(hcp->source_fd);
+
 	if (!(hcp->data_fd < 0))
 		close(hcp->data_fd);
 
@@ -1226,6 +1240,9 @@ end:
 	llapi_hsm_log_ct_progress(&hcp, hai, CT_FINISH, 0, 0);
 
 err_cleanup:
+	if (!(hcp->source_fd < 0))
+		close(hcp->source_fd);
+
 	if (!(hcp->data_fd < 0))
 		close(hcp->data_fd);
 
@@ -1311,8 +1328,8 @@ int llapi_hsm_action_get_fd(const struct hsm_copyaction_private *hcp)
 		return -EINVAL;
 
 	if (hai->hai_action == HSMA_ARCHIVE) {
-		return ct_open_by_fid(hcp->ct_priv, &hai->hai_dfid,
-				O_RDONLY | O_NOATIME | O_NOFOLLOW | O_NONBLOCK);
+		fd = dup(hcp->source_fd);
+		return fd < 0 ? -errno : fd;
 	} else if (hai->hai_action == HSMA_RESTORE) {
 		fd = dup(hcp->data_fd);
 		return fd < 0 ? -errno : fd;