X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Ftests%2Fll_dirstripe_verify.c;h=24d584b11f4d4c6774d3741218b456c554cf7b07;hb=c7ed812d6a87f0ffa3c0d4c1a9289497f680ccec;hp=30317ab19b9ab05fdec50c1bbce200fc3e40b0bc;hpb=70e80ade90af09300396706b8910e196a7928520;p=fs%2Flustre-release.git

diff --git a/lustre/tests/ll_dirstripe_verify.c b/lustre/tests/ll_dirstripe_verify.c
index 30317ab..24d584b 100644
--- a/lustre/tests/ll_dirstripe_verify.c
+++ b/lustre/tests/ll_dirstripe_verify.c
@@ -1,6 +1,4 @@
-/* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*-
- * vim:expandtab:shiftwidth=8:tabstop=8:
- *
+/*
  * GPL HEADER START
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -16,18 +14,16 @@
  * in the LICENSE file that accompanied this code).
  *
  * You should have received a copy of the GNU General Public License
- * version 2 along with this program; If not, see [sun.com URL with a
- * copy of GPLv2].
- *
- * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
+ * version 2 along with this program; If not, see
+ * http://www.gnu.org/licenses/gpl-2.0.html
  *
  * GPL HEADER END
  */
 /*
- * Copyright  2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
+ *
+ * Copyright (c) 2011, 2014, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
@@ -51,22 +47,12 @@
 #include <errno.h>
 #include <dirent.h>
 
-#include <liblustre.h>
-#include <obd.h>
-#include <lustre_lib.h>
-#include <lustre/liblustreapi.h>
-#include <obd_lov.h>
-
-#include <lnet/lnetctl.h>
-
+#include <libcfs/util/param.h>
+#include <libcfs/util/string.h>
+#include <lustre/lustreapi.h>
+#include <linux/lustre/lustre_idl.h>
 
 #define MAX_LOV_UUID_COUNT      1000
-union {
-        struct obd_uuid uuid;
-        char name[0];
-} lov;
-#define lov_uuid lov.uuid
-#define lov_name lov.name
 
 /* Returns bytes read on success and a negative value on failure.
  * If zero bytes are read it will be treated as failure as such
@@ -74,69 +60,62 @@ union {
  */
 int read_proc_entry(char *proc_path, char *buf, int len)
 {
-        int rc, fd;
-
-        memset(buf, 0, len);
-
-        fd = open(proc_path, O_RDONLY);
-        if (fd == -1) {
-                llapi_err(LLAPI_MSG_ERROR, "open('%s') failed: %s\n",
-                          proc_path);
-                return -2;
-        }
-
-        rc = read(fd, buf, len - 1);
-        if (rc < 0) {
-                llapi_err(LLAPI_MSG_ERROR, "read('%s') failed: %s\n",proc_path);
-                rc = -3;
-        } else if (rc == 0) {
-                llapi_err(LLAPI_MSG_ERROR | LLAPI_MSG_NO_ERRNO,
-                          "read('%s') zero bytes\n", proc_path);
-                rc = -4;
-        } else if (/* rc > 0 && */ buf[rc - 1] == '\n') {
-                buf[rc - 1] = '\0'; /* Remove trailing newline */
-        }
-        close(fd);
-
-        return (rc);
+	int rc, fd;
+
+	memset(buf, 0, len);
+
+	fd = open(proc_path, O_RDONLY);
+	if (fd < 0) {
+		llapi_error(LLAPI_MSG_ERROR, -errno, "cannot open '%s'",
+			    proc_path);
+		return -2;
+	}
+
+	rc = read(fd, buf, len - 1);
+	if (rc < 0) {
+		llapi_error(LLAPI_MSG_ERROR, -errno,
+			    "error reading from '%s'", proc_path);
+		rc = -3;
+	} else if (rc == 0) {
+		llapi_err_noerrno(LLAPI_MSG_ERROR,
+				  "read zero bytes from '%s'", proc_path);
+		rc = -4;
+	} else if (buf[rc - 1] == '\n') {
+		buf[rc - 1] = '\0'; /* Remove trailing newline */
+	}
+
+	close(fd);
+
+	return rc;
 }
 
