diff options
| author | vmallika <vmallika@redhat.com> | 2014-11-05 11:53:38 +0530 |
|---|---|---|
| committer | Raghavendra Bhat <raghavendra@redhat.com> | 2014-12-18 22:53:23 -0800 |
| commit | 211b8a8dc8cd146e509d0c822ce1151d5614524e (patch) | |
| tree | 17ed67bdeb30f1c581dd7db612383ecfa1f50193 | |
| parent | 859cdebc2d2b425fd76f46d598ad59933396b279 (diff) | |
uss/gluster: Move all uss related logs into subfolder.
For USS we have 1 snapd log per volume and as many snap logs for volume.
For example if there are 4 volumes having 256 snaps each and USS is
enabled than total number of logs under /var/log/glusterfs for USS would
be 1028 logs.
Total logs = (4(snapd per volume) + 4(volumes)*256(snaps)) = 1028
Hence, it makes sense to move into into sub-folder structure like
/var/log/glusterfs/snaps/<vol-name>/<snapd + snaps logs>
Change-Id: I29262e6458c3906916923cd67d1145d6ae10bec3
BUG: 1175728
Signed-off-by: vmallika <vmallika@redhat.com>
Reviewed-on: http://review.gluster.org/9050
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Rajesh Joseph <rjoseph@redhat.com>
Reviewed-by: Krishnan Parthasarathi <kparthas@redhat.com>
Tested-by: Krishnan Parthasarathi <kparthas@redhat.com>
Signed-off-by: Sachin Pandit <spandit@redhat.com>
Reviewed-on: http://review.gluster.org/9298
Reviewed-by: Raghavendra Bhat <raghavendra@redhat.com>
| -rw-r--r-- | xlators/features/snapview-server/src/snapview-server-helpers.c | 4 | ||||
| -rw-r--r-- | xlators/mgmt/glusterd/src/glusterd-utils.c | 16 |
2 files changed, 14 insertions, 6 deletions
diff --git a/xlators/features/snapview-server/src/snapview-server-helpers.c b/xlators/features/snapview-server/src/snapview-server-helpers.c index 46e7d49a036..fdabc00a9b5 100644 --- a/xlators/features/snapview-server/src/snapview-server-helpers.c +++ b/xlators/features/snapview-server/src/snapview-server-helpers.c @@ -477,8 +477,8 @@ __svs_initialise_snapshot_volume (xlator_t *this, const char *name) } snprintf (logfile, sizeof (logfile), - DEFAULT_SVD_LOG_FILE_DIRECTORY "/%s-%s.log", - name, dirent->uuid); + DEFAULT_SVD_LOG_FILE_DIRECTORY "/snaps/%s/%s-%s.log", + priv->volname, name, dirent->uuid); ret = glfs_set_logging(fs, logfile, loglevel); if (ret) { diff --git a/xlators/mgmt/glusterd/src/glusterd-utils.c b/xlators/mgmt/glusterd/src/glusterd-utils.c index 30d885c82bf..7252e50113b 100644 --- a/xlators/mgmt/glusterd/src/glusterd-utils.c +++ b/xlators/mgmt/glusterd/src/glusterd-utils.c @@ -13281,6 +13281,7 @@ glusterd_snapd_start (glusterd_volinfo_t *volinfo, gf_boolean_t wait) runner_t runner = {0,}; char pidfile[PATH_MAX] = {0,}; char logfile[PATH_MAX] = {0,}; + char logdir[PATH_MAX] = {0,}; char volfile[PATH_MAX] = {0,}; char glusterd_uuid [1024] = {0,}; char rundir[PATH_MAX] = {0,}; @@ -13322,8 +13323,16 @@ glusterd_snapd_start (glusterd_volinfo_t *volinfo, gf_boolean_t wait) goto out; } - snprintf (logfile, PATH_MAX, "%s/%s-snapd.log", + snprintf (logdir, PATH_MAX, "%s/snaps/%s", DEFAULT_LOG_FILE_DIRECTORY, volname); + ret = mkdir_p (logdir, 0755, _gf_true); + if ((ret == -1) && (EEXIST != errno)) { + gf_log (this->name, GF_LOG_ERROR, "Unable to create logdir %s", + logdir); + goto out; + } + + snprintf (logfile, PATH_MAX, "%s/snapd.log", logdir); snprintf (volfileid, sizeof (volfileid), "snapd/%s", volname); glusterd_set_snapd_socket_filepath (volinfo, sockfpath, @@ -13337,9 +13346,8 @@ glusterd_snapd_start (glusterd_volinfo_t *volinfo, gf_boolean_t wait) runinit (&runner); if (priv->valgrind) { - snprintf (valgrind_logfile, PATH_MAX, - "%s/valgrind-%s-snapd.log", - DEFAULT_LOG_FILE_DIRECTORY, volname); + snprintf (valgrind_logfile, PATH_MAX, "%s/valgrind-snapd.log", + logdir); runner_add_args (&runner, "valgrind", "--leak-check=full", "--trace-children=yes", "--track-origins=yes", |