From 554a89df0cf6d9832778e2913f9fe50b78baeedc Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Wed, 14 Jan 2009 13:59:09 +0100 Subject: s3:vfs_fileid: readd "fileid:algorithm" as option. "fileid:mapping" is still supported as fallback. metze --- source3/modules/vfs_fileid.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/source3/modules/vfs_fileid.c b/source3/modules/vfs_fileid.c index 8ab4ac3793..787a49f36b 100644 --- a/source3/modules/vfs_fileid.c +++ b/source3/modules/vfs_fileid.c @@ -188,10 +188,16 @@ static int fileid_connect(struct vfs_handle_struct *handle, return -1; } - data->device_mapping_fn = fileid_device_mapping_fsid; + /* + * "fileid:mapping" is only here as fallback for old setups + * "fileid:algorithm" is the option new setups should use + */ algorithm = lp_parm_const_string(SNUM(handle->conn), "fileid", "mapping", "fsname"); + algorithm = lp_parm_const_string(SNUM(handle->conn), + "fileid", "algorithm", + algorithm); if (strcmp("fsname", algorithm) == 0) { data->device_mapping_fn = fileid_device_mapping_fsname; } else if (strcmp("fsid", algorithm) == 0) { -- cgit From 6a94b7b9270f3d69595b93e2632051c9842645c9 Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Wed, 14 Jan 2009 11:52:01 +0100 Subject: s3:docs: vfs_fileid manpage metze --- docs-xml/manpages-3/vfs_fileid.8.xml | 112 +++++++++++++++++++++++++++++++++++ 1 file changed, 112 insertions(+) create mode 100644 docs-xml/manpages-3/vfs_fileid.8.xml diff --git a/docs-xml/manpages-3/vfs_fileid.8.xml b/docs-xml/manpages-3/vfs_fileid.8.xml new file mode 100644 index 0000000000..202d693a94 --- /dev/null +++ b/docs-xml/manpages-3/vfs_fileid.8.xml @@ -0,0 +1,112 @@ + + + + + + vfs_fileid + 8 + Samba + System Administration tools + 3.2 + + + + + vfs_fileid + Generates file_id structs with unique device id values for + cluster setups + + + + + vfs objects = fileid + + + + + DESCRIPTION + + This VFS module is part of the + samba + 7 + suite. + + Samba uses file_id structs to uniquely identify files + for locking purpose. By default the file_id contains the device + and inode number returned by the stat() system call. + As the file_id is a unique identifier of a file, it must be the same + on all nodes in a cluster setup. This module overloads the + SMB_VFS_FILE_ID_CREATE() operation and + generates the device number based on the configured algorithm + (see the "fileid:algorithm" option). + + + + + + OPTIONS + + + + + fileid:algorithm = ALGORITHM + + Available algorithms are fsname + and fsid. The default value is + fsname. + + The fsname algorithm generates + device id by hashing the kernel device name. + + The fsid algorithm generates + the device id from the f_fsid returned + from the statfs() syscall. + + + + + + fileid:mapping = ALGORITHM + + This option is the legacy version of the + fileid:algorithm option, which was used in earlier + versions of fileid mapping feature in custom Samba 3.0 versions. + + + + + + + + + EXAMPLES + + Usage of the fileid module with the + fsid algorithm: + + + + fileid + fsid + + + + + + VERSION + + This man page is correct for version 3.2 of the Samba suite. + + + + + AUTHOR + + The original Samba software and related utilities + were created by Andrew Tridgell. Samba is now developed + by the Samba Team as an Open Source project similar + to the way the Linux kernel is developed. + + + + -- cgit From dc6edf1ab4ae8e3fb3ef40b93135ff0ef5407e12 Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Wed, 14 Jan 2009 12:09:46 +0100 Subject: s3:cluster: fix ctdb ipv6 support We need to use CTDB_CONTROL_TCP_CLIENT instead of CTDB_CONTROL_TCP_ADD. CTDB_CONTROL_TCP_CLIENT has support for 2 modes in newer ctdb versions: - with struct ctdb_control_tcp it only supports ipv4. - with struct ctdb_control_tcp_addr it supports ipv4 and ipv6. You need new header files which defines struct ctdb_control_tcp_addr, but at runtime it should be fine to work against older ctdb versions (<= 1.0.68). metze --- source3/include/ctdbd_conn.h | 4 ++-- source3/lib/ctdbd_conn.c | 30 ++++++++++++++++++++---------- source3/smbd/server.c | 4 +--- 3 files changed, 23 insertions(+), 15 deletions(-) diff --git a/source3/include/ctdbd_conn.h b/source3/include/ctdbd_conn.h index 44c35168a8..d721235336 100644 --- a/source3/include/ctdbd_conn.h +++ b/source3/include/ctdbd_conn.h @@ -57,8 +57,8 @@ NTSTATUS ctdbd_traverse(uint32 db_id, void *private_data); NTSTATUS ctdbd_register_ips(struct ctdbd_connection *conn, - const struct sockaddr *server, - const struct sockaddr *client, + const struct sockaddr_storage *server, + const struct sockaddr_storage *client, void (*release_ip_handler)(const char *ip_addr, void *private_data), void *private_data); diff --git a/source3/lib/ctdbd_conn.c b/source3/lib/ctdbd_conn.c index c94ef802c4..f8dae8fbd6 100644 --- a/source3/lib/ctdbd_conn.c +++ b/source3/lib/ctdbd_conn.c @@ -1181,13 +1181,22 @@ NTSTATUS ctdbd_traverse(uint32 db_id, */ NTSTATUS ctdbd_register_ips(struct ctdbd_connection *conn, - const struct sockaddr *server, - const struct sockaddr *client, + const struct sockaddr_storage *server, + const struct sockaddr_storage *client, void (*release_ip_handler)(const char *ip_addr, void *private_data), void *private_data) { - struct ctdb_control_tcp_vnn p; + struct sockaddr *sock = (struct sockaddr *)client; + /* + * we still use ctdb_control_tcp for ipv4 + * because we want to work against older ctdb + * versions at runtime + */ + struct ctdb_control_tcp p4; +#ifdef HAVE_IPV6 + struct ctdb_control_tcp_addr p; +#endif TDB_DATA data; NTSTATUS status; @@ -1196,15 +1205,19 @@ NTSTATUS ctdbd_register_ips(struct ctdbd_connection *conn, */ SMB_ASSERT(conn->release_ip_handler == NULL); - switch (client->sa_family) { + switch (sock->sa_family) { case AF_INET: - p.dest.ip = *(struct sockaddr_in *)server; - p.src.ip = *(struct sockaddr_in *)client; + p4.dest = *(struct sockaddr_in *)server; + p4.src = *(struct sockaddr_in *)client; + data.dptr = (uint8_t *)&p4; + data.dsize = sizeof(p4); break; #ifdef HAVE_IPV6 case AF_INET6: p.dest.ip6 = *(struct sockaddr_in6 *)server; p.src.ip6 = *(struct sockaddr_in6 *)client; + data.dptr = (uint8_t *)&p; + data.dsize = sizeof(p); break; #endif default: @@ -1227,11 +1240,8 @@ NTSTATUS ctdbd_register_ips(struct ctdbd_connection *conn, * can send an extra ack to trigger a reset for our client, so it * immediately reconnects */ - data.dptr = (uint8_t *)&p; - data.dsize = sizeof(p); - return ctdbd_control(conn, CTDB_CURRENT_NODE, - CTDB_CONTROL_TCP_ADD, 0, + CTDB_CONTROL_TCP_CLIENT, 0, CTDB_CTRL_FLAG_NOREPLY, data, NULL, NULL, NULL); } diff --git a/source3/smbd/server.c b/source3/smbd/server.c index 00e939e2b8..a884914839 100644 --- a/source3/smbd/server.c +++ b/source3/smbd/server.c @@ -1458,9 +1458,7 @@ extern void build_options(bool screen); status = ctdbd_register_ips( messaging_ctdbd_connection(), - (struct sockaddr *)&srv, - (struct sockaddr *)&clnt, - release_ip, NULL); + &srv, &clnt, release_ip, NULL); if (!NT_STATUS_IS_OK(status)) { DEBUG(0, ("ctdbd_register_ips failed: %s\n", -- cgit