cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From r...@apache.org
Subject [13/13] git commit: updated refs/heads/master to 6fe5ae0
Date Tue, 20 Oct 2015 06:01:18 GMT
Merge pull request #940 from ekholabs/fix/rvr__keepalived_restart

CLOUDSTACK-8952 - The redundant routers are facing a race condition due to several KeepaliveD/ConntrackD
restartsThis PR fixes the following issues:

* KeepAliveD being restarted for each action performed on the routers
* ConntrackD configuration being copied for each action performed on the routers, causing
several restarts
* ACS Management Server relying in the JSON file to report which router is Master/Backup
* Public Interface on both routers are in UP state due to several places checking if the interface
is UP/DOWN and trying to do KeepAliveD
* Removing all the sleeps from the test_vpc_redundant.py - those are no longer needed
* When KeepAliveD calls master.py during the election, update the cmdline.json to set the
router in Backup mode: the election will take care of changing it afterwards.
* Add LB stats_rules to iptables INPUT chain
* The RVR public interface is set to eth2 instead of eth1 - as in the rVPC. Make sure the
check works in both cases

Those fixes make all the routers very stable, with ACL, FW, PF and LB working just fine!

* pr/940:
  CLOUDSTACK-8952 - Make the checkrouter.sh compatible with RVR as well
  CLOUDSTACK-8952 - Make the tests rely on the interface state other than the json file
  CLOUDSTACK-8952 - Reduce retried from 20 to 5
  CLOUDSTACK-8952 - Do not rely in the router state on the json file to report back to ACS
  CLOUDSTACK-8952 - Make the check for master more reliable
  CLOUDSTACK-8952 - Restart dnsmasq everytime the configure.py runs
  CLOUDSTACK-8952 - Make sure the calls to CsFile use the new logic of commit/is_changed methods
  CLOUDSTACK-8952 - Make sure we restart dnsmasq if the configuration file changes
  CLOUDSTACK-8952 - The public interface was comming UP in the Backup router
  CLOUDSTACK-8952 - Do not restart conntrackd unless it's needed
  CLOUDSTACK-8952 - Do not replace the conntrackd config file unless it's needed
  CLOUDSTACK-8952 - Remove the '--vrrp' search criteria form the CsProcess constructor call

Signed-off-by: Remi Bergsma <github@remi.nl>


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/6fe5ae0d
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/6fe5ae0d
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/6fe5ae0d

Branch: refs/heads/master
Commit: 6fe5ae0d609592c790848aa4249803904deb49cf
Parents: 0827e1f fb33cb2
Author: Remi Bergsma <github@remi.nl>
Authored: Tue Oct 20 08:00:03 2015 +0200
Committer: Remi Bergsma <github@remi.nl>
Committed: Tue Oct 20 08:00:04 2015 +0200

----------------------------------------------------------------------
 .../debian/config/opt/cloud/bin/checkrouter.sh  | 19 ++++--
 .../debian/config/opt/cloud/bin/configure.py    |  4 +-
 .../debian/config/opt/cloud/bin/cs/CsAddress.py | 23 +------
 .../debian/config/opt/cloud/bin/cs/CsApp.py     |  2 +-
 .../debian/config/opt/cloud/bin/cs/CsDhcp.py    | 14 ++--
 .../debian/config/opt/cloud/bin/cs/CsFile.py    |  7 +-
 .../config/opt/cloud/bin/cs/CsLoadBalancer.py   | 20 ++++--
 .../config/opt/cloud/bin/cs/CsRedundant.py      | 42 +++++++-----
 .../debian/config/opt/cloud/bin/master.py       |  3 +
 .../opt/cloud/templates/checkrouter.sh.templ    | 19 ++++--
 .../integration/component/test_vpc_redundant.py | 69 ++++++++++++++++----
 11 files changed, 147 insertions(+), 75 deletions(-)
----------------------------------------------------------------------



Mime
View raw message