You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ml...@apache.org on 2014/05/22 17:18:12 UTC
git commit: updated refs/heads/master to 2c810d7
Repository: cloudstack
Updated Branches:
refs/heads/master d5754d910 -> 2c810d73e
CLOUDSTACK-6751 - Disable stats logging for conntrackd upon systemvm creation
Submitted-by: Joris van Lieshout <jv...@schubergphilis.com>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/2c810d73
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/2c810d73
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/2c810d73
Branch: refs/heads/master
Commit: 2c810d73e24411e767296b62e59d2acbb77b7df5
Parents: d5754d9
Author: Marcus Sorensen <ma...@betterservers.com>
Authored: Thu May 22 09:20:33 2014 -0600
Committer: Marcus Sorensen <ma...@betterservers.com>
Committed: Thu May 22 09:20:33 2014 -0600
----------------------------------------------------------------------
.../appliance/definitions/systemvm64template/postinstall.sh | 8 ++++++++
tools/appliance/definitions/systemvmtemplate/postinstall.sh | 8 ++++++++
2 files changed, 16 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/2c810d73/tools/appliance/definitions/systemvm64template/postinstall.sh
----------------------------------------------------------------------
diff --git a/tools/appliance/definitions/systemvm64template/postinstall.sh b/tools/appliance/definitions/systemvm64template/postinstall.sh
index cc8ead9..2e0ff13 100644
--- a/tools/appliance/definitions/systemvm64template/postinstall.sh
+++ b/tools/appliance/definitions/systemvm64template/postinstall.sh
@@ -183,6 +183,13 @@ EOF
locale-gen en_US.UTF-8
}
+# This is actually a bug in the conntrackd package. The comment in the conf file says stats logging is off by default but the parameter is set to on.
+# After a couple weeks logrotate will rotate the conntrackd-stats.log file ans start conntracking even if we don't want it to (on non-redundant routers for instance).
+fix_conntrackd() {
+ sed -i '/Stats {/,/}/ s/LogFile on/LogFile off/' /etc/conntrackd/conntrackd.conf
+ rm -f /var/log/conntrackd-stats.log
+}
+
fix_vhdutil() {
wget --no-check-certificate http://download.cloud.com.s3.amazonaws.com/tools/vhd-util -O /bin/vhd-util
chmod a+x /bin/vhd-util
@@ -194,6 +201,7 @@ do_fixes() {
fix_acpid
fix_hostname
fix_locale
+ fix_conntrackd
fix_vhdutil
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/2c810d73/tools/appliance/definitions/systemvmtemplate/postinstall.sh
----------------------------------------------------------------------
diff --git a/tools/appliance/definitions/systemvmtemplate/postinstall.sh b/tools/appliance/definitions/systemvmtemplate/postinstall.sh
index 23e66dd..4b3990c 100644
--- a/tools/appliance/definitions/systemvmtemplate/postinstall.sh
+++ b/tools/appliance/definitions/systemvmtemplate/postinstall.sh
@@ -173,6 +173,13 @@ EOF
locale-gen en_US.UTF-8
}
+# This is actually a bug in the conntrackd package. The comment in the conf file says stats logging is off by default but the parameter is set to on.
+# After a couple weeks logrotate will rotate the conntrackd-stats.log file ans start conntracking even if we don't want it to (on non-redundant routers for instance).
+fix_conntrackd() {
+ sed -i '/Stats {/,/}/ s/LogFile on/LogFile off/' /etc/conntrackd/conntrackd.conf
+ rm -f /var/log/conntrackd-stats.log
+}
+
fix_vhdutil() {
wget --no-check-certificate http://download.cloud.com.s3.amazonaws.com/tools/vhd-util -O /bin/vhd-util
chmod a+x /bin/vhd-util
@@ -184,6 +191,7 @@ do_fixes() {
fix_acpid
fix_hostname
fix_locale
+ fix_conntrackd
fix_vhdutil
}