cloudfs-devel January 2011

cloudfs-devel@lists.fedorahosted.org

1 participants
4 discussions

5 commits - fedora-ize pkg/cloudfs.spec pkg/cloudfs.spec.in scripts/cloudfs scripts/volfilter.py xlators/cluster xlators/encryption xlators/features
by Jeff Darcy 26 Jan '11

26 Jan '11

fedora-ize | 2 pkg/cloudfs.spec | 13 + pkg/cloudfs.spec.in | 13 + scripts/cloudfs | 206 ++++++++++++++++++++++++++++ scripts/volfilter.py | 16 +- xlators/cluster/cloud/src/cloud-mem-types.h | 2 xlators/cluster/cloud/src/cloud.c | 10 - xlators/cluster/login/src/login.c | 6 xlators/encryption/crypt/src/crypt.c | 8 - xlators/encryption/crypt/src/crypt.h | 2 xlators/features/oplock/src/oplock.c | 8 - xlators/features/oplock/src/oplock.h | 2 12 files changed, 260 insertions(+), 28 deletions(-) New commits: commit a187af3d67739c5fd7701740bd1a715519ab64b7 Author: Jeff Darcy <jdarcy(a)redhat.com> Date: Wed Jan 26 15:39:23 2011 -0500 Update build stuff to include cloudfs/volfilter diff --git a/fedora-ize b/fedora-ize index 604259b..c5bca93 100755 --- a/fedora-ize +++ b/fedora-ize @@ -30,6 +30,8 @@ cd - # Create and populate the SOURCES directory. mkdir -p SOURCES (cd $mytmp; tar cvfz ../SOURCES/cloudfs-0.5.tgz cloudfs-0.5) +cp scripts/volfilter.py SOURCES/ +cp scripts/cloudfs SOURCES/ # Create and populate the SPECS directory. mkdir -p SPECS diff --git a/pkg/cloudfs.spec b/pkg/cloudfs.spec index 6a2c957..1a03fcc 100644 --- a/pkg/cloudfs.spec +++ b/pkg/cloudfs.spec @@ -1,3 +1,5 @@ +%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")} + # if you make changes, the it is advised to increment this number, and provide # a descriptive suffix to identify who owns or what the change represents # e.g. release_version 2.MSW @@ -13,12 +15,17 @@ Vendor: Red Hat Packager: cloudfs- URL: http://cloudfs.org Source0: cloudfs-0.5.tgz +Source1: volfilter.py +Source2: cloudfs BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root Requires: glusterfs >= 3.1.1 +Requires: openssl +Requires: python BuildRequires: glusterfs-devel >= 3.1.1 BuildRequires: bison flex BuildRequires: gcc make +BuildRequires: openssl-devel %description CloudFS is a cloud-capable filesystem based on GlusterFS (http://gluster.org) @@ -41,6 +48,10 @@ Provides: cloudfs = %{version}-%{release} %install %{__rm} -rf %{buildroot} %{__make} install DESTDIR=%{buildroot} +%{__install} -D -p -m 0644 %{SOURCE1} \ + %{buildroot}%{python_sitelib}/volfilter.py +%{__install} -D -p -m 0755 %{SOURCE2} \ + %{buildroot}%{_bindir}/cloudfs # Remove unwanted files from all the shared libraries find %{buildroot}%{_libdir} -name '*.a' -delete @@ -55,6 +66,8 @@ find %{buildroot}%{_libdir} -name '*.la' -delete %{_libdir}/glusterfs/3.1.1/xlator/cluster/*.so* %{_libdir}/glusterfs/3.1.1/xlator/encryption/*.so* %{_libdir}/glusterfs/3.1.1/xlator/features/*.so* +%{python_sitelib}/volfilter.py +%{_bindir}/cloudfs %changelog * Fri Jan 21 2011 Jeff Darcy <jdarcy(a)redhat.com> - 0.5 diff --git a/pkg/cloudfs.spec.in b/pkg/cloudfs.spec.in index 01e8196..3e0a705 100644 --- a/pkg/cloudfs.spec.in +++ b/pkg/cloudfs.spec.in @@ -1,3 +1,5 @@ +%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")} + # if you make changes, the it is advised to increment this number, and provide # a descriptive suffix to identify who owns or what the change represents # e.g. release_version 2.MSW @@ -13,12 +15,17 @@ Vendor: Red Hat Packager: @PACKAGE_BUGREPORT@ URL: http://cloudfs.org Source0: cloudfs-0.5.tgz +Source1: volfilter.py +Source2: cloudfs BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root Requires: glusterfs >= 3.1.1 +Requires: openssl +Requires: python BuildRequires: glusterfs-devel >= 3.1.1 BuildRequires: bison flex BuildRequires: gcc make +BuildRequires: openssl-devel %description CloudFS is a cloud-capable filesystem based on GlusterFS (http://gluster.org) @@ -41,6 +48,10 @@ Provides: cloudfs = %{version}-%{release} %install %{__rm} -rf %{buildroot} %{__make} install DESTDIR=%{buildroot} +%{__install} -D -p -m 0644 %{SOURCE1} \ + %{buildroot}%{python_sitelib}/volfilter.py +%{__install} -D -p -m 0755 %{SOURCE2} \ + %{buildroot}%{_bindir}/cloudfs # Remove unwanted files from all the shared libraries find %{buildroot}%{_libdir} -name '*.a' -delete @@ -55,6 +66,8 @@ find %{buildroot}%{_libdir} -name '*.la' -delete %{_libdir}/glusterfs/@GLUSTER_VERSION@/xlator/cluster/*.so* %{_libdir}/glusterfs/@GLUSTER_VERSION@/xlator/encryption/*.so* %{_libdir}/glusterfs/@GLUSTER_VERSION@/xlator/features/*.so* +%{python_sitelib}/volfilter.py +%{_bindir}/cloudfs %changelog * Fri Jan 21 2011 Jeff Darcy <jdarcy(a)redhat.com> - 0.5 commit 5d0407a720a90ba786b567d552bdbd89e158cf4f Author: Jeff Darcy <jdarcy(a)redhat.com> Date: Wed Jan 26 15:37:24 2011 -0500 Fix bugs in cloudfs script. added user-* options representing tenants in cloud xlator added code to delete quick-read when using encryption diff --git a/scripts/cloudfs b/scripts/cloudfs index 4c68755..30d73bd 100755 --- a/scripts/cloudfs +++ b/scripts/cloudfs @@ -97,6 +97,9 @@ def cloudify_server (volfile, users): # One cloud to bring them all... my_xl = volfilter.Translator(last.subvols[0].name) my_xl.type = "cluster/cloud" + my_xl.opts = {} + for user, pw in users: + my_xl.opts["user-"+user] = pw my_xl.subvols = subvols # ...and splice it in. @@ -176,6 +179,10 @@ def do_init_crypt (): graph, last = volfilter.load(vfname+".save") opts = { "key": sys.argv[3] } to_do = [xl for xl in graph.itervalues() + if xl.type == "performance/quick-read"] + for td in to_do: + volfilter.delete(graph,td) + to_do = [xl for xl in graph.itervalues() if xl.type == "protocol/client"] for td in to_do: volfilter.push_filter(graph,td,"encryption/crypt",opts) commit 1e17b56f8e187d54ffb7a9ad93a7de3b98dcb447 Author: Jeff Darcy <jdarcy(a)redhat.com> Date: Wed Jan 26 14:36:13 2011 -0500 Add cloudfs script to bring everything together. diff --git a/scripts/cloudfs b/scripts/cloudfs new file mode 100755 index 0000000..4c68755 --- /dev/null +++ b/scripts/cloudfs @@ -0,0 +1,199 @@ +#!/usr/bin/python + +# Copyright (c) 2010 Red Hat, Inc. +# +# This file is part of CloudFS. +# +# CloudFS is free software: you can redistribute it and/or modify it under the +# terms of the GNU Affero General Public License as published by the Free +# Software Foundation, either version 3 of the License, or (at your option) +# any later version. +# +# CloudFS is distributed in the hope that it will be useful, but WITHOUT ANY +# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS +# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more +# details. +# +# You should have received a copy of the GNU Affero General Public License * +# along with CloudFS. If not, see <http://www.gnu.org/licenses/>. + +import copy +import glob +import os +import sys +import volfilter + +help = {} +help["_main"] = """\ +Usage: %s command args... + +Commands available: + help COMMAND show detailed help for COMMAND + init VOL USERS modify volfiles for VOL""" + +help["init"] = """\ +%s init VOL USERS + +Adds CloudFS-specific modifications to *all* client and server volfiles for +VOL, as specified for the "gluster" command. The USERS argument should be a +path for a file where each line contains a tenant username and password, +separated by a space.""" + +help["initc"] = """\ +%s initc VOLFILE KEY + +Adds client-side encryption to *one* volfile.""" + +glusterd_dirs = [ + "/tmp/glusterd", # debug + "/var/lib/glusterd", # Fedora + "/etc/glusterd" # Gluster +] + +def copy_stack (old_xl,suffix,recursive=False): + if recursive: + new_name = old_xl.name + "-" + suffix + else: + new_name = suffix + new_xl = volfilter.Translator(new_name) + new_xl.type = old_xl.type + # The results with normal assignment here are . . . amusing. + new_xl.opts = copy.deepcopy(old_xl.opts) + for sv in old_xl.subvols: + new_xl.subvols.append(copy_stack(sv,suffix,True)) + # Patch up the path at the bottom. + if new_xl.type == "storage/posix": + new_xl.opts["directory"] += ("/" + suffix) + return new_xl + +def cloudify_client (volfile, users): + print "# Cloudifying client %s" % volfile + for user, pw in users: + ptvf = "%s.%s" % (volfile, user) # Per Tenant Vol File + graph, last = volfilter.load(volfile+".save") + opts = { "username": user, "password": pw } + to_do = [xl for xl in graph.itervalues() + if xl.type == "protocol/client"] + for td in to_do: + volfilter.push_filter(graph,td,"cluster/login",opts) + volfilter.generate(graph,last,file(ptvf,"w")) + +def cloudify_server (volfile, users): + print "# Cloudifying server %s" % volfile + graph, last = volfilter.load(volfile+".save") + + # Add the pre-authentication subvolume. + junk_sv = last.subvols[0] + while junk_sv.type != "storage/posix": + junk_sv = junk_sv.subvols[0] + subvols = [copy_stack(junk_sv,"junk")] + + # Add the per-tenant subvolumes. + for user, pw in users: + new_stack = copy_stack(last.subvols[0],user) + volfilter.push_filter(graph,new_stack,"features/oplock") + subvols.append(new_stack) + + # One cloud to bring them all... + my_xl = volfilter.Translator(last.subvols[0].name) + my_xl.type = "cluster/cloud" + my_xl.subvols = subvols + + # ...and splice it in. + last.subvols = [my_xl] + + volfilter.generate(graph,last,file(volfile,"w")) + +def do_help (): + prog = sys.argv[0] + cmd = sys.argv[2] + try: + print >> sys.stderr, help[cmd] % prog + except KeyError: + print >> sys.stderr, "No help available for '%s'" % cmd + return 1 + return 0 + +def do_init (): + prog = sys.argv[0] + if len(sys.argv) != 4: + print >> sys.stderr, help["init"] % prog + return 1 + + volname = sys.argv[2] + voldir = "" + for gdir in glusterd_dirs: + probe = "%s/vols/%s" % (gdir, volname) + print "trying %s" % probe + if os.access(probe,os.X_OK): + voldir = probe + break + if voldir == "": + print >> sys.stderr, "Could not find volfiles for %s" % volname + return 1 + client_volfile = "%s/%s-fuse.vol" % (voldir, volname) + + try: + userfile = file(sys.argv[3],"r") + except IOError: + print >> sys.stderr, "Could not load users from %s" % userfile + return 1 + users = [] + for line in userfile.readlines(): + space = line.find(" ") + if space == -1: + print >> sys.stderr, "Bad line in userfile: %s" % line + users.append([line[:space],line[space+1:-1]]) + + volfiles = glob.glob('%s/*.vol'%voldir) + for v in volfiles: + if os.access(v+".save",os.F_OK): + print "%s.save already exists - aborting" % v + return 1 + for v in volfiles: + os.rename(v,v+".save") + + for v in volfiles: + if v == client_volfile: + cloudify_client(v,users) + else: + cloudify_server(v,users) + +def do_init_crypt (): + prog = sys.argv[0] + if len(sys.argv) != 4: + print >> sys.stderr, help["initc"] % prog + return 1 + + vfname = sys.argv[2] + print "# Adding encryption to %s" % vfname + + if os.access(vfname+".save",os.F_OK): + print "%s.save already exists - aborting" % vfname + return 1 + os.rename(vfname,vfname+".save") + + graph, last = volfilter.load(vfname+".save") + opts = { "key": sys.argv[3] } + to_do = [xl for xl in graph.itervalues() + if xl.type == "protocol/client"] + for td in to_do: + volfilter.push_filter(graph,td,"encryption/crypt",opts) + volfilter.generate(graph,last,file(vfname,"w")) + +if len(sys.argv) < 3: + print >> sys.stderr, help["_main"] % sys.argv[0] + sys.exit(1) + +if sys.argv[1] == "help": + sys.exit(do_help()) + +if sys.argv[1] == "init": + sys.exit(do_init()) + +if sys.argv[1] == "initc": + sys.exit(do_init_crypt()) + +# Unrecognized command. +print >> sys.stderr, help["_main"] % sys.argv[0] +sys.exit(1) diff --git a/scripts/volfilter.py b/scripts/volfilter.py index 3fd6250..7453c32 100755 --- a/scripts/volfilter.py +++ b/scripts/volfilter.py @@ -69,20 +69,20 @@ def load (path): raise RuntimeError, "unclosed volume definition" return all_xlators, last_xlator -def generate (graph, last): +def generate (graph, last, stream=sys.stdout): for sv in last.subvols: if not sv.dumped: - generate(graph,sv) - print "" + generate(graph,sv,stream) + print >> stream, "" sv.dumped = True - print "volume %s" % last.name - print " type %s" % last.type + print >> stream, "volume %s" % last.name + print >> stream, " type %s" % last.type for k, v in last.opts.iteritems(): - print " option %s %s" % (k, v) + print >> stream, " option %s %s" % (k, v) if last.subvols: - print " subvolumes %s" % string.join( + print >> stream, " subvolumes %s" % string.join( [ sv.name for sv in last.subvols ]) - print "end-volume" + print >> stream, "end-volume" def push_filter (graph, old_xl, filt_type, opts={}): suffix = string.split(old_xl.type,"/")[1] commit 4fd457e2d5f91274c5db31816eabfa443e730d80 Author: Jeff Darcy <jdarcy(a)redhat.com> Date: Wed Jan 26 11:41:31 2011 -0500 Fix log levels. diff --git a/xlators/cluster/cloud/src/cloud.c b/xlators/cluster/cloud/src/cloud.c index bdd0336..5cdbd3f 100644 --- a/xlators/cluster/cloud/src/cloud.c +++ b/xlators/cluster/cloud/src/cloud.c @@ -49,8 +49,6 @@ * openssl or Kerberos or some other stronger authentication method. */ -#define CLOUD_LEVEL GF_LOG_DEBUG - typedef struct { dict_t *users; } cloud_priv; @@ -283,7 +281,7 @@ cloud_setxattr (call_frame_t *frame, xlator_t *this, op_errno = EPERM; goto barf; } - gf_log(this->name,GF_LOG_ERROR, + gf_log(this->name,GF_LOG_INFO, "re-binding to subvolume %s", sv->xlator->name); if (!sv->xlator->itable) { sv->xlator->itable = inode_table_new(0,sv->xlator); @@ -382,7 +380,7 @@ collect_users (dict_t *this, char *key, data_t *value, void *ctx) return; } - gf_log(xlator->name,CLOUD_LEVEL, "added user %s", user); + gf_log(xlator->name,GF_LOG_INFO, "added user %s", user); } int @@ -449,7 +447,7 @@ fini (xlator_t *this) dict_unref(((cloud_priv *)(this->private))->users); GF_FREE(this->private); - gf_log (this->name, GF_LOG_NORMAL, + gf_log (this->name, GF_LOG_INFO, "cloud translator unloaded"); return; } diff --git a/xlators/cluster/login/src/login.c b/xlators/cluster/login/src/login.c index 713dd94..344640e 100644 --- a/xlators/cluster/login/src/login.c +++ b/xlators/cluster/login/src/login.c @@ -56,7 +56,7 @@ login_do_login (xlator_t *this, xlator_t *client) call_frame_t *frame = NULL; dict_t *dict = NULL; - gf_log(this->name,GF_LOG_DEBUG,"found client %s",client->name); + gf_log(this->name,GF_LOG_INFO,"found client %s",client->name); frame = create_frame(client,&priv->pool); if (!frame) { @@ -203,7 +203,7 @@ init (xlator_t *this) priv->password = password; this->private = priv; - gf_log ("login", GF_LOG_DEBUG, "login xlator loaded"); + gf_log ("login", GF_LOG_INFO, "login xlator loaded"); return 0; err_no_frames: diff --git a/xlators/encryption/crypt/src/crypt.c b/xlators/encryption/crypt/src/crypt.c index 0c39a1d..6110816 100644 --- a/xlators/encryption/crypt/src/crypt.c +++ b/xlators/encryption/crypt/src/crypt.c @@ -330,7 +330,7 @@ crypt_readv (call_frame_t *frame, local->my_size = size; local->my_offset = offset; - gf_log(this->name,GF_LOG_TRACE,"reading %lu at %ld",size,offset); + gf_log(this->name,GF_LOG_DEBUG,"reading %lu at %ld",size,offset); STACK_WIND (frame, crypt_readv_cbk, FIRST_CHILD (this), @@ -654,7 +654,7 @@ crypt_writev (call_frame_t *frame, } local->orig_offset = offset; - gf_log(this->name,GF_LOG_TRACE,"WRITEV: size %lu, offset %ld", + gf_log(this->name,GF_LOG_DEBUG,"WRITEV: size %lu, offset %ld", local->orig_size, local->orig_offset); head_resid = offset % priv->block_size; @@ -802,7 +802,7 @@ init (xlator_t *this) return EINVAL; } - gf_log ("crypt", GF_LOG_DEBUG, "crypt xlator loaded"); + gf_log ("crypt", GF_LOG_INFO, "crypt xlator loaded"); return 0; } diff --git a/xlators/features/oplock/src/oplock.c b/xlators/features/oplock/src/oplock.c index cd6ae0b..940398e 100644 --- a/xlators/features/oplock/src/oplock.c +++ b/xlators/features/oplock/src/oplock.c @@ -100,7 +100,7 @@ oplock_fsetxattr (call_frame_t *frame, xlator_t *this, dict_foreach(state->dict,oplock_check_for_lock,&lock_str); if (lock_str) { inode = fd->inode; - gf_log(this->name,GF_LOG_WARNING, + gf_log(this->name,GF_LOG_DEBUG, "got lock request for %d from %p", inode->ino, state->conn); ret = store_op_lock(&priv->locks,inode,state->conn,inode->gen); @@ -149,7 +149,7 @@ oplock_writev (call_frame_t *frame, xlator_t *this, fd_t *fd, struct iovec *vect entry = fetch_op_lock(&priv->locks,inode,state->conn); if (entry) { if (entry->value != inode->gen) { - gf_log(this->name,GF_LOG_WARNING, + gf_log(this->name,GF_LOG_DEBUG, "would reject write for %d from %p", inode->ino, state->conn); op_errno = EBUSY; @@ -193,7 +193,7 @@ init (xlator_t *this) LIST_INIT(&priv->locks); this->private = priv; - gf_log ("oplock", GF_LOG_DEBUG, "oplock xlator loaded"); + gf_log ("oplock", GF_LOG_INFO, "oplock xlator loaded"); return 0; } commit 232a9436a5cf7ff2d8c7de9e874a0964b34bc56a Author: Jeff Darcy <jdarcy(a)redhat.com> Date: Wed Jan 26 11:29:25 2011 -0500 Updated copyright dates. diff --git a/xlators/cluster/cloud/src/cloud-mem-types.h b/xlators/cluster/cloud/src/cloud-mem-types.h index 5727cb8..21971c8 100644 --- a/xlators/cluster/cloud/src/cloud-mem-types.h +++ b/xlators/cluster/cloud/src/cloud-mem-types.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010 Red Hat, Inc. + * Copyright (c) 2010,2011 Red Hat, Inc. * * This file is part of CloudFS. * diff --git a/xlators/cluster/cloud/src/cloud.c b/xlators/cluster/cloud/src/cloud.c index 7c8a650..bdd0336 100644 --- a/xlators/cluster/cloud/src/cloud.c +++ b/xlators/cluster/cloud/src/cloud.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010 Red Hat, Inc. + * Copyright (c) 2010,2011 Red Hat, Inc. * * This file is part of CloudFS. * diff --git a/xlators/cluster/login/src/login.c b/xlators/cluster/login/src/login.c index c537d12..713dd94 100644 --- a/xlators/cluster/login/src/login.c +++ b/xlators/cluster/login/src/login.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010 Red Hat, Inc. + * Copyright (c) 2011 Red Hat, Inc. * * This file is part of CloudFS. * diff --git a/xlators/encryption/crypt/src/crypt.c b/xlators/encryption/crypt/src/crypt.c index 35cc31b..0c39a1d 100644 --- a/xlators/encryption/crypt/src/crypt.c +++ b/xlators/encryption/crypt/src/crypt.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010 Red Hat, Inc. + * Copyright (c) 2010,2011 Red Hat, Inc. * * This file is part of CloudFS. * diff --git a/xlators/encryption/crypt/src/crypt.h b/xlators/encryption/crypt/src/crypt.h index f62708e..0c6548c 100644 --- a/xlators/encryption/crypt/src/crypt.h +++ b/xlators/encryption/crypt/src/crypt.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010 Red Hat, Inc. + * Copyright (c) 2010,2011 Red Hat, Inc. * * This file is part of CloudFS. * diff --git a/xlators/features/oplock/src/oplock.c b/xlators/features/oplock/src/oplock.c index 1a9e5b5..cd6ae0b 100644 --- a/xlators/features/oplock/src/oplock.c +++ b/xlators/features/oplock/src/oplock.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010 Red Hat, Inc. + * Copyright (c) 2011 Red Hat, Inc. * * This file is part of CloudFS. * diff --git a/xlators/features/oplock/src/oplock.h b/xlators/features/oplock/src/oplock.h index 7aec177..dc5daf3 100644 --- a/xlators/features/oplock/src/oplock.h +++ b/xlators/features/oplock/src/oplock.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010 Red Hat, Inc. + * Copyright (c) 2011 Red Hat, Inc. * * This file is part of CloudFS. *

