]> git.ipfire.org Git - thirdparty/samba.git/commitdiff
ctdb-scripts: Always check memory usage
authorMartin Schwenke <martin@meltin.net>
Fri, 10 Jun 2022 00:03:41 +0000 (10:03 +1000)
committerAmitay Isaacs <amitay@samba.org>
Fri, 22 Jul 2022 06:38:32 +0000 (06:38 +0000)
If filesystem usage exceeds the unhealthy threshold then checking
memory usage checking is not done.  Always do them both.

Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>
ctdb/config/events/legacy/05.system.script

index 87d03eff30ddf656043e6a8220bc304ec1fa6175..70e4678f45b2561e5bfdd25f4683048d9aee3b57 100755 (executable)
@@ -181,8 +181,10 @@ monitor)
        # Load/cache database options from configuration file
        ctdb_get_db_options
 
-       monitor_filesystem_usage
-       monitor_memory_usage
+       rc=0
+       monitor_filesystem_usage || rc=$?
+       monitor_memory_usage || rc=$?
+       exit $rc
        ;;
 esac