-int compare(struct lov_user_md *lum_dir, struct lov_user_md *lum_file1,
-            struct lov_user_md *lum_file2)
+int compare(struct obd_uuid *puuid, struct lov_user_md *lum_dir,
+	    struct lov_user_md *lum_file1, struct lov_user_md *lum_file2)
 {
-        int stripe_count = 0, min_stripe_count = 0, def_stripe_count = 1;
-        int stripe_size = 0;
-        int stripe_offset = -1;
-        int ost_count;
-        char buf[128];
-        char lov_path[PATH_MAX];
-        char tmp_path[PATH_MAX];
-        int i;
-        FILE *fp;
-
-        fp = popen("\\ls -d  /proc/fs/lustre/lov/*clilov* | head -1", "r");
-        if (!fp) {
-                llapi_err(LLAPI_MSG_ERROR,
-                          "open(lustre/lov/*clilov*) failed: %s\n");
-                return 2;
-        }
-        if (fscanf(fp, "%s", lov_path) < 1) {
-                llapi_err(LLAPI_MSG_ERROR,
-                          "read(lustre/lov/*clilov*) failed: %s\n");
-                pclose(fp);
-                return 3;
-        }
-        pclose(fp);
-
-        snprintf(tmp_path, sizeof(tmp_path) - 1, "%s/stripecount",
-                 lov_path);
-        if (read_proc_entry(tmp_path, buf, sizeof(buf)) < 0)
+	int stripe_count = 0, min_stripe_count = 0, def_stripe_count = 1;
+	int stripe_size = 0;
+	int stripe_offset = -1;
+	int ost_count;
+	char buf[128];
+	glob_t path;
+	int i;
+
+	if (cfs_get_param_paths(&path, "lov/%s/stripecount", puuid->uuid) != 0)
+		return 2;
+	if (read_proc_entry(path.gl_pathv[0], buf, sizeof(buf)) < 0) {
+		cfs_free_param_data(&path);
                 return 5;
-        def_stripe_count = (short)atoi(buf);
-
-        snprintf(tmp_path, sizeof(tmp_path) - 1, "%s/numobd", lov_path);
-        if (read_proc_entry(tmp_path, buf, sizeof(buf)) < 0)
+	}
+	cfs_free_param_data(&path);
+	def_stripe_count = (short)atoi(buf);
+
+	if (cfs_get_param_paths(&path, "lov/%s/numobd", puuid->uuid) != 0)
+		return 2;
+	if (read_proc_entry(path.gl_pathv[0], buf, sizeof(buf)) < 0) {
+		cfs_free_param_data(&path);
                 return 6;
+	}
+	cfs_free_param_data(&path);
         ost_count = atoi(buf);
 
         if (lum_dir == NULL) {
@@ -163,30 +142,37 @@ int compare(struct lov_user_md *lum_dir, struct lov_user_md *lum_file1,
 
         if (lum_file1->lmm_stripe_count != stripe_count ||
             lum_file1->lmm_stripe_count < min_stripe_count) {
-                llapi_err(LLAPI_MSG_ERROR, "file1 stripe count %d != dir %d\n",
-                          lum_file1->lmm_stripe_count, stripe_count);
+                llapi_err_noerrno(LLAPI_MSG_ERROR,
+                                  "file1 stripe count %d != dir %d\n",
+                                  lum_file1->lmm_stripe_count, stripe_count);
                 return 7;
         }
 
         if (lum_file1->lmm_stripe_count < stripe_count)
-                llapi_err(LLAPI_MSG_WARN, "warning: file1 used fewer stripes"
-                          " %d < dir %d (likely due to bug 4900)\n",
-                          lum_file1->lmm_stripe_count, stripe_count);
+                llapi_err_noerrno(LLAPI_MSG_WARN,
+                                  "warning: file1 used fewer stripes"
+                                  " %d < dir %d (likely due to bug 4900)\n",
+                                  lum_file1->lmm_stripe_count, stripe_count);
 
         if (lum_dir != NULL)
                 stripe_size = (int)lum_dir->lmm_stripe_size;
         if (stripe_size == 0) {
-                snprintf(tmp_path, sizeof(tmp_path) - 1, "%s/stripesize",
-                         lov_path);
-                if (read_proc_entry(tmp_path, buf, sizeof(buf)) < 0)
-                        return 5;
+		if (cfs_get_param_paths(&path, "lov/%s/stripesize",
+					puuid->uuid) != 0)
+			return 2;
+		if (read_proc_entry(path.gl_pathv[0], buf, sizeof(buf)) < 0) {
+			cfs_free_param_data(&path);
+			return 5;
+		}
+		cfs_free_param_data(&path);
 
                 stripe_size = atoi(buf);
         }
 
         if (lum_file1->lmm_stripe_size != stripe_size) {
-                llapi_err(LLAPI_MSG_ERROR, "file1 stripe size %d != dir %d\n",
-                          lum_file1->lmm_stripe_size, stripe_size);
+                llapi_err_noerrno(LLAPI_MSG_ERROR,
+                                  "file1 stripe size %d != dir %d\n",
+                                  lum_file1->lmm_stripe_size, stripe_size);
                 return 8;
         }
 
@@ -196,7 +182,7 @@ int compare(struct lov_user_md *lum_dir, struct lov_user_md *lum_file1,
                 for (i = 0; i < stripe_count; i++)
                         if (lum_file1->lmm_objects[i].l_ost_idx !=
                             (stripe_offset + i) % ost_count) {
-                                llapi_err(LLAPI_MSG_WARN,
+                                llapi_err_noerrno(LLAPI_MSG_WARN,
                                           "warning: file1 non-sequential "
                                           "stripe[%d] %d != %d\n", i,
                                           lum_file1->lmm_objects[i].l_ost_idx,
@@ -208,7 +194,8 @@ int compare(struct lov_user_md *lum_dir, struct lov_user_md *lum_file1,
                        ost_count;
                 idx = lum_file2->lmm_objects[0].l_ost_idx;
                 if (idx != next) {
-                        llapi_err(LLAPI_MSG_WARN, "warning: non-sequential "
+                        llapi_err_noerrno(LLAPI_MSG_WARN,
+                                  "warning: non-sequential "
                                   "file1 stripe[%d] %d != file2 stripe[0] %d\n",
                                   stripe, lum_file1->lmm_objects[stripe].l_ost_idx,
                                   idx);
@@ -218,101 +205,158 @@ int compare(struct lov_user_md *lum_dir, struct lov_user_md *lum_file1,
         return 0;
 }
 
-int main(int argc, char **argv)
+int compare_lum(struct obd_uuid *puuid, struct lov_user_md *lum_dir,
+		struct lov_user_md *lum_file1, struct lov_user_md *lum_file2)
 {
-        DIR * dir;
-        struct lov_user_md *lum_dir, *lum_file1 = NULL, *lum_file2 = NULL;
-        int rc;
-        int lum_size;
-
-        if (argc < 3) {
-                llapi_err(LLAPI_MSG_ERROR,
-                          "Usage: %s <dirname> <filename1> [filename2]\n",
-                          argv[0]);
-                return 1;
-        }
-
-        dir = opendir(argv[1]);
-        if (dir == NULL) {
-                rc = errno;
-                llapi_err(LLAPI_MSG_ERROR,
-                          "error: %s opendir failed\n", argv[1]);
-                return rc;
-        }
-
-        lum_size = lov_mds_md_size(MAX_LOV_UUID_COUNT);
-        if ((lum_dir = (struct lov_user_md *)malloc(lum_size)) == NULL) {
-                rc = ENOMEM;
-                llapi_err(LLAPI_MSG_ERROR, "error: can't allocate %d bytes "
-                          "for dir EA", lum_size);
-                goto cleanup;
-        }
-
-        rc = llapi_file_get_stripe(argv[1], lum_dir);
-        if (rc) {
-                if (errno == ENODATA) {
-                        free(lum_dir);
-                        lum_dir = NULL;
-                } else {
-                        rc = errno;
-                        llapi_err(LLAPI_MSG_ERROR,
-                                  "error: can't get EA for %s\n", argv[1]);
-                        goto cleanup;
-                }
-        }
-
-        /* XXX should be llapi_lov_getname() */
-        rc = llapi_file_get_lov_uuid(argv[1], &lov_uuid);
-        if (rc) {
-                rc = errno;
-                llapi_err(LLAPI_MSG_ERROR, "error: can't get lov name for %s\n",
-                          argv[1]);
-                return rc;
-        }
-
-        if ((lum_file1 = (struct lov_user_md *)malloc(lum_size)) == NULL) {
-                rc = ENOMEM;
-                llapi_err(LLAPI_MSG_ERROR,
-                          "error: can't allocate %d bytes for EA\n", lum_size);
-                goto cleanup;
-        }
-
-        rc = llapi_file_get_stripe(argv[2], lum_file1);
-        if (rc) {
-                rc = errno;
-                llapi_err(LLAPI_MSG_ERROR,
-                          "error: unable to get EA for %s\n", argv[2]);
-                goto cleanup;
-        }
-
-        if (argc == 4) {
-                lum_file2 = (struct lov_user_md *)malloc(lum_size);
-                if (lum_file2 == NULL) {
-                        rc = ENOMEM;
-                        llapi_err(LLAPI_MSG_ERROR, "error: can't allocate %d "
-                                  "bytes for file2 EA\n", lum_size);
-                        goto cleanup;
-                }
-
-                rc = llapi_file_get_stripe(argv[3], lum_file2);
-                if (rc) {
-                        rc = errno;
-                        llapi_err(LLAPI_MSG_ERROR,
-                                  "error: can't get EA for %s\n", argv[3]);
-                        goto cleanup;
-                }
-        }
+	struct lov_comp_md_v1 *comp_dir, *comp_file1;
+	struct lov_user_md *sub_dir, *sub_file1;
+	int i, rc = 0;
+
+	if (lum_dir == NULL || lum_dir->lmm_magic != LOV_MAGIC_COMP_V1)
+		return compare(puuid, lum_dir, lum_file1, lum_file2);
+
+	comp_dir = (struct lov_comp_md_v1 *)lum_dir;
+	comp_file1 = (struct lov_comp_md_v1 *)lum_file1;
+
+	if (lum_file1->lmm_magic != lum_dir->lmm_magic) {
+		llapi_err_noerrno(LLAPI_MSG_ERROR, "file1 magic %#x != %#x\n",
+				  lum_file1->lmm_magic, lum_dir->lmm_magic);
+		return 10;
+	}
+
+	if (comp_file1->lcm_entry_count != comp_dir->lcm_entry_count) {
+		llapi_err_noerrno(LLAPI_MSG_ERROR, "file1 comp cnt %d != %d\n",
+				  comp_file1->lcm_entry_count,
+				  comp_dir->lcm_entry_count);
+		return 11;
+	}
+
+	for (i = 0; i < comp_dir->lcm_entry_count; i++) {
+		sub_dir = (struct lov_user_md *)((char *)comp_dir +
+				comp_dir->lcm_entries[i].lcme_offset);
+		sub_file1 = (struct lov_user_md *)((char *)comp_file1 +
+				comp_file1->lcm_entries[i].lcme_offset);
+
+		rc = compare(puuid, sub_dir, sub_file1, NULL);
+		if (rc)
+			break;
+	}
+
+	return rc;
+}
 
-        rc = compare(lum_dir, lum_file1, lum_file2);
+int main(int argc, char **argv)
+{
+	struct lov_user_md *lum_dir, *lum_file1 = NULL, *lum_file2 = NULL;
+	struct obd_uuid uuid;
+	int lum_size, rc;
+	DIR *dir;
+
+	if (argc < 3) {
+		llapi_err_noerrno(LLAPI_MSG_ERROR,
+				  "Usage: %s <dirname> <filename1> [filename2]\n",
+				  argv[0]);
+		return 1;
+	}
+
+	dir = opendir(argv[1]);
+	if (dir == NULL) {
+		rc = -errno;
+		llapi_error(LLAPI_MSG_ERROR, rc,
+			    "error: %s opendir failed", argv[1]);
+		return rc;
+	}
+
+	lum_size = lov_user_md_size(MAX_LOV_UUID_COUNT, LOV_USER_MAGIC);
+	lum_dir = (struct lov_user_md *)malloc(lum_size);
+	if (lum_dir == NULL) {
+		rc = -ENOMEM;
+		llapi_error(LLAPI_MSG_ERROR, rc,
+			    "error: can't allocate %d bytes "
+			    "for dir EA", lum_size);
+		goto cleanup;
+	}
+
+	rc = llapi_file_get_stripe(argv[1], lum_dir);
+	if (rc == -ENODATA) {
+		char root[PATH_MAX];
+
+		rc = llapi_search_mounts(argv[1], 0, root, NULL);
+		if (rc) {
+			llapi_error(LLAPI_MSG_ERROR, rc, "error: can't get "
+				    "root path for %s\n", argv[1]);
+			goto cleanup;
+		}
+
+		strlcat(root, "/.", PATH_MAX);
+		rc = llapi_file_get_stripe(root, lum_dir);
+		if (rc == -ENODATA) {
+			free(lum_dir);
+			lum_dir = NULL;
+		} else if (rc) {
+			llapi_error(LLAPI_MSG_ERROR, rc, "error: cant't get "
+				    "root's LOVEA for %s\n", root);
+			goto cleanup;
+		}
+	} else if (rc) {
+		llapi_error(LLAPI_MSG_ERROR, rc, "error: can't get LOVEA for "
+			    "%s", argv[1]);
+		goto cleanup;
+	}
+
+	/* XXX should be llapi_lov_getname() */
+	rc = llapi_file_get_lov_uuid(argv[1], &uuid);
+	if (rc) {
+		llapi_error(LLAPI_MSG_ERROR, rc,
+			    "error: can't get lov name for %s",
+			    argv[1]);
+		return rc;
+	}
+
+	lum_file1 = malloc(lum_size);
+	if (lum_file1 == NULL) {
+		rc = -ENOMEM;
+		llapi_error(LLAPI_MSG_ERROR, rc,
+			    "error: can't allocate %d bytes for EA",
+			    lum_size);
+		goto cleanup;
+	}
+
+	rc = llapi_file_get_stripe(argv[2], lum_file1);
+	if (rc) {
+		llapi_error(LLAPI_MSG_ERROR, rc,
+			    "error: unable to get EA for %s", argv[2]);
+		goto cleanup;
+	}
+
+	if (argc == 4) {
+		lum_file2 = (struct lov_user_md *)malloc(lum_size);
+		if (lum_file2 == NULL) {
+			rc = -ENOMEM;
+			llapi_error(LLAPI_MSG_ERROR, rc,
+				    "error: can't allocate %d "
+				    "bytes for file2 EA", lum_size);
+			goto cleanup;
+		}
+
+		rc = llapi_file_get_stripe(argv[3], lum_file2);
+		if (rc) {
+			llapi_error(LLAPI_MSG_ERROR, rc,
+				    "error: can't get EA for %s", argv[3]);
+			goto cleanup;
+		}
+	}
+
+	rc = compare_lum(&uuid, lum_dir, lum_file1, lum_file2);
 
 cleanup:
-        closedir(dir);
-        if (lum_dir != NULL)
-                free(lum_dir);
-        if (lum_file1 != NULL)
-                free(lum_file1);
-        if (lum_file2 != NULL)
-                free(lum_file2);
-
-        return rc;
+	closedir(dir);
+	if (lum_dir != NULL)
+		free(lum_dir);
+	if (lum_file1 != NULL)
+		free(lum_file1);
+	if (lum_file2 != NULL)
+		free(lum_file2);
+
+	return rc;
 }