From: Chris Horn <hornc@cray.com>
Date: Tue, 4 Jun 2019 19:34:01 +0000 (-0500)
Subject: LU-12387 utils: Read existing ldd data in l_tunedisk
X-Git-Tag: 2.12.55~15
X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=9cb4f810164efa5f058dc7605fb1835ea51b0a92;p=fs%2Flustre-release.git

LU-12387 utils: Read existing ldd data in l_tunedisk

Read the lustre_disk_data from the device passed to l_tunedisk, so
we can determine whether the device is an MGT or MDT and thus skip
the tuning of the device.

Fixes: 892280742a2b ("LU-9551 utils: add l_tunedisk to fix disk tunings")
Fixes: 2f8d7b4679de ("LU-11736 utils: don't set max_sectors_kb on MDT/MGT")
Cray-bug-id: LUS-7358
Signed-off-by: Chris Horn <hornc@cray.com>
Change-Id: I193fe008d5777b0e83f2be9a500eaffb1d3ca615
Reviewed-on: https://review.whamcloud.com/35066
Tested-by: Jenkins
Tested-by: Maloo <maloo@whamcloud.com>
Reviewed-by: Andreas Dilger <adilger@whamcloud.com>
Reviewed-by: Gu Zheng <gzheng@ddn.com>
Reviewed-by: Nathaniel Clark <nclark@whamcloud.com>
---

diff --git a/lustre/utils/l_tunedisk.c b/lustre/utils/l_tunedisk.c
index 47d977b..b02e1e8 100644
--- a/lustre/utils/l_tunedisk.c
+++ b/lustre/utils/l_tunedisk.c
@@ -44,6 +44,8 @@ int main(int argc, char *const argv[])
 	struct mount_opts mop = {
 		.mo_max_sectors_kb = -1
 	};
+	struct lustre_disk_data *ldd = &mop.mo_ldd;
+
 	char real_path[PATH_MAX] = {'\0'};
 	unsigned int mount_type;
 	int ret;
@@ -73,6 +75,15 @@ int main(int argc, char *const argv[])
 	if (ret == 0)
 		goto out;
 
+	ldd->ldd_mount_type = mount_type;
+
+	ret = osd_read_ldd(mop.mo_source, ldd);
+	if (ret != 0) {
+		fprintf(stderr, "Failed to read previous Lustre data from %s "
+			"(%d)\n", mop.mo_source, ret);
+		goto out;
+	}
+
 	ret = osd_tune_lustre(mop.mo_source, &mop);
 
 out: