X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Futils%2Fliblustreapi_hsm.c;h=345ab1be37088ae673f0a80693012e7327117c61;hb=2789a4b0852a97a10eda6b3ffd6166f6d99d329f;hp=d95383a8028237b89673ebd4d1df70eca96c16a6;hpb=8caff5d019674aea7d98e225d0136bf4694d5157;p=fs%2Flustre-release.git

diff --git a/lustre/utils/liblustreapi_hsm.c b/lustre/utils/liblustreapi_hsm.c
index d95383a..345ab1b 100644
--- a/lustre/utils/liblustreapi_hsm.c
+++ b/lustre/utils/liblustreapi_hsm.c
@@ -6,7 +6,7 @@
  * (C) Copyright 2012 Commissariat a l'energie atomique et aux energies
  *     alternatives
  *
- * Copyright (c) 2013, 2015, Intel Corporation.
+ * Copyright (c) 2013, 2016, Intel Corporation.
  *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the GNU Lesser General Public License
@@ -429,11 +429,12 @@ static int llapi_hsm_log_ct_progress(struct hsm_copyaction_private **phcp,
 			goto err;
 	}
 
-	if (progress_type == CT_RUNNING)
+	if (progress_type == CT_RUNNING) {
 		rc = llapi_json_add_item(&json_items, "current_bytes",
 					 LLAPI_JSON_BIGNUM, &current);
 		if (rc < 0)
 			goto err;
+	}
 
 cancel:
 	rc = llapi_json_add_item(&json_items, "event_type", LLAPI_JSON_STRING,
@@ -474,6 +475,8 @@ int llapi_hsm_register_event_fifo(const char *path)
 {
 	int read_fd;
 	struct stat statbuf;
+	struct sigaction ignore_action;
+	int rc;
 
 	/* Create the FIFO if necessary. */
 	if ((mkfifo(path, 0644) < 0) && (errno != EEXIST)) {
@@ -508,19 +511,24 @@ int llapi_hsm_register_event_fifo(const char *path)
 	/* Open the FIFO for writes, but don't block on waiting
 	 * for a reader. */
 	llapi_hsm_event_fd = open(path, O_WRONLY | O_NONBLOCK);
-	if (llapi_hsm_event_fd < 0) {
-		llapi_error(LLAPI_MSG_ERROR, errno,
-			    "cannot open(%s) for write", path);
-		return -errno;
-	}
+	rc = -errno;
 
 	/* Now close the reader. An external monitoring process can
 	 * now open the FIFO for reads. If no reader comes along the
 	 * events are lost. NOTE: Only one reader at a time! */
 	close(read_fd);
 
+	if (llapi_hsm_event_fd < 0) {
+		llapi_error(LLAPI_MSG_ERROR, -rc,
+			    "cannot open(%s) for write", path);
+		return rc;
+	}
+
 	/* Ignore SIGPIPEs -- can occur if the reader goes away. */
-	signal(SIGPIPE, SIG_IGN);
+	memset(&ignore_action, 0, sizeof(ignore_action));
+	ignore_action.sa_handler = SIG_IGN;
+	sigemptyset(&ignore_action.sa_mask);
+	sigaction(SIGPIPE, &ignore_action, NULL);
 
 	return 0;
 }
@@ -800,13 +808,17 @@ int llapi_hsm_copytool_unregister(struct hsm_copytool_private **priv)
 	if (ct->magic != CT_PRIV_MAGIC)
 		return -EINVAL;
 
+	/* Close the read side of the KUC pipe. This should be done
+	 * before unregistering to avoid deadlock: a ldlm_cb thread
+	 * enters libcfs_kkuc_group_put() acquires kg_sem and blocks
+	 * in pipe_write() due to full pipe; then we attempt to
+	 * unregister and block on kg_sem. */
+	libcfs_ukuc_stop(&ct->kuc);
+
 	/* Tell the kernel to stop sending us messages */
 	ct->kuc.lk_flags = LK_FLG_STOP;
 	ioctl(ct->mnt_fd, LL_IOC_HSM_CT_START, &ct->kuc);
 
-	/* Shut down the kernelcomms */
-	libcfs_ukuc_stop(&ct->kuc);
-
 	llapi_hsm_log_ct_registration(&ct, CT_UNREGISTER);
 
 	close(ct->open_by_fid_fd);
@@ -1173,13 +1185,14 @@ int llapi_hsm_action_end(struct hsm_copyaction_private **phcp,
 			.lfu_ctime_nsec = hcp->stat.st_ctim.tv_nsec,
 		};
 
-		/* Set {a,m,c}time of volatile file to that of original. */
-		if (ioctl(hcp->data_fd, LL_IOC_FUTIMES_3, &lfu) < 0) {
+		rc = fsync(hcp->data_fd);
+		if (rc < 0) {
 			errval = -errno;
 			goto end;
 		}
 
-		rc = fsync(hcp->data_fd);
+		/* Set {a,m,c}time of volatile file to that of original. */
+		rc = ioctl(hcp->data_fd, LL_IOC_FUTIMES_3, &lfu);
 		if (rc < 0) {
 			errval = -errno;
 			goto end;