From 2e1be8bc6962b403c47524c782b13211d3e11d93 Mon Sep 17 00:00:00 2001 From: Dmitry Date: Mon, 11 Nov 2024 13:17:39 +0300 Subject: [PATCH] Fixed an issue with infinite configuration application. (#375) --- config/config.go | 2 +- current_version_agent | 2 +- install.sh | 4 ++-- mysqlconfigurer.sh | 4 ++-- tasks/tasks.go | 4 ++++ 5 files changed, 10 insertions(+), 6 deletions(-) diff --git a/config/config.go b/config/config.go index 4092922..bad5d99 100644 --- a/config/config.go +++ b/config/config.go @@ -9,7 +9,7 @@ import ( ) const ( - ReleemAgentVersion = "1.19.6" + ReleemAgentVersion = "1.19.6.1" ) type Config struct { diff --git a/current_version_agent b/current_version_agent index a85b56d..4e9b792 100644 --- a/current_version_agent +++ b/current_version_agent @@ -1 +1 @@ -1.19.6 \ No newline at end of file +1.19.6.1 \ No newline at end of file diff --git a/install.sh b/install.sh index 5a59b49..ffddf32 100644 --- a/install.sh +++ b/install.sh @@ -1,5 +1,5 @@ #!/bin/bash -# install.sh - Version 1.19.6 +# install.sh - Version 1.19.6.1 # (C) Releem, Inc 2022 # All rights reserved @@ -9,7 +9,7 @@ export PATH=$PATH:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/ # using the package manager. set -e -E -install_script_version=1.19.6 +install_script_version=1.19.6.1 logfile="/var/log/releem-install.log" WORKDIR="/opt/releem" diff --git a/mysqlconfigurer.sh b/mysqlconfigurer.sh index 05f6d4c..4eee77d 100755 --- a/mysqlconfigurer.sh +++ b/mysqlconfigurer.sh @@ -1,5 +1,5 @@ #!/bin/bash -# mysqlconfigurer.sh - Version 1.19.6 +# mysqlconfigurer.sh - Version 1.19.6.1 # (C) Releem, Inc 2022 # All rights reserved @@ -15,7 +15,7 @@ MYSQLTUNER_REPORT=$MYSQLCONFIGURER_PATH"mysqltunerreport.json" RELEEM_MYSQL_VERSION=$MYSQLCONFIGURER_PATH"mysql_version" MYSQLCONFIGURER_CONFIGFILE="${MYSQLCONFIGURER_PATH}${MYSQLCONFIGURER_FILE_NAME}" MYSQL_MEMORY_LIMIT=0 -VERSION="1.19.6" +VERSION="1.19.6.1" RELEEM_INSTALL_PATH=$MYSQLCONFIGURER_PATH"install.sh" logfile="/var/log/releem-mysqlconfigurer.log" diff --git a/tasks/tasks.go b/tasks/tasks.go index f25ff62..32a9d3b 100644 --- a/tasks/tasks.go +++ b/tasks/tasks.go @@ -233,6 +233,10 @@ func ApplyConfLocal(metrics *models.Metrics, repeaters models.MetricsRepeater, g task_status = 4 } else if need_restart { task_exit_code = 10 + task_status = 1 + } else { + task_exit_code = 0 + task_status = 1 } } time.Sleep(10 * time.Second)