X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fmdt%2Fmdt_hsm_cdt_actions.c;h=da7f5a9441989e87199251fa4b0dbdc14de73791;hb=c1770567350f479ff4014a94a4d5411c41de0dc3;hp=8a080050ebe931d0e7a62ce9db642598e46c607f;hpb=1294081248bbd3e9dc23eb1ffb275dc59a4278db;p=fs%2Flustre-release.git

diff --git a/lustre/mdt/mdt_hsm_cdt_actions.c b/lustre/mdt/mdt_hsm_cdt_actions.c
index 8a08005..da7f5a9 100644
--- a/lustre/mdt/mdt_hsm_cdt_actions.c
+++ b/lustre/mdt/mdt_hsm_cdt_actions.c
@@ -25,7 +25,7 @@
  *
  */
 /*
- * lustre/mdt/mdt_agent_actions.c
+ * lustre/mdt/mdt_hsm_cdt_actions.c
  *
  * Lustre HSM
  *
@@ -93,7 +93,7 @@ int cdt_llog_process(const struct lu_env *env, struct mdt_device *mdt,
 	ENTRY;
 
 	lctxt = llog_get_context(obd, LLOG_AGENT_ORIG_CTXT);
-	if ((lctxt == NULL) || (lctxt->loc_handle == NULL))
+	if (lctxt == NULL || lctxt->loc_handle == NULL)
 		RETURN(-ENOENT);
 
 	mutex_lock(&cdt->cdt_llog_lock);
@@ -148,7 +148,7 @@ int mdt_agent_record_add(const struct lu_env *env,
 	memcpy(&larr->arr_hai, hai, hai->hai_len);
 
 	lctxt = llog_get_context(obd, LLOG_AGENT_ORIG_CTXT);
-	if ((lctxt == NULL) || (lctxt->loc_handle == NULL))
+	if (lctxt == NULL || lctxt->loc_handle == NULL)
 		GOTO(free, rc = -ENOENT);
 
 	mutex_lock(&cdt->cdt_llog_lock);
@@ -223,8 +223,8 @@ static int mdt_agent_record_update_cb(const struct lu_env *env,
 	 * the 1st has to be set to ARS_CANCELED and the 2nd to ARS_SUCCEED
 	 */
 	if (agent_req_in_final_state(larr->arr_status) ||
-	    ((larr->arr_hai.hai_action == HSMA_CANCEL) &&
-	     (ducb->status == ARS_CANCELED)))
+	    (larr->arr_hai.hai_action == HSMA_CANCEL &&
+	     ducb->status == ARS_CANCELED))
 		RETURN(0);
 
 	rc = 0;
