From: Kévin Baillergeau <kevin.baillergeau.ocre@cea.fr>
Date: Fri, 15 May 2020 01:22:19 +0000 (+0000)
Subject: LU-13559 utils: fix lfs mirror delete error message
X-Git-Tag: 2.13.55~150
X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=f530ecc221ac345ba1aac5ff1cdf6420ac7651d3;p=fs%2Flustre-release.git

LU-13559 utils: fix lfs mirror delete error message

Add different error messages depending on the option used.
Add a mirror_id variable instead of reusing the id variable
to store the result of mirror_id_of(id).

Signed-off-by: Kévin Baillergeau <kevin.baillergeau.ocre@cea.fr>
Change-Id: I5fbd307c4132c22d54470f2a1407074efe8bbc0a
Reviewed-on: https://review.whamcloud.com/38609
Reviewed-by: Andreas Dilger <adilger@whamcloud.com>
Reviewed-by: Dominique Martinet <dominique.martinet@cea.fr>
Tested-by: jenkins <devops@whamcloud.com>
Tested-by: Maloo <maloo@whamcloud.com>
---

diff --git a/lustre/utils/lfs.c b/lustre/utils/lfs.c
index f86e4cb..1753019 100644
--- a/lustre/utils/lfs.c
+++ b/lustre/utils/lfs.c
@@ -1992,6 +1992,7 @@ static int mirror_split(const char *fname, __u32 id, const char *pool,
 	char *ptr;
 	struct ll_ioc_lease *data;
 	uint16_t mirror_count;
+	__u32 mirror_id;
 	int mdt_index;
 	int fd, fdv;
 	int rc;
@@ -2030,22 +2031,35 @@ static int mirror_split(const char *fname, __u32 id, const char *pool,
 
 		rc = llapi_layout_comp_iterate(layout, find_comp_id_by_pool,
 					       &data);
-		id = data.id;
+		mirror_id = data.id;
 	} else if (mflags & MF_COMP_ID) {
 		rc = llapi_layout_comp_iterate(layout, find_comp_id, &id);
-		id = mirror_id_of(id);
+		mirror_id = mirror_id_of(id);
 	} else {
 		rc = llapi_layout_comp_iterate(layout, find_mirror_id, &id);
+		mirror_id = id;
 	}
 	if (rc < 0) {
 		fprintf(stderr, "error %s: failed to iterate layout of '%s'\n",
 			progname, fname);
 		goto free_layout;
 	} else if (rc == LLAPI_LAYOUT_ITER_CONT) {
-		fprintf(stderr,
-		     "error %s: file '%s' does not contain mirror with id %u\n",
-			progname, fname, id);
-		goto free_layout;
+		if (mflags & MF_COMP_POOL) {
+			fprintf(stderr,
+				"error %s: file '%s' does not contain mirror with pool '%s'\n",
+				progname, fname, pool);
+			goto free_layout;
+		} else if (mflags & MF_COMP_ID) {
+			fprintf(stderr,
+				"error %s: file '%s' does not contain mirror with comp-id %u\n",
+				progname, fname, id);
+			goto free_layout;
+		} else {
+			fprintf(stderr,
+				"error %s: file '%s' does not contain mirror with id %u\n",
+				progname, fname, id);
+			goto free_layout;
+		}
 	}
 
 	fd = open(fname, O_RDWR);
@@ -2088,7 +2102,7 @@ static int mirror_split(const char *fname, __u32 id, const char *pool,
 	if (victim_file == NULL) {
 		/* use a temp file to store the splitted layout */
 		if (mflags & MF_DESTROY) {
-			if (last_non_stale_mirror(id, layout)) {
+			if (last_non_stale_mirror(mirror_id, layout)) {
 				rc = -EUCLEAN;
 				fprintf(stderr,
 					"%s: cannot destroy the last non-stale mirror of file '%s'\n",
@@ -2100,7 +2114,7 @@ static int mirror_split(const char *fname, __u32 id, const char *pool,
 							O_LOV_DELAY_CREATE);
 		} else {
 			snprintf(victim, sizeof(victim), "%s.mirror~%u",
-				 fname, id);
+				 fname, mirror_id);
 			fdv = open(victim, flags, S_IRUSR | S_IWUSR);
 		}
 	} else {
@@ -2135,7 +2149,7 @@ static int mirror_split(const char *fname, __u32 id, const char *pool,
 	data->lil_flags = LL_LEASE_LAYOUT_SPLIT;
 	data->lil_count = 2;
 	data->lil_ids[0] = fdv;
-	data->lil_ids[1] = id;
+	data->lil_ids[1] = mirror_id;
 	rc = llapi_lease_set(fd, data);
 	if (rc <= 0) {
 		if (rc == 0) /* lost lease lock */