openstack/deb-nova
Code Issues Proposed changes

Merge "XenAPI: Fix race in rotate_xen_guest_logs"

Browse Source
This commit is contained in:
Jenkins
2016-01-05 17:33:34 +00:00
committed by Gerrit Code Review
parent 300a2edf9f 61813e69f7
commit 3fdb41323a
1 changed files with 20 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
tools/xenserver/rotate_xen_guest_logs.sh
View File

@@ -18,12 +18,18 @@ log_dir="/var/log/xen/guest"
kb=1024 kb=1024
max_size_bytes=$(($kb*$kb)) max_size_bytes=$(($kb*$kb))
truncated_size_bytes=$((5*$kb)) truncated_size_bytes=$((5*$kb))
syslog_tag='rotate_xen_guest_logs'
log_file_base="${log_dir}/console." log_file_base="${log_dir}/console."
# Ensure logging is setup correctly for all domains # Ensure logging is setup correctly for all domains
xenstore-write /local/logconsole/@ "${log_file_base}%d" xenstore-write /local/logconsole/@ "${log_file_base}%d"
# Grab the list of logs now to prevent a race where the domain is
# started after we get the valid last_dom_ids, but before the logs are
# deleted. Add spaces to ensure we can do containment tests below
current_logs=$(find "$log_dir" -type f)
# Ensure the last_dom_id is set + updated for all running VMs # Ensure the last_dom_id is set + updated for all running VMs
for vm in $(xe vm-list power-state=running --minimal | tr ',' ' '); do for vm in $(xe vm-list power-state=running --minimal | tr ',' ' '); do
xe vm-param-set uuid=$vm other-config:last_dom_id=$(xe vm-param-get uuid=$vm param-name=dom-id) xe vm-param-set uuid=$vm other-config:last_dom_id=$(xe vm-param-get uuid=$vm param-name=dom-id)
@@ -31,19 +37,27 @@ done
# Get the last_dom_id for all VMs # Get the last_dom_id for all VMs
valid_last_dom_ids=$(xe vm-list params=other-config --minimal | tr ';,' '\n\n' | grep last_dom_id | sed -e 's/last_dom_id: //g' | xargs) valid_last_dom_ids=$(xe vm-list params=other-config --minimal | tr ';,' '\n\n' | grep last_dom_id | sed -e 's/last_dom_id: //g' | xargs)
echo "Valid dom IDs: $valid_last_dom_ids" | /usr/bin/logger -t $syslog_tag
# Remove console files that do not correspond to valid last_dom_id's # Remove console files that do not correspond to valid last_dom_id's
allowed_consoles=".*console.\(${valid_last_dom_ids// /\\|}\)$" allowed_consoles=".*console.\(${valid_last_dom_ids// /\\|}\)$"
find $log_dir -type f -not -regex $allowed_consoles -delete delete_logs=`find "$log_dir" -type f -not -regex "$allowed_consoles"`
for log in $delete_logs; do
if echo "$current_logs" | grep -q -w "$log"; then
echo "Deleting: $log" | /usr/bin/logger -t $syslog_tag
rm $log
fi
done
# Truncate all remaining logs # Truncate all remaining logs
for log in `find $log_dir -type f -regex '.*console.*' -size +${max_size_bytes}c`; do for log in `find "$log_dir" -type f -regex '.*console.*' -size +${max_size_bytes}c`; do
echo "Truncating log: $log" | /usr/bin/logger -t $syslog_tag
tmp="$log.tmp" tmp="$log.tmp"
tail -c $truncated_size_bytes $log > $tmp tail -c $truncated_size_bytes "$log" > "$tmp"
mv -f $tmp $log mv -f "$tmp" "$log"
# Notify xen that it needs to reload the file # Notify xen that it needs to reload the file
domid=${log##*.} domid="${log##*.}"
xenstore-write /local/logconsole/$domid $log xenstore-write /local/logconsole/$domid "$log"
xenstore-rm /local/logconsole/$domid xenstore-rm /local/logconsole/$domid
done done