You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by bh...@apache.org on 2015/03/30 10:19:50 UTC
[1/2] git commit: updated refs/heads/4.5 to 77ed0c4
Repository: cloudstack
Updated Branches:
refs/heads/4.5 9875803cf -> 77ed0c4b9
systemvm64template: use separate partition for /var/log
/var/log fills up /var and fails operation of normal services. This fix
restricts /var/log to 100-200M. The fix for CLOUDSTACK-6885 tries to make sure
we don't keep a lot of logs.
Signed-off-by: Rohit Yadav <ro...@shapeblue.com>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/77ed0c4b
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/77ed0c4b
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/77ed0c4b
Branch: refs/heads/4.5
Commit: 77ed0c4b96426b8ba5d96a771fe03b5ad88ed04f
Parents: 888f67f
Author: Rohit Yadav <ro...@shapeblue.com>
Authored: Mon Mar 30 13:47:31 2015 +0530
Committer: Rohit Yadav <ro...@shapeblue.com>
Committed: Mon Mar 30 13:49:15 2015 +0530
----------------------------------------------------------------------
.../appliance/definitions/systemvm64template/preseed.cfg | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/77ed0c4b/tools/appliance/definitions/systemvm64template/preseed.cfg
----------------------------------------------------------------------
diff --git a/tools/appliance/definitions/systemvm64template/preseed.cfg b/tools/appliance/definitions/systemvm64template/preseed.cfg
index 70696c5..b1675c2 100644
--- a/tools/appliance/definitions/systemvm64template/preseed.cfg
+++ b/tools/appliance/definitions/systemvm64template/preseed.cfg
@@ -136,7 +136,7 @@ d-i partman-auto/expert_recipe string \
use_filesystem{ } filesystem{ ext4 } \
mountpoint{ /boot } \
. \
- 400 40 800 ext4 \
+ 500 40 800 ext4 \
method{ format } format{ } \
use_filesystem{ } filesystem{ ext4 } \
mountpoint{ / } \
@@ -146,12 +146,12 @@ d-i partman-auto/expert_recipe string \
use_filesystem{ } filesystem{ ext4 } \
mountpoint{ /home } \
. \
- 700 60 1400 ext4 \
+ 800 60 1400 ext4 \
method{ format } format{ } \
use_filesystem{ } filesystem{ ext4 } \
mountpoint{ /usr } \
. \
- 300 40 600 ext4 \
+ 100 40 200 ext4 \
method{ format } format{ } \
use_filesystem{ } filesystem{ ext4 } \
mountpoint{ /opt } \
@@ -161,6 +161,11 @@ d-i partman-auto/expert_recipe string \
use_filesystem{ } filesystem{ ext4 } \
mountpoint{ /var } \
. \
+ 200 50 500 ext4 \
+ method{ format } format{ } \
+ use_filesystem{ } filesystem{ ext4 } \
+ mountpoint{ /var/log } \
+ . \
100 90 200 ext4 \
method{ format } format{ } \
use_filesystem{ } filesystem{ ext4 } \
[2/2] git commit: updated refs/heads/4.5 to 77ed0c4
Posted by bh...@apache.org.
systemvm: fix socat usage
Signed-off-by: Rohit Yadav <ro...@shapeblue.com>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/888f67f0
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/888f67f0
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/888f67f0
Branch: refs/heads/4.5
Commit: 888f67f0bdc3e76c452c2dc3f7715f2df12bda7d
Parents: 9875803
Author: Rohit Yadav <ro...@shapeblue.com>
Authored: Mon Mar 30 12:44:52 2015 +0530
Committer: Rohit Yadav <ro...@shapeblue.com>
Committed: Mon Mar 30 13:49:15 2015 +0530
----------------------------------------------------------------------
.../patches/debian/config/etc/init.d/cloud-passwd-srvr | 10 +++++-----
.../patches/debian/config/opt/cloud/bin/vpc_guestnw.sh | 2 +-
.../patches/debian/config/opt/cloud/bin/vpc_passwd_server | 2 +-
.../component/maint/test_multiple_ip_ranges.py | 4 ++--
4 files changed, 9 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/888f67f0/systemvm/patches/debian/config/etc/init.d/cloud-passwd-srvr
----------------------------------------------------------------------
diff --git a/systemvm/patches/debian/config/etc/init.d/cloud-passwd-srvr b/systemvm/patches/debian/config/etc/init.d/cloud-passwd-srvr
index d276bfd..33b0ea3 100755
--- a/systemvm/patches/debian/config/etc/init.d/cloud-passwd-srvr
+++ b/systemvm/patches/debian/config/etc/init.d/cloud-passwd-srvr
@@ -86,16 +86,16 @@ getpid() {
echo $pid
}
-stop_socat() {
- spid=$(pidof socat)
- [ "$spid" != "" ] && kill -9 $spid && echo "Killed socat (pid=$spid)"
+stop_password_server() {
+ spid=$(pidof -s python passwd_server_ip.py)
+ [ "$spid" != "" ] && kill -9 $spid && echo "Killed password server (pid=$spid)"
return 0
}
stop () {
- stop_socat
+ stop_password_server
pid=$(getpid)
- [ "$pid" != "" ] && kill -9 $pid && remove_iptables_rules && echo "Stopped password server (pid=$pid)" && stop_socat && return 0
+ [ "$pid" != "" ] && kill -9 $pid && remove_iptables_rules && echo "Stopped password server (pid=$pid)" && stop_password_server && return 0
echo "Password server is not running" && return 0
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/888f67f0/systemvm/patches/debian/config/opt/cloud/bin/vpc_guestnw.sh
----------------------------------------------------------------------
diff --git a/systemvm/patches/debian/config/opt/cloud/bin/vpc_guestnw.sh b/systemvm/patches/debian/config/opt/cloud/bin/vpc_guestnw.sh
index 0115ab2..a788134 100755
--- a/systemvm/patches/debian/config/opt/cloud/bin/vpc_guestnw.sh
+++ b/systemvm/patches/debian/config/opt/cloud/bin/vpc_guestnw.sh
@@ -121,7 +121,7 @@ setup_passwdsvcs() {
desetup_passwdsvcs() {
logger -t cloud "Desetting up password service for network $ip/$mask, eth $dev "
sudo iptables -D INPUT -i $dev -d $ip -p tcp -m state --state NEW --dport 8080 -j ACCEPT
- pid=`ps -ef | grep socat | grep $ip | grep -v grep | awk '{print $2}'`
+ pid=`ps -ef | grep passwd_server_ip.py | grep $ip | grep -v grep | awk '{print $2}'`
if [ -n "$pid" ]
then
kill -9 $pid
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/888f67f0/systemvm/patches/debian/config/opt/cloud/bin/vpc_passwd_server
----------------------------------------------------------------------
diff --git a/systemvm/patches/debian/config/opt/cloud/bin/vpc_passwd_server b/systemvm/patches/debian/config/opt/cloud/bin/vpc_passwd_server
index 31fbd8c..228e156 100755
--- a/systemvm/patches/debian/config/opt/cloud/bin/vpc_passwd_server
+++ b/systemvm/patches/debian/config/opt/cloud/bin/vpc_passwd_server
@@ -25,7 +25,7 @@ do
rc=$?
if [ $rc -ne 0 ]
then
- logger -t cloud "Password server failed with error code $rc. Restarting socat..."
+ logger -t cloud "Password server failed with error code $rc. Restarting password server..."
sleep 3
fi
result=`ip addr show | grep $ip`
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/888f67f0/test/integration/component/maint/test_multiple_ip_ranges.py
----------------------------------------------------------------------
diff --git a/test/integration/component/maint/test_multiple_ip_ranges.py b/test/integration/component/maint/test_multiple_ip_ranges.py
index f73c470..cd845d2 100644
--- a/test/integration/component/maint/test_multiple_ip_ranges.py
+++ b/test/integration/component/maint/test_multiple_ip_ranges.py
@@ -362,7 +362,7 @@ class TestMultipleIpRanges(cloudstackTestCase):
def test_03_passwd_service_on_alias_IP(self):
"""Deploy guest vm in new CIDR and verify passwd service on alias ip
1.Deploy guest vm in new cidr
- 2.Verify password service(socat) listens on alias ip in VR
+ 2.Verify password service(passwd_server_ip.py) listens on alias ip in VR
"""
list_router_response = list_routers(
self.apiclient,
@@ -403,7 +403,7 @@ class TestMultipleIpRanges(cloudstackTestCase):
# attempt
SshClient(host.ipaddress, port, username, password)
- proc = "socat"
+ proc = "python passwd_server_ip.py"
result = get_process_status(
host.ipaddress,
port,