1 0

6 commits - COPYING fedora-ize patches/root_inode.patch patches/root-inode.patch pkg/autogen.sh pkg/cloudfs.spec pkg/cloudfs.spec.in pkg/configure.ac pkg/COPYING pkg/Makefile.am xlators/cluster xlators/encryption xlators/features
by Jeff Darcy 26 Jan '11

26 Jan '11

COPYING | 661 ------------------------------- fedora-ize | 36 + patches/root-inode.patch | 110 +++++ patches/root_inode.patch | 110 ----- pkg/COPYING | 661 +++++++++++++++++++++++++++++++ pkg/Makefile.am | 11 pkg/autogen.sh | 7 pkg/cloudfs.spec | 62 ++ pkg/cloudfs.spec.in | 62 ++ pkg/configure.ac | 85 +++ xlators/cluster/cloud/src/Makefile.am | 15 xlators/cluster/cloud/src/cloud.c | 653 ++++++++---------------------- xlators/cluster/login/src/Makefile.am | 15 xlators/cluster/login/src/login.c | 245 +++++++++++ xlators/encryption/crypt/src/Makefile.am | 11 xlators/encryption/crypt/src/crypt.c | 2 xlators/features/oplock/src/Makefile.am | 17 xlators/features/oplock/src/oplock.c | 220 ++++++++++ xlators/features/oplock/src/oplock.h | 44 ++ 19 files changed, 1775 insertions(+), 1252 deletions(-) New commits: commit 85efb7244f7d6a74827ce854acced3c876c63f4f Author: Jeff Darcy <jdarcy(a)redhat.com> Date: Wed Jan 26 10:34:20 2011 -0500 We don't need the patches (they're part of glusterfs) diff --git a/fedora-ize b/fedora-ize index 0d19c5a..604259b 100755 --- a/fedora-ize +++ b/fedora-ize @@ -30,10 +30,6 @@ cd - # Create and populate the SOURCES directory. mkdir -p SOURCES (cd $mytmp; tar cvfz ../SOURCES/cloudfs-0.5.tgz cloudfs-0.5) -cp patches/dht-fsetxattr.patch SOURCES/ -cp patches/inode-gen.patch SOURCES/ -cp patches/root-inode.patch SOURCES/ -cp patches/wb-quota.patch SOURCES/ # Create and populate the SPECS directory. mkdir -p SPECS commit 2df052cd8902865be282c3aea92131188dd06597 Author: Jeff Darcy <jdarcy(a)redhat.com> Date: Wed Jan 26 10:27:23 2011 -0500 Intercept and return EPERM for ops other than re-bind diff --git a/xlators/cluster/cloud/src/cloud.c b/xlators/cluster/cloud/src/cloud.c index 5390b46..7c8a650 100644 --- a/xlators/cluster/cloud/src/cloud.c +++ b/xlators/cluster/cloud/src/cloud.c @@ -62,6 +62,178 @@ typedef struct { static char user_prefix[] = "user-"; +int32_t +cloud_access (call_frame_t *frame, xlator_t *this, loc_t *loc, int32_t mask) +{ + STACK_UNWIND_STRICT (access, frame, -1, EPERM); + return 0; +} + +int32_t +cloud_create (call_frame_t *frame, xlator_t *this, loc_t *loc, int32_t flags, + mode_t mode, fd_t *fd, dict_t *params) +{ + STACK_UNWIND_STRICT (create, frame, -1, EPERM, fd, NULL, NULL, + NULL, NULL); + return 0; +} + +int32_t +cloud_entrylk (call_frame_t *frame, xlator_t *this, + const char *volume, loc_t *loc, const char *basename, + entrylk_cmd cmd, entrylk_type type) +{ + STACK_UNWIND_STRICT (fentrylk, frame, -1, EPERM); + return 0; +} + +int32_t +cloud_getxattr (call_frame_t *frame, xlator_t *this, loc_t *loc, + const char *name) +{ + STACK_UNWIND_STRICT (getxattr, frame, -1, EPERM, NULL); + return 0; +} + + +int32_t +cloud_inodelk (call_frame_t *frame, xlator_t *this, + const char *volume, loc_t *loc, int32_t cmd, + struct gf_flock *lock) +{ + STACK_UNWIND_STRICT (finodelk, frame, -1, EPERM); + return 0; +} + +int32_t +cloud_link (call_frame_t *frame, xlator_t *this, loc_t *oldloc, loc_t *newloc) +{ + STACK_UNWIND_STRICT (link, frame, -1, EPERM, NULL, NULL, + NULL, NULL); + return 0; +} + +int +cloud_mkdir (call_frame_t *frame, xlator_t *this, loc_t *loc, mode_t mode, + dict_t *params) +{ + STACK_UNWIND_STRICT (mkdir, frame, -1, EPERM, NULL, + NULL, NULL, NULL); + return 0; +} + +int +cloud_mknod (call_frame_t *frame, xlator_t *this, loc_t *loc, mode_t mode, + dev_t rdev, dict_t *parms) +{ + STACK_UNWIND_STRICT (mknod, frame, -1, EPERM, NULL, + NULL, NULL, NULL); + return 0; +} + +int32_t +cloud_open (call_frame_t *frame, xlator_t *this, loc_t *loc, int32_t flags, + fd_t *fd, int32_t wbflags) +{ + STACK_UNWIND_STRICT (open, frame, -1, EPERM, fd); + return 0; +} + +int32_t +cloud_opendir (call_frame_t *frame, xlator_t *this, loc_t *loc, fd_t *fd) +{ + STACK_UNWIND_STRICT (opendir, frame, -1, EPERM, fd); + return 0; +} + +int32_t +cloud_readlink (call_frame_t *frame, xlator_t *this, loc_t *loc, size_t size) +{ + STACK_UNWIND_STRICT (readlink, frame, -1, EPERM, NULL, NULL); + return 0; +} + +int32_t +cloud_removexattr (call_frame_t *frame, xlator_t *this, loc_t *loc, + const char *name) +{ + STACK_UNWIND_STRICT (removexattr, frame, -1, EPERM); + return 0; +} + +int32_t +cloud_rename (call_frame_t *frame, xlator_t *this, loc_t *oldloc, + loc_t *newloc) +{ + STACK_UNWIND_STRICT (rename, frame, -1, EPERM, NULL, NULL, + NULL, NULL, NULL); + return 0; +} + +int32_t +cloud_rmdir (call_frame_t *frame, xlator_t *this, loc_t *loc, int flags) +{ + STACK_UNWIND_STRICT (rmdir, frame, -1, EPERM, NULL, + NULL); + return 0; +} + +int32_t +cloud_setattr (call_frame_t *frame, xlator_t *this, loc_t *loc, + struct iatt *stbuf, int32_t valid) +{ + STACK_UNWIND_STRICT (setattr, frame, -1, EPERM, NULL, + NULL); + return 0; +} + +int32_t +cloud_stat (call_frame_t *frame, xlator_t *this, loc_t *loc) +{ + STACK_UNWIND_STRICT (stat, frame, -1, EPERM, NULL); + return 0; +} + +int32_t +cloud_statfs (call_frame_t *frame, xlator_t *this, loc_t *loc) +{ + STACK_UNWIND_STRICT (statfs, frame, -1, EPERM, NULL); + return 0; +} + +int +cloud_symlink (call_frame_t *frame, xlator_t *this, const char *linkpath, + loc_t *loc, dict_t *params) +{ + STACK_UNWIND_STRICT (symlink, frame, -1, EPERM, NULL, NULL, + NULL, NULL); + return 0; +} + +int32_t +cloud_truncate (call_frame_t *frame, xlator_t *this, loc_t *loc, off_t offset) +{ + STACK_UNWIND_STRICT (truncate, frame, -1, EPERM, NULL, + NULL); + return 0; +} + +int32_t +cloud_unlink (call_frame_t *frame, xlator_t *this, loc_t *loc) +{ + STACK_UNWIND_STRICT (unlink, frame, -1, EPERM, NULL, + NULL); + return 0; +} + +int32_t +cloud_xattrop (call_frame_t *frame, xlator_t *this, loc_t *loc, + gf_xattrop_flags_t flags, dict_t *dict) +{ + STACK_UNWIND_STRICT (xattrop, frame, -1, EPERM, dict); + return 0; +} + int cloud_setxattr_cbk (call_frame_t *frame, void *cookie, xlator_t *this, int op_ret, int op_errno) @@ -301,7 +473,37 @@ validate_options (xlator_t *this, dict_t *options, char **op_errstr) } struct xlator_fops fops = { - .setxattr = cloud_setxattr, + /* + * Leave lookup alone. With everything else disabled prior to the + * re-bind, the only thing it can do is look up the root - which is + * exactly what we need so we can get to the setxattr which does the + * re-bind. Also, don't bother with any ops that require an fd; + * they won't work anyway since all of the ops to *get* an fd will + * get EPERM first. + */ + .access = cloud_access, + .create = cloud_create, + .entrylk = cloud_entrylk, + .getxattr = cloud_getxattr, + .inodelk = cloud_inodelk, + .link = cloud_link, + .mkdir = cloud_mkdir, + .mknod = cloud_mknod, + .open = cloud_open, + .opendir = cloud_opendir, + .readlink = cloud_readlink, + .removexattr = cloud_removexattr, + .rename = cloud_rename, + .rmdir = cloud_rmdir, + .setattr = cloud_setattr, + .stat = cloud_stat, + .statfs = cloud_statfs, + .symlink = cloud_symlink, + .truncate = cloud_truncate, + .unlink = cloud_unlink, + .xattrop = cloud_xattrop, + /* This op is our raison d'etre. */ + .setxattr = cloud_setxattr }; struct xlator_cbks cbks = { commit 15dbe928f591b2733930a7536d71b45f34d36944 Author: Jeff Darcy <jdarcy(a)redhat.com> Date: Wed Jan 26 09:20:11 2011 -0500 Strip old-login-method stuff out of cloud xlator diff --git a/xlators/cluster/cloud/src/cloud.c b/xlators/cluster/cloud/src/cloud.c index 430e137..5390b46 100644 --- a/xlators/cluster/cloud/src/cloud.c +++ b/xlators/cluster/cloud/src/cloud.c @@ -43,13 +43,11 @@ * we also handle that type of authentication here. Some day we might also do * UID mapping here. * - * Right now the authentication is just simple password, passed via mkdir in a - * special first-level subdirectory because mkdir requests are easily to - * generate by hand and have convenient behavior in terms of fanning out to all - * bricks even under DHT. In the future, a client-side translator will sit on - * top of each brick and do a more sophisticated kind of authentication such as - * x.509 or Kerberos. - */ + * Right now the authentication is just a simple username and password, passed + * in by the client-side login translator using a special setxattr on the root. + * In the future, we might use this xattr loophole to exchange parameters for + * openssl or Kerberos or some other stronger authentication method. + */ #define CLOUD_LEVEL GF_LOG_DEBUG @@ -62,341 +60,8 @@ typedef struct { char password[1]; } cloud_subvol; -static char special_dir[] = "/_auth/"; static char user_prefix[] = "user-"; -xlator_t * -get_subvol (xlator_t *this, void *state, char *purpose) -{ - rpc_transport_t *xprt = ((server_state_t *)state)->xprt; - xlator_t *subvol = xprt->xlator_data; - - if (subvol) { - gf_log(this->name,CLOUD_LEVEL,"forcing %s to %s", - purpose,subvol->name); - return subvol; - } - - gf_log(this->name,CLOUD_LEVEL,"using default for %s",purpose); - return FIRST_CHILD(this); -} - -int -root_lookup_cbk (call_frame_t *frame, void *cookie, xlator_t *this, - int op_ret, int op_errno, - inode_t *inode, struct iatt *stbuf, dict_t *xattr, - struct iatt *postparent) -{ - gf_log(this->name,GF_LOG_ERROR,"%s: op_ret = %d, op_errno = %d", - __func__, op_ret, op_errno); - - /* TBD: free frame/stack */ - return 0; -} - -void -set_subvol (xlator_t *this, void *state, xlator_t *subvol) -{ - rpc_transport_t *xprt = ((server_state_t *)state)->xprt; - call_frame_t *frame = NULL; - static loc_t loc = { .path = "/", .inode = NULL }; - dict_t *dict = NULL; - static uuid_t gfid; /* TBD: might as well be global. */ - int ret = 0; - - gf_log(this->name,CLOUD_LEVEL,"associating %p with %s", - xprt, subvol->name); - xprt->xlator_data = subvol; - /* TBD: this bit should really be done from init */ - frame = create_frame(this,this->ctx->pool); - if (frame) { - frame->local = subvol; - dict = dict_new(); - if (dict) { - memset(gfid,0,15); - gfid[15] = 1; - ret = dict_set_static_bin(dict,"gfid-req",gfid,16); - if (ret == 0) { - STACK_WIND(frame,root_lookup_cbk,subvol, - subvol->fops->lookup,&loc,dict); - } - else { - gf_log(this->name,GF_LOG_WARNING, - "could not set root gfid for %s", - subvol->name); - } - dict_unref(dict); - } - } -} - -inode_table_t * -cloud_get_itbl (xlator_t *this, void *state) -{ - xlator_t *subvol = get_subvol(this,state,(char *)__func__); - - if (subvol && subvol->itable && (subvol != FIRST_CHILD(this))) { - return subvol->itable; - } - - return this->itable; -} - -void -cloud_check_auth (call_frame_t *frame, xlator_t *this, loc_t *loc) -{ - char *subdir = (char *)(loc->path)+sizeof(special_dir)-1; - char *password = NULL; - cloud_priv *priv = (cloud_priv *)(this->private); - cloud_subvol *sv = NULL; - - gf_log(this->name,CLOUD_LEVEL,"got special mkdir(%s)",subdir); - - password = index(subdir,'='); - if (!password) { - STACK_UNWIND_STRICT(mkdir,frame,-1,EINVAL,NULL,NULL,NULL,NULL); - return; - } - *(password++) = '\0'; - - if (dict_get_ptr(priv->users,subdir,(void **)&sv) != 0) { - *(--password) = '='; - STACK_UNWIND_STRICT(mkdir,frame,-1,ENOENT,NULL,NULL,NULL,NULL); - return; - } - - if (strcmp(password,sv->password)) { - gf_log(this->name,CLOUD_LEVEL,"bad password for %s", subdir); - *(--password) = '='; - STACK_UNWIND_STRICT(mkdir,frame,-1,EPERM,NULL,NULL,NULL,NULL); - return; - } - - gf_log(this->name,GF_LOG_WARNING, - "forcing this connection to subvol %s",subdir); - *(--password) = '='; - if (!sv->xlator->itable) { - sv->xlator->itable = inode_table_new(0,sv->xlator); - } - set_subvol(this,frame->root->state,sv->xlator); - STACK_UNWIND_STRICT(mkdir,frame,0,0,NULL,NULL,NULL,NULL); -} - -int -cloud_mkdir_cbk (call_frame_t *frame, void *cookie, xlator_t *this, - int op_ret, int op_errno, inode_t *inode, struct iatt *stbuf, - struct iatt *preparent, struct iatt *postparent) -{ - STACK_UNWIND_STRICT(mkdir,frame,op_ret,op_errno,inode,stbuf, - preparent, postparent); - return 0; -} - -int -cloud_mkdir (call_frame_t *frame, xlator_t *this, - loc_t *loc, mode_t mode, dict_t *params) -{ - xlator_t *next; - - if (!strncmp(loc->path,special_dir,sizeof(special_dir)-1)) { - cloud_check_auth(frame,this,loc); - return 0; - } - - next = get_subvol(this,frame->root->state,"mkdir"); - STACK_WIND(frame,cloud_mkdir_cbk,next,next->fops->mkdir, - loc,mode,params); - return 0; -} - -int -cloud_lookup_cbk (call_frame_t *frame, void *cookie, xlator_t *this, - int op_ret, int op_errno, - inode_t *inode, struct iatt *stbuf, dict_t *xattr, - struct iatt *postparent) -{ - /* - * Copied from server_lookup_cbk because they use BOUND_XL and - * thus don't properly evaluate whether it's necessary. - */ - if (inode && inode->table && stbuf) { - gf_log(this->name,GF_LOG_ERROR,"patching up root inode"); - if (inode == inode->table->root) { - stbuf->ia_ino = 1; - uuid_copy (stbuf->ia_gfid, inode->table->root->gfid); - } - } - - STACK_UNWIND_STRICT(lookup,frame,op_ret,op_errno, - inode, stbuf, xattr, postparent); - return 0; -} - -int -cloud_lookup (call_frame_t *frame, xlator_t *this, - loc_t *loc, dict_t *xattr_req) -{ - xlator_t *next = NULL; - - gf_log(this->name,GF_LOG_ERROR,"lookup path is %s",loc->path); - - if (strcmp(loc->path,"/")) { - next = get_subvol(this,frame->root->state,"lookup"); - } - else { - gf_log(this->name,GF_LOG_ERROR,"NOT virtualizing lookup"); - next = FIRST_CHILD(this); - } - - STACK_WIND(frame,cloud_lookup_cbk,next,next->fops->lookup, - loc, xattr_req); - return 0; -} - -int -cloud_create_cbk (call_frame_t *frame, void *cookie, xlator_t *this, - int op_ret, int op_errno, - fd_t *fd, inode_t *inode, struct iatt *stbuf, - struct iatt *preparent, struct iatt *postparent) -{ - STACK_UNWIND_STRICT(create,frame,op_ret,op_errno, - fd,inode,stbuf,preparent,postparent); - return 0; -} - -int -cloud_create (call_frame_t *frame, xlator_t *this, - loc_t *loc, int32_t flags, mode_t mode, - fd_t *fd, dict_t *params) -{ - xlator_t *next = get_subvol(this,frame->root->state,"create"); - - STACK_WIND(frame,cloud_create_cbk,next,next->fops->create, - loc, flags, mode, fd, params); - return 0; -} - -/* - * For now, getxattr/setxattr on the root are not virtualized because some - * internal xattrs (e.g. those used by DHT/AFR) are initialized before we - * virtualize but needed after. The result if we did things normally would - * be that the post-virtualization calls would fail, leaving the translators - * that need them very confused. - * - * TBD: look for pre-virtualization calls to "special" xattrs and fan them out - * to the other subvolumes. - */ - -int -cloud_getxattr_cbk (call_frame_t *frame, void *cookie, xlator_t *this, - int op_ret, int op_errno, dict_t *xattr) -{ - STACK_UNWIND_STRICT(getxattr,frame,op_ret,op_errno,xattr); - return 0; -} - -int -cloud_getxattr (call_frame_t *frame, xlator_t *this, - loc_t *loc, const char *key) -{ - xlator_t *next = NULL; - - if (strcmp(loc->path,"/")) { - next = get_subvol(this,frame->root->state,"getxattr"); - } - else { - gf_log(this->name,GF_LOG_ERROR,"NOT virtualizing getxattr"); - next = FIRST_CHILD(this); - } - - STACK_WIND(frame,cloud_getxattr_cbk,next,next->fops->getxattr,loc,key); - return 0; -} - -int -cloud_open_cbk (call_frame_t *frame, void *cookie, xlator_t *this, - int op_ret, int op_errno, fd_t *fd) -{ - STACK_UNWIND_STRICT(open,frame,op_ret,op_errno,fd); - return 0; -} - -int -cloud_open (call_frame_t *frame, xlator_t *this, - loc_t *loc, int flags, fd_t *fd, int wbflags) -{ - xlator_t *next = get_subvol(this,frame->root->state,"open"); - - STACK_WIND(frame,cloud_open_cbk,next,next->fops->open, - loc,flags,fd,wbflags); - return 0; -} - -int -cloud_stat_cbk (call_frame_t *frame, void *cookie, xlator_t *this, - int op_ret, int op_errno, struct iatt *stbuf) -{ - STACK_UNWIND_STRICT(stat,frame,op_ret,op_errno,stbuf); - return 0; -} - -int -cloud_stat (call_frame_t *frame, xlator_t *this, loc_t *loc) -{ - xlator_t *next = get_subvol(this,frame->root->state,"stat"); - - STACK_WIND(frame,cloud_stat_cbk,next,next->fops->stat,loc); - return 0; -} - -int -cloud_fstat_cbk (call_frame_t *frame, void *cookie, xlator_t *this, - int op_ret, int op_errno, struct iatt *stbuf) -{ - STACK_UNWIND_STRICT(fstat,frame,op_ret,op_errno,stbuf); - return 0; -} - -int -cloud_fstat (call_frame_t *frame, xlator_t *this, fd_t *fd) -{ - xlator_t *next = get_subvol(this,frame->root->state,"fstat"); - - STACK_WIND(frame,cloud_fstat_cbk,next,next->fops->fstat,fd); - return 0; -} - -int -cloud_truncate_cbk (call_frame_t *frame, void *cookie, xlator_t *this, - int op_ret, int op_errno, struct iatt *prebuf, - struct iatt *postbuf) -{ - STACK_UNWIND_STRICT(truncate,frame,op_ret,op_errno,prebuf,postbuf); - return 0; -} - -int -cloud_truncate (call_frame_t *frame, xlator_t *this, loc_t *loc, off_t offset) -{ - xlator_t *next = get_subvol(this,frame->root->state,"truncate"); - - STACK_WIND(frame,cloud_truncate_cbk,next,next->fops->truncate, - loc,offset); - return 0; -} - -int -cloud_ftruncate (call_frame_t *frame, xlator_t *this, fd_t *fd, off_t offset) -{ - xlator_t *next = get_subvol(this,frame->root->state,"ftruncate"); - - STACK_WIND(frame,cloud_truncate_cbk,next,next->fops->ftruncate, - fd,offset); - return 0; -} - -/* See comment near cloud_getxattr about why we don't always virtualize. */ - int cloud_setxattr_cbk (call_frame_t *frame, void *cookie, xlator_t *this, int op_ret, int op_errno) @@ -405,235 +70,55 @@ cloud_setxattr_cbk (call_frame_t *frame, void *cookie, xlator_t *this, return 0; } +/* + * Here's the real "meat" of this translator. Thanks to the login translator + * on the other side, this should be almost the first call we see, and after + * we re-bind the connection to one of our children it should also be the last. + * Just in case somebody's not using the login translator, we should reject + * anything else except for that first root-inode lookup. + */ int cloud_setxattr (call_frame_t *frame, xlator_t *this, loc_t *loc, dict_t *xattr, int flags) { - xlator_t *next = NULL; char *username = NULL; char *password = NULL; cloud_priv *priv = this->private; cloud_subvol *sv = NULL; + int op_errno = 0; - if (dict_get_str(xattr,"trusted.cloud.username",&username) == 0) { - username = strdup(username); - dict_del(xattr,"trusted.cloud.username"); + if (dict_get_str(xattr,"trusted.cloud.username",&username) != 0) { + op_errno = EPERM; } - if (dict_get_str(xattr,"trusted.cloud.password",&password) == 0) { - password = strdup(password); - dict_del(xattr,"trusted.cloud.password"); + if (dict_get_str(xattr,"trusted.cloud.password",&password) != 0) { + op_errno = EPERM; } - if (username && password) { - int op_errno = 0; - if (dict_get_ptr(priv->users,username,(void **)&sv) != 0) { - gf_log(this->name,GF_LOG_ERROR, - "bad username %s", username); - op_errno = EINVAL; - goto barf; - } - if (strcmp(password,sv->password)) { - gf_log(this->name,GF_LOG_ERROR, - "bad password for %s", username); - op_errno = EPERM; - goto barf; - } - gf_log(this->name,GF_LOG_ERROR, - "re-binding to subvolume %s", sv->xlator->name); - if (!sv->xlator->itable) { - sv->xlator->itable = inode_table_new(0,sv->xlator); - } - CALL_STATE(frame)->conn->bound_xl = sv->xlator; -barf: - free(username); - free(password); - STACK_UNWIND_STRICT(setxattr,frame,op_errno?(-1):0,op_errno); + + if (op_errno) { + STACK_UNWIND_STRICT(setxattr,frame,-1,op_errno); return 0; } - else { - free(username); - free(password); - } - if (strcmp(loc->path,"/")) { - next = get_subvol(this,frame->root->state,"setxattr"); + if (dict_get_ptr(priv->users,username,(void **)&sv) != 0) { + gf_log(this->name,GF_LOG_ERROR, + "bad username %s", username); + op_errno = EINVAL; + goto barf; } - else { - gf_log(this->name,GF_LOG_ERROR,"NOT virtualizing setxattr"); - next = FIRST_CHILD(this); + if (strcmp(password,sv->password)) { + gf_log(this->name,GF_LOG_ERROR, + "bad password for %s", username); + op_errno = EPERM; + goto barf; } - - STACK_WIND(frame,cloud_setxattr_cbk,next,next->fops->setxattr, - loc, xattr, flags); - return 0; -} - -int -cloud_readv_cbk (call_frame_t *frame, void *cookie, xlator_t *this, - int op_ret, int op_errno, - struct iovec *vector, int count, struct iatt *stbuf, - struct iobref *iobref) -{ - STACK_UNWIND_STRICT(readv,frame,op_ret,op_errno, - vector, count, stbuf, iobref); - return 0; -} - -int -cloud_readv (call_frame_t *frame, xlator_t *this, - fd_t *fd, size_t size, off_t off) -{ - xlator_t *next = get_subvol(this,frame->root->state,"readv"); - - STACK_WIND(frame,cloud_readv_cbk,next,next->fops->readv,fd,size,off); - return 0; -} - -int -cloud_writev_cbk (call_frame_t *frame, void *cookie, xlator_t *this, - int op_ret, int op_errno, struct iatt *prebuf, - struct iatt *postbuf) -{ - STACK_UNWIND_STRICT(writev,frame,op_ret,op_errno,prebuf,postbuf); - return 0; -} - -int -cloud_writev (call_frame_t *frame, xlator_t *this, - fd_t *fd, struct iovec *vector, int count, off_t off, - struct iobref *iobref) -{ - xlator_t *next = get_subvol(this,frame->root->state,"writev"); - - STACK_WIND(frame,cloud_writev_cbk,next,next->fops->writev, - fd, vector, count, off, iobref); - return 0; -} - -int -cloud_flush_cbk (call_frame_t *frame, void *cookie, xlator_t *this, - int op_ret, int op_errno) -{ - STACK_UNWIND_STRICT(flush,frame,op_ret,op_errno); - return 0; -} - -int -cloud_flush (call_frame_t *frame, xlator_t *this, fd_t *fd) -{ - xlator_t *next = get_subvol(this,frame->root->state,"flush"); - - STACK_WIND(frame,cloud_flush_cbk,next,next->fops->flush,fd); - return 0; -} - -int -cloud_opendir_cbk (call_frame_t *frame, void *cookie, xlator_t *this, - int op_ret, int op_errno, fd_t *fd) -{ - STACK_UNWIND_STRICT(opendir,frame,op_ret,op_errno,fd); - return 0; -} - -int -cloud_opendir (call_frame_t *frame, xlator_t *this, loc_t *loc, fd_t *fd) -{ - xlator_t *next = get_subvol(this,frame->root->state,"opendir"); - - STACK_WIND(frame,cloud_opendir_cbk,next,next->fops->opendir,loc,fd); - return 0; -} - -int -cloud_readdir_cbk (call_frame_t *frame, void *cookie, xlator_t *this, - int op_ret, int op_errno, gf_dirent_t *orig_entries) -{ - STACK_UNWIND_STRICT(readdir,frame,op_ret,op_errno,orig_entries); - return 0; -} - -int -cloud_readdir (call_frame_t *frame, xlator_t *this, fd_t *fd, size_t size, - off_t yoff) -{ - xlator_t *next = get_subvol(this,frame->root->state,"readdir"); - - STACK_WIND(frame,cloud_readdir_cbk,next,next->fops->readdir, - fd,size,yoff); - return 0; -} - -int -cloud_readdirp_cbk (call_frame_t *frame, void *cookie, xlator_t *this, - int op_ret, int op_errno, gf_dirent_t *orig_entries) -{ - STACK_UNWIND_STRICT(readdirp,frame,op_ret,op_errno,orig_entries); - return 0; -} - -int -cloud_readdirp (call_frame_t *frame, xlator_t *this, fd_t *fd, size_t size, - off_t yoff) -{ - xlator_t *next = get_subvol(this,frame->root->state,"readdirp"); - - STACK_WIND(frame,cloud_readdirp_cbk,next,next->fops->readdirp, - fd,size,yoff); - return 0; -} - -int -cloud_unlink_cbk (call_frame_t *frame, void *cookie, xlator_t *this, - int op_ret, int op_errno, - struct iatt *preparent, struct iatt *postparent) -{ - STACK_UNWIND_STRICT(unlink,frame,op_ret,op_errno,preparent,postparent); - return 0; -} - -int -cloud_unlink (call_frame_t *frame, xlator_t *this, loc_t *loc) -{ - xlator_t *next = get_subvol(this,frame->root->state,"unlink"); - - STACK_WIND(frame,cloud_unlink_cbk,next,next->fops->unlink,loc); - return 0; -} - -int -cloud_rmdir_cbk (call_frame_t *frame, void *cookie, xlator_t *this, - int op_ret, int op_errno, - struct iatt *preparent, struct iatt *postparent) -{ - STACK_UNWIND_STRICT(rmdir,frame,op_ret,op_errno,preparent,postparent); - return 0; -} - -int -cloud_rmdir (call_frame_t *frame, xlator_t *this, loc_t *loc, int flags) -{ - xlator_t *next = get_subvol(this,frame->root->state,"rmdir"); - - STACK_WIND(frame,cloud_rmdir_cbk,next,next->fops->rmdir,loc,flags); - return 0; -} - -int -cloud_setattr_cbk (call_frame_t *frame, void *cookie, xlator_t *this, - int op_ret, int op_errno, struct iatt *statpre, - struct iatt *statpost) -{ - STACK_UNWIND_STRICT(setattr,frame,op_ret,op_errno,statpre,statpost); - return 0; -} - -int -cloud_setattr (call_frame_t *frame, xlator_t *this, loc_t *loc, - struct iatt *stbuf, int32_t valid) -{ - xlator_t *next = get_subvol(this,frame->root->state,"setattr"); - - STACK_WIND(frame,cloud_setattr_cbk,next,next->fops->setattr, - loc,stbuf,valid); + gf_log(this->name,GF_LOG_ERROR, + "re-binding to subvolume %s", sv->xlator->name); + if (!sv->xlator->itable) { + sv->xlator->itable = inode_table_new(0,sv->xlator); + } + CALL_STATE(frame)->conn->bound_xl = sv->xlator; +barf: + STACK_UNWIND_STRICT(setxattr,frame,op_errno?(-1):0,op_errno); return 0; } @@ -778,7 +263,6 @@ init (xlator_t *this) } dict_foreach(options,collect_users,this); - this->get_itbl = cloud_get_itbl; return 0; } @@ -817,25 +301,7 @@ validate_options (xlator_t *this, dict_t *options, char **op_errstr) } struct xlator_fops fops = { - .lookup = cloud_lookup, - .create = cloud_create, - .stat = cloud_stat, - .fstat = cloud_fstat, - .truncate = cloud_truncate, - .ftruncate = cloud_ftruncate, .setxattr = cloud_setxattr, - .getxattr = cloud_getxattr, - .open = cloud_open, - .readv = cloud_readv, - .writev = cloud_writev, - .flush = cloud_flush, - .opendir = cloud_opendir, - .readdir = cloud_readdir, - .readdirp = cloud_readdirp, - .unlink = cloud_unlink, - .mkdir = cloud_mkdir, - .rmdir = cloud_rmdir, - .setattr = cloud_setattr, }; struct xlator_cbks cbks = { commit c5fefb8c9bc0c015c1ed30a278aea70203dfe066 Author: Jeff Darcy <jdarcy(a)redhat.com> Date: Wed Jan 26 08:47:24 2011 -0500 New login translator/method for virtualizing namespaces login: new translator cloud: intercept special setxattr, do re-binding there pkg/root: add new directory diff --git a/fedora-ize b/fedora-ize index 2eef94a..0d19c5a 100755 --- a/fedora-ize +++ b/fedora-ize @@ -18,6 +18,7 @@ mkdir -p $work cp -r xlators/cluster/cloud/src $work/cloud/ cp -r xlators/encryption/crypt/src $work/crypt/ cp -r xlators/features/oplock/src $work/oplock/ +cp -r xlators/cluster/login/src $work/login/ cp pkg/* $work/ # Configure just enough to get a decent specfile. diff --git a/pkg/Makefile.am b/pkg/Makefile.am index d13591b..0c83e6c 100644 --- a/pkg/Makefile.am +++ b/pkg/Makefile.am @@ -1,6 +1,6 @@ EXTRA_DIST = autogen.sh COPYING cloudfs.spec -SUBDIRS = cloud crypt oplock +SUBDIRS = cloud crypt oplock login CLEANFILES = diff --git a/pkg/configure.ac b/pkg/configure.ac index 100c21e..d53fafa 100644 --- a/pkg/configure.ac +++ b/pkg/configure.ac @@ -24,6 +24,7 @@ AC_CONFIG_FILES([Makefile cloud/Makefile crypt/Makefile oplock/Makefile + login/Makefile cloudfs.spec]) AC_CANONICAL_HOST diff --git a/xlators/cluster/cloud/src/cloud.c b/xlators/cluster/cloud/src/cloud.c index ed5419d..430e137 100644 --- a/xlators/cluster/cloud/src/cloud.c +++ b/xlators/cluster/cloud/src/cloud.c @@ -27,6 +27,7 @@ #include "rpc/rpc-transport.h" #include "rpc/glusterfs3-xdr.h" #include "server/server.h" +#include "server/server-helpers.h" #include "glusterfs.h" #include "byte-order.h" #include "xlator.h" @@ -408,8 +409,51 @@ int cloud_setxattr (call_frame_t *frame, xlator_t *this, loc_t *loc, dict_t *xattr, int flags) { - xlator_t *next = NULL; - + xlator_t *next = NULL; + char *username = NULL; + char *password = NULL; + cloud_priv *priv = this->private; + cloud_subvol *sv = NULL; + + if (dict_get_str(xattr,"trusted.cloud.username",&username) == 0) { + username = strdup(username); + dict_del(xattr,"trusted.cloud.username"); + } + if (dict_get_str(xattr,"trusted.cloud.password",&password) == 0) { + password = strdup(password); + dict_del(xattr,"trusted.cloud.password"); + } + if (username && password) { + int op_errno = 0; + if (dict_get_ptr(priv->users,username,(void **)&sv) != 0) { + gf_log(this->name,GF_LOG_ERROR, + "bad username %s", username); + op_errno = EINVAL; + goto barf; + } + if (strcmp(password,sv->password)) { + gf_log(this->name,GF_LOG_ERROR, + "bad password for %s", username); + op_errno = EPERM; + goto barf; + } + gf_log(this->name,GF_LOG_ERROR, + "re-binding to subvolume %s", sv->xlator->name); + if (!sv->xlator->itable) { + sv->xlator->itable = inode_table_new(0,sv->xlator); + } + CALL_STATE(frame)->conn->bound_xl = sv->xlator; +barf: + free(username); + free(password); + STACK_UNWIND_STRICT(setxattr,frame,op_errno?(-1):0,op_errno); + return 0; + } + else { + free(username); + free(password); + } + if (strcmp(loc->path,"/")) { next = get_subvol(this,frame->root->state,"setxattr"); } diff --git a/xlators/cluster/login/src/Makefile.am b/xlators/cluster/login/src/Makefile.am new file mode 100644 index 0000000..b3a5fdf --- /dev/null +++ b/xlators/cluster/login/src/Makefile.am @@ -0,0 +1,15 @@ +xlator_LTLIBRARIES = login.la +xlatordir = $(libdir)/glusterfs/$(GLUSTER_VERSION)/xlator/cluster + +login_la_LDFLAGS = -module -avoidversion -lglusterfs + +login_la_SOURCES = login.c +#login_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la + +GLUSTERDIR=$(includedir)/glusterfs + +AM_CFLAGS = -fPIC -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE -Wall -D$(GF_HOST_OS) \ + -I$(GLUSTERDIR) -I$(GLUSTERDIR)/rpc -I$(GLUSTERDIR)/server \ + -shared -nostartfiles $(GF_CFLAGS) + +CLEANFILES = diff --git a/xlators/cluster/login/src/login.c b/xlators/cluster/login/src/login.c new file mode 100644 index 0000000..c537d12 --- /dev/null +++ b/xlators/cluster/login/src/login.c @@ -0,0 +1,245 @@ +/* + * Copyright (c) 2010 Red Hat, Inc. + * + * This file is part of CloudFS. + * + * CloudFS is free software: you can redistribute it and/or modify it under the + * terms of the GNU Affero General Public License as published by the Free + * Software Foundation, either version 3 of the License, or (at your option) + * any later version. + * + * CloudFS is distributed in the hope that it will be useful, but WITHOUT ANY + * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more + * details. + * + * You should have received a copy of the GNU Affero General Public License * + * along with CloudFS. If not, see <http://www.gnu.org/licenses/>. + */ + +#include <ctype.h> +#include <sys/uio.h> + +#ifndef _CONFIG_H +#define _CONFIG_H +#include "config.h" +#endif + +#include "glusterfs.h" +#include "xlator.h" +#include "logging.h" + +typedef struct { + call_pool_t pool; + loc_t loc; + gf_boolean_t did_walk; + char *username; + char *password; +} login_private_t; + +int32_t +login_setxattr_cbk (call_frame_t *frame, void *cookie, xlator_t *this, + int32_t op_ret, int32_t op_errno) +{ + gf_log(this->name,GF_LOG_DEBUG,"op_ret = %d, op_errno = %d", + op_ret,op_errno); + + dict_unref(cookie); + STACK_DESTROY(frame->root); + return 0; +} + +void +login_do_login (xlator_t *this, xlator_t *client) +{ + login_private_t *priv = this->private; + call_frame_t *frame = NULL; + dict_t *dict = NULL; + + gf_log(this->name,GF_LOG_DEBUG,"found client %s",client->name); + + frame = create_frame(client,&priv->pool); + if (!frame) { + gf_log(this->name,GF_LOG_ERROR, + "could not allocate frame for %s", client->name); + goto err_no_frame; + } + + dict = dict_new(); + if (!dict) { + gf_log(this->name,GF_LOG_ERROR, + "could not allocate dict for %s", client->name); + goto err_no_dict; + } + + if (dict_set_str(dict,"trusted.cloud.username",priv->username) != 0) { + gf_log(this->name,GF_LOG_ERROR, + "could not set username for %s", client->name); + goto err_no_login; + } + + if (dict_set_str(dict,"trusted.cloud.password",priv->password) != 0) { + gf_log(this->name,GF_LOG_ERROR, + "could not set password for %s", client->name); + goto err_no_login; + } + + STACK_WIND_COOKIE(frame,login_setxattr_cbk,dict, + client,client->fops->setxattr,&priv->loc,dict,0); + return; + +err_no_login: + dict_unref(dict); +err_no_dict: + STACK_DESTROY(frame->root); +err_no_frame: + ; +} + +void +login_walk_subtree (xlator_t *this, xlator_t *root) +{ + xlator_list_t *trav = NULL; + xlator_t *kid = NULL; + + gf_log(this->name,GF_LOG_DEBUG,"walking subtree at %s",root->name); + + for (trav = root->children; trav; trav = trav->next) { + kid = trav->xlator; + if (strcmp(kid->type,"protocol/client")) { + login_walk_subtree(this,kid); + } + else { + login_do_login(this,kid); + } + } +} + +int +login_lookup_cbk (call_frame_t *frame, void *cookie, xlator_t *this, + int op_ret, int op_errno, inode_t *inode, + struct iatt *stbuf, dict_t *xattr, struct iatt *postparent) +{ + login_private_t *priv = this->private; + + if (!priv->did_walk) { + priv->did_walk = _gf_true; + login_walk_subtree(this,this); + } + + STACK_UNWIND_STRICT(lookup,frame,op_ret,op_errno, + inode, stbuf, xattr, postparent); + return 0; +} + +int +login_lookup (call_frame_t *frame, xlator_t *this, loc_t *loc, dict_t *xattr_req) +{ + login_private_t *priv = this->private; + + /* Save a copy of the loc for when the callback runs. */ + loc_copy(&priv->loc,loc); + + STACK_WIND(frame,login_lookup_cbk, + FIRST_CHILD(this),FIRST_CHILD(this)->fops->lookup, + loc,xattr_req); + return 0; +} + +int32_t +init (xlator_t *this) +{ + login_private_t *priv = NULL; + char *username = NULL; + char *password = NULL; + + if (!this->children || this->children->next) { + gf_log ("login", GF_LOG_ERROR, + "FATAL: login should have exactly one child"); + return -1; + } + + if (!this->parents) { + gf_log (this->name, GF_LOG_WARNING, + "dangling volume. check volfile "); + } + + if (dict_get_str(this->options,"username",&username) != 0) { + gf_log(this->name,GF_LOG_ERROR,"missing option: username"); + return -1; + } + + if (dict_get_str(this->options,"password",&password) != 0) { + gf_log(this->name,GF_LOG_ERROR,"missing option: password"); + return -1; + } + + priv = CALLOC(1,sizeof(*priv)); + if (!priv) { + gf_log(this->name,GF_LOG_ERROR, + "could not allocate login_private_t"); + goto err_no_priv; + } + + priv->pool.stack_mem_pool = mem_pool_new(call_stack_t,100); + if (!priv->pool.stack_mem_pool) { + gf_log(this->name,GF_LOG_ERROR, + "could not allocate call stacks"); + goto err_no_stacks; + } + + priv->pool.frame_mem_pool = mem_pool_new(call_frame_t,100); + if (!priv->pool.frame_mem_pool) { + gf_log(this->name,GF_LOG_ERROR, + "could not allocate call frames"); + goto err_no_frames; + } + + /* We don't need a stub pool because we don't use stubs. */ + INIT_LIST_HEAD(&priv->pool.all_frames); + LOCK_INIT(&priv->pool.lock); + priv->did_walk = _gf_false; + priv->username = username; + priv->password = password; + this->private = priv; + + gf_log ("login", GF_LOG_DEBUG, "login xlator loaded"); + return 0; + +err_no_frames: + mem_pool_destroy(priv->pool.stack_mem_pool); +err_no_stacks: + FREE(priv); +err_no_priv: + return -1; +} + +void +fini (xlator_t *this) +{ + login_private_t *priv = this->private; + + if (priv->did_walk) { + loc_wipe(&priv->loc); + } + mem_pool_destroy(priv->pool.frame_mem_pool); + mem_pool_destroy(priv->pool.stack_mem_pool); + FREE(priv); +} + +struct xlator_fops fops = { + .lookup = login_lookup +}; + +struct xlator_cbks cbks = { +}; + +struct volume_options options[] = { + { .key = {"username"}, + .type = GF_OPTION_TYPE_STR, + }, + { .key = {"password"}, + .type = GF_OPTION_TYPE_STR, + }, + { .key = {NULL} }, +}; commit 6d6e5d47907d466a7f8f9b6d9e1aecd2f2a27e7c Author: Jeff Darcy <jdarcy(a)redhat.com> Date: Tue Jan 25 11:52:22 2011 -0500 Added script to rearrange git sources into rpmbuild form. diff --git a/COPYING b/COPYING deleted file mode 100644 index dba13ed..0000000 --- a/COPYING +++ /dev/null @@ -1,661 +0,0 @@ - GNU AFFERO GENERAL PUBLIC LICENSE - Version 3, 19 November 2007 - - Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/> - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - Preamble - - The GNU Affero General Public License is a free, copyleft license for -software and other kinds of works, specifically designed to ensure -cooperation with the community in the case of network server software. - - The licenses for most software and other practical works are designed -to take away your freedom to share and change the works. By contrast, -our General Public Licenses are intended to guarantee your freedom to -share and change all versions of a program--to make sure it remains free -software for all its users. - - When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -them if you wish), that you receive source code or can get it if you -want it, that you can change the software or use pieces of it in new -free programs, and that you know you can do these things. - - Developers that use our General Public Licenses protect your rights -with two steps: (1) assert copyright on the software, and (2) offer -you this License which gives you legal permission to copy, distribute -and/or modify the software. - - A secondary benefit of defending all users' freedom is that -improvements made in alternate versions of the program, if they -receive widespread use, become available for other developers to -incorporate. Many developers of free software are heartened and -encouraged by the resulting cooperation. However, in the case of -software used on network servers, this result may fail to come about. -The GNU General Public License permits making a modified version and -letting the public access it on a server without ever releasing its -source code to the public. - - The GNU Affero General Public License is designed specifically to -ensure that, in such cases, the modified source code becomes available -to the community. It requires the operator of a network server to -provide the source code of the modified version running there to the -users of that server. Therefore, public use of a modified version, on -a publicly accessible server, gives the public access to the source -code of the modified version. - - An older license, called the Affero General Public License and -published by Affero, was designed to accomplish similar goals. This is -a different license, not a version of the Affero GPL, but Affero has -released a new version of the Affero GPL which permits relicensing under -this license. - - The precise terms and conditions for copying, distribution and -modification follow. - - TERMS AND CONDITIONS - - 0. Definitions. - - "This License" refers to version 3 of the GNU Affero General Public License. - - "Copyright" also means copyright-like laws that apply to other kinds of -works, such as semiconductor masks. - - "The Program" refers to any copyrightable work licensed under this -License. Each licensee is addressed as "you". "Licensees" and -"recipients" may be individuals or organizations. - - To "modify" a work means to copy from or adapt all or part of the work -in a fashion requiring copyright permission, other than the making of an -exact copy. The resulting work is called a "modified version" of the -earlier work or a work "based on" the earlier work. - - A "covered work" means either the unmodified Program or a work based -on the Program. - - To "propagate" a work means to do anything with it that, without -permission, would make you directly or secondarily liable for -infringement under applicable copyright law, except executing it on a -computer or modifying a private copy. Propagation includes copying, -distribution (with or without modification), making available to the -public, and in some countries other activities as well. - - To "convey" a work means any kind of propagation that enables other -parties to make or receive copies. Mere interaction with a user through -a computer network, with no transfer of a copy, is not conveying. - - An interactive user interface displays "Appropriate Legal Notices" -to the extent that it includes a convenient and prominently visible -feature that (1) displays an appropriate copyright notice, and (2) -tells the user that there is no warranty for the work (except to the -extent that warranties are provided), that licensees may convey the -work under this License, and how to view a copy of this License. If -the interface presents a list of user commands or options, such as a -menu, a prominent item in the list meets this criterion. - - 1. Source Code. - - The "source code" for a work means the preferred form of the work -for making modifications to it. "Object code" means any non-source -form of a work. - - A "Standard Interface" means an interface that either is an official -standard defined by a recognized standards body, or, in the case of -interfaces specified for a particular programming language, one that -is widely used among developers working in that language. - - The "System Libraries" of an executable work include anything, other -than the work as a whole, that (a) is included in the normal form of -packaging a Major Component, but which is not part of that Major -Component, and (b) serves only to enable use of the work with that -Major Component, or to implement a Standard Interface for which an -implementation is available to the public in source code form. A -"Major Component", in this context, means a major essential component -(kernel, window system, and so on) of the specific operating system -(if any) on which the executable work runs, or a compiler used to -produce the work, or an object code interpreter used to run it. - - The "Corresponding Source" for a work in object code form means all -the source code needed to generate, install, and (for an executable -work) run the object code and to modify the work, including scripts to -control those activities. However, it does not include the work's -System Libraries, or general-purpose tools or generally available free -programs which are used unmodified in performing those activities but -which are not part of the work. For example, Corresponding Source -includes interface definition files associated with source files for -the work, and the source code for shared libraries and dynamically -linked subprograms that the work is specifically designed to require, -such as by intimate data communication or control flow between those -subprograms and other parts of the work. - - The Corresponding Source need not include anything that users -can regenerate automatically from other parts of the Corresponding -Source. - - The Corresponding Source for a work in source code form is that -same work. - - 2. Basic Permissions. - - All rights granted under this License are granted for the term of -copyright on the Program, and are irrevocable provided the stated -conditions are met. This License explicitly affirms your unlimited -permission to run the unmodified Program. The output from running a -covered work is covered by this License only if the output, given its -content, constitutes a covered work. This License acknowledges your -rights of fair use or other equivalent, as provided by copyright law. - - You may make, run and propagate covered works that you do not -convey, without conditions so long as your license otherwise remains -in force. You may convey covered works to others for the sole purpose -of having them make modifications exclusively for you, or provide you -with facilities for running those works, provided that you comply with -the terms of this License in conveying all material for which you do -not control copyright. Those thus making or running the covered works -for you must do so exclusively on your behalf, under your direction -and control, on terms that prohibit them from making any copies of -your copyrighted material outside their relationship with you. - - Conveying under any other circumstances is permitted solely under -the conditions stated below. Sublicensing is not allowed; section 10 -makes it unnecessary. - - 3. Protecting Users' Legal Rights From Anti-Circumvention Law. - - No covered work shall be deemed part of an effective technological -measure under any applicable law fulfilling obligations under article -11 of the WIPO copyright treaty adopted on 20 December 1996, or -similar laws prohibiting or restricting circumvention of such -measures. - - When you convey a covered work, you waive any legal power to forbid -circumvention of technological measures to the extent such circumvention -is effected by exercising rights under this License with respect to -the covered work, and you disclaim any intention to limit operation or -modification of the work as a means of enforcing, against the work's -users, your or third parties' legal rights to forbid circumvention of -technological measures. - - 4. Conveying Verbatim Copies. - - You may convey verbatim copies of the Program's source code as you -receive it, in any medium, provided that you conspicuously and -appropriately publish on each copy an appropriate copyright notice; -keep intact all notices stating that this License and any -non-permissive terms added in accord with section 7 apply to the code; -keep intact all notices of the absence of any warranty; and give all -recipients a copy of this License along with the Program. - - You may charge any price or no price for each copy that you convey, -and you may offer support or warranty protection for a fee. - - 5. Conveying Modified Source Versions. - - You may convey a work based on the Program, or the modifications to -produce it from the Program, in the form of source code under the -terms of section 4, provided that you also meet all of these conditions: - - a) The work must carry prominent notices stating that you modified - it, and giving a relevant date. - - b) The work must carry prominent notices stating that it is - released under this License and any conditions added under section - 7. This requirement modifies the requirement in section 4 to - "keep intact all notices". - - c) You must license the entire work, as a whole, under this - License to anyone who comes into possession of a copy. This - License will therefore apply, along with any applicable section 7 - additional terms, to the whole of the work, and all its parts, - regardless of how they are packaged. This License gives no - permission to license the work in any other way, but it does not - invalidate such permission if you have separately received it. - - d) If the work has interactive user interfaces, each must display - Appropriate Legal Notices; however, if the Program has interactive - interfaces that do not display Appropriate Legal Notices, your - work need not make them do so. - - A compilation of a covered work with other separate and independent -works, which are not by their nature extensions of the covered work, -and which are not combined with it such as to form a larger program, -in or on a volume of a storage or distribution medium, is called an -"aggregate" if the compilation and its resulting copyright are not -used to limit the access or legal rights of the compilation's users -beyond what the individual works permit. Inclusion of a covered work -in an aggregate does not cause this License to apply to the other -parts of the aggregate. - - 6. Conveying Non-Source Forms. - - You may convey a covered work in object code form under the terms -of sections 4 and 5, provided that you also convey the -machine-readable Corresponding Source under the terms of this License, -in one of these ways: - - a) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by the - Corresponding Source fixed on a durable physical medium - customarily used for software interchange. - - b) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by a - written offer, valid for at least three years and valid for as - long as you offer spare parts or customer support for that product - model, to give anyone who possesses the object code either (1) a - copy of the Corresponding Source for all the software in the - product that is covered by this License, on a durable physical - medium customarily used for software interchange, for a price no - more than your reasonable cost of physically performing this - conveying of source, or (2) access to copy the - Corresponding Source from a network server at no charge. - - c) Convey individual copies of the object code with a copy of the - written offer to provide the Corresponding Source. This - alternative is allowed only occasionally and noncommercially, and - only if you received the object code with such an offer, in accord - with subsection 6b. - - d) Convey the object code by offering access from a designated - place (gratis or for a charge), and offer equivalent access to the - Corresponding Source in the same way through the same place at no - further charge. You need not require recipients to copy the - Corresponding Source along with the object code. If the place to - copy the object code is a network server, the Corresponding Source - may be on a different server (operated by you or a third party) - that supports equivalent copying facilities, provided you maintain - clear directions next to the object code saying where to find the - Corresponding Source. Regardless of what server hosts the - Corresponding Source, you remain obligated to ensure that it is - available for as long as needed to satisfy these requirements. - - e) Convey the object code using peer-to-peer transmission, provided - you inform other peers where the object code and Corresponding - Source of the work are being offered to the general public at no - charge under subsection 6d. - - A separable portion of the object code, whose source code is excluded -from the Corresponding Source as a System Library, need not be -included in conveying the object code work. - - A "User Product" is either (1) a "consumer product", which means any -tangible personal property which is normally used for personal, family, -or household purposes, or (2) anything designed or sold for incorporation -into a dwelling. In determining whether a product is a consumer product, -doubtful cases shall be resolved in favor of coverage. For a particular -product received by a particular user, "normally used" refers to a -typical or common use of that class of product, regardless of the status -of the particular user or of the way in which the particular user -actually uses, or expects or is expected to use, the product. A product -is a consumer product regardless of whether the product has substantial -commercial, industrial or non-consumer uses, unless such uses represent -the only significant mode of use of the product. - - "Installation Information" for a User Product means any methods, -procedures, authorization keys, or other information required to install -and execute modified versions of a covered work in that User Product from -a modified version of its Corresponding Source. The information must -suffice to ensure that the continued functioning of the modified object -code is in no case prevented or interfered with solely because -modification has been made. - - If you convey an object code work under this section in, or with, or -specifically for use in, a User Product, and the conveying occurs as -part of a transaction in which the right of possession and use of the -User Product is transferred to the recipient in perpetuity or for a -fixed term (regardless of how the transaction is characterized), the -Corresponding Source conveyed under this section must be accompanied -by the Installation Information. But this requirement does not apply -if neither you nor any third party retains the ability to install -modified object code on the User Product (for example, the work has -been installed in ROM). - - The requirement to provide Installation Information does not include a -requirement to continue to provide support service, warranty, or updates -for a work that has been modified or installed by the recipient, or for -the User Product in which it has been modified or installed. Access to a -network may be denied when the modification itself materially and -adversely affects the operation of the network or violates the rules and -protocols for communication across the network. - - Corresponding Source conveyed, and Installation Information provided, -in accord with this section must be in a format that is publicly -documented (and with an implementation available to the public in -source code form), and must require no special password or key for -unpacking, reading or copying. - - 7. Additional Terms. - - "Additional permissions" are terms that supplement the terms of this -License by making exceptions from one or more of its conditions. -Additional permissions that are applicable to the entire Program shall -be treated as though they were included in this License, to the extent -that they are valid under applicable law. If additional permissions -apply only to part of the Program, that part may be used separately -under those permissions, but the entire Program remains governed by -this License without regard to the additional permissions. - - When you convey a copy of a covered work, you may at your option -remove any additional permissions from that copy, or from any part of -it. (Additional permissions may be written to require their own -removal in certain cases when you modify the work.) You may place -additional permissions on material, added by you to a covered work, -for which you have or can give appropriate copyright permission. - - Notwithstanding any other provision of this License, for material you -add to a covered work, you may (if authorized by the copyright holders of -that material) supplement the terms of this License with terms: - - a) Disclaiming warranty or limiting liability differently from the - terms of sections 15 and 16 of this License; or - - b) Requiring preservation of specified reasonable legal notices or - author attributions in that material or in the Appropriate Legal - Notices displayed by works containing it; or - - c) Prohibiting misrepresentation of the origin of that material, or - requiring that modified versions of such material be marked in - reasonable ways as different from the original version; or - - d) Limiting the use for publicity purposes of names of licensors or - authors of the material; or - - e) Declining to grant rights under trademark law for use of some - trade names, trademarks, or service marks; or - - f) Requiring indemnification of licensors and authors of that - material by anyone who conveys the material (or modified versions of - it) with contractual assumptions of liability to the recipient, for - any liability that these contractual assumptions directly impose on - those licensors and authors. - - All other non-permissive additional terms are considered "further -restrictions" within the meaning of section 10. If the Program as you -received it, or any part of it, contains a notice stating that it is -governed by this License along with a term that is a further -restriction, you may remove that term. If a license document contains -a further restriction but permits relicensing or conveying under this -License, you may add to a covered work material governed by the terms -of that license document, provided that the further restriction does -not survive such relicensing or conveying. - - If you add terms to a covered work in accord with this section, you -must place, in the relevant source files, a statement of the -additional terms that apply to those files, or a notice indicating -where to find the applicable terms. - - Additional terms, permissive or non-permissive, may be stated in the -form of a separately written license, or stated as exceptions; -the above requirements apply either way. - - 8. Termination. - - You may not propagate or modify a covered work except as expressly -provided under this License. Any attempt otherwise to propagate or -modify it is void, and will automatically terminate your rights under -this License (including any patent licenses granted under the third -paragraph of section 11). - - However, if you cease all violation of this License, then your -license from a particular copyright holder is reinstated (a) -provisionally, unless and until the copyright holder explicitly and -finally terminates your license, and (b) permanently, if the copyright -holder fails to notify you of the violation by some reasonable means -prior to 60 days after the cessation. - - Moreover, your license from a particular copyright holder is -reinstated permanently if the copyright holder notifies you of the -violation by some reasonable means, this is the first time you have -received notice of violation of this License (for any work) from that -copyright holder, and you cure the violation prior to 30 days after -your receipt of the notice. - - Termination of your rights under this section does not terminate the -licenses of parties who have received copies or rights from you under -this License. If your rights have been terminated and not permanently -reinstated, you do not qualify to receive new licenses for the same -material under section 10. - - 9. Acceptance Not Required for Having Copies. - - You are not required to accept this License in order to receive or -run a copy of the Program. Ancillary propagation of a covered work -occurring solely as a consequence of using peer-to-peer transmission -to receive a copy likewise does not require acceptance. However, -nothing other than this License grants you permission to propagate or -modify any covered work. These actions infringe copyright if you do -not accept this License. Therefore, by modifying or propagating a -covered work, you indicate your acceptance of this License to do so. - - 10. Automatic Licensing of Downstream Recipients. - - Each time you convey a covered work, the recipient automatically -receives a license from the original licensors, to run, modify and -propagate that work, subject to this License. You are not responsible -for enforcing compliance by third parties with this License. - - An "entity transaction" is a transaction transferring control of an -organization, or substantially all assets of one, or subdividing an -organization, or merging organizations. If propagation of a covered -work results from an entity transaction, each party to that -transaction who receives a copy of the work also receives whatever -licenses to the work the party's predecessor in interest had or could -give under the previous paragraph, plus a right to possession of the -Corresponding Source of the work from the predecessor in interest, if -the predecessor has it or can get it with reasonable efforts. - - You may not impose any further restrictions on the exercise of the -rights granted or affirmed under this License. For example, you may -not impose a license fee, royalty, or other charge for exercise of -rights granted under this License, and you may not initiate litigation -(including a cross-claim or counterclaim in a lawsuit) alleging that -any patent claim is infringed by making, using, selling, offering for -sale, or importing the Program or any portion of it. - - 11. Patents. - - A "contributor" is a copyright holder who authorizes use under this -License of the Program or a work on which the Program is based. The -work thus licensed is called the contributor's "contributor version". - - A contributor's "essential patent claims" are all patent claims -owned or controlled by the contributor, whether already acquired or -hereafter acquired, that would be infringed by some manner, permitted -by this License, of making, using, or selling its contributor version, -but do not include claims that would be infringed only as a -consequence of further modification of the contributor version. For -purposes of this definition, "control" includes the right to grant -patent sublicenses in a manner consistent with the requirements of -this License. - - Each contributor grants you a non-exclusive, worldwide, royalty-free -patent license under the contributor's essential patent claims, to -make, use, sell, offer for sale, import and otherwise run, modify and -propagate the contents of its contributor version. - - In the following three paragraphs, a "patent license" is any express -agreement or commitment, however denominated, not to enforce a patent -(such as an express permission to practice a patent or covenant not to -sue for patent infringement). To "grant" such a patent license to a -party means to make such an agreement or commitment not to enforce a -patent against the party. - - If you convey a covered work, knowingly relying on a patent license, -and the Corresponding Source of the work is not available for anyone -to copy, free of charge and under the terms of this License, through a -publicly available network server or other readily accessible means, -then you must either (1) cause the Corresponding Source to be so -available, or (2) arrange to deprive yourself of the benefit of the -patent license for this particular work, or (3) arrange, in a manner -consistent with the requirements of this License, to extend the patent -license to downstream recipients. "Knowingly relying" means you have -actual knowledge that, but for the patent license, your conveying the -covered work in a country, or your recipient's use of the covered work -in a country, would infringe one or more identifiable patents in that -country that you have reason to believe are valid. - - If, pursuant to or in connection with a single transaction or -arrangement, you convey, or propagate by procuring conveyance of, a -covered work, and grant a patent license to some of the parties -receiving the covered work authorizing them to use, propagate, modify -or convey a specific copy of the covered work, then the patent license -you grant is automatically extended to all recipients of the covered -work and works based on it. - - A patent license is "discriminatory" if it does not include within -the scope of its coverage, prohibits the exercise of, or is -conditioned on the non-exercise of one or more of the rights that are -specifically granted under this License. You may not convey a covered -work if you are a party to an arrangement with a third party that is -in the business of distributing software, under which you make payment -to the third party based on the extent of your activity of conveying -the work, and under which the third party grants, to any of the -parties who would receive the covered work from you, a discriminatory -patent license (a) in connection with copies of the covered work -conveyed by you (or copies made from those copies), or (b) primarily -for and in connection with specific products or compilations that -contain the covered work, unless you entered into that arrangement, -or that patent license was granted, prior to 28 March 2007. - - Nothing in this License shall be construed as excluding or limiting -any implied license or other defenses to infringement that may -otherwise be available to you under applicable patent law. - - 12. No Surrender of Others' Freedom. - - If conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot convey a -covered work so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you may -not convey it at all. For example, if you agree to terms that obligate you -to collect a royalty for further conveying from those to whom you convey -the Program, the only way you could satisfy both those terms and this -License would be to refrain entirely from conveying the Program. - - 13. Remote Network Interaction; Use with the GNU General Public License. - - Notwithstanding any other provision of this License, if you modify the -Program, your modified version must prominently offer all users -interacting with it remotely through a computer network (if your version -supports such interaction) an opportunity to receive the Corresponding -Source of your version by providing access to the Corresponding Source -from a network server at no charge, through some standard or customary -means of facilitating copying of software. This Corresponding Source -shall include the Corresponding Source for any work covered by version 3 -of the GNU General Public License that is incorporated pursuant to the -following paragraph. - - Notwithstanding any other provision of this License, you have -permission to link or combine any covered work with a work licensed -under version 3 of the GNU General Public License into a single -combined work, and to convey the resulting work. The terms of this -License will continue to apply to the part which is the covered work, -but the work with which it is combined will remain governed by version -3 of the GNU General Public License. - - 14. Revised Versions of this License. - - The Free Software Foundation may publish revised and/or new versions of -the GNU Affero General Public License from time to time. Such new versions -will be similar in spirit to the present version, but may differ in detail to -address new problems or concerns. - - Each version is given a distinguishing version number. If the -Program specifies that a certain numbered version of the GNU Affero General -Public License "or any later version" applies to it, you have the -option of following the terms and conditions either of that numbered -version or of any later version published by the Free Software -Foundation. If the Program does not specify a version number of the -GNU Affero General Public License, you may choose any version ever published -by the Free Software Foundation. - - If the Program specifies that a proxy can decide which future -versions of the GNU Affero General Public License can be used, that proxy's -public statement of acceptance of a version permanently authorizes you -to choose that version for the Program. - - Later license versions may give you additional or different -permissions. However, no additional obligations are imposed on any -author or copyright holder as a result of your choosing to follow a -later version. - - 15. Disclaimer of Warranty. - - THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY -APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT -HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY -OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, -THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM -IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF -ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - - 16. Limitation of Liability. - - IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS -THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY -GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE -USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF -DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD -PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), -EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF -SUCH DAMAGES. - - 17. Interpretation of Sections 15 and 16. - - If the disclaimer of warranty and limitation of liability provided -above cannot be given local legal effect according to their terms, -reviewing courts shall apply local law that most closely approximates -an absolute waiver of all civil liability in connection with the -Program, unless a warranty or assumption of liability accompanies a -copy of the Program in return for a fee. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Programs - - If you develop a new program, and you want it to be of the greatest -possible use to the public, the best way to achieve this is to make it -free software which everyone can redistribute and change under these terms. - - To do so, attach the following notices to the program. It is safest -to attach them to the start of each source file to most effectively -state the exclusion of warranty; and each file should have at least -the "copyright" line and a pointer to where the full notice is found. - - <one line to give the program's name and a brief idea of what it does.> - Copyright (C) <year> <name of author> - - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU Affero General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Affero General Public License for more details. - - You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. - -Also add information on how to contact you by electronic and paper mail. - - If your software can interact with users remotely through a computer -network, you should also make sure that it provides a way for users to -get its source. For example, if your program is a web application, its -interface could display a "Source" link that leads users to an archive -of the code. There are many ways you could offer source, and different -solutions will be better for different programs; see section 13 for the -specific requirements. - - You should also get your employer (if you work as a programmer) or school, -if any, to sign a "copyright disclaimer" for the program, if necessary. -For more information on this, and how to apply and follow the GNU AGPL, see -<http://www.gnu.org/licenses/>. diff --git a/fedora-ize b/fedora-ize new file mode 100755 index 0000000..2eef94a --- /dev/null +++ b/fedora-ize @@ -0,0 +1,39 @@ +#!/bin/bash + +# Pull the git sources into a form suitable for Fedora packaging: +# SOURCES +# cloudfs-0.5.tgz +# foo.patch +# bar.patch +# ... +# SPECS +# cloudfs.spec + +mytmp=$(mktemp -d --tmpdir=. pkg_XXXXXX) +trap "rm -rf $PWD/$mytmp" EXIT +work=$mytmp/cloudfs-0.5 +mkdir -p $work + +# Copy the translators into a working directory. +cp -r xlators/cluster/cloud/src $work/cloud/ +cp -r xlators/encryption/crypt/src $work/crypt/ +cp -r xlators/features/oplock/src $work/oplock/ +cp pkg/* $work/ + +# Configure just enough to get a decent specfile. +cd $work +./autogen.sh +./configure --prefix=/usr +cd - + +# Create and populate the SOURCES directory. +mkdir -p SOURCES +(cd $mytmp; tar cvfz ../SOURCES/cloudfs-0.5.tgz cloudfs-0.5) +cp patches/dht-fsetxattr.patch SOURCES/ +cp patches/inode-gen.patch SOURCES/ +cp patches/root-inode.patch SOURCES/ +cp patches/wb-quota.patch SOURCES/ + +# Create and populate the SPECS directory. +mkdir -p SPECS +cp $work/cloudfs.spec SPECS/ diff --git a/pkg/COPYING b/pkg/COPYING new file mode 100644 index 0000000..dba13ed --- /dev/null +++ b/pkg/COPYING @@ -0,0 +1,661 @@ + GNU AFFERO GENERAL PUBLIC LICENSE + Version 3, 19 November 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/> + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The GNU Affero General Public License is a free, copyleft license for +software and other kinds of works, specifically designed to ensure +cooperation with the community in the case of network server software. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +our General Public Licenses are intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + + Developers that use our General Public Licenses protect your rights +with two steps: (1) assert copyright on the software, and (2) offer +you this License which gives you legal permission to copy, distribute +and/or modify the software. + + A secondary benefit of defending all users' freedom is that +improvements made in alternate versions of the program, if they +receive widespread use, become available for other developers to +incorporate. Many developers of free software are heartened and +encouraged by the resulting cooperation. However, in the case of +software used on network servers, this result may fail to come about. +The GNU General Public License permits making a modified version and +letting the public access it on a server without ever releasing its +source code to the public. + + The GNU Affero General Public License is designed specifically to +ensure that, in such cases, the modified source code becomes available +to the community. It requires the operator of a network server to +provide the source code of the modified version running there to the +users of that server. Therefore, public use of a modified version, on +a publicly accessible server, gives the public access to the source +code of the modified version. + + An older license, called the Affero General Public License and +published by Affero, was designed to accomplish similar goals. This is +a different license, not a version of the Affero GPL, but Affero has +released a new version of the Affero GPL which permits relicensing under +this license. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU Affero General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Remote Network Interaction; Use with the GNU General Public License. + + Notwithstanding any other provision of this License, if you modify the +Program, your modified version must prominently offer all users +interacting with it remotely through a computer network (if your version +supports such interaction) an opportunity to receive the Corresponding +Source of your version by providing access to the Corresponding Source +from a network server at no charge, through some standard or customary +means of facilitating copying of software. This Corresponding Source +shall include the Corresponding Source for any work covered by version 3 +of the GNU General Public License that is incorporated pursuant to the +following paragraph. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the work with which it is combined will remain governed by version +3 of the GNU General Public License. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU Affero General Public License from time to time. Such new versions +will be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU Affero General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU Affero General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU Affero General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + <one line to give the program's name and a brief idea of what it does.> + Copyright (C) <year> <name of author> + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see <http://www.gnu.org/licenses/>. + +Also add information on how to contact you by electronic and paper mail. + + If your software can interact with users remotely through a computer +network, you should also make sure that it provides a way for users to +get its source. For example, if your program is a web application, its +interface could display a "Source" link that leads users to an archive +of the code. There are many ways you could offer source, and different +solutions will be better for different programs; see section 13 for the +specific requirements. + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU AGPL, see +<http://www.gnu.org/licenses/>. diff --git a/xlators/features/oplock/Makefile.am b/xlators/features/oplock/Makefile.am deleted file mode 100644 index 5122e91..0000000 --- a/xlators/features/oplock/Makefile.am +++ /dev/null @@ -1,17 +0,0 @@ -xlator_LTLIBRARIES = oplock.la -xlatordir = $(libdir)/glusterfs/$(GLUSTER_VERSION)/xlator/features - -oplock_la_LDFLAGS = -module -avoidversion -lglusterfs - -oplock_la_SOURCES = oplock.c -#oplock_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la - -noinst_HEADERS = oplock.h - -GLUSTERDIR=$(includedir)/glusterfs - -AM_CFLAGS = -fPIC -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE -Wall -D$(GF_HOST_OS) \ - -I$(GLUSTERDIR) -I$(GLUSTERDIR)/rpc -I$(GLUSTERDIR)/server \ - -shared -nostartfiles $(GF_CFLAGS) - -CLEANFILES = diff --git a/xlators/features/oplock/oplock.c b/xlators/features/oplock/oplock.c deleted file mode 100644 index 1a9e5b5..0000000 --- a/xlators/features/oplock/oplock.c +++ /dev/null @@ -1,220 +0,0 @@ -/* - * Copyright (c) 2010 Red Hat, Inc. - * - * This file is part of CloudFS. - * - * CloudFS is free software: you can redistribute it and/or modify it under the - * terms of the GNU Affero General Public License as published by the Free - * Software Foundation, either version 3 of the License, or (at your option) - * any later version. - * - * CloudFS is distributed in the hope that it will be useful, but WITHOUT ANY - * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS - * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more - * details. - * - * You should have received a copy of the GNU Affero General Public License * - * along with CloudFS. If not, see <http://www.gnu.org/licenses/>. - */ - -#include <ctype.h> -#include <sys/uio.h> - -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - -#include "glusterfs.h" -#include "xlator.h" -#include "logging.h" -#include "server/server.h" -#include "server/server-helpers.h" - -#include "oplock.h" - -int -store_op_lock (struct oplock_list *head, void *p1, void *p2, uint64_t v) -{ - struct oplock_entry *entry = CALLOC(1,sizeof(*entry)); - - if (!entry) { - return -1; - } - - entry->ptr1 = p1; - entry->ptr2 = p2; - entry->value = v; - LIST_INSERT_HEAD(head,entry,links); - return 0; -} - -struct oplock_entry * -fetch_op_lock (struct oplock_list *head, void *p1, void *p2) -{ - struct oplock_entry *entry = NULL; - - for (entry = head->lh_first; entry; entry = entry->links.le_next) { - if ((entry->ptr1 == p1) && (entry->ptr2 == p2)) { - return entry; - } - } - - return NULL; -} - -int -oplock_fsetxattr_cbk (call_frame_t *frame, void *cookie, xlator_t *this, - int op_ret, int op_errno) -{ - STACK_UNWIND_STRICT(fsetxattr,frame,op_ret,op_errno); - return 0; -} - -void -oplock_check_for_lock (dict_t *dict, char *key, data_t *value, void *ctx) -{ - char **lock_str = ctx; - - /* Only return the first match. */ - if (*lock_str) { - return; - } - - if (!strcmp(key,"trusted.glusterfs.lock")) { - *lock_str = data_to_str(value); - } -} - -int -oplock_fsetxattr (call_frame_t *frame, xlator_t *this, - fd_t *fd, dict_t *xattr, int flags) -{ - server_state_t *state = CALL_STATE(frame); - char *lock_str = NULL; - inode_t *inode = NULL; - int ret = 0; - int op_errno = 0; - oplock_private_t *priv = this->private; - - dict_foreach(state->dict,oplock_check_for_lock,&lock_str); - if (lock_str) { - inode = fd->inode; - gf_log(this->name,GF_LOG_WARNING, - "got lock request for %d from %p", - inode->ino, state->conn); - ret = store_op_lock(&priv->locks,inode,state->conn,inode->gen); - if (ret != 0) { - gf_log(this->name,GF_LOG_ERROR, - "lock request failed (store_op_lock) for %d", - inode->ino); - op_errno = ENOMEM; - goto err; - } - } - - STACK_WIND(frame,oplock_fsetxattr_cbk, - FIRST_CHILD(this), FIRST_CHILD(this)->fops->fsetxattr, - fd, xattr, flags); - return 0; - -err: - STACK_UNWIND_STRICT(fsetxattr,frame,-1,op_errno); - return 0; -} - -int32_t -oplock_writev_cbk (call_frame_t *frame, - void *cookie, - xlator_t *this, - int32_t op_ret, - int32_t op_errno, - struct iatt *prebuf, - struct iatt *postbuf) -{ - STACK_UNWIND_STRICT (writev, frame, op_ret, op_errno, prebuf, postbuf); - return 0; -} - -int32_t -oplock_writev (call_frame_t *frame, xlator_t *this, fd_t *fd, struct iovec *vector, - int32_t count, off_t offset, struct iobref *iobref) -{ - server_state_t *state = CALL_STATE(frame); - inode_t *inode = fd->inode; - struct oplock_entry *entry = NULL; - oplock_private_t *priv = this->private; - int op_errno = 0; - - entry = fetch_op_lock(&priv->locks,inode,state->conn); - if (entry) { - if (entry->value != inode->gen) { - gf_log(this->name,GF_LOG_WARNING, - "would reject write for %d from %p", - inode->ino, state->conn); - op_errno = EBUSY; - goto err; - } - LIST_REMOVE(entry,links); - FREE(entry); - } - ++(inode->gen); - - STACK_WIND (frame, oplock_writev_cbk, - FIRST_CHILD(this), FIRST_CHILD(this)->fops->writev, - fd, vector, count, offset, iobref); - return 0; - -err: - STACK_UNWIND_STRICT(writev,frame,-1,op_errno,NULL,NULL); - return 0; -} - -int32_t -init (xlator_t *this) -{ - oplock_private_t *priv = NULL; - - if (!this->children || this->children->next) { - gf_log ("oplock", GF_LOG_ERROR, - "FATAL: oplock should have exactly one child"); - return -1; - } - - if (!this->parents) { - gf_log (this->name, GF_LOG_WARNING, - "dangling volume. check volfile "); - } - - priv = CALLOC (1, sizeof(oplock_private_t)); - if (!priv) { - return -1; - } - LIST_INIT(&priv->locks); - this->private = priv; - - gf_log ("oplock", GF_LOG_DEBUG, "oplock xlator loaded"); - return 0; -} - -void -fini (xlator_t *this) -{ - oplock_private_t *priv = this->private; - - FREE (priv); - - return; -} - -struct xlator_fops fops = { - .fsetxattr = oplock_fsetxattr, - .writev = oplock_writev -}; - -struct xlator_cbks cbks = { -}; - -struct volume_options options[] = { - { .key = {NULL} }, -}; diff --git a/xlators/features/oplock/oplock.h b/xlators/features/oplock/oplock.h deleted file mode 100644 index 7aec177..0000000 --- a/xlators/features/oplock/oplock.h +++ /dev/null @@ -1,44 +0,0 @@ -/* - * Copyright (c) 2010 Red Hat, Inc. - * - * This file is part of CloudFS. - * - * CloudFS is free software: you can redistribute it and/or modify it under the - * terms of the GNU Affero General Public License as published by the Free - * Software Foundation, either version 3 of the License, or (at your option) - * any later version. - * - * CloudFS is distributed in the hope that it will be useful, but WITHOUT ANY - * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS - * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more - * details. - * - * You should have received a copy of the GNU Affero General Public License * - * along with CloudFS. If not, see <http://www.gnu.org/licenses/>. - */ - - -#ifndef __CRYPT_H__ -#define __CRYPT_H__ - -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - -#include <sys/queue.h> - -LIST_HEAD(oplock_list,oplock_entry); - -typedef struct { - struct oplock_list locks; -} oplock_private_t; - -struct oplock_entry { - LIST_ENTRY(oplock_entry) links; - void *ptr1; /* NULL means not in use */ - void *ptr2; - uint64_t value; -}; - -#endif /* __CRYPT_H__ */ diff --git a/xlators/features/oplock/src/Makefile.am b/xlators/features/oplock/src/Makefile.am new file mode 100644 index 0000000..5122e91 --- /dev/null +++ b/xlators/features/oplock/src/Makefile.am @@ -0,0 +1,17 @@ +xlator_LTLIBRARIES = oplock.la +xlatordir = $(libdir)/glusterfs/$(GLUSTER_VERSION)/xlator/features + +oplock_la_LDFLAGS = -module -avoidversion -lglusterfs + +oplock_la_SOURCES = oplock.c +#oplock_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la + +noinst_HEADERS = oplock.h + +GLUSTERDIR=$(includedir)/glusterfs + +AM_CFLAGS = -fPIC -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE -Wall -D$(GF_HOST_OS) \ + -I$(GLUSTERDIR) -I$(GLUSTERDIR)/rpc -I$(GLUSTERDIR)/server \ + -shared -nostartfiles $(GF_CFLAGS) + +CLEANFILES = diff --git a/xlators/features/oplock/src/oplock.c b/xlators/features/oplock/src/oplock.c new file mode 100644 index 0000000..1a9e5b5 --- /dev/null +++ b/xlators/features/oplock/src/oplock.c @@ -0,0 +1,220 @@ +/* + * Copyright (c) 2010 Red Hat, Inc. + * + * This file is part of CloudFS. + * + * CloudFS is free software: you can redistribute it and/or modify it under the + * terms of the GNU Affero General Public License as published by the Free + * Software Foundation, either version 3 of the License, or (at your option) + * any later version. + * + * CloudFS is distributed in the hope that it will be useful, but WITHOUT ANY + * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more + * details. + * + * You should have received a copy of the GNU Affero General Public License * + * along with CloudFS. If not, see <http://www.gnu.org/licenses/>. + */ + +#include <ctype.h> +#include <sys/uio.h> + +#ifndef _CONFIG_H +#define _CONFIG_H +#include "config.h" +#endif + +#include "glusterfs.h" +#include "xlator.h" +#include "logging.h" +#include "server/server.h" +#include "server/server-helpers.h" + +#include "oplock.h" + +int +store_op_lock (struct oplock_list *head, void *p1, void *p2, uint64_t v) +{ + struct oplock_entry *entry = CALLOC(1,sizeof(*entry)); + + if (!entry) { + return -1; + } + + entry->ptr1 = p1; + entry->ptr2 = p2; + entry->value = v; + LIST_INSERT_HEAD(head,entry,links); + return 0; +} + +struct oplock_entry * +fetch_op_lock (struct oplock_list *head, void *p1, void *p2) +{ + struct oplock_entry *entry = NULL; + + for (entry = head->lh_first; entry; entry = entry->links.le_next) { + if ((entry->ptr1 == p1) && (entry->ptr2 == p2)) { + return entry; + } + } + + return NULL; +} + +int +oplock_fsetxattr_cbk (call_frame_t *frame, void *cookie, xlator_t *this, + int op_ret, int op_errno) +{ + STACK_UNWIND_STRICT(fsetxattr,frame,op_ret,op_errno); + return 0; +} + +void +oplock_check_for_lock (dict_t *dict, char *key, data_t *value, void *ctx) +{ + char **lock_str = ctx; + + /* Only return the first match. */ + if (*lock_str) { + return; + } + + if (!strcmp(key,"trusted.glusterfs.lock")) { + *lock_str = data_to_str(value); + } +} + +int +oplock_fsetxattr (call_frame_t *frame, xlator_t *this, + fd_t *fd, dict_t *xattr, int flags) +{ + server_state_t *state = CALL_STATE(frame); + char *lock_str = NULL; + inode_t *inode = NULL; + int ret = 0; + int op_errno = 0; + oplock_private_t *priv = this->private; + + dict_foreach(state->dict,oplock_check_for_lock,&lock_str); + if (lock_str) { + inode = fd->inode; + gf_log(this->name,GF_LOG_WARNING, + "got lock request for %d from %p", + inode->ino, state->conn); + ret = store_op_lock(&priv->locks,inode,state->conn,inode->gen); + if (ret != 0) { + gf_log(this->name,GF_LOG_ERROR, + "lock request failed (store_op_lock) for %d", + inode->ino); + op_errno = ENOMEM; + goto err; + } + } + + STACK_WIND(frame,oplock_fsetxattr_cbk, + FIRST_CHILD(this), FIRST_CHILD(this)->fops->fsetxattr, + fd, xattr, flags); + return 0; + +err: + STACK_UNWIND_STRICT(fsetxattr,frame,-1,op_errno); + return 0; +} + +int32_t +oplock_writev_cbk (call_frame_t *frame, + void *cookie, + xlator_t *this, + int32_t op_ret, + int32_t op_errno, + struct iatt *prebuf, + struct iatt *postbuf) +{ + STACK_UNWIND_STRICT (writev, frame, op_ret, op_errno, prebuf, postbuf); + return 0; +} + +int32_t +oplock_writev (call_frame_t *frame, xlator_t *this, fd_t *fd, struct iovec *vector, + int32_t count, off_t offset, struct iobref *iobref) +{ + server_state_t *state = CALL_STATE(frame); + inode_t *inode = fd->inode; + struct oplock_entry *entry = NULL; + oplock_private_t *priv = this->private; + int op_errno = 0; + + entry = fetch_op_lock(&priv->locks,inode,state->conn); + if (entry) { + if (entry->value != inode->gen) { + gf_log(this->name,GF_LOG_WARNING, + "would reject write for %d from %p", + inode->ino, state->conn); + op_errno = EBUSY; + goto err; + } + LIST_REMOVE(entry,links); + FREE(entry); + } + ++(inode->gen); + + STACK_WIND (frame, oplock_writev_cbk, + FIRST_CHILD(this), FIRST_CHILD(this)->fops->writev, + fd, vector, count, offset, iobref); + return 0; + +err: + STACK_UNWIND_STRICT(writev,frame,-1,op_errno,NULL,NULL); + return 0; +} + +int32_t +init (xlator_t *this) +{ + oplock_private_t *priv = NULL; + + if (!this->children || this->children->next) { + gf_log ("oplock", GF_LOG_ERROR, + "FATAL: oplock should have exactly one child"); + return -1; + } + + if (!this->parents) { + gf_log (this->name, GF_LOG_WARNING, + "dangling volume. check volfile "); + } + + priv = CALLOC (1, sizeof(oplock_private_t)); + if (!priv) { + return -1; + } + LIST_INIT(&priv->locks); + this->private = priv; + + gf_log ("oplock", GF_LOG_DEBUG, "oplock xlator loaded"); + return 0; +} + +void +fini (xlator_t *this) +{ + oplock_private_t *priv = this->private; + + FREE (priv); + + return; +} + +struct xlator_fops fops = { + .fsetxattr = oplock_fsetxattr, + .writev = oplock_writev +}; + +struct xlator_cbks cbks = { +}; + +struct volume_options options[] = { + { .key = {NULL} }, +}; diff --git a/xlators/features/oplock/src/oplock.h b/xlators/features/oplock/src/oplock.h new file mode 100644 index 0000000..7aec177 --- /dev/null +++ b/xlators/features/oplock/src/oplock.h @@ -0,0 +1,44 @@ +/* + * Copyright (c) 2010 Red Hat, Inc. + * + * This file is part of CloudFS. + * + * CloudFS is free software: you can redistribute it and/or modify it under the + * terms of the GNU Affero General Public License as published by the Free + * Software Foundation, either version 3 of the License, or (at your option) + * any later version. + * + * CloudFS is distributed in the hope that it will be useful, but WITHOUT ANY + * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more + * details. + * + * You should have received a copy of the GNU Affero General Public License * + * along with CloudFS. If not, see <http://www.gnu.org/licenses/>. + */ + + +#ifndef __CRYPT_H__ +#define __CRYPT_H__ + +#ifndef _CONFIG_H +#define _CONFIG_H +#include "config.h" +#endif + +#include <sys/queue.h> + +LIST_HEAD(oplock_list,oplock_entry); + +typedef struct { + struct oplock_list locks; +} oplock_private_t; + +struct oplock_entry { + LIST_ENTRY(oplock_entry) links; + void *ptr1; /* NULL means not in use */ + void *ptr2; + uint64_t value; +}; + +#endif /* __CRYPT_H__ */ commit 2d865054491750502a7913736b2f54a33d42fd44 Author: Jeff Darcy <jdarcy(a)redhat.com> Date: Tue Jan 25 11:19:48 2011 -0500 Changes/additions related to packaging for Fedora 15. diff --git a/patches/root-inode.patch b/patches/root-inode.patch new file mode 100644 index 0000000..b78ef2e --- /dev/null +++ b/patches/root-inode.patch @@ -0,0 +1,110 @@ +diff --git a/libglusterfs/src/defaults.c b/libglusterfs/src/defaults.c +index 718afeb..ed07a75 100644 +--- a/libglusterfs/src/defaults.c ++++ b/libglusterfs/src/defaults.c +@@ -1258,3 +1258,11 @@ default_mem_acct_init (xlator_t *this) + + return ret; + } ++ ++inode_table_t * ++default_get_itbl (xlator_t *this, void *state) ++{ ++ (void)state; ++ return this->itable; ++} ++ +diff --git a/libglusterfs/src/defaults.h b/libglusterfs/src/defaults.h +index 6e45160..7b37a33 100644 +--- a/libglusterfs/src/defaults.h ++++ b/libglusterfs/src/defaults.h +@@ -676,4 +676,7 @@ default_getspec_cbk (call_frame_t *frame, void *cookie, xlator_t *this, + + int32_t + default_mem_acct_init (xlator_t *this); ++ ++inode_table_t * ++default_get_itbl (xlator_t *this, void *state); + #endif /* _DEFAULTS_H */ +diff --git a/libglusterfs/src/xlator.c b/libglusterfs/src/xlator.c +index 37ea816..bfa356b 100644 +--- a/libglusterfs/src/xlator.c ++++ b/libglusterfs/src/xlator.c +@@ -103,6 +103,10 @@ fill_defaults (xlator_t *xl) + if (!xl->mem_acct_init) + xl->mem_acct_init = default_mem_acct_init; + ++ if (!xl->get_itbl) { ++ xl->get_itbl = default_get_itbl; ++ } ++ + return; + } + +diff --git a/libglusterfs/src/xlator.h b/libglusterfs/src/xlator.h +index e583e8c..d0fe7f3 100644 +--- a/libglusterfs/src/xlator.h ++++ b/libglusterfs/src/xlator.h +@@ -820,6 +820,7 @@ struct _xlator { + glusterfs_ctx_t *ctx; + glusterfs_graph_t *graph; /* not set for fuse */ + inode_table_t *itable; ++ inode_table_t *(*get_itbl) (xlator_t *this, void *state); + char init_succeeded; + void *private; + struct mem_acct mem_acct; +diff --git a/rpc/rpc-lib/src/rpc-transport.h b/rpc/rpc-lib/src/rpc-transport.h +index 9db24c0..33b38fb 100644 +--- a/rpc/rpc-lib/src/rpc-transport.h ++++ b/rpc/rpc-lib/src/rpc-transport.h +@@ -212,6 +212,7 @@ struct rpc_transport { + uint64_t total_bytes_write; + + struct list_head list; ++ void *xlator_data; + }; + + struct rpc_transport_ops { +diff --git a/xlators/protocol/server/src/server-helpers.c b/xlators/protocol/server/src/server-helpers.c +index 69fb5f6..5e617cf 100644 +--- a/xlators/protocol/server/src/server-helpers.c ++++ b/xlators/protocol/server/src/server-helpers.c +@@ -761,6 +761,7 @@ server_alloc_frame (rpcsvc_request_t *req) + call_frame_t *frame = NULL; + server_state_t *state = NULL; + server_connection_t *conn = NULL; ++ xlator_t *xl = NULL; + + GF_VALIDATE_OR_GOTO("server", req, out); + GF_VALIDATE_OR_GOTO("server", req->trans, out); +@@ -777,12 +778,15 @@ server_alloc_frame (rpcsvc_request_t *req) + state = GF_CALLOC (1, sizeof (*state), gf_server_mt_state_t); + GF_VALIDATE_OR_GOTO("server", state, out); + +- if (conn->bound_xl) +- state->itable = conn->bound_xl->itable; +- + state->xprt = rpc_transport_ref (req->trans); + state->conn = conn; + ++ xl = conn->bound_xl; ++ if (xl) { ++ state->itable = xl->get_itbl(xl,state); ++ } ++ /* TBD: seems like it should be an error for xl to be NULL. */ ++ + state->resolve.fd_no = -1; + state->resolve2.fd_no = -1; + +diff --git a/xlators/protocol/server/src/server.c b/xlators/protocol/server/src/server.c +index 7c92441..ecb199e 100644 +--- a/xlators/protocol/server/src/server.c ++++ b/xlators/protocol/server/src/server.c +@@ -422,6 +422,7 @@ server_rpc_notify (rpcsvc_t *rpc, void *xl, rpcsvc_event_t event, + conn = get_server_conn_state (this, xprt); + if (conn) + server_connection_cleanup (this, conn); ++ xprt->xlator_data = NULL; + + gf_log (this->name, GF_LOG_INFO, + "disconnected connection from %s", diff --git a/patches/root_inode.patch b/patches/root_inode.patch deleted file mode 100644 index b78ef2e..0000000 --- a/patches/root_inode.patch +++ /dev/null @@ -1,110 +0,0 @@ -diff --git a/libglusterfs/src/defaults.c b/libglusterfs/src/defaults.c -index 718afeb..ed07a75 100644 ---- a/libglusterfs/src/defaults.c -+++ b/libglusterfs/src/defaults.c -@@ -1258,3 +1258,11 @@ default_mem_acct_init (xlator_t *this) - - return ret; - } -+ -+inode_table_t * -+default_get_itbl (xlator_t *this, void *state) -+{ -+ (void)state; -+ return this->itable; -+} -+ -diff --git a/libglusterfs/src/defaults.h b/libglusterfs/src/defaults.h -index 6e45160..7b37a33 100644 ---- a/libglusterfs/src/defaults.h -+++ b/libglusterfs/src/defaults.h -@@ -676,4 +676,7 @@ default_getspec_cbk (call_frame_t *frame, void *cookie, xlator_t *this, - - int32_t - default_mem_acct_init (xlator_t *this); -+ -+inode_table_t * -+default_get_itbl (xlator_t *this, void *state); - #endif /* _DEFAULTS_H */ -diff --git a/libglusterfs/src/xlator.c b/libglusterfs/src/xlator.c -index 37ea816..bfa356b 100644 ---- a/libglusterfs/src/xlator.c -+++ b/libglusterfs/src/xlator.c -@@ -103,6 +103,10 @@ fill_defaults (xlator_t *xl) - if (!xl->mem_acct_init) - xl->mem_acct_init = default_mem_acct_init; - -+ if (!xl->get_itbl) { -+ xl->get_itbl = default_get_itbl; -+ } -+ - return; - } - -diff --git a/libglusterfs/src/xlator.h b/libglusterfs/src/xlator.h -index e583e8c..d0fe7f3 100644 ---- a/libglusterfs/src/xlator.h -+++ b/libglusterfs/src/xlator.h -@@ -820,6 +820,7 @@ struct _xlator { - glusterfs_ctx_t *ctx; - glusterfs_graph_t *graph; /* not set for fuse */ - inode_table_t *itable; -+ inode_table_t *(*get_itbl) (xlator_t *this, void *state); - char init_succeeded; - void *private; - struct mem_acct mem_acct; -diff --git a/rpc/rpc-lib/src/rpc-transport.h b/rpc/rpc-lib/src/rpc-transport.h -index 9db24c0..33b38fb 100644 ---- a/rpc/rpc-lib/src/rpc-transport.h -+++ b/rpc/rpc-lib/src/rpc-transport.h -@@ -212,6 +212,7 @@ struct rpc_transport { - uint64_t total_bytes_write; - - struct list_head list; -+ void *xlator_data; - }; - - struct rpc_transport_ops { -diff --git a/xlators/protocol/server/src/server-helpers.c b/xlators/protocol/server/src/server-helpers.c -index 69fb5f6..5e617cf 100644 ---- a/xlators/protocol/server/src/server-helpers.c -+++ b/xlators/protocol/server/src/server-helpers.c -@@ -761,6 +761,7 @@ server_alloc_frame (rpcsvc_request_t *req) - call_frame_t *frame = NULL; - server_state_t *state = NULL; - server_connection_t *conn = NULL; -+ xlator_t *xl = NULL; - - GF_VALIDATE_OR_GOTO("server", req, out); - GF_VALIDATE_OR_GOTO("server", req->trans, out); -@@ -777,12 +778,15 @@ server_alloc_frame (rpcsvc_request_t *req) - state = GF_CALLOC (1, sizeof (*state), gf_server_mt_state_t); - GF_VALIDATE_OR_GOTO("server", state, out); - -- if (conn->bound_xl) -- state->itable = conn->bound_xl->itable; -- - state->xprt = rpc_transport_ref (req->trans); - state->conn = conn; - -+ xl = conn->bound_xl; -+ if (xl) { -+ state->itable = xl->get_itbl(xl,state); -+ } -+ /* TBD: seems like it should be an error for xl to be NULL. */ -+ - state->resolve.fd_no = -1; - state->resolve2.fd_no = -1; - -diff --git a/xlators/protocol/server/src/server.c b/xlators/protocol/server/src/server.c -index 7c92441..ecb199e 100644 ---- a/xlators/protocol/server/src/server.c -+++ b/xlators/protocol/server/src/server.c -@@ -422,6 +422,7 @@ server_rpc_notify (rpcsvc_t *rpc, void *xl, rpcsvc_event_t event, - conn = get_server_conn_state (this, xprt); - if (conn) - server_connection_cleanup (this, conn); -+ xprt->xlator_data = NULL; - - gf_log (this->name, GF_LOG_INFO, - "disconnected connection from %s", diff --git a/pkg/Makefile.am b/pkg/Makefile.am new file mode 100644 index 0000000..d13591b --- /dev/null +++ b/pkg/Makefile.am @@ -0,0 +1,11 @@ +EXTRA_DIST = autogen.sh COPYING cloudfs.spec + +SUBDIRS = cloud crypt oplock + +CLEANFILES = + +gitclean: distclean + find . -name Makefile.in -exec rm -f {} \; + find . -name Makefile -exec rm -f {} \; + rm -fr autom4te.cache + rm -f missing aclocal.m4 config.h.in config.guess config.sub ltmain.sh install-sh configure depcomp diff --git a/pkg/autogen.sh b/pkg/autogen.sh new file mode 100755 index 0000000..39f24fd --- /dev/null +++ b/pkg/autogen.sh @@ -0,0 +1,7 @@ +#!/bin/sh + +aclocal +autoheader +(libtoolize --automake --copy --force || glibtoolize --automake --copy --force) +autoconf +automake --add-missing --copy --foreign diff --git a/pkg/cloudfs.spec b/pkg/cloudfs.spec new file mode 100644 index 0000000..6a2c957 --- /dev/null +++ b/pkg/cloudfs.spec @@ -0,0 +1,62 @@ +# if you make changes, the it is advised to increment this number, and provide +# a descriptive suffix to identify who owns or what the change represents +# e.g. release_version 2.MSW +%define release 1%{?dist} + +Summary: Cloud File System +Name: cloudfs +Version: 0.5 +Release: %{release} +License: AGPLv3+ +Group: System Environment/Base +Vendor: Red Hat +Packager: cloudfs- +URL: http://cloudfs.org +Source0: cloudfs-0.5.tgz +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root + +Requires: glusterfs >= 3.1.1 +BuildRequires: glusterfs-devel >= 3.1.1 +BuildRequires: bison flex +BuildRequires: gcc make + +%description +CloudFS is a cloud-capable filesystem based on GlusterFS (http://gluster.org) +with additional authentication/encryption/multi-tenancy features. + +Summary: CloudFS +Group: Applications/File +Provides: cloudfs = %{version}-%{release} + +%prep +%setup -q -n %{name}-%{version} + +%build + +%configure + +%{__make} %{?_smp_mflags} + + +%install +%{__rm} -rf %{buildroot} +%{__make} install DESTDIR=%{buildroot} + +# Remove unwanted files from all the shared libraries +find %{buildroot}%{_libdir} -name '*.a' -delete +find %{buildroot}%{_libdir} -name '*.la' -delete + +%clean +%{__rm} -rf %{buildroot} + +%files +%defattr(-,root,root) +%doc COPYING +%{_libdir}/glusterfs/3.1.1/xlator/cluster/*.so* +%{_libdir}/glusterfs/3.1.1/xlator/encryption/*.so* +%{_libdir}/glusterfs/3.1.1/xlator/features/*.so* + +%changelog +* Fri Jan 21 2011 Jeff Darcy <jdarcy(a)redhat.com> - 0.5 +- Original version based on GlusterFS 3.1.1 + diff --git a/pkg/cloudfs.spec.in b/pkg/cloudfs.spec.in new file mode 100644 index 0000000..01e8196 --- /dev/null +++ b/pkg/cloudfs.spec.in @@ -0,0 +1,62 @@ +# if you make changes, the it is advised to increment this number, and provide +# a descriptive suffix to identify who owns or what the change represents +# e.g. release_version 2.MSW +%define release 1%{?dist} + +Summary: Cloud File System +Name: @PACKAGE_NAME@ +Version: @PACKAGE_VERSION@ +Release: %{release} +License: AGPLv3+ +Group: System Environment/Base +Vendor: Red Hat +Packager: @PACKAGE_BUGREPORT@ +URL: http://cloudfs.org +Source0: cloudfs-0.5.tgz +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root + +Requires: glusterfs >= 3.1.1 +BuildRequires: glusterfs-devel >= 3.1.1 +BuildRequires: bison flex +BuildRequires: gcc make + +%description +CloudFS is a cloud-capable filesystem based on GlusterFS (http://gluster.org) +with additional authentication/encryption/multi-tenancy features. + +Summary: CloudFS +Group: Applications/File +Provides: cloudfs = %{version}-%{release} + +%prep +%setup -q -n %{name}-%{version} + +%build + +%configure + +%{__make} %{?_smp_mflags} + + +%install +%{__rm} -rf %{buildroot} +%{__make} install DESTDIR=%{buildroot} + +# Remove unwanted files from all the shared libraries +find %{buildroot}%{_libdir} -name '*.a' -delete +find %{buildroot}%{_libdir} -name '*.la' -delete + +%clean +%{__rm} -rf %{buildroot} + +%files +%defattr(-,root,root) +%doc COPYING +%{_libdir}/glusterfs/@GLUSTER_VERSION@/xlator/cluster/*.so* +%{_libdir}/glusterfs/@GLUSTER_VERSION@/xlator/encryption/*.so* +%{_libdir}/glusterfs/@GLUSTER_VERSION@/xlator/features/*.so* + +%changelog +* Fri Jan 21 2011 Jeff Darcy <jdarcy(a)redhat.com> - 0.5 +- Original version based on GlusterFS 3.1.1 + diff --git a/pkg/configure.ac b/pkg/configure.ac new file mode 100644 index 0000000..100c21e --- /dev/null +++ b/pkg/configure.ac @@ -0,0 +1,84 @@ +dnl Copyright (c) 2010-2011 Red Hat, Inc. <http://www.redhat.com> +dnl This file is part of CloudFS. +dnl +dnl CloudFS is free software; you can redistribute it and/or modify +dnl it under the terms of the GNU Affero General Public License as published by +dnl the Free Software Foundation; either version 3 of the License, or +dnl (at your option) any later version. +dnl +dnl CloudFS is distributed in the hope that it will be useful, +dnl but WITHOUT ANY WARRANTY; without even the implied warranty of +dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +dnl GNU Affero General Public License for more details. +dnl +dnl You should have received a copy of the GNU Affero General Public License +dnl along with this program. If not, see <http://www.gnu.org/licenses/>. + +AC_INIT([cloudfs],[0.5],[cloudfs-]) + +AM_INIT_AUTOMAKE + +AM_CONFIG_HEADER([config.h]) + +AC_CONFIG_FILES([Makefile + cloud/Makefile + crypt/Makefile + oplock/Makefile + cloudfs.spec]) + +AC_CANONICAL_HOST + +AC_PROG_CC +AC_PROG_LIBTOOL +AC_CHECK_TOOL([LD],[ld]) + +dnl We don't bother checking for things that GlusterFS already needed. +AC_CHECK_HEADERS([glusterfs/glusterfs.h]) +AC_CHECK_HEADERS([openssl/des.h]) + +GF_DISTRIBUTION= +AC_CHECK_FILE([/etc/debian_version]) +AC_CHECK_FILE([/etc/SuSE-release]) +AC_CHECK_FILE([/etc/redhat-release]) + +if test "x$ac_cv_file__etc_debian_version" = "xyes"; then + GF_DISTRIBUTION=Debian +fi +if test "x$ac_cv_file__etc_SuSE_release" = "xyes"; then + GF_DISTRIBUTION=SuSE +fi +if test "x$ac_cv_file__etc_redhat_release" = "xyes"; then + GF_DISTRIBUTION=Redhat +fi + +dnl If we don't match the glusterfs package's behavior here, then locking.h +dnl selects the wrong lock types and every structure containing a lock gets +dnl completely messed up. The visible result is usually a weird segfault in +dnl the middle of STACK_WIND *after* a call to any callback we define. All +dnl of this pain is the result of upstream once having supported Mac OS X. +AC_CHECK_LIB([pthread], [pthread_mutex_init], , AC_MSG_ERROR([Posix threads library is required to build glusterfs])) +AC_CHECK_FUNC([pthread_spin_init], [have_spinlock=yes]) +if test "x${have_spinlock}" = "xyes"; then + AC_DEFINE(HAVE_SPINLOCK, 1, [define if found spinlock]) +fi + +GLUSTER_VERSION=3.1.1 +GF_HOST_OS="" +GF_LDFLAGS="-rdynamic" +GF_HOST_OS="GF_LINUX_HOST_OS" +GF_CFLAGS="" +GF_GLUSTERFS_CFLAGS="${GF_CFLAGS}" +GF_LDADD="" +INCLUDES="" + +AC_SUBST(GF_DISTRIBUTION) +AC_SUBST(GLUSTER_VERSION) +AC_SUBST(GF_HOST_OS) +AC_SUBST(GF_GLUSTERFS_CFLAGS) +AC_SUBST(GF_CFLAGS) +AC_SUBST(GF_LDFLAGS) +AC_SUBST(GF_LDADD) +AC_SUBST(INCLUDES) +AC_SUBST(HAVE_SPINLOCK) + +AC_OUTPUT diff --git a/xlators/cluster/cloud/src/Makefile.am b/xlators/cluster/cloud/src/Makefile.am index 36271f7..2477932 100644 --- a/xlators/cluster/cloud/src/Makefile.am +++ b/xlators/cluster/cloud/src/Makefile.am @@ -1,19 +1,18 @@ xlator_LTLIBRARIES = cloud.la -xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/cluster +xlatordir = $(libdir)/glusterfs/$(GLUSTER_VERSION)/xlator/cluster -cloud_la_LDFLAGS = -module -avoidversion +cloud_la_LDFLAGS = -module -avoidversion -lglusterfs cloud_la_SOURCES = cloud.c -cloud_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la +#cloud_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la noinst_HEADERS = cloud-mem-types.h -AM_CFLAGS = -fPIC -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE -Wall -D$(GF_HOST_OS)\ - -I$(top_srcdir)/libglusterfs/src \ - -I$(top_srcdir)/rpc/rpc-lib/src \ - -I$(top_srcdir)/rpc/xdr/src \ - -I$(top_srcdir)/xlators/protocol/server/src \ +GLUSTERDIR=$(includedir)/glusterfs + +AM_CFLAGS = -fPIC -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE -Wall -D$(GF_HOST_OS) \ + -I$(GLUSTERDIR) -I$(GLUSTERDIR)/rpc -I$(GLUSTERDIR)/server \ -shared -nostartfiles $(GF_CFLAGS) CLEANFILES = diff --git a/xlators/cluster/cloud/src/cloud.c b/xlators/cluster/cloud/src/cloud.c index e800ba1..ed5419d 100644 --- a/xlators/cluster/cloud/src/cloud.c +++ b/xlators/cluster/cloud/src/cloud.c @@ -24,9 +24,9 @@ #include <fnmatch.h> #include <pthread.h> #include "xlator.h" -#include "rpc-transport.h" -#include "glusterfs3-xdr.h" -#include "server.h" +#include "rpc/rpc-transport.h" +#include "rpc/glusterfs3-xdr.h" +#include "server/server.h" #include "glusterfs.h" #include "byte-order.h" #include "xlator.h" @@ -101,6 +101,7 @@ set_subvol (xlator_t *this, void *state, xlator_t *subvol) static loc_t loc = { .path = "/", .inode = NULL }; dict_t *dict = NULL; static uuid_t gfid; /* TBD: might as well be global. */ + int ret = 0; gf_log(this->name,CLOUD_LEVEL,"associating %p with %s", xprt, subvol->name); @@ -113,10 +114,16 @@ set_subvol (xlator_t *this, void *state, xlator_t *subvol) if (dict) { memset(gfid,0,15); gfid[15] = 1; - dict_set_static_bin(dict,"gfid-req",gfid,16); - /* TBD: return value */ - STACK_WIND(frame,root_lookup_cbk,subvol, - subvol->fops->lookup,&loc,dict); + ret = dict_set_static_bin(dict,"gfid-req",gfid,16); + if (ret == 0) { + STACK_WIND(frame,root_lookup_cbk,subvol, + subvol->fops->lookup,&loc,dict); + } + else { + gf_log(this->name,GF_LOG_WARNING, + "could not set root gfid for %s", + subvol->name); + } dict_unref(dict); } } @@ -207,8 +214,6 @@ cloud_lookup_cbk (call_frame_t *frame, void *cookie, xlator_t *this, inode_t *inode, struct iatt *stbuf, dict_t *xattr, struct iatt *postparent) { - inode_table_t *table = NULL; - /* * Copied from server_lookup_cbk because they use BOUND_XL and * thus don't properly evaluate whether it's necessary. diff --git a/xlators/encryption/crypt/src/Makefile.am b/xlators/encryption/crypt/src/Makefile.am index ca1c359..a558228 100644 --- a/xlators/encryption/crypt/src/Makefile.am +++ b/xlators/encryption/crypt/src/Makefile.am @@ -1,14 +1,17 @@ xlator_LTLIBRARIES = crypt.la -xlatordir = $(libdir)/glusterfs/$(PACKAGE_VERSION)/xlator/encryption +xlatordir = $(libdir)/glusterfs/$(GLUSTER_VERSION)/xlator/encryption -crypt_la_LDFLAGS = -module -avoidversion -lssl +crypt_la_LDFLAGS = -module -avoidversion -lssl -lglusterfs crypt_la_SOURCES = crypt.c -crypt_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la +#crypt_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la noinst_HEADERS = crypt.h +GLUSTERDIR=$(includedir)/glusterfs + AM_CFLAGS = -fPIC -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE -Wall -D$(GF_HOST_OS) \ - -I$(top_srcdir)/libglusterfs/src -shared -nostartfiles $(GF_CFLAGS) + -I$(GLUSTERDIR) -I$(GLUSTERDIR)/rpc -I$(GLUSTERDIR)/server \ + -shared -nostartfiles $(GF_CFLAGS) CLEANFILES = diff --git a/xlators/encryption/crypt/src/crypt.c b/xlators/encryption/crypt/src/crypt.c index 9d0aab3..35cc31b 100644 --- a/xlators/encryption/crypt/src/crypt.c +++ b/xlators/encryption/crypt/src/crypt.c @@ -684,7 +684,7 @@ crypt_writev (call_frame_t *frame, goto err; } - if (dict_set_str(local->xattr,"user.glusterfs.lock","fubar") != 0) { + if (dict_set_str(local->xattr,"trusted.glusterfs.lock","fubar") != 0) { op_errno = EIO; dict_unref(local->xattr); goto err; diff --git a/xlators/features/oplock/Makefile.am b/xlators/features/oplock/Makefile.am new file mode 100644 index 0000000..5122e91 --- /dev/null +++ b/xlators/features/oplock/Makefile.am @@ -0,0 +1,17 @@ +xlator_LTLIBRARIES = oplock.la +xlatordir = $(libdir)/glusterfs/$(GLUSTER_VERSION)/xlator/features + +oplock_la_LDFLAGS = -module -avoidversion -lglusterfs + +oplock_la_SOURCES = oplock.c +#oplock_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la + +noinst_HEADERS = oplock.h + +GLUSTERDIR=$(includedir)/glusterfs + +AM_CFLAGS = -fPIC -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE -Wall -D$(GF_HOST_OS) \ + -I$(GLUSTERDIR) -I$(GLUSTERDIR)/rpc -I$(GLUSTERDIR)/server \ + -shared -nostartfiles $(GF_CFLAGS) + +CLEANFILES = diff --git a/xlators/features/oplock/oplock.c b/xlators/features/oplock/oplock.c new file mode 100644 index 0000000..1a9e5b5 --- /dev/null +++ b/xlators/features/oplock/oplock.c @@ -0,0 +1,220 @@ +/* + * Copyright (c) 2010 Red Hat, Inc. + * + * This file is part of CloudFS. + * + * CloudFS is free software: you can redistribute it and/or modify it under the + * terms of the GNU Affero General Public License as published by the Free + * Software Foundation, either version 3 of the License, or (at your option) + * any later version. + * + * CloudFS is distributed in the hope that it will be useful, but WITHOUT ANY + * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more + * details. + * + * You should have received a copy of the GNU Affero General Public License * + * along with CloudFS. If not, see <http://www.gnu.org/licenses/>. + */ + +#include <ctype.h> +#include <sys/uio.h> + +#ifndef _CONFIG_H +#define _CONFIG_H +#include "config.h" +#endif + +#include "glusterfs.h" +#include "xlator.h" +#include "logging.h" +#include "server/server.h" +#include "server/server-helpers.h" + +#include "oplock.h" + +int +store_op_lock (struct oplock_list *head, void *p1, void *p2, uint64_t v) +{ + struct oplock_entry *entry = CALLOC(1,sizeof(*entry)); + + if (!entry) { + return -1; + } + + entry->ptr1 = p1; + entry->ptr2 = p2; + entry->value = v; + LIST_INSERT_HEAD(head,entry,links); + return 0; +} + +struct oplock_entry * +fetch_op_lock (struct oplock_list *head, void *p1, void *p2) +{ + struct oplock_entry *entry = NULL; + + for (entry = head->lh_first; entry; entry = entry->links.le_next) { + if ((entry->ptr1 == p1) && (entry->ptr2 == p2)) { + return entry; + } + } + + return NULL; +} + +int +oplock_fsetxattr_cbk (call_frame_t *frame, void *cookie, xlator_t *this, + int op_ret, int op_errno) +{ + STACK_UNWIND_STRICT(fsetxattr,frame,op_ret,op_errno); + return 0; +} + +void +oplock_check_for_lock (dict_t *dict, char *key, data_t *value, void *ctx) +{ + char **lock_str = ctx; + + /* Only return the first match. */ + if (*lock_str) { + return; + } + + if (!strcmp(key,"trusted.glusterfs.lock")) { + *lock_str = data_to_str(value); + } +} + +int +oplock_fsetxattr (call_frame_t *frame, xlator_t *this, + fd_t *fd, dict_t *xattr, int flags) +{ + server_state_t *state = CALL_STATE(frame); + char *lock_str = NULL; + inode_t *inode = NULL; + int ret = 0; + int op_errno = 0; + oplock_private_t *priv = this->private; + + dict_foreach(state->dict,oplock_check_for_lock,&lock_str); + if (lock_str) { + inode = fd->inode; + gf_log(this->name,GF_LOG_WARNING, + "got lock request for %d from %p", + inode->ino, state->conn); + ret = store_op_lock(&priv->locks,inode,state->conn,inode->gen); + if (ret != 0) { + gf_log(this->name,GF_LOG_ERROR, + "lock request failed (store_op_lock) for %d", + inode->ino); + op_errno = ENOMEM; + goto err; + } + } + + STACK_WIND(frame,oplock_fsetxattr_cbk, + FIRST_CHILD(this), FIRST_CHILD(this)->fops->fsetxattr, + fd, xattr, flags); + return 0; + +err: + STACK_UNWIND_STRICT(fsetxattr,frame,-1,op_errno); + return 0; +} + +int32_t +oplock_writev_cbk (call_frame_t *frame, + void *cookie, + xlator_t *this, + int32_t op_ret, + int32_t op_errno, + struct iatt *prebuf, + struct iatt *postbuf) +{ + STACK_UNWIND_STRICT (writev, frame, op_ret, op_errno, prebuf, postbuf); + return 0; +} + +int32_t +oplock_writev (call_frame_t *frame, xlator_t *this, fd_t *fd, struct iovec *vector, + int32_t count, off_t offset, struct iobref *iobref) +{ + server_state_t *state = CALL_STATE(frame); + inode_t *inode = fd->inode; + struct oplock_entry *entry = NULL; + oplock_private_t *priv = this->private; + int op_errno = 0; + + entry = fetch_op_lock(&priv->locks,inode,state->conn); + if (entry) { + if (entry->value != inode->gen) { + gf_log(this->name,GF_LOG_WARNING, + "would reject write for %d from %p", + inode->ino, state->conn); + op_errno = EBUSY; + goto err; + } + LIST_REMOVE(entry,links); + FREE(entry); + } + ++(inode->gen); + + STACK_WIND (frame, oplock_writev_cbk, + FIRST_CHILD(this), FIRST_CHILD(this)->fops->writev, + fd, vector, count, offset, iobref); + return 0; + +err: + STACK_UNWIND_STRICT(writev,frame,-1,op_errno,NULL,NULL); + return 0; +} + +int32_t +init (xlator_t *this) +{ + oplock_private_t *priv = NULL; + + if (!this->children || this->children->next) { + gf_log ("oplock", GF_LOG_ERROR, + "FATAL: oplock should have exactly one child"); + return -1; + } + + if (!this->parents) { + gf_log (this->name, GF_LOG_WARNING, + "dangling volume. check volfile "); + } + + priv = CALLOC (1, sizeof(oplock_private_t)); + if (!priv) { + return -1; + } + LIST_INIT(&priv->locks); + this->private = priv; + + gf_log ("oplock", GF_LOG_DEBUG, "oplock xlator loaded"); + return 0; +} + +void +fini (xlator_t *this) +{ + oplock_private_t *priv = this->private; + + FREE (priv); + + return; +} + +struct xlator_fops fops = { + .fsetxattr = oplock_fsetxattr, + .writev = oplock_writev +}; + +struct xlator_cbks cbks = { +}; + +struct volume_options options[] = { + { .key = {NULL} }, +}; diff --git a/xlators/features/oplock/oplock.h b/xlators/features/oplock/oplock.h new file mode 100644 index 0000000..7aec177 --- /dev/null +++ b/xlators/features/oplock/oplock.h @@ -0,0 +1,44 @@ +/* + * Copyright (c) 2010 Red Hat, Inc. + * + * This file is part of CloudFS. + * + * CloudFS is free software: you can redistribute it and/or modify it under the + * terms of the GNU Affero General Public License as published by the Free + * Software Foundation, either version 3 of the License, or (at your option) + * any later version. + * + * CloudFS is distributed in the hope that it will be useful, but WITHOUT ANY + * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more + * details. + * + * You should have received a copy of the GNU Affero General Public License * + * along with CloudFS. If not, see <http://www.gnu.org/licenses/>. + */ + + +#ifndef __CRYPT_H__ +#define __CRYPT_H__ + +#ifndef _CONFIG_H +#define _CONFIG_H +#include "config.h" +#endif + +#include <sys/queue.h> + +LIST_HEAD(oplock_list,oplock_entry); + +typedef struct { + struct oplock_list locks; +} oplock_private_t; + +struct oplock_entry { + LIST_ENTRY(oplock_entry) links; + void *ptr1; /* NULL means not in use */ + void *ptr2; + uint64_t value; +}; + +#endif /* __CRYPT_H__ */

