From 62e93ef9a29341091c49d66a1535ea243ea950be Mon Sep 17 00:00:00 2001 From: Frank Zago Date: Mon, 18 Apr 2016 13:53:00 -0400 Subject: [PATCH] LU-8030 hsm: prevent duplicated HSM requests It is possible to insert identical HSM requests in the HSM action list. The following command lfs hsm-archive foo foo foo foo results in 4 new archive requests in the "actions" list for the same file. Identify such requests and suppress the duplicates. Signed-off-by: frank zago Change-Id: If83d2855948578b94babca96dc72c33f96ae4f71 Reviewed-on: http://review.whamcloud.com/19635 Tested-by: Jenkins Reviewed-by: jacques-Charles Lafoucriere Reviewed-by: John L. Hammond Tested-by: Maloo Reviewed-by: Oleg Drokin --- lustre/mdt/mdt_hsm.c | 25 ++++++++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) diff --git a/lustre/mdt/mdt_hsm.c b/lustre/mdt/mdt_hsm.c index d4cf668..ab0e851 100644 --- a/lustre/mdt/mdt_hsm.c +++ b/lustre/mdt/mdt_hsm.c @@ -460,6 +460,22 @@ out: return rc; } +/* Return true if a FID is present in an action list. */ +static bool is_fid_in_hal(struct hsm_action_list *hal, const lustre_fid *fid) +{ + struct hsm_action_item *hai; + int i; + + for (hai = hai_first(hal), i = 0; + i < hal->hal_count; + i++, hai = hai_next(hai)) { + if (lu_fid_eq(&hai->hai_fid, fid)) + return true; + } + + return false; +} + /** * Process the HSM actions described in a struct hsm_user_request. * @@ -548,9 +564,14 @@ int mdt_hsm_request(struct tgt_session_info *tsi) obd_uuid2fsname(hal->hal_fsname, mdt_obd_name(info->mti_mdt), MTI_NAME_MAXLEN); - hal->hal_count = hr->hr_itemcount; + hal->hal_count = 0; hai = hai_first(hal); for (i = 0; i < hr->hr_itemcount; i++, hai = hai_next(hai)) { + /* Get rid of duplicate entries. Otherwise we get + * duplicated work in the llog. */ + if (is_fid_in_hal(hal, &hui[i].hui_fid)) + continue; + hai->hai_action = action; hai->hai_cookie = 0; hai->hai_gid = 0; @@ -558,6 +579,8 @@ int mdt_hsm_request(struct tgt_session_info *tsi) hai->hai_extent = hui[i].hui_extent; memcpy(hai->hai_data, data, hr->hr_data_len); hai->hai_len = sizeof(*hai) + hr->hr_data_len; + + hal->hal_count++; } rc = mdt_hsm_add_actions(info, hal, &compound_id); -- 1.8.3.1