m4_define([LUSTRE_PATCH],[50])
m4_define([LUSTRE_FIX],[0])
+dnl # don't forget to update the service tags info
+m4_define([CLIENT_URN],["LUSTRE-165-CLT"])
+m4_define([MDS_URN],["LUSTRE-165-MDS"])
+m4_define([MGS_URN],["LUSTRE-165-MGS"])
+m4_define([OSS_URN],["LUSTRE-165-OSS"])
+
dnl # liblustre delta is 0.0.1.32 , next version with fixes is ok, but
dnl # after following release candidate/beta would spill this warning already.
m4_define([LUSTRE_VER_ALLOWED_OFFSET],["OBD_OCD_VERSION(0,0,1,32)"])
[AC_LUSTRE_VER_ALLOWED_OFFSET]=LUSTRE_VER_ALLOWED_OFFSET
[AC_LUSTRE_LIB_VER_OFFSET_WARN]=LUSTRE_LIB_VER_OFFSET_WARN
[AC_LUSTRE_CLI_VER_OFFSET_WARN]=LUSTRE_CLI_VER_OFFSET_WARN
+[AC_LUSTRE_CLIENT_URN]=CLIENT_URN
+[AC_LUSTRE_MGS_URN]=MGS_URN
+[AC_LUSTRE_MDS_URN]=MDS_URN
+[AC_LUSTRE_OSS_URN]=OSS_URN
AC_SUBST([AC_LUSTRE_MAJOR])
AC_SUBST([AC_LUSTRE_MINOR])
AC_SUBST([AC_LUSTRE_VER_ALLOWED_OFFSET])
AC_SUBST([AC_LUSTRE_LIB_VER_OFFSET_WARN])
AC_SUBST([AC_LUSTRE_CLI_VER_OFFSET_WARN])
+AC_SUBST([AC_LUSTRE_CLIENT_URN])
+AC_SUBST([AC_LUSTRE_MDS_URN])
+AC_SUBST([AC_LUSTRE_MGS_URN])
+AC_SUBST([AC_LUSTRE_OSS_URN])
#include <lustre_param.h>
#include <lnet/lnetctl.h>
#include <lustre_ver.h>
+#include <mount_utils.h>
#ifndef PATH_MAX
#define PATH_MAX 4096
int mo_mgs_failnodes;
};
-static char *progname;
-static int verbose = 1;
+char *progname;
+int verbose = 1;
static int print_only = 0;
static int failover = 0;
#define vprint if (verbose > 0) printf
#define verrprint if (verbose >= 0) printf
-static void fatal(void)
-{
- verbose = 0;
- fprintf(stderr, "\n%s FATAL: ", progname);
-}
-
/*================ utility functions =====================*/
char *strscat(char *dst, char *src, int buflen) {
return version;
}
-int run_command(char *cmd, int cmdsz)
-{
- char log[] = "/tmp/mkfs_logXXXXXX";
- int fd = -1, rc;
-
- if ((cmdsz - strlen(cmd)) < 6) {
- fatal();
- fprintf(stderr, "Command buffer overflow: %.*s...\n",
- cmdsz, cmd);
- return ENOMEM;
- }
-
- if (verbose > 1) {
- printf("cmd: %s\n", cmd);
- } else {
- if ((fd = mkstemp(log)) >= 0) {
- close(fd);
- strcat(cmd, " >");
- strcat(cmd, log);
- }
- }
- strcat(cmd, " 2>&1");
-
- /* Can't use popen because we need the rv of the command */
- rc = system(cmd);
- if (rc && (fd >= 0)) {
- char buf[128];
- FILE *fp;
- fp = fopen(log, "r");
- if (fp) {
- while (fgets(buf, sizeof(buf), fp) != NULL) {
- printf(" %s", buf);
- }
- fclose(fp);
- }
- }
- if (fd >= 0)
- remove(log);
- return rc;
-}
-
static int check_mtab_entry(char *spec)
{
FILE *fp;
if (strstr(debugfs_cmd, "unsupported feature")) {
disp_old_e2fsprogs_msg("an unknown", 0);
}
+ pclose(fp);
return -1;
}
pclose(fp);
dev = mop->mo_device;
+ /* TODO: it's worth observing the get_mountdata() function that is
+ in mount_utils.c for getting the mountdata out of the
+ filesystem */
+
/* Construct debugfs command line. */
snprintf(cmd, cmdsz, "debugfs -c -R 'dump /%s %s/mountdata' %s",
MOUNT_DATA_FILE, tmpdir, dev);
--- /dev/null
+#include <stdio.h>
+#include <errno.h>
+#include <string.h>
+#include <config.h>
+#include <lustre_disk.h>
+#include <lustre_ver.h>
+#include <sys/stat.h>
+#include <sys/utsname.h>
+
+extern char *progname;
+extern int verbose;
+
+#define vprint if (verbose > 0) printf
+#define verrprint if (verbose >= 0) printf
+
+void fatal(void)
+{
+ verbose = 0;
+ fprintf(stderr, "\n%s FATAL: ", progname);
+}
+
+int run_command(char *cmd, int cmdsz)
+{
+ char log[] = "/tmp/run_command_logXXXXXX";
+ int fd = -1, rc;
+
+ if ((cmdsz - strlen(cmd)) < 6) {
+ fatal();
+ fprintf(stderr, "Command buffer overflow: %.*s...\n",
+ cmdsz, cmd);
+ return ENOMEM;
+ }
+
+ if (verbose > 1) {
+ printf("cmd: %s\n", cmd);
+ } else {
+ if ((fd = mkstemp(log)) >= 0) {
+ close(fd);
+ strcat(cmd, " >");
+ strcat(cmd, log);
+ }
+ }
+ strcat(cmd, " 2>&1");
+
+ /* Can't use popen because we need the rv of the command */
+ rc = system(cmd);
+ if (rc && (fd >= 0)) {
+ char buf[128];
+ FILE *fp;
+ fp = fopen(log, "r");
+ if (fp) {
+ while (fgets(buf, sizeof(buf), fp) != NULL) {
+ printf(" %s", buf);
+ }
+ fclose(fp);
+ }
+ }
+ if (fd >= 0)
+ remove(log);
+ return rc;
+}
+
+int get_mountdata(char *dev, struct lustre_disk_data *mo_ldd)
+{
+
+ char tmpdir[] = "/tmp/lustre_tmp.XXXXXX";
+ char cmd[256];
+ char filepnm[128];
+ FILE *filep;
+ int ret = 0;
+ int ret2 = 0;
+ int cmdsz = sizeof(cmd);
+
+ /* Make a temporary directory to hold Lustre data files. */
+ if (!mkdtemp(tmpdir)) {
+ verrprint(stderr, "%s: Can't create temporary "
+ "directory %s: %s\n",
+ progname, tmpdir, strerror(errno));
+ return errno;
+ }
+
+ snprintf(cmd, cmdsz, "/sbin/debugfs -c -R 'dump /%s %s/mountdata' %s",
+ MOUNT_DATA_FILE, tmpdir, dev);
+
+ ret = run_command(cmd, cmdsz);
+ if (ret) {
+ verrprint("%s: Unable to dump %s dir (%d)\n",
+ progname, MOUNT_CONFIGS_DIR, ret);
+ goto out_rmdir;
+ }
+
+ sprintf(filepnm, "%s/mountdata", tmpdir);
+ filep = fopen(filepnm, "r");
+ if (filep) {
+ vprint("Reading %s\n", MOUNT_DATA_FILE);
+ fread(mo_ldd, sizeof(*mo_ldd), 1, filep);
+ } else {
+ verrprint("%s: Unable to read %d.%d config %s.\n",
+ progname, LUSTRE_MAJOR, LUSTRE_MINOR, filepnm);
+ goto out_close;
+ }
+
+out_close:
+ fclose(filep);
+
+out_rmdir:
+ snprintf(cmd, cmdsz, "rm -rf %s", tmpdir);
+ ret2 = run_command(cmd, cmdsz);
+ if (ret2) {
+ verrprint("Failed to remove temp dir %s (%d)\n", tmpdir, ret2);
+ /* failure return from run_command() is more important
+ * than the failure to remove a dir */
+ if (!ret)
+ ret = ret2;
+ }
+
+ return ret;
+}
+
+#define PARENT_URN "urn:uuid:2bb5bdbf-6c4b-11dc-9b8e-080020a9ed93"
+#define PARENT_PRODUCT "Lustre"
+
+static int stclient(char *type, char *arch)
+{
+
+ char product[64];
+ char *urn = NULL;
+ char cmd[1024];
+ FILE *fp;
+ int i;
+
+ if (strcmp(type, "Client") == 0)
+ urn = CLIENT_URN;
+ else if (strcmp(type, "MDS") == 0)
+ urn = MDS_URN;
+ else if (strcmp(type, "MGS") == 0)
+ urn = MGS_URN;
+ else if (strcmp(type, "OSS") == 0)
+ urn = OSS_URN;
+
+ snprintf(product, 64, "Lustre %s %d.%d.%d", type, LUSTRE_MAJOR,
+ LUSTRE_MINOR, LUSTRE_PATCH);
+
+ /* need to see if the entry exists first */
+ snprintf(cmd, 1024,
+ "/opt/sun/servicetag/bin/stclient -f -t '%s' ", urn);
+ fp = popen(cmd, "r");
+ if (!fp) {
+ if (verbose)
+ fprintf(stderr, "%s: trying to run stclient -f: %s\n",
+ progname, strerror(errno));
+ return 0;
+ }
+
+ i = fread(cmd, 1, sizeof(cmd), fp);
+ if (i) {
+ cmd[i] = 0;
+ if (strcmp(cmd, "Record not found\n") != 0) {
+ /* exists, just return */
+ pclose(fp);
+ return 0;
+ }
+ }
+ pclose(fp);
+
+ snprintf(cmd, 1024, "/opt/sun/servicetag/bin/stclient -a -p '%s' "
+ "-e %d.%d.%d -t '%s' -S mount -F '%s' -P '%s' -m SUN "
+ "-A %s -z global", product, LUSTRE_MAJOR, LUSTRE_MINOR,
+ LUSTRE_PATCH, urn, PARENT_URN, PARENT_PRODUCT, arch);
+
+ return(run_command(cmd, sizeof(cmd)));
+}
+
+void register_service_tags(char *usource, char *source, char *target)
+{
+ struct lustre_disk_data mo_ldd;
+ struct utsname utsname_buf;
+ struct stat stat_buf;
+ char stclient_loc[] = "/opt/sun/servicetag/bin/stclient";
+ int rc;
+
+ rc = stat(stclient_loc, &stat_buf);
+
+ if (rc == 0) {
+ /* call the service tags stclient to show that we use Lustre on
+ this system */
+
+ rc = uname(&utsname_buf);
+ if (rc) {
+ if (verbose)
+ fprintf(stderr,
+ "%s: trying to get uname failed: %s, "
+ "inventory tags will not be created\n",
+ progname, strerror(errno));
+ } else {
+
+ /* client or server? */
+ if (strchr(usource, ':')) {
+ stclient("Client", utsname_buf.machine);
+ } else {
+ /* first figure what type of device it is */
+ rc = get_mountdata(source, &mo_ldd);
+ if (rc) {
+ if (verbose)
+ fprintf(stderr,
+ "%s: trying to read mountdata from %s "
+ "failed: %s, inventory tags will not "
+ "be created\n",
+ progname, target, strerror(errno));
+ } else {
+
+ if (IS_MDT(&mo_ldd))
+ stclient("MDS", utsname_buf.machine);
+
+ if (IS_MGS(&mo_ldd))
+ stclient("MGS", utsname_buf.machine);
+
+ if (IS_OST(&mo_ldd))
+ stclient("OSS", utsname_buf.machine);
+ }
+ }
+ }
+ } else {
+ if (errno != ENOENT && verbose) {
+ fprintf(stderr,
+ "%s: trying to stat stclient failed: %s\n",
+ progname, strerror(errno));
+ }
+ }
+}
git://git.whamcloud.com / fs / lustre-release.git / commitdiff