1 0

patches/dht-fsetxattr.patch
by Jeff Darcy 25 Jan '11

25 Jan '11

patches/dht-fsetxattr.patch | 67 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 67 insertions(+) New commits: commit 08e677c27e8296a9be2659405c969aa9784510c6 Author: Jeff Darcy <jdarcy(a)redhat.com> Date: Tue Jan 25 10:27:06 2011 -0500 Patch for DHT using wrong subvolume via default_fsetxattr. diff --git a/patches/dht-fsetxattr.patch b/patches/dht-fsetxattr.patch new file mode 100644 index 0000000..4abee52 --- /dev/null +++ b/patches/dht-fsetxattr.patch @@ -0,0 +1,67 @@ +diff --git a/xlators/cluster/dht/src/dht-common.c b/xlators/cluster/dht/src/dht-common.c +index e204726..df0033a 100644 +--- a/xlators/cluster/dht/src/dht-common.c ++++ b/xlators/cluster/dht/src/dht-common.c +@@ -2068,6 +2068,50 @@ err: + return 0; + } + ++int ++dht_fsetxattr (call_frame_t *frame, xlator_t *this, ++ fd_t *fd, dict_t *xattr, int flags) ++{ ++ xlator_t *subvol = NULL; ++ dht_local_t *local = NULL; ++ int op_errno = EINVAL; ++ ++ VALIDATE_OR_GOTO (frame, err); ++ VALIDATE_OR_GOTO (this, err); ++ VALIDATE_OR_GOTO (fd, err); ++ VALIDATE_OR_GOTO (fd->inode, err); ++ ++ subvol = dht_subvol_get_cached (this, fd->inode); ++ if (!subvol) { ++ gf_log (this->name, GF_LOG_DEBUG, ++ "no cached subvolume for fd=%p", fd); ++ op_errno = EINVAL; ++ goto err; ++ } ++ ++ local = dht_local_init (frame); ++ if (!local) { ++ op_errno = ENOMEM; ++ gf_log (this->name, GF_LOG_ERROR, ++ "Out of memory"); ++ goto err; ++ } ++ ++ local->inode = inode_ref (fd->inode); ++ local->call_cnt = 1; ++ ++ STACK_WIND (frame, dht_err_cbk, subvol, subvol->fops->fsetxattr, ++ fd, xattr, flags); ++ ++ return 0; ++ ++err: ++ op_errno = (op_errno == -1) ? errno : op_errno; ++ DHT_STACK_UNWIND (setxattr, frame, -1, op_errno); ++ ++ return 0; ++} ++ + + int + dht_removexattr (call_frame_t *frame, xlator_t *this, +diff --git a/xlators/cluster/dht/src/dht.c b/xlators/cluster/dht/src/dht.c +index 93d01f1..3f81ba7 100644 +--- a/xlators/cluster/dht/src/dht.c ++++ b/xlators/cluster/dht/src/dht.c +@@ -491,6 +491,7 @@ struct xlator_fops fops = { + .access = dht_access, + .readlink = dht_readlink, + .setxattr = dht_setxattr, ++ .fsetxattr = dht_fsetxattr, + .getxattr = dht_getxattr, + .removexattr = dht_removexattr, + .open = dht_open,

1 0

3 commits - patches/root_inode.patch xlators/cluster
by Jeff Darcy 18 Jan '11

18 Jan '11

patches/root_inode.patch | 110 +++++++++ xlators/cluster/cloud/src/Makefile.am | 6 xlators/cluster/cloud/src/cloud-mem-types.h | 6 xlators/cluster/cloud/src/cloud.c | 318 ++++++++++++++++++++-------- 4 files changed, 346 insertions(+), 94 deletions(-) New commits: commit e760714b0ec60530eeba4dc0778525ec49386731 Author: Jeff Darcy <jdarcy(a)redhat.com> Date: Tue Jan 18 14:38:50 2011 -0500 Store virtualized xlator in rpc_transport_t. diff --git a/patches/root_inode.patch b/patches/root_inode.patch index d426828..b78ef2e 100644 --- a/patches/root_inode.patch +++ b/patches/root_inode.patch @@ -53,6 +53,18 @@ index e583e8c..d0fe7f3 100644 char init_succeeded; void *private; struct mem_acct mem_acct; +diff --git a/rpc/rpc-lib/src/rpc-transport.h b/rpc/rpc-lib/src/rpc-transport.h +index 9db24c0..33b38fb 100644 +--- a/rpc/rpc-lib/src/rpc-transport.h ++++ b/rpc/rpc-lib/src/rpc-transport.h +@@ -212,6 +212,7 @@ struct rpc_transport { + uint64_t total_bytes_write; + + struct list_head list; ++ void *xlator_data; + }; + + struct rpc_transport_ops { diff --git a/xlators/protocol/server/src/server-helpers.c b/xlators/protocol/server/src/server-helpers.c index 69fb5f6..5e617cf 100644 --- a/xlators/protocol/server/src/server-helpers.c @@ -84,3 +96,15 @@ index 69fb5f6..5e617cf 100644 state->resolve.fd_no = -1; state->resolve2.fd_no = -1; +diff --git a/xlators/protocol/server/src/server.c b/xlators/protocol/server/src/server.c +index 7c92441..ecb199e 100644 +--- a/xlators/protocol/server/src/server.c ++++ b/xlators/protocol/server/src/server.c +@@ -422,6 +422,7 @@ server_rpc_notify (rpcsvc_t *rpc, void *xl, rpcsvc_event_t event, + conn = get_server_conn_state (this, xprt); + if (conn) + server_connection_cleanup (this, conn); ++ xprt->xlator_data = NULL; + + gf_log (this->name, GF_LOG_INFO, + "disconnected connection from %s", diff --git a/xlators/cluster/cloud/src/cloud.c b/xlators/cluster/cloud/src/cloud.c index a3a9d09..e800ba1 100644 --- a/xlators/cluster/cloud/src/cloud.c +++ b/xlators/cluster/cloud/src/cloud.c @@ -64,25 +64,16 @@ typedef struct { static char special_dir[] = "/_auth/"; static char user_prefix[] = "user-"; -/* TBD: use a scalable per-instance data structure */ -#define MAX_CONNS 10 -struct { - void *xprt; - xlator_t *subvol; -} conn_list[MAX_CONNS]; - xlator_t * get_subvol (xlator_t *this, void *state, char *purpose) { - int i; rpc_transport_t *xprt = ((server_state_t *)state)->xprt; + xlator_t *subvol = xprt->xlator_data; - for (i = 0; i < MAX_CONNS; ++i) { - if (conn_list[i].xprt == xprt) { - gf_log(this->name,CLOUD_LEVEL,"forcing %s to %s", - purpose,conn_list[i].subvol->name); - return conn_list[i].subvol; - } + if (subvol) { + gf_log(this->name,CLOUD_LEVEL,"forcing %s to %s", + purpose,subvol->name); + return subvol; } gf_log(this->name,CLOUD_LEVEL,"using default for %s",purpose); @@ -98,20 +89,6 @@ root_lookup_cbk (call_frame_t *frame, void *cookie, xlator_t *this, gf_log(this->name,GF_LOG_ERROR,"%s: op_ret = %d, op_errno = %d", __func__, op_ret, op_errno); -#if 0 - if (!op_ret) { - xlator_t *subvol; - - subvol = frame->local; - frame->local = NULL; - gf_log(this->name,GF_LOG_ERROR," root inode for %s is %llu", - subvol->name, stbuf->ia_ino); - inode->ino = 1; - inode->ia_type = stbuf->ia_type; - subvol->itable->root = inode; - } -#endif - /* TBD: free frame/stack */ return 0; } @@ -119,47 +96,29 @@ root_lookup_cbk (call_frame_t *frame, void *cookie, xlator_t *this, void set_subvol (xlator_t *this, void *state, xlator_t *subvol) { - int i; - int found = MAX_CONNS; rpc_transport_t *xprt = ((server_state_t *)state)->xprt; call_frame_t *frame = NULL; - static loc_t loc = { .path = "/", .inode = NULL }; - dict_t *dict = NULL; - static uuid_t gfid; /* TBD: might as well be global. */ - - for (i = 0; i < MAX_CONNS; ++i) { - if (conn_list[i].xprt == xprt) { - found = i; - break; + static loc_t loc = { .path = "/", .inode = NULL }; + dict_t *dict = NULL; + static uuid_t gfid; /* TBD: might as well be global. */ + + gf_log(this->name,CLOUD_LEVEL,"associating %p with %s", + xprt, subvol->name); + xprt->xlator_data = subvol; + /* TBD: this bit should really be done from init */ + frame = create_frame(this,this->ctx->pool); + if (frame) { + frame->local = subvol; + dict = dict_new(); + if (dict) { + memset(gfid,0,15); + gfid[15] = 1; + dict_set_static_bin(dict,"gfid-req",gfid,16); + /* TBD: return value */ + STACK_WIND(frame,root_lookup_cbk,subvol, + subvol->fops->lookup,&loc,dict); + dict_unref(dict); } - if ((found == MAX_CONNS) && !conn_list[i].xprt) { - found = i; - } - } - - if (found < MAX_CONNS) { - gf_log(this->name,CLOUD_LEVEL,"associating %p with %s", - xprt, subvol->name); - conn_list[found].xprt = xprt; - conn_list[found].subvol = subvol; - /* TBD: this bit should really be done from init */ - frame = create_frame(this,this->ctx->pool); - if (frame) { - frame->local = subvol; - dict = dict_new(); - if (dict) { - memset(gfid,0,15); - gfid[15] = 1; - dict_set_static_bin(dict,"gfid-req",gfid,16); - /* TBD: return value */ - STACK_WIND(frame,root_lookup_cbk,subvol, - subvol->fops->lookup,&loc,dict); - dict_unref(dict); - } - } - } - else { - gf_log(this->name,GF_LOG_ERROR,"subvol table full"); } } commit 9a7aaba99a14e14003c8cc6f6b913ed664fb6fa0 Author: Jeff Darcy <jdarcy(a)redhat.com> Date: Tue Jan 18 12:58:35 2011 -0500 Use per-tenant inode tables for more complete separation. diff --git a/patches/root_inode.patch b/patches/root_inode.patch new file mode 100644 index 0000000..d426828 --- /dev/null +++ b/patches/root_inode.patch @@ -0,0 +1,86 @@ +diff --git a/libglusterfs/src/defaults.c b/libglusterfs/src/defaults.c +index 718afeb..ed07a75 100644 +--- a/libglusterfs/src/defaults.c ++++ b/libglusterfs/src/defaults.c +@@ -1258,3 +1258,11 @@ default_mem_acct_init (xlator_t *this) + + return ret; + } ++ ++inode_table_t * ++default_get_itbl (xlator_t *this, void *state) ++{ ++ (void)state; ++ return this->itable; ++} ++ +diff --git a/libglusterfs/src/defaults.h b/libglusterfs/src/defaults.h +index 6e45160..7b37a33 100644 +--- a/libglusterfs/src/defaults.h ++++ b/libglusterfs/src/defaults.h +@@ -676,4 +676,7 @@ default_getspec_cbk (call_frame_t *frame, void *cookie, xlator_t *this, + + int32_t + default_mem_acct_init (xlator_t *this); ++ ++inode_table_t * ++default_get_itbl (xlator_t *this, void *state); + #endif /* _DEFAULTS_H */ +diff --git a/libglusterfs/src/xlator.c b/libglusterfs/src/xlator.c +index 37ea816..bfa356b 100644 +--- a/libglusterfs/src/xlator.c ++++ b/libglusterfs/src/xlator.c +@@ -103,6 +103,10 @@ fill_defaults (xlator_t *xl) + if (!xl->mem_acct_init) + xl->mem_acct_init = default_mem_acct_init; + ++ if (!xl->get_itbl) { ++ xl->get_itbl = default_get_itbl; ++ } ++ + return; + } + +diff --git a/libglusterfs/src/xlator.h b/libglusterfs/src/xlator.h +index e583e8c..d0fe7f3 100644 +--- a/libglusterfs/src/xlator.h ++++ b/libglusterfs/src/xlator.h +@@ -820,6 +820,7 @@ struct _xlator { + glusterfs_ctx_t *ctx; + glusterfs_graph_t *graph; /* not set for fuse */ + inode_table_t *itable; ++ inode_table_t *(*get_itbl) (xlator_t *this, void *state); + char init_succeeded; + void *private; + struct mem_acct mem_acct; +diff --git a/xlators/protocol/server/src/server-helpers.c b/xlators/protocol/server/src/server-helpers.c +index 69fb5f6..5e617cf 100644 +--- a/xlators/protocol/server/src/server-helpers.c ++++ b/xlators/protocol/server/src/server-helpers.c +@@ -761,6 +761,7 @@ server_alloc_frame (rpcsvc_request_t *req) + call_frame_t *frame = NULL; + server_state_t *state = NULL; + server_connection_t *conn = NULL; ++ xlator_t *xl = NULL; + + GF_VALIDATE_OR_GOTO("server", req, out); + GF_VALIDATE_OR_GOTO("server", req->trans, out); +@@ -777,12 +778,15 @@ server_alloc_frame (rpcsvc_request_t *req) + state = GF_CALLOC (1, sizeof (*state), gf_server_mt_state_t); + GF_VALIDATE_OR_GOTO("server", state, out); + +- if (conn->bound_xl) +- state->itable = conn->bound_xl->itable; +- + state->xprt = rpc_transport_ref (req->trans); + state->conn = conn; + ++ xl = conn->bound_xl; ++ if (xl) { ++ state->itable = xl->get_itbl(xl,state); ++ } ++ /* TBD: seems like it should be an error for xl to be NULL. */ ++ + state->resolve.fd_no = -1; + state->resolve2.fd_no = -1; + diff --git a/xlators/cluster/cloud/src/Makefile.am b/xlators/cluster/cloud/src/Makefile.am index d2b84f8..36271f7 100644 --- a/xlators/cluster/cloud/src/Makefile.am +++ b/xlators/cluster/cloud/src/Makefile.am @@ -10,6 +10,10 @@ cloud_la_LIBADD = $(top_builddir)/libglusterfs/src/libglusterfs.la noinst_HEADERS = cloud-mem-types.h AM_CFLAGS = -fPIC -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE -Wall -D$(GF_HOST_OS)\ - -I$(top_srcdir)/libglusterfs/src -shared -nostartfiles $(GF_CFLAGS) + -I$(top_srcdir)/libglusterfs/src \ + -I$(top_srcdir)/rpc/rpc-lib/src \ + -I$(top_srcdir)/rpc/xdr/src \ + -I$(top_srcdir)/xlators/protocol/server/src \ + -shared -nostartfiles $(GF_CFLAGS) CLEANFILES = diff --git a/xlators/cluster/cloud/src/cloud.c b/xlators/cluster/cloud/src/cloud.c index bbfe32b..a3a9d09 100644 --- a/xlators/cluster/cloud/src/cloud.c +++ b/xlators/cluster/cloud/src/cloud.c @@ -24,6 +24,9 @@ #include <fnmatch.h> #include <pthread.h> #include "xlator.h" +#include "rpc-transport.h" +#include "glusterfs3-xdr.h" +#include "server.h" #include "glusterfs.h" #include "byte-order.h" #include "xlator.h" @@ -64,17 +67,18 @@ static char user_prefix[] = "user-"; /* TBD: use a scalable per-instance data structure */ #define MAX_CONNS 10 struct { - void *conn; - xlator_t *subvol; + void *xprt; + xlator_t *subvol; } conn_list[MAX_CONNS]; xlator_t * -get_subvol (xlator_t *this, void *conn, char *purpose) +get_subvol (xlator_t *this, void *state, char *purpose) { int i; + rpc_transport_t *xprt = ((server_state_t *)state)->xprt; for (i = 0; i < MAX_CONNS; ++i) { - if (conn_list[i].conn == conn) { + if (conn_list[i].xprt == xprt) { gf_log(this->name,CLOUD_LEVEL,"forcing %s to %s", purpose,conn_list[i].subvol->name); return conn_list[i].subvol; @@ -85,29 +89,99 @@ get_subvol (xlator_t *this, void *conn, char *purpose) return FIRST_CHILD(this); } +int +root_lookup_cbk (call_frame_t *frame, void *cookie, xlator_t *this, + int op_ret, int op_errno, + inode_t *inode, struct iatt *stbuf, dict_t *xattr, + struct iatt *postparent) +{ + gf_log(this->name,GF_LOG_ERROR,"%s: op_ret = %d, op_errno = %d", + __func__, op_ret, op_errno); + +#if 0 + if (!op_ret) { + xlator_t *subvol; + + subvol = frame->local; + frame->local = NULL; + gf_log(this->name,GF_LOG_ERROR," root inode for %s is %llu", + subvol->name, stbuf->ia_ino); + inode->ino = 1; + inode->ia_type = stbuf->ia_type; + subvol->itable->root = inode; + } +#endif + + /* TBD: free frame/stack */ + return 0; +} + void -set_subvol (xlator_t *this, void *conn, xlator_t *subvol) +set_subvol (xlator_t *this, void *state, xlator_t *subvol) { - int i; + int i; + int found = MAX_CONNS; + rpc_transport_t *xprt = ((server_state_t *)state)->xprt; + call_frame_t *frame = NULL; + static loc_t loc = { .path = "/", .inode = NULL }; + dict_t *dict = NULL; + static uuid_t gfid; /* TBD: might as well be global. */ for (i = 0; i < MAX_CONNS; ++i) { - if (!conn_list[i].conn) { - gf_log(this->name,CLOUD_LEVEL,"associating %p with %s", - conn, subvol->name); - conn_list[i].conn = conn; - conn_list[i].subvol = subvol; - return; + if (conn_list[i].xprt == xprt) { + found = i; + break; } + if ((found == MAX_CONNS) && !conn_list[i].xprt) { + found = i; + } + } + + if (found < MAX_CONNS) { + gf_log(this->name,CLOUD_LEVEL,"associating %p with %s", + xprt, subvol->name); + conn_list[found].xprt = xprt; + conn_list[found].subvol = subvol; + /* TBD: this bit should really be done from init */ + frame = create_frame(this,this->ctx->pool); + if (frame) { + frame->local = subvol; + dict = dict_new(); + if (dict) { + memset(gfid,0,15); + gfid[15] = 1; + dict_set_static_bin(dict,"gfid-req",gfid,16); + /* TBD: return value */ + STACK_WIND(frame,root_lookup_cbk,subvol, + subvol->fops->lookup,&loc,dict); + dict_unref(dict); + } + } + } + else { + gf_log(this->name,GF_LOG_ERROR,"subvol table full"); + } +} + +inode_table_t * +cloud_get_itbl (xlator_t *this, void *state) +{ + xlator_t *subvol = get_subvol(this,state,(char *)__func__); + + if (subvol && subvol->itable && (subvol != FIRST_CHILD(this))) { + return subvol->itable; } + + return this->itable; } void cloud_check_auth (call_frame_t *frame, xlator_t *this, loc_t *loc) { - char *subdir = (char *)(loc->path) + sizeof(special_dir) - 1; - char *password = NULL; - cloud_priv *priv = (cloud_priv *)(this->private); - cloud_subvol *sv = NULL; + char *subdir = (char *)(loc->path)+sizeof(special_dir)-1; + char *password = NULL; + cloud_priv *priv = (cloud_priv *)(this->private); + cloud_subvol *sv = NULL; gf_log(this->name,CLOUD_LEVEL,"got special mkdir(%s)",subdir); @@ -134,7 +208,10 @@ cloud_check_auth (call_frame_t *frame, xlator_t *this, loc_t *loc) gf_log(this->name,GF_LOG_WARNING, "forcing this connection to subvol %s",subdir); *(--password) = '='; - set_subvol(this,frame->root->trans,sv->xlator); + if (!sv->xlator->itable) { + sv->xlator->itable = inode_table_new(0,sv->xlator); + } + set_subvol(this,frame->root->state,sv->xlator); STACK_UNWIND_STRICT(mkdir,frame,0,0,NULL,NULL,NULL,NULL); } @@ -159,7 +236,7 @@ cloud_mkdir (call_frame_t *frame, xlator_t *this, return 0; } - next = get_subvol(this,frame->root->trans,"mkdir"); + next = get_subvol(this,frame->root->state,"mkdir"); STACK_WIND(frame,cloud_mkdir_cbk,next,next->fops->mkdir, loc,mode,params); return 0; @@ -171,6 +248,20 @@ cloud_lookup_cbk (call_frame_t *frame, void *cookie, xlator_t *this, inode_t *inode, struct iatt *stbuf, dict_t *xattr, struct iatt *postparent) { + inode_table_t *table = NULL; + + /* + * Copied from server_lookup_cbk because they use BOUND_XL and + * thus don't properly evaluate whether it's necessary. + */ + if (inode && inode->table && stbuf) { + gf_log(this->name,GF_LOG_ERROR,"patching up root inode"); + if (inode == inode->table->root) { + stbuf->ia_ino = 1; + uuid_copy (stbuf->ia_gfid, inode->table->root->gfid); + } + } + STACK_UNWIND_STRICT(lookup,frame,op_ret,op_errno, inode, stbuf, xattr, postparent); return 0; @@ -180,7 +271,17 @@ int cloud_lookup (call_frame_t *frame, xlator_t *this, loc_t *loc, dict_t *xattr_req) { - xlator_t *next = get_subvol(this,frame->root->trans,"lookup"); + xlator_t *next = NULL; + + gf_log(this->name,GF_LOG_ERROR,"lookup path is %s",loc->path); + + if (strcmp(loc->path,"/")) { + next = get_subvol(this,frame->root->state,"lookup"); + } + else { + gf_log(this->name,GF_LOG_ERROR,"NOT virtualizing lookup"); + next = FIRST_CHILD(this); + } STACK_WIND(frame,cloud_lookup_cbk,next,next->fops->lookup, loc, xattr_req); @@ -203,13 +304,24 @@ cloud_create (call_frame_t *frame, xlator_t *this, loc_t *loc, int32_t flags, mode_t mode, fd_t *fd, dict_t *params) { - xlator_t *next = get_subvol(this,frame->root->trans,"create"); + xlator_t *next = get_subvol(this,frame->root->state,"create"); STACK_WIND(frame,cloud_create_cbk,next,next->fops->create, loc, flags, mode, fd, params); return 0; } +/* + * For now, getxattr/setxattr on the root are not virtualized because some + * internal xattrs (e.g. those used by DHT/AFR) are initialized before we + * virtualize but needed after. The result if we did things normally would + * be that the post-virtualization calls would fail, leaving the translators + * that need them very confused. + * + * TBD: look for pre-virtualization calls to "special" xattrs and fan them out + * to the other subvolumes. + */ + int cloud_getxattr_cbk (call_frame_t *frame, void *cookie, xlator_t *this, int op_ret, int op_errno, dict_t *xattr) @@ -222,7 +334,15 @@ int cloud_getxattr (call_frame_t *frame, xlator_t *this, loc_t *loc, const char *key) { - xlator_t *next = get_subvol(this,frame->root->trans,"getxattr"); + xlator_t *next = NULL; + + if (strcmp(loc->path,"/")) { + next = get_subvol(this,frame->root->state,"getxattr"); + } + else { + gf_log(this->name,GF_LOG_ERROR,"NOT virtualizing getxattr"); + next = FIRST_CHILD(this); + } STACK_WIND(frame,cloud_getxattr_cbk,next,next->fops->getxattr,loc,key); return 0; @@ -240,7 +360,7 @@ int cloud_open (call_frame_t *frame, xlator_t *this, loc_t *loc, int flags, fd_t *fd, int wbflags) { - xlator_t *next = get_subvol(this,frame->root->trans,"open"); + xlator_t *next = get_subvol(this,frame->root->state,"open"); STACK_WIND(frame,cloud_open_cbk,next,next->fops->open, loc,flags,fd,wbflags); @@ -258,7 +378,7 @@ cloud_stat_cbk (call_frame_t *frame, void *cookie, xlator_t *this, int cloud_stat (call_frame_t *frame, xlator_t *this, loc_t *loc) { - xlator_t *next = get_subvol(this,frame->root->trans,"stat"); + xlator_t *next = get_subvol(this,frame->root->state,"stat"); STACK_WIND(frame,cloud_stat_cbk,next,next->fops->stat,loc); return 0; @@ -275,7 +395,7 @@ cloud_fstat_cbk (call_frame_t *frame, void *cookie, xlator_t *this, int cloud_fstat (call_frame_t *frame, xlator_t *this, fd_t *fd) { - xlator_t *next = get_subvol(this,frame->root->trans,"fstat"); + xlator_t *next = get_subvol(this,frame->root->state,"fstat"); STACK_WIND(frame,cloud_fstat_cbk,next,next->fops->fstat,fd); return 0; @@ -293,7 +413,7 @@ cloud_truncate_cbk (call_frame_t *frame, void *cookie, xlator_t *this, int cloud_truncate (call_frame_t *frame, xlator_t *this, loc_t *loc, off_t offset) { - xlator_t *next = get_subvol(this,frame->root->trans,"truncate"); + xlator_t *next = get_subvol(this,frame->root->state,"truncate"); STACK_WIND(frame,cloud_truncate_cbk,next,next->fops->truncate, loc,offset); @@ -303,13 +423,15 @@ cloud_truncate (call_frame_t *frame, xlator_t *this, loc_t *loc, off_t offset) int cloud_ftruncate (call_frame_t *frame, xlator_t *this, fd_t *fd, off_t offset) { - xlator_t *next = get_subvol(this,frame->root->trans,"ftruncate"); + xlator_t *next = get_subvol(this,frame->root->state,"ftruncate"); STACK_WIND(frame,cloud_truncate_cbk,next,next->fops->ftruncate, fd,offset); return 0; } +/* See comment near cloud_getxattr about why we don't always virtualize. */ + int cloud_setxattr_cbk (call_frame_t *frame, void *cookie, xlator_t *this, int op_ret, int op_errno) @@ -322,7 +444,15 @@ int cloud_setxattr (call_frame_t *frame, xlator_t *this, loc_t *loc, dict_t *xattr, int flags) { - xlator_t *next = get_subvol(this,frame->root->trans,"setxattr"); + xlator_t *next = NULL; + + if (strcmp(loc->path,"/")) { + next = get_subvol(this,frame->root->state,"setxattr"); + } + else { + gf_log(this->name,GF_LOG_ERROR,"NOT virtualizing setxattr"); + next = FIRST_CHILD(this); + } STACK_WIND(frame,cloud_setxattr_cbk,next,next->fops->setxattr, loc, xattr, flags); @@ -344,7 +474,7 @@ int cloud_readv (call_frame_t *frame, xlator_t *this, fd_t *fd, size_t size, off_t off) { - xlator_t *next = get_subvol(this,frame->root->trans,"readv"); + xlator_t *next = get_subvol(this,frame->root->state,"readv"); STACK_WIND(frame,cloud_readv_cbk,next,next->fops->readv,fd,size,off); return 0; @@ -364,7 +494,7 @@ cloud_writev (call_frame_t *frame, xlator_t *this, fd_t *fd, struct iovec *vector, int count, off_t off, struct iobref *iobref) { - xlator_t *next = get_subvol(this,frame->root->trans,"writev"); + xlator_t *next = get_subvol(this,frame->root->state,"writev"); STACK_WIND(frame,cloud_writev_cbk,next,next->fops->writev, fd, vector, count, off, iobref); @@ -382,7 +512,7 @@ cloud_flush_cbk (call_frame_t *frame, void *cookie, xlator_t *this, int cloud_flush (call_frame_t *frame, xlator_t *this, fd_t *fd) { - xlator_t *next = get_subvol(this,frame->root->trans,"flush"); + xlator_t *next = get_subvol(this,frame->root->state,"flush"); STACK_WIND(frame,cloud_flush_cbk,next,next->fops->flush,fd); return 0; @@ -399,7 +529,7 @@ cloud_opendir_cbk (call_frame_t *frame, void *cookie, xlator_t *this, int cloud_opendir (call_frame_t *frame, xlator_t *this, loc_t *loc, fd_t *fd) { - xlator_t *next = get_subvol(this,frame->root->trans,"opendir"); + xlator_t *next = get_subvol(this,frame->root->state,"opendir"); STACK_WIND(frame,cloud_opendir_cbk,next,next->fops->opendir,loc,fd); return 0; @@ -417,7 +547,7 @@ int cloud_readdir (call_frame_t *frame, xlator_t *this, fd_t *fd, size_t size, off_t yoff) { - xlator_t *next = get_subvol(this,frame->root->trans,"readdir"); + xlator_t *next = get_subvol(this,frame->root->state,"readdir"); STACK_WIND(frame,cloud_readdir_cbk,next,next->fops->readdir, fd,size,yoff); @@ -436,7 +566,7 @@ int cloud_readdirp (call_frame_t *frame, xlator_t *this, fd_t *fd, size_t size, off_t yoff) { - xlator_t *next = get_subvol(this,frame->root->trans,"readdirp"); + xlator_t *next = get_subvol(this,frame->root->state,"readdirp"); STACK_WIND(frame,cloud_readdirp_cbk,next,next->fops->readdirp, fd,size,yoff); @@ -455,7 +585,7 @@ cloud_unlink_cbk (call_frame_t *frame, void *cookie, xlator_t *this, int cloud_unlink (call_frame_t *frame, xlator_t *this, loc_t *loc) { - xlator_t *next = get_subvol(this,frame->root->trans,"unlink"); + xlator_t *next = get_subvol(this,frame->root->state,"unlink"); STACK_WIND(frame,cloud_unlink_cbk,next,next->fops->unlink,loc); return 0; @@ -473,7 +603,7 @@ cloud_rmdir_cbk (call_frame_t *frame, void *cookie, xlator_t *this, int cloud_rmdir (call_frame_t *frame, xlator_t *this, loc_t *loc, int flags) { - xlator_t *next = get_subvol(this,frame->root->trans,"rmdir"); + xlator_t *next = get_subvol(this,frame->root->state,"rmdir"); STACK_WIND(frame,cloud_rmdir_cbk,next,next->fops->rmdir,loc,flags); return 0; @@ -492,7 +622,7 @@ int cloud_setattr (call_frame_t *frame, xlator_t *this, loc_t *loc, struct iatt *stbuf, int32_t valid) { - xlator_t *next = get_subvol(this,frame->root->trans,"setattr"); + xlator_t *next = get_subvol(this,frame->root->state,"setattr"); STACK_WIND(frame,cloud_setattr_cbk,next,next->fops->setattr, loc,stbuf,valid); @@ -596,8 +726,6 @@ init (xlator_t *this) dict_t *options = NULL; int ret = 0; char *log_str = NULL; - xlator_list_t *trav = NULL; - int i = 0; cloud_priv *priv = NULL; if (!this) @@ -642,6 +770,7 @@ init (xlator_t *this) } dict_foreach(options,collect_users,this); + this->get_itbl = cloud_get_itbl; return 0; } commit 4144fd4dba0b1651eaa532b8c53dec87bb0ad3e3 Author: Jeff Darcy <jdarcy(a)redhat.com> Date: Mon Jan 3 17:09:20 2011 -0500 Use options for specifying users (tenants). diff --git a/xlators/cluster/cloud/src/cloud-mem-types.h b/xlators/cluster/cloud/src/cloud-mem-types.h index 49f3f63..5727cb8 100644 --- a/xlators/cluster/cloud/src/cloud-mem-types.h +++ b/xlators/cluster/cloud/src/cloud-mem-types.h @@ -23,10 +23,8 @@ #include "mem-types.h" enum gf_cloud_mem_types_ { - gf_cloud_mt_cloud_conf = gf_common_mt_end + 1, - gf_cloud_mt_cloud_fd, - gf_cloud_mt_rename, - gf_cloud_mt_rename_gen, + gf_cloud_mt_cloud_priv = gf_common_mt_end + 1, + gf_cloud_mt_cloud_subvol, gf_cloud_mt_end }; #endif diff --git a/xlators/cluster/cloud/src/cloud.c b/xlators/cluster/cloud/src/cloud.c index ebfc68d..bbfe32b 100644 --- a/xlators/cluster/cloud/src/cloud.c +++ b/xlators/cluster/cloud/src/cloud.c @@ -49,19 +49,17 @@ #define CLOUD_LEVEL GF_LOG_DEBUG -static char special_dir[] = "/_auth/"; +typedef struct { + dict_t *users; +} cloud_priv; -/* TBD: initialize subdir list from option */ -struct { - char *name; - char *password; +typedef struct { xlator_t *xlator; -} subvol_list[] = { - { "foo", "passw0rd" }, - { "bar", "passw1rd" }, - { "ugh", "not_there" }, - { NULL } -}; + char password[1]; +} cloud_subvol; + +static char special_dir[] = "/_auth/"; +static char user_prefix[] = "user-"; /* TBD: use a scalable per-instance data structure */ #define MAX_CONNS 10 @@ -106,9 +104,10 @@ set_subvol (xlator_t *this, void *conn, xlator_t *subvol) void cloud_check_auth (call_frame_t *frame, xlator_t *this, loc_t *loc) { - char *subdir = (char *)(loc->path) + sizeof(special_dir) - 1; - char *password = NULL; - int i = 0; + char *subdir = (char *)(loc->path) + sizeof(special_dir) - 1; + char *password = NULL; + cloud_priv *priv = (cloud_priv *)(this->private); + cloud_subvol *sv = NULL; gf_log(this->name,CLOUD_LEVEL,"got special mkdir(%s)",subdir); @@ -119,30 +118,24 @@ cloud_check_auth (call_frame_t *frame, xlator_t *this, loc_t *loc) } *(password++) = '\0'; - for (i = 0; subvol_list[i].name; ++i) { - if (strcmp(subdir,subvol_list[i].name)) { - continue; - } - if (strcmp(password,subvol_list[i].password)) { - gf_log(this->name,CLOUD_LEVEL,"bad password for %s", - subdir); - continue; - } - if (!subvol_list[i].xlator) { - gf_log(this->name,CLOUD_LEVEL,"no translator for %s", - subdir); - continue; - } - gf_log(this->name,GF_LOG_WARNING, - "forcing this connection to subvol %s",subdir); + if (dict_get_ptr(priv->users,subdir,(void **)&sv) != 0) { + *(--password) = '='; + STACK_UNWIND_STRICT(mkdir,frame,-1,ENOENT,NULL,NULL,NULL,NULL); + return; + } + + if (strcmp(password,sv->password)) { + gf_log(this->name,CLOUD_LEVEL,"bad password for %s", subdir); *(--password) = '='; - set_subvol(this,frame->root->trans,subvol_list[i].xlator); - STACK_UNWIND_STRICT(mkdir,frame,0,0,NULL,NULL,NULL,NULL); + STACK_UNWIND_STRICT(mkdir,frame,-1,EPERM,NULL,NULL,NULL,NULL); return; } + gf_log(this->name,GF_LOG_WARNING, + "forcing this connection to subvol %s",subdir); *(--password) = '='; - STACK_UNWIND_STRICT(mkdir,frame,-1,EPERM,NULL,NULL,NULL,NULL); + set_subvol(this,frame->root->trans,sv->xlator); + STACK_UNWIND_STRICT(mkdir,frame,0,0,NULL,NULL,NULL,NULL); } int @@ -166,7 +159,7 @@ cloud_mkdir (call_frame_t *frame, xlator_t *this, return 0; } - next = get_subvol(this,frame->root->trans,"lookup"); + next = get_subvol(this,frame->root->trans,"mkdir"); STACK_WIND(frame,cloud_mkdir_cbk,next,next->fops->mkdir, loc,mode,params); return 0; @@ -551,6 +544,52 @@ mem_acct_init (xlator_t *this) return ret; } +void +collect_users (dict_t *this, char *key, data_t *value, void *ctx) +{ + char *user = NULL; + char *pass = NULL; + xlator_t *xlator = (xlator_t *)ctx; + cloud_priv *priv = (cloud_priv *)(xlator->private); + cloud_subvol *sv = NULL; + xlator_list_t *trav = NULL; + + if (strncmp(key,user_prefix,sizeof(user_prefix)-1)) { + return; + } + + user = key + sizeof(user_prefix) - 1; + for (trav = xlator->children; trav; trav = trav->next) { + if (!strcmp(trav->xlator->name,user)) { + break; + } + } + if (!trav) { + gf_log(xlator->name,GF_LOG_ERROR,"no such subvol %s",user); + return; + } + + pass = data_to_str(value); + sv = GF_CALLOC(sizeof(*sv)+strlen(pass),1,gf_cloud_mt_cloud_subvol); + if (!sv) { + gf_log(xlator->name,GF_LOG_ERROR, + "could not allocate subvol structure for %s", user); + return; + } + + sv->xlator = trav->xlator; + strcpy(sv->password,pass); + + if (dict_set_ptr(priv->users,user,sv) != 0) { + gf_log(xlator->name,GF_LOG_ERROR, + "could not set data for user %s", user); + GF_FREE(sv); + return; + } + + gf_log(xlator->name,CLOUD_LEVEL, "added user %s", user); +} + int init (xlator_t *this) { @@ -559,6 +598,7 @@ init (xlator_t *this) char *log_str = NULL; xlator_list_t *trav = NULL; int i = 0; + cloud_priv *priv = NULL; if (!this) return -1; @@ -574,6 +614,22 @@ init (xlator_t *this) "dangling volume. check volfile "); } + priv = GF_CALLOC(1,sizeof(cloud_priv),gf_cloud_mt_cloud_priv); + if (!priv) { + gf_log(this->name,GF_LOG_ERROR, + "could not allocate private structure"); + return -1; + } + + priv->users = dict_new(); + if (!priv->users) { + gf_log(this->name,GF_LOG_ERROR, + "could not allocate user dict"); + GF_FREE(priv); + return -1; + } + + this->private = priv; options = this->options; ret = dict_get_str (options, "log-level", &log_str); @@ -585,17 +641,7 @@ init (xlator_t *this) } } - for (i = 0; subvol_list[i].name; ++i) { - for (trav = this->children; trav; trav = trav->next) { - if (!strcmp(subvol_list[i].name,trav->xlator->name)) { - gf_log(this->name,CLOUD_LEVEL, - "mapping %s -> %p", - subvol_list[i].name, trav->xlator->name); - subvol_list[i].xlator = trav->xlator; - break; - } - } - } + dict_foreach(options,collect_users,this); return 0; } @@ -607,6 +653,9 @@ fini (xlator_t *this) if (!this) return; + dict_unref(((cloud_priv *)(this->private))->users); + GF_FREE(this->private); + gf_log (this->name, GF_LOG_NORMAL, "cloud translator unloaded"); return; @@ -659,5 +708,8 @@ struct volume_options options[] = { { .key = {"log-level"}, .type = GF_OPTION_TYPE_STR, }, + { .key = {"user-*"}, + .type = GF_OPTION_TYPE_STR, + }, { .key = {NULL} }, };

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

cloudfs-devel January 2011