diff options
| author | Kotresh HR <khiremat@redhat.com> | 2015-03-25 23:39:16 +0530 |
|---|---|---|
| committer | Venky Shankar <vshankar@redhat.com> | 2015-03-30 06:57:16 -0700 |
| commit | 624938999bf925af710e9f73c75040416f68b756 (patch) | |
| tree | 8581ab7d9e49d068cf2306d7bb454df3a24305dd /xlators | |
| parent | 86fa9298ea9d04766c0a693192e6660ad4b02165 (diff) | |
geo-rep: Add support for acls
This patch adds support for ACLS. When it sees SETXATTR
in Changelog, it adds the file to data queue. rsync/tar+ssh
will take care of syncing ACLS. User set ACLS will be
synced to Slave.
This requires "system.posix_acl_access" to go through when
client-pid is equal GF_CLIENT_PID_GSYNCD in fuse layer.
New config interface is introduced, sync-acls
Which can be set using geo-rep config(Default is True)
gluster volume geo-replication <VOLUME> <SLAVEHOST>::<SLAVEVOL> \
config sync-acls false
Change-Id: I7eb3523fa72b8fed830efc98138891244e830d65
BUG: 1187021
Signed-off-by: Kotresh HR <khiremat@redhat.com>
Reviewed-on: http://review.gluster.org/10001
Reviewed-by: Aravinda VK <avishwan@redhat.com>
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Venky Shankar <vshankar@redhat.com>
Tested-by: Venky Shankar <vshankar@redhat.com>
Diffstat (limited to 'xlators')
| -rw-r--r-- | xlators/mgmt/glusterd/src/glusterd-geo-rep.c | 4 | ||||
| -rw-r--r-- | xlators/mgmt/glusterd/src/glusterd.c | 4 | ||||
| -rw-r--r-- | xlators/mount/fuse/src/fuse-helpers.c | 2 |
3 files changed, 6 insertions, 4 deletions
diff --git a/xlators/mgmt/glusterd/src/glusterd-geo-rep.c b/xlators/mgmt/glusterd/src/glusterd-geo-rep.c index 8dff3d9e419..4e02b5bbf18 100644 --- a/xlators/mgmt/glusterd/src/glusterd-geo-rep.c +++ b/xlators/mgmt/glusterd/src/glusterd-geo-rep.c @@ -5025,7 +5025,7 @@ create_conf_file (glusterd_conf_t *conf, char *conf_path) /* gluster-params */ runinit_gsyncd_setrx (&runner, conf_path); runner_add_args (&runner, "gluster-params", - "aux-gfid-mount", + "aux-gfid-mount acl", ".", ".", NULL); RUN_GSYNCD_CMD; @@ -5148,7 +5148,7 @@ create_conf_file (glusterd_conf_t *conf, char *conf_path) /* gluster-params */ runinit_gsyncd_setrx (&runner, conf_path); runner_add_args (&runner, "gluster-params", - "aux-gfid-mount", + "aux-gfid-mount acl", ".", NULL); RUN_GSYNCD_CMD; diff --git a/xlators/mgmt/glusterd/src/glusterd.c b/xlators/mgmt/glusterd/src/glusterd.c index abe35e0c26f..dc4293dcc07 100644 --- a/xlators/mgmt/glusterd/src/glusterd.c +++ b/xlators/mgmt/glusterd/src/glusterd.c @@ -640,7 +640,7 @@ configure_syncdaemon (glusterd_conf_t *conf) /* gluster-params */ runinit_gsyncd_setrx (&runner, conf); runner_add_args (&runner, "gluster-params", - "aux-gfid-mount", + "aux-gfid-mount acl", ".", ".", NULL); RUN_GSYNCD_CMD; @@ -764,7 +764,7 @@ configure_syncdaemon (glusterd_conf_t *conf) /* gluster-params */ runinit_gsyncd_setrx (&runner, conf); runner_add_args (&runner, "gluster-params", - "aux-gfid-mount", + "aux-gfid-mount acl", ".", NULL); RUN_GSYNCD_CMD; diff --git a/xlators/mount/fuse/src/fuse-helpers.c b/xlators/mount/fuse/src/fuse-helpers.c index ca3a08e773f..7fc41383c36 100644 --- a/xlators/mount/fuse/src/fuse-helpers.c +++ b/xlators/mount/fuse/src/fuse-helpers.c @@ -600,6 +600,8 @@ fuse_ignore_xattr_set (fuse_private_t *priv, char *key) key, FNM_PERIOD) == 0) || (fnmatch ("*.glusterfs.volume-mark.*", key, FNM_PERIOD) == 0) + || (fnmatch ("system.posix_acl_access", + key, FNM_PERIOD) == 0) || (fnmatch ("glusterfs.gfid.newfile", key, FNM_PERIOD) == 0))) ret = -1; |