sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-09-12 13:44:19 +03:00
Code Activity

ctdb-scripts: Don't shutdown CTDB when memory monitoring fails

Browse Source 
Marking the node unhealthy should cause Samba processes to close,
possible freeing a stack of memory.  If not, then it is somebody
else's problem.

Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>
This commit is contained in:
Martin Schwenke
2015-08-03 19:55:27 +10:00
committed by Amitay Isaacs
parent b6a0e4b856
commit e6b5163bc1
4 changed files with 0 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ctdb/config/events.d/05.system
View File

@@ -78,13 +78,9 @@ monitor_filesystem_usage ()
dump_memory_info () dump_memory_info ()
{ {
echo "CRITICAL: Shutting down CTDB!!!"
get_proc "meminfo" get_proc "meminfo"
ps auxfww ps auxfww
set_proc "sysrq-trigger" "m" set_proc "sysrq-trigger" "m"
ctdb disable
sleep 3
ctdb shutdown
} }
monitor_memory_usage () monitor_memory_usage ()

2
ctdb/tests/eventscripts/05.system.monitor.013.sh
View File

@@ -11,10 +11,8 @@ CTDB_MONITOR_SWAP_USAGE=":50"
required_result 1 <<EOF required_result 1 <<EOF
ERROR: System swap utilization 90% >= threshold 50% ERROR: System swap utilization 90% >= threshold 50%
CRITICAL: Shutting down CTDB!!!
$FAKE_PROC_MEMINFO $FAKE_PROC_MEMINFO
$(ps foobar) $(ps foobar)
CTDB says BYE!
EOF EOF
simple_test simple_test

2
ctdb/tests/eventscripts/05.system.monitor.015.sh
View File

@@ -11,10 +11,8 @@ CTDB_MONITOR_SWAP_USAGE=""
required_result 1 <<EOF required_result 1 <<EOF
ERROR: System memory utilization 90% >= threshold 85% ERROR: System memory utilization 90% >= threshold 85%
CRITICAL: Shutting down CTDB!!!
$FAKE_PROC_MEMINFO $FAKE_PROC_MEMINFO
$(ps foobar) $(ps foobar)
CTDB says BYE!
EOF EOF
simple_test simple_test

2
ctdb/tests/eventscripts/05.system.monitor.017.sh
View File

@@ -11,7 +11,6 @@ CTDB_MONITOR_SWAP_USAGE=""
required_result 1 <<EOF required_result 1 <<EOF
ERROR: System memory utilization 87% >= threshold 80% ERROR: System memory utilization 87% >= threshold 80%
CRITICAL: Shutting down CTDB!!!
MemTotal: 3940712 kB MemTotal: 3940712 kB
MemFree: 225268 kB MemFree: 225268 kB
Buffers: 146120 kB Buffers: 146120 kB
@@ -36,7 +35,6 @@ root 1 0.0 0.0 2976 624 ? Ss Aug28 0:07 init [2]
root 495 0.0 0.0 3888 1640 ? Ss Aug28 0:00 udevd --daemon root 495 0.0 0.0 3888 1640 ? Ss Aug28 0:00 udevd --daemon
... ...
[MORE FAKE ps OUTPUT] [MORE FAKE ps OUTPUT]
CTDB says BYE!
EOF EOF
simple_test simple_test