summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLalatendu Mohanty <lmohanty@redhat.com>2014-10-30 01:11:02 +0530
committerNiels de Vos <ndevos@redhat.com>2014-10-30 02:19:14 -0700
commita970fc0cd7ec4ddb806273b0d7279c52587452a4 (patch)
treed09de09adcecff9a8314768c85b70065d2dbe8b6
parentd8c40d37a5850bf1021288c91d75a66c494c9c98 (diff)
logrotate: gluster logrotate config should not be globalv3.5.3beta2
Issue : Previously glusterfs logrotate config file pollutes global config. So moved the directives inside the curly braces, so they don't pollute the global config state. Change-Id: I8836893dfcdf457d9c5d766612d687bfce64e2ae BUG: 1126801 "Signed-off-by: Lalatendu Mohanty <lmohanty@redhat.com>" "Reviewed-on: http://review.gluster.org/8994" "Reviewed-by: Niels de Vos <ndevos@redhat.com>" "Tested-by: Gluster Build System <jenkins@build.gluster.com>" (cherry picked from commit a5d73daabf6df95bc73b186d92f3e2d1239a6f8a) Signed-off-by: Lalatendu Mohanty <lmohanty@redhat.com> Reviewed-on: http://review.gluster.org/9001 Tested-by: Gluster Build System <jenkins@build.gluster.com> Reviewed-by: Niels de Vos <ndevos@redhat.com>
-rw-r--r--extras/glusterfs-georep-logrotate59
-rw-r--r--extras/glusterfs-logrotate23
2 files changed, 45 insertions, 37 deletions
diff --git a/extras/glusterfs-georep-logrotate b/extras/glusterfs-georep-logrotate
index 85e69d2..381db8b 100644
--- a/extras/glusterfs-georep-logrotate
+++ b/extras/glusterfs-georep-logrotate
@@ -1,36 +1,43 @@
-
-rotate 52
-missingok
-
-compress
-delaycompress
-notifempty
-
/var/log/glusterfs/geo-replication/*/*.log {
- sharedscripts
- postrotate
- for pid in `ps -aef | grep glusterfs | egrep "\-\-aux-gfid-mount" | awk '{print $2}'`; do
- /usr/bin/kill -HUP $pid > /dev/null 2>&1 || true
- done
- endscript
+ sharedscripts
+ rotate 52
+ missingok
+ compress
+ delaycompress
+ notifempty
+ postrotate
+ for pid in `ps -aef | grep glusterfs | egrep "\-\-aux-gfid-mount" | awk '{print $2}'`; do
+ /usr/bin/kill -HUP $pid > /dev/null 2>&1 || true
+ done
+ endscript
}
/var/log/glusterfs/geo-replication-slaves/*.log {
- sharedscripts
- postrotate
- for pid in `ps -aef | grep glusterfs | egrep "\-\-aux-gfid-mount" | awk '{print $2}'`; do
- /usr/bin/kill -HUP $pid > /dev/null 2>&1 || true
- done
- endscript
+ sharedscripts
+ rotate 52
+ missingok
+ compress
+ delaycompress
+ notifempty
+ postrotate
+ for pid in `ps -aef | grep glusterfs | egrep "\-\-aux-gfid-mount" | awk '{print $2}'`; do
+ /usr/bin/kill -HUP $pid > /dev/null 2>&1 || true
+ done
+ endscript
}
/var/log/glusterfs/geo-replication-slaves/*/*.log {
- sharedscripts
- postrotate
- for pid in `ps -aef | grep glusterfs | egrep "\-\-aux-gfid-mount" | awk '{print $2}'`; do
- /usr/bin/kill -HUP $pid > /dev/null 2>&1 || true
- done
- endscript
+ sharedscripts
+ postrotate
+ rotate 52
+ missingok
+ compress
+ delaycompress
+ notifempty
+ for pid in `ps -aef | grep glusterfs | egrep "\-\-aux-gfid-mount" | awk '{print $2}'`; do
+ /usr/bin/kill -HUP $pid > /dev/null 2>&1 || true
+ done
+ endscript
}
diff --git a/extras/glusterfs-logrotate b/extras/glusterfs-logrotate
index 373ec2e..e3319af 100644
--- a/extras/glusterfs-logrotate
+++ b/extras/glusterfs-logrotate
@@ -1,17 +1,12 @@
-# perform the log rotate every week
-weekly
-# keep the backup of 52 weeks
-rotate 52
-missingok
-
-# compress the logs, but from the .2 onwards
-compress
-delaycompress
-notifempty
-
# Rotate client logs
/var/log/glusterfs/*.log {
sharedscripts
+ weekly
+ rotate 52
+ missingok
+ compress
+ delaycompress
+ notifempty
postrotate
/usr/bin/killall -HUP glusterfs > /dev/null 2>&1 || true
/usr/bin/killall -HUP glusterd > /dev/null 2>&1 || true
@@ -21,6 +16,12 @@ notifempty
# Rotate server logs
/var/log/glusterfs/bricks/*.log {
sharedscripts
+ weekly
+ rotate 52
+ missingok
+ compress
+ delaycompress
+ notifempty
postrotate
/usr/bin/killall -HUP glusterfsd > /dev/null 2>&1 || true
endscript