diff options
| author | Avra Sengupta <asengupt@redhat.com> | 2015-07-05 12:21:31 +0530 |
|---|---|---|
| committer | Rajesh Joseph <rjoseph@redhat.com> | 2015-07-06 22:52:44 -0700 |
| commit | cd43a3e15ee2d0f551740bf8d15a45f1d1f17e96 (patch) | |
| tree | 800907bd3ddbdfbd0badb84f183f61894b73d8ef /xlators/mgmt/glusterd/src/glusterd-op-sm.c | |
| parent | 87f512655f76e788a5a81c5de66ed55881cb5f82 (diff) | |
glusterd/shared_storage: Use /var/lib/glusterd/ss_brick as shared storage's brick
The brick path we use to create shared storage is
/var/run/gluster/ss_brick.
The problem with using this brick path is /var/run/gluster
is a tmpfs and all the brick/shared storage data will be wiped
off when the node restarts. Hence using /var/lib/glusterd/ss_brick
as the brick path for shared storage volume as this brick and
the shared storage volume is internally created by us (albeit on
user's request), and contains only internal state data and no user data.
Change-Id: I808d1aa3e204a5d2022086d23bdbfdd44a2cfb1c
BUG: 1218573
Signed-off-by: Avra Sengupta <asengupt@redhat.com>
Reviewed-on: http://review.gluster.org/11533
Tested-by: NetBSD Build System <jenkins@build.gluster.org>
Reviewed-by: Atin Mukherjee <amukherj@redhat.com>
Reviewed-by: Niels de Vos <ndevos@redhat.com>
Reviewed-by: Rajesh Joseph <rjoseph@redhat.com>
Diffstat (limited to 'xlators/mgmt/glusterd/src/glusterd-op-sm.c')
| -rw-r--r-- | xlators/mgmt/glusterd/src/glusterd-op-sm.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/xlators/mgmt/glusterd/src/glusterd-op-sm.c b/xlators/mgmt/glusterd/src/glusterd-op-sm.c index 0a0c6ef0b67..07a407bd2bb 100644 --- a/xlators/mgmt/glusterd/src/glusterd-op-sm.c +++ b/xlators/mgmt/glusterd/src/glusterd-op-sm.c @@ -51,7 +51,6 @@ #include <signal.h> #include <sys/wait.h> -extern char ss_brick_path[PATH_MAX]; extern char local_node_hostname[PATH_MAX]; static int glusterd_set_shared_storage (dict_t *dict, char *key, char *value, @@ -2291,12 +2290,12 @@ glusterd_set_shared_storage (dict_t *dict, char *key, char *value, /* Re-create the brick path so as to be * * able to re-use it * */ - ret = recursive_rmdir (ss_brick_path); + ret = recursive_rmdir (GLUSTER_SHARED_STORAGE_BRICK_DIR); if (ret) { snprintf (errstr, PATH_MAX, "Failed to remove shared " "storage brick(%s). " - "Reason: %s", ss_brick_path, + "Reason: %s", GLUSTER_SHARED_STORAGE_BRICK_DIR, strerror (errno)); gf_msg (this->name, GF_LOG_ERROR, errno, GD_MSG_DIR_OP_FAILED, "%s", errstr); @@ -2304,12 +2303,12 @@ glusterd_set_shared_storage (dict_t *dict, char *key, char *value, goto out; } - ret = mkdir_p (ss_brick_path, 0777, _gf_true); + ret = mkdir_p (GLUSTER_SHARED_STORAGE_BRICK_DIR, 0777, _gf_true); if (-1 == ret) { snprintf (errstr, PATH_MAX, "Failed to create shared " "storage brick(%s). " - "Reason: %s", ss_brick_path, + "Reason: %s", GLUSTER_SHARED_STORAGE_BRICK_DIR, strerror (errno)); gf_msg (this->name, GF_LOG_ERROR, errno, GD_MSG_CREATE_DIR_FAILED, "%s", errstr); |