diff options
| -rwxr-xr-x | tests/bugs/bug-823081.t | 9 | ||||
| -rw-r--r-- | xlators/mgmt/glusterd/src/glusterd.c | 2 |
2 files changed, 6 insertions, 5 deletions
diff --git a/tests/bugs/bug-823081.t b/tests/bugs/bug-823081.t index 760d9e2b6dd..15b38517945 100755 --- a/tests/bugs/bug-823081.t +++ b/tests/bugs/bug-823081.t @@ -3,6 +3,7 @@ . $(dirname $0)/../include.rc cleanup; +cmd_log_history="cmd_history.log" V1=patchy2 TEST glusterd @@ -21,20 +22,20 @@ function set_tail () set_tail $V0; TEST $CLI volume create $V0 $H0:$B0/${V0}{1,2}; -tail=`tail --lines=1 $logdir/.cmd_log_history | cut -d " " -f 5-` +tail=`tail --lines=1 $logdir/$cmd_log_history | cut -d " " -f 5-` TEST [[ \"$tail\" == \"$tail_success\" ]] TEST ! $CLI volume create $V0 $H0:$B0/${V0}{1,2}; -tail=`tail --lines=1 $logdir/.cmd_log_history | cut -d " " -f 5-` +tail=`tail --lines=1 $logdir/$cmd_log_history | cut -d " " -f 5-` TEST [[ \"$tail\" == \"$tail_failure\" ]] set_tail $V1; TEST gluster volume create $V1 $H0:$B0/${V1}{1,2} force; -tail=`tail --lines=1 $logdir/.cmd_log_history | cut -d " " -f 5-` +tail=`tail --lines=1 $logdir/$cmd_log_history | cut -d " " -f 5-` TEST [[ \"$tail\" == \"$tail_success_force\" ]] TEST ! gluster volume create $V1 $H0:$B0/${V1}{1,2} force; -tail=`tail --lines=1 $logdir/.cmd_log_history | cut -d " " -f 5-` +tail=`tail --lines=1 $logdir/$cmd_log_history | cut -d " " -f 5-` TEST [[ \"$tail\" == \"$tail_failure_force\" ]] cleanup; diff --git a/xlators/mgmt/glusterd/src/glusterd.c b/xlators/mgmt/glusterd/src/glusterd.c index df1ff41f4ef..1ea2f357026 100644 --- a/xlators/mgmt/glusterd/src/glusterd.c +++ b/xlators/mgmt/glusterd/src/glusterd.c @@ -1480,7 +1480,7 @@ init (xlator_t *this) exit (1); } - snprintf (cmd_log_filename, PATH_MAX,"%s/.cmd_log_history", + snprintf (cmd_log_filename, PATH_MAX, "%s/cmd_history.log", DEFAULT_LOG_FILE_DIRECTORY); ret = gf_cmd_log_init (cmd_log_filename); |