Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 99a92265 authored by jcl's avatar jcl Committed by Greg Kroah-Hartman
Browse files

staging/lustre/mdt: HSM on disk actions record 

HSM coordinator memorizes all actions in a llog
This patch implements the methods needed to create
update display these records.

Intel-bug-id: https://jira.hpdd.intel.com/browse/LU-3339
Lustre-change: http://review.whamcloud.com/6529


Signed-off-by: default avatarJC Lafoucriere <jacques-charles.lafoucriere@cea.fr>
Reviewed-by: default avatarAndreas Dilger <andreas.dilger@intel.com>
Reviewed-by: default avatarOleg Drokin <oleg.drokin@intel.com>
Signed-off-by: default avatarPeng Tao <tao.peng@emc.com>
Signed-off-by: default avatarAndreas Dilger <andreas.dilger@intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 73e8636e

drivers/staging/lustre/lustre/include/lprocfs_status.h

+0 −3
Original line number Diff line number Diff line
@@ -826,9 +826,6 @@ extern int lprocfs_quota_rd_qs_factor(char *page, char **start, loff_t off, 
extern int lprocfs_quota_wr_qs_factor(struct file *file,

				      const char *buffer,

				      unsigned long count, void *data);







#else

/* LPROCFS is not defined */

drivers/staging/lustre/lustre/include/lustre/lustre_idl.h

+47 −0
Original line number Diff line number Diff line
@@ -2986,6 +2986,7 @@ typedef enum { 
	/* LLOG_JOIN_REC	= LLOG_OP_MAGIC | 0x50000, obsolete  1.8.0 */

	CHANGELOG_REC		= LLOG_OP_MAGIC | 0x60000,

	CHANGELOG_USER_REC	= LLOG_OP_MAGIC | 0x70000,

	HSM_AGENT_REC		= LLOG_OP_MAGIC | 0x80000,

	LLOG_HDR_MAGIC		= LLOG_OP_MAGIC | 0x45539,

	LLOG_LOGID_MAGIC	= LLOG_OP_MAGIC | 0x4553b,

} llog_op_type;
@@ -3105,6 +3106,52 @@ struct llog_changelog_user_rec { 
	struct llog_rec_tail  cur_tail;

} __attribute__((packed));



enum agent_req_status {

	ARS_WAITING,

	ARS_STARTED,

	ARS_FAILED,

	ARS_CANCELED,

	ARS_SUCCEED,

};



static inline char *agent_req_status2name(enum agent_req_status ars)

{

	switch (ars) {

	case ARS_WAITING:

		return "WAITING";

	case ARS_STARTED:

		return "STARTED";

	case ARS_FAILED:

		return "FAILED";

	case ARS_CANCELED:

		return "CANCELED";

	case ARS_SUCCEED:

		return "SUCCEED";

	default:

		return "UNKNOWN";

	}

}



static inline bool agent_req_in_final_state(enum agent_req_status ars)

{

	return ((ars == ARS_SUCCEED) || (ars == ARS_FAILED) ||

		(ars == ARS_CANCELED));

}



struct llog_agent_req_rec {

	struct llog_rec_hdr	arr_hdr;	/**< record header */

	__u32			arr_status;	/**< status of the request */

						/* must match enum

						 * agent_req_status */

	__u32			arr_archive_id;	/**< backend archive number */

	__u64			arr_flags;	/**< req flags */

	__u64			arr_compound_id;	/**< compound cookie */

	__u64			arr_req_create;	/**< req. creation time */

	__u64			arr_req_change;	/**< req. status change time */

	struct hsm_action_item	arr_hai;	/**< req. to the agent */

	struct llog_rec_tail	arr_tail; /**< record tail for_sizezof_only */

} __attribute__((packed));



/* Old llog gen for compatibility */

struct llog_gen {

	__u64 mnt_cnt;

drivers/staging/lustre/lustre/include/lustre_disk.h

+29 −27
Original line number Diff line number Diff line
@@ -67,6 +67,7 @@ 
#define MGS_NIDTBL_DIR		"NIDTBL_VERSIONS"

#define QMT_DIR			"quota_master"

#define QSD_DIR			"quota_slave"

#define HSM_ACTIONS		"hsm_actions"



/****************** persistent mount data *********************/
@@ -241,6 +242,7 @@ struct lustre_mount_data { 
#define LMD_FLG_NO_PRIMNODE	0x0800	/* all nodes are service nodes */

#define LMD_FLG_VIRGIN		0x1000	/* the service registers first time */

#define LMD_FLG_UPDATE		0x2000	/* update parameters */

#define LMD_FLG_HSM		0x4000	/* Start coordinator */



#define lmd_is_client(x) ((x)->lmd_flags & LMD_FLG_CLIENT)

drivers/staging/lustre/lustre/include/obd.h

+4 −3
Original line number Diff line number Diff line
@@ -295,6 +295,7 @@ enum llog_ctxt_id { 
	LLOG_CHANGELOG_ORIG_CTXT,	/**< changelog generation on mdd */

	LLOG_CHANGELOG_REPL_CTXT,	/**< changelog access on clients */

	LLOG_CHANGELOG_USER_ORIG_CTXT,	/**< for multiple changelog consumers */

	LLOG_AGENT_ORIG_CTXT,		/**< agent requests generation on cdt */

	LLOG_MAX_CTXTS

};

drivers/staging/lustre/lustre/obdclass/llog_swab.c

+17 −0
Original line number Diff line number Diff line
@@ -203,6 +203,23 @@ void lustre_swab_llog_rec(struct llog_rec_hdr *rec) 
		break;

	}



	case HSM_AGENT_REC: {

		struct llog_agent_req_rec *arr =

			(struct llog_agent_req_rec *)rec;



		__swab32s(&arr->arr_hai.hai_len);

		__swab32s(&arr->arr_hai.hai_action);

		lustre_swab_lu_fid(&arr->arr_hai.hai_fid);

		lustre_swab_lu_fid(&arr->arr_hai.hai_dfid);

		__swab64s(&arr->arr_hai.hai_cookie);

		__swab64s(&arr->arr_hai.hai_extent.offset);

		__swab64s(&arr->arr_hai.hai_extent.length);

		__swab64s(&arr->arr_hai.hai_gid);

		/* no swabing for opaque data */

		/* hai_data[0]; */

		break;

	}



	case MDS_SETATTR64_REC:

	{

		struct llog_setattr64_rec *lsr =