staging/lustre/hsm: HSM requests not delivered (e55c4476) · Commits · 戴 / test

The total size of an HSM archive request may exceed the desired (LNET) message. When this happens, it can hang the client and not allow the archive request to succeed. Before we know the total size of the hsm_action_items, we need to limit the size of the reguest. Doing this limits the number of items that can be sent in one archive request. We'e reduced the size allowed for the user archive request to MDS_MAXREQSIZE/3. Signed-off-by:

James Nunez <james.a.nunez@intel.com> Reviewed-on: http://review.whamcloud.com/9393 Intel-bug-id: https://jira.hpdd.intel.com/browse/LU-4639 Reviewed-by:

John L. Hammond <john.hammond@intel.com> Reviewed-by:

Jinshan Xiong <jinshan.xiong@intel.com> Signed-off-by:

Oleg Drokin <oleg.drokin@intel.com> Signed-off-by:

Greg Kroah-Hartman <gregkh@linuxfoundation.org>

drivers/staging/lustre/lustre/include/lustre_net.h

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -264,6 +264,8 @@
	#define LDLM_MAXREQSIZE (5 * 1024)		#define LDLM_MAXREQSIZE (5 * 1024)
	#define LDLM_MAXREPSIZE (1024)		#define LDLM_MAXREPSIZE (1024)

			#define MDS_MAXREQSIZE (5 * 1024) /* >= 4736 */

	#define OST_MAXREQSIZE (5 * 1024)		#define OST_MAXREQSIZE (5 * 1024)

	/* Macro to hide a typecast. */		/* Macro to hide a typecast. */

drivers/staging/lustre/lustre/llite/dir.c

+5 −0

Original line number	Original line	Diff line number	Diff line
	@@ -1804,6 +1804,11 @@ out_rmdir:
	/* Compute the whole struct size */		/* Compute the whole struct size */
	totalsize = hur_len(hur);		totalsize = hur_len(hur);
	OBD_FREE_PTR(hur);		OBD_FREE_PTR(hur);

			/* Final size will be more than double totalsize */
			if (totalsize >= MDS_MAXREQSIZE / 3)
			return -E2BIG;

	OBD_ALLOC_LARGE(hur, totalsize);		OBD_ALLOC_LARGE(hur, totalsize);
	if (hur == NULL)		if (hur == NULL)
	return -ENOMEM;		return -ENOMEM;

Admin message