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: 1160534
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>
This commit is contained in:
vmallika 2014-11-05 11:53:38 +05:30 committed by Krishnan Parthasarathi
parent 70b0c7b725
commit e607ca013f
2 changed files with 14 additions and 6 deletions

View File

@ -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) {

View File

@ -13301,6 +13301,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,};
@ -13342,8 +13343,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,
@ -13357,9 +13366,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",