@@ -325,8 +325,7 @@ int mdt_agent_llog_update_rec(const struct lu_env *env,
  * multiple record in seq_file buffer in one show call.
  * op->start() sets the iterator up and returns the first element of sequence
  * op->stop() shuts it down.
- * op->next() returns the next element of sequence.
- * op->show() prints element into the buffer.
+ * op->show() iterate llog and print element into the buffer.
  * In case of error ->start() and ->next() return ERR_PTR(error)
  * In the end of sequence they return %NULL
  * op->show() returns 0 in case of success and negative number in case of error.
@@ -338,19 +337,19 @@ int mdt_agent_llog_update_rec(const struct lu_env *env,
 #define AGENT_ACTIONS_IT_MAGIC 0x19660426
 struct agent_action_iterator {
 	int			 aai_magic;	 /**< magic number */
+	bool			 aai_eof;	 /**< all done */
 	struct lu_env		 aai_env;	 /**< lustre env for llog */
-	struct obd_device	*aai_obd;	 /**< metadata device */
+	struct mdt_device	*aai_mdt;	 /**< metadata device */
 	struct llog_ctxt	*aai_ctxt;	 /**< llog context */
-	int			 aai_index_done; /**< idx already shown */
-	int			 aai_index_cb;	 /**< current idx in loop cb */
-	int			 aai_eof;	 /**< all done */
+	int			 aai_cat_index;	 /**< cata idx already shown */
+	int			 aai_index;	 /**< idx in cata shown */
 };
 
 /**
  * seq_file method called to start access to /proc file
  * get llog context + llog handle
  */
-static void *mdt_agent_actions_proc_start(struct seq_file *s, loff_t *pos)
+static void *mdt_hsm_actions_proc_start(struct seq_file *s, loff_t *pos)
 {
 	struct agent_action_iterator	*aai = s->private;
 	ENTRY;
@@ -358,8 +357,9 @@ static void *mdt_agent_actions_proc_start(struct seq_file *s, loff_t *pos)
 	LASSERTF(aai->aai_magic == AGENT_ACTIONS_IT_MAGIC, "%08X",
 		 aai->aai_magic);
 
-	aai->aai_ctxt = llog_get_context(aai->aai_obd, LLOG_AGENT_ORIG_CTXT);
-	if ((aai->aai_ctxt == NULL) || (aai->aai_ctxt->loc_handle == NULL)) {
+	aai->aai_ctxt = llog_get_context(mdt2obd_dev(aai->aai_mdt),
+					 LLOG_AGENT_ORIG_CTXT);
+	if (aai->aai_ctxt == NULL || aai->aai_ctxt->loc_handle == NULL) {
 		CERROR("llog_get_context() failed\n");
 		RETURN(ERR_PTR(-ENOENT));
 	}
@@ -368,42 +368,28 @@ static void *mdt_agent_actions_proc_start(struct seq_file *s, loff_t *pos)
 	       *pos);
 	/* first call = rewind */
 	if (*pos == 0) {
-		aai->aai_index_done = 0;
-		aai->aai_eof = 0;
+		aai->aai_cat_index = 0;
+		aai->aai_index = -1;
+		aai->aai_eof = false;
 		*pos = 1;
 	}
 
+	if (aai->aai_eof)
+		RETURN(NULL);
+
 	RETURN(aai);
 }
 
-/**
- * seq_file method called to get next item
- * just returns NULL at eof
- * (seq_file buffer filling is done in llog_cat_process() callback)
- */
-static void *mdt_agent_actions_proc_next(struct seq_file *s, void *v,
+static void *mdt_hsm_actions_proc_next(struct seq_file *s, void *v,
 					 loff_t *pos)
 {
-	struct agent_action_iterator *aai = s->private;
-	ENTRY;
-
-	LASSERTF(aai->aai_magic == AGENT_ACTIONS_IT_MAGIC, "%08X",
-		 aai->aai_magic);
-
-	CDEBUG(D_HSM, "set current="LPD64" to done=%d, eof=%d\n",
-	       *pos, aai->aai_index_done, aai->aai_eof);
-	(*pos) = aai->aai_index_done;
-
-	if (aai->aai_eof)
-		RETURN(NULL);
-
-	RETURN(aai);
+	RETURN(NULL);
 }
 
 /**
  *  llog_cat_process() callback, used to fill a seq_file buffer
  */
-static int agent_actions_show_cb(const struct lu_env *env,
+static int hsm_actions_show_cb(const struct lu_env *env,
 				 struct llog_handle *llh,
 				 struct llog_rec_hdr *hdr,
 				 void *data)
@@ -412,6 +398,7 @@ static int agent_actions_show_cb(const struct lu_env *env,
 	struct seq_file		     *s = data;
 	struct agent_action_iterator *aai;
 	int			      rc, sz;
+	size_t			      count;
 	char			      buf[12];
 	ENTRY;
 
@@ -419,21 +406,25 @@ static int agent_actions_show_cb(const struct lu_env *env,
 	LASSERTF(aai->aai_magic == AGENT_ACTIONS_IT_MAGIC, "%08X",
 		 aai->aai_magic);
 
-	aai->aai_index_cb++;
 	/* if rec already printed => skip */
-	if (aai->aai_index_cb <= aai->aai_index_done)
+	if (unlikely(llh->lgh_hdr->llh_cat_idx < aai->aai_cat_index))
 		RETURN(0);
 
+	if (unlikely(llh->lgh_hdr->llh_cat_idx == aai->aai_cat_index &&
+		     hdr->lrh_index <= aai->aai_index))
+		RETURN(0);
+
+	count = s->count;
 	sz = larr->arr_hai.hai_len - sizeof(larr->arr_hai);
-	rc = seq_printf(s, "lrh=[type=%X len=%d idx=%d] fid="DFID
+	rc = seq_printf(s, "lrh=[type=%X len=%d idx=%d/%d] fid="DFID
 			" dfid="DFID
 			" compound/cookie="LPX64"/"LPX64
 			" action=%s archive#=%d flags="LPX64
 			" extent="LPX64"-"LPX64
 			" gid="LPX64" datalen=%d status=%s"
 			" data=[%s]\n",
-			larr->arr_hdr.lrh_type,
-			larr->arr_hdr.lrh_len, larr->arr_hdr.lrh_index,
+			hdr->lrh_type, hdr->lrh_len,
+			llh->lgh_hdr->llh_cat_idx, hdr->lrh_index,
 			PFID(&larr->arr_hai.hai_fid),
 			PFID(&larr->arr_hai.hai_dfid),
 			larr->arr_compound_id, larr->arr_hai.hai_cookie,
@@ -445,43 +436,46 @@ static int agent_actions_show_cb(const struct lu_env *env,
 			larr->arr_hai.hai_gid, sz,
 			agent_req_status2name(larr->arr_status),
 			hai_dump_data_field(&larr->arr_hai, buf, sizeof(buf)));
-	if (rc >= 0) {
-		aai->aai_index_done++;
-		RETURN(0);
+	if (rc == 0) {
+		aai->aai_cat_index = llh->lgh_hdr->llh_cat_idx;
+		aai->aai_index = hdr->lrh_index;
+	} else {
+		if (s->count == s->size && count > 0) /* rewind the buffer */
+			s->count = count;
+		rc = LLOG_PROC_BREAK;
 	}
-	/* buffer is full, stop filling */
-	RETURN(LLOG_PROC_BREAK);
+	RETURN(rc);
 }
 
 /**
- * mdt_agent_actions_proc_show() is called at for each seq record
+ * mdt_hsm_actions_proc_show() is called at for each seq record
  * process the llog, with a cb which fill the file_seq buffer
  * to be faster, one show will fill multiple records
  */
-static int mdt_agent_actions_proc_show(struct seq_file *s, void *v)
+static int mdt_hsm_actions_proc_show(struct seq_file *s, void *v)
 {
 	struct agent_action_iterator	*aai = s->private;
+	struct coordinator		*cdt = &aai->aai_mdt->mdt_coordinator;
 	int				 rc;
 	ENTRY;
 
 	LASSERTF(aai->aai_magic == AGENT_ACTIONS_IT_MAGIC, "%08X",
 		 aai->aai_magic);
 
-	CDEBUG(D_HSM, "show from done=%d, eof=%d\n",
-	       aai->aai_index_done, aai->aai_eof);
+	CDEBUG(D_HSM, "show from cat %d index %d eof=%d\n",
+	       aai->aai_cat_index, aai->aai_index, aai->aai_eof);
 	if (aai->aai_eof)
 		RETURN(0);
 
-	aai->aai_index_cb = 0;
+	mutex_lock(&cdt->cdt_llog_lock);
 	rc = llog_cat_process(&aai->aai_env, aai->aai_ctxt->loc_handle,
-			      agent_actions_show_cb, s, 0, 0);
-	/* was all llog parsed? */
-	if (rc == 0)
-		aai->aai_eof = 1;
-	/* not enough room in buffer? */
-	if (rc == LLOG_PROC_BREAK)
-		RETURN(0);
-	/* error */
+			      hsm_actions_show_cb, s,
+			      aai->aai_cat_index, aai->aai_index + 1);
+	mutex_unlock(&cdt->cdt_llog_lock);
+	if (rc == 0) /* all llog parsed */
+		aai->aai_eof = true;
+	if (rc == LLOG_PROC_BREAK) /* buffer full */
+		rc = 0;
 	RETURN(rc);
 }
 
@@ -489,7 +483,7 @@ static int mdt_agent_actions_proc_show(struct seq_file *s, void *v)
  * seq_file method called to stop access to /proc file
  * clean + put llog context
  */
-static void mdt_agent_actions_proc_stop(struct seq_file *s, void *v)
+static void mdt_hsm_actions_proc_stop(struct seq_file *s, void *v)
 {
 	struct agent_action_iterator *aai = s->private;
 	ENTRY;
@@ -504,14 +498,14 @@ static void mdt_agent_actions_proc_stop(struct seq_file *s, void *v)
 	return;
 }
 
-static const struct seq_operations mdt_agent_actions_proc_ops = {
-	.start	= mdt_agent_actions_proc_start,
-	.next	= mdt_agent_actions_proc_next,
-	.show	= mdt_agent_actions_proc_show,
-	.stop	= mdt_agent_actions_proc_stop,
+static const struct seq_operations mdt_hsm_actions_proc_ops = {
+	.start	= mdt_hsm_actions_proc_start,
+	.next	= mdt_hsm_actions_proc_next,
+	.show	= mdt_hsm_actions_proc_show,
+	.stop	= mdt_hsm_actions_proc_stop,
 };
 
-static int lprocfs_open_agent_actions(struct inode *inode, struct file *file)
+static int lprocfs_open_hsm_actions(struct inode *inode, struct file *file)
 {
 	struct agent_action_iterator	*aai;
 	struct seq_file			*s;
@@ -519,14 +513,12 @@ static int lprocfs_open_agent_actions(struct inode *inode, struct file *file)
 	struct mdt_device		*mdt;
 	ENTRY;
 
-	if (LPROCFS_ENTRY_AND_CHECK(PDE(inode)))
+	if (LPROCFS_ENTRY_CHECK(PDE(inode)))
 		RETURN(-ENOENT);
 
-	rc = seq_open(file, &mdt_agent_actions_proc_ops);
-	if (rc) {
-		LPROCFS_EXIT();
+	rc = seq_open(file, &mdt_hsm_actions_proc_ops);
+	if (rc)
 		RETURN(rc);
-	}
 
 	OBD_ALLOC_PTR(aai);
 	if (aai == NULL)
@@ -541,7 +533,7 @@ static int lprocfs_open_agent_actions(struct inode *inode, struct file *file)
 	 * mdt_coordinator_procfs_init() calling lprocfs_register()
 	 */
 	mdt = (struct mdt_device *)PDE(inode)->data;
-	aai->aai_obd = mdt2obd_dev(mdt);
+	aai->aai_mdt = mdt;
 	s = file->private_data;
 	s->private = aai;
 
@@ -558,10 +550,10 @@ out:
 }
 
 /**
- * lprocfs_release_agent_actions() is called at end of /proc access
- * free alloacted ressources and call cleanup lprocfs methods
+ * lprocfs_release_hsm_actions() is called at end of /proc access.
+ * It frees allocated ressources and calls cleanup lprocfs methods.
  */
-static int lprocfs_release_agent_actions(struct inode *inode, struct file *file)
+static int lprocfs_release_hsm_actions(struct inode *inode, struct file *file)
 {
 	struct seq_file			*seq = file->private_data;
 	struct agent_action_iterator	*aai = seq->private;
@@ -574,12 +566,12 @@ static int lprocfs_release_agent_actions(struct inode *inode, struct file *file)
 	return lprocfs_seq_release(inode, file);
 }
 
-/* methods to access agent actions llog through /proc */
-const struct file_operations mdt_agent_actions_fops = {
+/* Methods to access HSM action list LLOG through /proc */
+const struct file_operations mdt_hsm_actions_fops = {
 	.owner		= THIS_MODULE,
-	.open		= lprocfs_open_agent_actions,
+	.open		= lprocfs_open_hsm_actions,
 	.read		= seq_read,
 	.llseek		= seq_lseek,
-	.release	= lprocfs_release_agent_actions,
+	.release	= lprocfs_release_hsm_actions,
 };