* GPL HEADER END
*/
/*
- * Copyright (c) 2012, 2016, Intel Corporation.
+ * Copyright (c) 2012, 2017, Intel Corporation.
* Use is subject to license terms.
*/
/*
#include <stdio.h>
#include <string.h>
#include <libzfs.h>
-
-#define HOSTID_PATH "/etc/hostid"
+#include <sys/systeminfo.h>
/* Persistent mount data is stored in these user attributes */
#define LDD_PREFIX "lustre:"
static int zfs_check_hostid(struct mkfs_opts *mop)
{
- FILE *f;
unsigned long hostid;
+#ifndef HAVE_ZFS_MULTIHOST
+ FILE *f;
int rc;
+#endif
if (strstr(mop->mo_ldd.ldd_params, PARAM_FAILNODE) == NULL)
return 0;
+#ifdef HAVE_ZFS_MULTIHOST
+ hostid = get_system_hostid();
+#else
+ /* This reimplements libzfs2::get_system_hostid() from 0.7+ because
+ * prior to 0.7.0 (MULTIHOST support), get_system_hostid() would return
+ * gethostid() if spl_hostid was 0, which would generate a hostid if
+ * /etc/hostid wasn't set, which is incompatible with the kernel
+ * implementation.
+ */
f = fopen("/sys/module/spl/parameters/spl_hostid", "r");
if (f == NULL) {
fatal();
if (hostid != 0)
return 0;
- f = fopen(HOSTID_PATH, "r");
+ f = fopen(HW_HOSTID_PATH, "r");
if (f == NULL)
goto out;
fclose(f);
if (rc != 1) {
- fprintf(stderr, "Failed to read "HOSTID_PATH": %d\n",
+ fprintf(stderr, "Failed to read "HW_HOSTID_PATH": %d\n",
rc);
hostid = 0;
}
out:
+#endif
if (hostid == 0) {
if (mop->mo_flags & MO_NOHOSTID_CHECK) {
fprintf(stderr, "WARNING: spl_hostid not set. ZFS has "
ldd->ldd_mount_type = LDD_MT_ZFS;
ret = 0;
+
+#ifdef HAVE_ZFS_MULTIHOST
+ if (strstr(ldd->ldd_params, PARAM_FAILNODE) != NULL) {
+ zpool_handle_t *pool = zfs_get_pool_handle(zhp);
+ uint64_t mh = zpool_get_prop_int(pool, ZPOOL_PROP_MULTIHOST,
+ NULL);
+ if (!mh)
+ fprintf(stderr, "%s: %s is configured for failover "
+ "but zpool does not have multihost enabled\n",
+ progname, ds);
+ }
+#endif
+
out_close:
zfs_close(zhp);
+
out:
return ret;
}
if (strlen(mop->mo_mkfsopts) != 0)
snprintf(str, len, " -o %s", mop->mo_mkfsopts);
+ if (mop->mo_device_kb)
+ snprintf(str, len, " -o quota=%llu",
+ mop->mo_device_kb * 1024);
return str;
}
php = zpool_open(g_zfs, pool);
if (php) {
pool_exists = 1;
+ zpool_set_prop(php, "canmount", "off");
zpool_close(php);
}
/*
* Set Options on ZPOOL
*
- * ALL - canmount=off
+ * ALL - canmount=off (set above)
* 0.7.0 - multihost=on
+ * 0.7.0 - feature@userobj_accounting=enabled
*/
+#if defined(HAVE_ZFS_MULTIHOST) || defined(HAVE_DMU_USEROBJ_ACCOUNTING)
php = zpool_open(g_zfs, pool);
if (php) {
- if (pool_exists)
- zpool_set_prop(php, "canmount", "off");
-
+#ifdef HAVE_ZFS_MULTIHOST
zpool_set_prop(php, "multihost", "on");
-
+#endif
+#ifdef HAVE_DMU_USEROBJ_ACCOUNTING
+ zpool_set_prop(php, "feature@userobj_accounting", "enabled");
+#endif
zpool_close(php);
}
+#endif
/*
* Create the ZFS filesystem with any required mkfs options:
* - canmount=off is set to prevent zfs automounting
- * - xattr=sa is set to use system attribute based xattrs
*/
memset(mkfs_cmd, 0, PATH_MAX);
snprintf(mkfs_cmd, PATH_MAX,
- "zfs create -o canmount=off -o xattr=sa%s %s",
+ "zfs create -o canmount=off %s %s",
zfs_mkfs_opts(mop, mkfs_tmp, PATH_MAX), ds);
vprint("mkfs_cmd = %s\n", mkfs_cmd);
goto out;
}
+ /*
+ * Attempt to set dataset properties to reasonable defaults
+ * to optimize performance, unless the values were specified
+ * at the mkfs command line. Some ZFS pools or ZFS versions
+ * do not support these properties. We can safely ignore the
+ * errors and continue in those cases.
+ *
+ * zfs 0.6.1 - system attribute based xattrs
+ * zfs 0.6.5 - large block support
+ * zfs 0.7.0 - large dnode support
+ *
+ * Check if zhp is NULL as a defensive measure. Any dataset
+ * validation errors that would cause zfs_open() to fail
+ * should have been caught earlier.
+ */
+ zhp = zfs_open(g_zfs, ds, ZFS_TYPE_FILESYSTEM);
+ if (zhp) {
+ /* zfs 0.6.1 - system attribute based xattrs */
+ if (!strstr(mop->mo_mkfsopts, "xattr="))
+ zfs_set_prop_str(zhp, "xattr", "sa");
+
+ /* zfs 0.7.0 - large dnode support */
+ if (!strstr(mop->mo_mkfsopts, "dnodesize=") &&
+ !strstr(mop->mo_mkfsopts, "dnsize="))
+ zfs_set_prop_str(zhp, "dnodesize", "auto");
+
+ if (IS_OST(&mop->mo_ldd)) {
+ /* zfs 0.6.5 - large block support */
+ if (!strstr(mop->mo_mkfsopts, "recordsize=") &&
+ !strstr(mop->mo_mkfsopts, "recsize="))
+ zfs_set_prop_str(zhp, "recordsize", "1M");
+ }
+
+ zfs_close(zhp);
+ }
+
out:
if (pool != NULL)
free(pool);
git://git.whamcloud.com / fs / lustre-release.git / blobdiff