Skip to content

Revert "Feature/mem check" #126

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ayushaga14 wants to merge 1 commit into
base: feature/k8s_ebpf
Choose a base branch
from
+2 −69
Open

Revert "Feature/mem check" #126

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
71 changes: 2 additions & 69 deletions ebpf-run.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,7 @@

LOG_FILE="/tmp/dump.log"
MAX_LOG_SIZE=${MAX_LOG_SIZE:-10485760} # Default to 10 MB if not set (10 MB = 10 * 1024 * 1024 bytes)
CHECK_INTERVAL=${CHECK_INTERVAL:-60}
CHECK_INTERVAL_MEM=${CHECK_INTERVAL_MEM:-10} # Check interval in seconds (configurable via env)
MEMORY_THRESHOLD=${MEMORY_THRESHOLD:-80} # Kill process at this % memory usage (configurable via env)
CHECK_INTERVAL=60 # Check interval in seconds

# Function to rotate the log file
rotate_log() {
Expand All @@ -16,30 +14,6 @@ rotate_log() {
fi
}

# Function to check memory usage and kill process if threshold exceeded
check_memory_and_kill() {
# Get current memory usage in bytes
if [ -f /sys/fs/cgroup/memory.current ]; then
# cgroup v2
CURRENT_MEM=$(cat /sys/fs/cgroup/memory.current)
elif [ -f /sys/fs/cgroup/memory/memory.usage_in_bytes ]; then
# cgroup v1
CURRENT_MEM=$(cat /sys/fs/cgroup/memory/memory.usage_in_bytes)
else
return
fi

# Calculate percentage used
PERCENT_USED=$((CURRENT_MEM * 100 / MEM_LIMIT_BYTES))

echo "Memory usage: ${PERCENT_USED}% (${CURRENT_MEM} / ${MEM_LIMIT_BYTES} bytes)"

if [ "$PERCENT_USED" -ge "$MEMORY_THRESHOLD" ]; then
echo "Memory threshold ${MEMORY_THRESHOLD}% exceeded (${PERCENT_USED}%), killing ebpf-logging process"
pkill -9 ebpf-logging
fi
}

# Start monitoring in the background
if [[ "${ENABLE_LOGS}" == "false" ]]; then
while true; do
Expand All @@ -48,51 +22,10 @@ if [[ "${ENABLE_LOGS}" == "false" ]]; then
done &
fi

# 1. Check if MEM_LIMIT is provided as env variable
if [ -z "$MEM_LIMIT" ]; then
# Not provided, detect and read cgroup memory limits
if [ -f /sys/fs/cgroup/memory.max ]; then
# cgroup v2
MEM_LIMIT_BYTES=$(cat /sys/fs/cgroup/memory.max)
elif [ -f /sys/fs/cgroup/memory/memory.limit_in_bytes ]; then
# cgroup v1
MEM_LIMIT_BYTES=$(cat /sys/fs/cgroup/memory/memory.limit_in_bytes)
else
# Fallback to free -b (bytes) if cgroup file not found
echo "Neither cgroup v2 nor v1 memory file found, defaulting to free -m"
# Convert from kB to bytes
MEM_LIMIT_BYTES=$(free -b | awk '/Mem:/ {print $2}')
fi

# 2. Handle edge cases: "max" means no strict limit or a very large limit
if [ "$MEM_LIMIT_BYTES" = "max" ]; then
# Arbitrary fallback (1 GiB in bytes here, but adjust as needed)
echo "Cgroup memory limit set to 'max', defaulting to free memory"
MEM_LIMIT_BYTES=$(free -b | awk '/Mem:/ {print $2}')
fi

# 3. Convert the memory limit from bytes to MB (integer division)
MEM_LIMIT_MB=$((MEM_LIMIT_BYTES / 1024 / 1024))
else
# MEM_LIMIT provided as env variable, treat as MB
echo "Using MEM_LIMIT from environment variable: ${MEM_LIMIT} MB"
MEM_LIMIT_MB=$MEM_LIMIT
# Convert MB to bytes for calculations
MEM_LIMIT_BYTES=$((MEM_LIMIT * 1024 * 1024))
fi

echo "Using container memory limit: ${MEM_LIMIT_MB} MB"

# Start memory monitoring in the background
while true; do
check_memory_and_kill
sleep "$CHECK_INTERVAL_MEM"
done &

while :
do
if [[ "${ENABLE_LOGS}" == "false" ]]; then
./ebpf-logging >> "$LOG_FILE" 2>&1
./ebpf-logging >> "$LOG_FILE" 2>&1
else
./ebpf-logging
fi
Expand Down
Loading