diff options
| author | Niels de Vos <ndevos@redhat.com> | 2014-05-08 22:21:25 -0300 |
|---|---|---|
| committer | Niels de Vos <ndevos@redhat.com> | 2014-05-09 07:36:02 -0700 |
| commit | e528724e793a8add1e3c21932913d8cb4e93da8c (patch) | |
| tree | e2a30a9a1aecac3cabe7673fd294f3209e3e136f /xlators/storage/posix | |
| parent | a256094f34df6500bcd19845fd0f32a9f3690751 (diff) | |
posix: if brick-uid or brick-gid is not specified, do not set
Current code would set owner uid/gid explicitly to 0/0 on start
even if none was specified. Fix it.
Cherry picked from commit 8bdc329:
> Change-Id: I72dec9e79c51bd1eb3af5334c42b7c23b01d0258
> BUG: 1040275
> Signed-off-by: Anand Avati <avati@redhat.com>
> Reviewed-on: http://review.gluster.org/6476
> Tested-by: Gluster Build System <jenkins@build.gluster.com>
> Tested-by: Lukáš Bezdička <lukas.bezdicka@gooddata.com>
> Reviewed-by: Krishnan Parthasarathi <kparthas@redhat.com>
> Reviewed-by: Vijay Bellur <vbellur@redhat.com>
Change-Id: Ie0396c1a4e6e0979ea9c855d33db963544a75c42
BUG: 1095971
Signed-off-by: Niels de Vos <ndevos@redhat.com>
Reviewed-on: http://review.gluster.org/7720
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Diffstat (limited to 'xlators/storage/posix')
| -rw-r--r-- | xlators/storage/posix/src/posix.c | 41 |
1 files changed, 29 insertions, 12 deletions
diff --git a/xlators/storage/posix/src/posix.c b/xlators/storage/posix/src/posix.c index f22770eb41a..6a7e691724e 100644 --- a/xlators/storage/posix/src/posix.c +++ b/xlators/storage/posix/src/posix.c @@ -5097,9 +5097,22 @@ posix_set_owner (xlator_t *this, uid_t uid, gid_t gid) { struct posix_private *priv = NULL; int ret = -1; + struct stat st = {0,}; priv = this->private; + ret = sys_lstat (priv->base_path, &st); + if (ret) { + gf_log (this->name, GF_LOG_ERROR, "Failed to stat " + "brick path %s (%s)", + priv->base_path, strerror (errno)); + return ret; + } + + if ((uid == -1 || st.st_uid == uid) && + (gid == -1 || st.st_gid == gid)) + return 0; + ret = sys_chown (priv->base_path, uid, gid); if (ret) gf_log (this->name, GF_LOG_ERROR, "Failed to set " @@ -5135,15 +5148,16 @@ reconfigure (xlator_t *this, dict_t *options) { int ret = -1; struct posix_private *priv = NULL; - uid_t uid = -1; - gid_t gid = -1; + int32_t uid = -1; + int32_t gid = -1; char *batch_fsync_mode_str = NULL; priv = this->private; - GF_OPTION_RECONF ("brick-uid", uid, options, uint32, out); - GF_OPTION_RECONF ("brick-gid", gid, options, uint32, out); - posix_set_owner (this, uid, gid); + GF_OPTION_RECONF ("brick-uid", uid, options, int32, out); + GF_OPTION_RECONF ("brick-gid", gid, options, int32, out); + if (uid != -1 || gid != -1) + posix_set_owner (this, uid, gid); GF_OPTION_RECONF ("batch-fsync-delay-usec", priv->batch_fsync_delay_usec, options, uint32, out); @@ -5209,8 +5223,8 @@ init (xlator_t *this) uuid_t gfid = {0,}; uuid_t rootgfid = {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1}; char *guuid = NULL; - uid_t uid = -1; - gid_t gid = -1; + int32_t uid = -1; + int32_t gid = -1; char *batch_fsync_mode_str; dir_data = dict_get (this->options, "directory"); @@ -5545,9 +5559,10 @@ init (xlator_t *this) _private->aio_init_done = _gf_false; _private->aio_capable = _gf_false; - GF_OPTION_INIT ("brick-uid", uid, uint32, out); - GF_OPTION_INIT ("brick-gid", gid, uint32, out); - posix_set_owner (this, uid, gid); + GF_OPTION_INIT ("brick-uid", uid, int32, out); + GF_OPTION_INIT ("brick-gid", gid, int32, out); + if (uid != -1 || gid != -1) + posix_set_owner (this, uid, gid); GF_OPTION_INIT ("linux-aio", _private->aio_configured, bool, out); @@ -5708,15 +5723,17 @@ struct volume_options options[] = { { .key = {"brick-uid"}, .type = GF_OPTION_TYPE_INT, - .min = 0, + .min = -1, .validate = GF_OPT_VALIDATE_MIN, + .default_value = "-1", .description = "Support for setting uid of brick's owner" }, { .key = {"brick-gid"}, .type = GF_OPTION_TYPE_INT, - .min = 0, + .min = -1, .validate = GF_OPT_VALIDATE_MIN, + .default_value = "-1", .description = "Support for setting gid of brick's owner" }, { .key = {"node-uuid-pathinfo"}, |