You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by re...@apache.org on 2015/10/20 08:01:15 UTC
[10/13] git commit: updated refs/heads/master to 6fe5ae0
CLOUDSTACK-8952 - Reduce retried from 20 to 5
- We do not need to retry that much
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/2a747ca7
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/2a747ca7
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/2a747ca7
Branch: refs/heads/master
Commit: 2a747ca73538325fb24b3eefb95197bc1f8c6222
Parents: 5b3c990
Author: Wilder Rodrigues <wr...@schubergphilis.com>
Authored: Sat Oct 17 12:09:26 2015 +0200
Committer: Wilder Rodrigues <wr...@schubergphilis.com>
Committed: Sat Oct 17 12:20:42 2015 +0200
----------------------------------------------------------------------
systemvm/patches/debian/config/opt/cloud/bin/checkrouter.sh | 2 +-
.../patches/debian/config/opt/cloud/templates/checkrouter.sh.templ | 2 +-
test/integration/component/test_vpc_redundant.py | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/2a747ca7/systemvm/patches/debian/config/opt/cloud/bin/checkrouter.sh
----------------------------------------------------------------------
diff --git a/systemvm/patches/debian/config/opt/cloud/bin/checkrouter.sh b/systemvm/patches/debian/config/opt/cloud/bin/checkrouter.sh
index 1e4335c..9579b11 100755
--- a/systemvm/patches/debian/config/opt/cloud/bin/checkrouter.sh
+++ b/systemvm/patches/debian/config/opt/cloud/bin/checkrouter.sh
@@ -20,6 +20,6 @@ STATUS=BACKUP
ETH1_STATE=$(ip addr | grep eth1 | grep state | awk '{print $9;}')
if [ $ETH1_STATE = "UP" ]
then
- STATUS=MASTER
+ STATUS=MASTER
fi
echo "Status: ${STATUS}"
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/2a747ca7/systemvm/patches/debian/config/opt/cloud/templates/checkrouter.sh.templ
----------------------------------------------------------------------
diff --git a/systemvm/patches/debian/config/opt/cloud/templates/checkrouter.sh.templ b/systemvm/patches/debian/config/opt/cloud/templates/checkrouter.sh.templ
index 1e4335c..9579b11 100755
--- a/systemvm/patches/debian/config/opt/cloud/templates/checkrouter.sh.templ
+++ b/systemvm/patches/debian/config/opt/cloud/templates/checkrouter.sh.templ
@@ -20,6 +20,6 @@ STATUS=BACKUP
ETH1_STATE=$(ip addr | grep eth1 | grep state | awk '{print $9;}')
if [ $ETH1_STATE = "UP" ]
then
- STATUS=MASTER
+ STATUS=MASTER
fi
echo "Status: ${STATUS}"
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/2a747ca7/test/integration/component/test_vpc_redundant.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_vpc_redundant.py b/test/integration/component/test_vpc_redundant.py
index dfbf574..a6032a1 100644
--- a/test/integration/component/test_vpc_redundant.py
+++ b/test/integration/component/test_vpc_redundant.py
@@ -555,7 +555,7 @@ class TestVPCRedundancy(cloudstackTestCase):
time.sleep(5)
def do_vpc_test(self, expectFail):
- retries = 20
+ retries = 5
if expectFail:
retries = 2
for o in self.networks: