From b416ed72d43242432a0a151ec5cb5c3509e33a43 Mon Sep 17 00:00:00 2001 From: Martin Schwenke Date: Tue, 6 Feb 2018 13:56:05 +1100 Subject: [PATCH] ctdb-scripts: Simplify the names of NFS fail counter files Signed-off-by: Martin Schwenke Reviewed-by: Amitay Isaacs --- ctdb/config/events.d/60.nfs | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/ctdb/config/events.d/60.nfs b/ctdb/config/events.d/60.nfs index b7775db6449..f630a3d861e 100755 --- a/ctdb/config/events.d/60.nfs +++ b/ctdb/config/events.d/60.nfs @@ -119,8 +119,6 @@ nfs_check_service () esac done - _service_name="nfs_${_progname}" - _ok=false if [ -n "$service_check_cmd" ] ; then # Using eval means variables can contain semicolon separated commands @@ -140,13 +138,13 @@ nfs_check_service () if $_ok ; then if [ $unhealthy_after -ne 1 -o $restart_every -ne 0 ] ; then - ctdb_counter_init "$_service_name" + ctdb_counter_init "$_progname" fi exit 0 fi - ctdb_counter_incr "$_service_name" - _failcount=$(ctdb_counter_get "$_service_name") + ctdb_counter_incr "$_progname" + _failcount=$(ctdb_counter_get "$_progname") _unhealthy=false if [ "$unhealthy_after" -gt 0 ] ; then -- 2.34.1