GitHub user wilderrodrigues opened a pull request:
https://github.com/apache/cloudstack/pull/1259
Critical VPCVR issues fixed: CLOUDSTACK-9154; CLOUDSTACK-9187; and
CLOUDSTACK-9188
This PR fixes:
* CLOUDSTACK-9154: rVPC doesn't recover from cleaning up of network garbage
collector
* CLOUDSTACK-9187: rVPC routers in Master/Master due to concurrency problem
when writing the keepalivd.conf
* CLOUDSTACK-9188: NetworkGarbageCollector is not using gc.interval and
gc.wait from settings
Those changes have been covered by 2 new tests added to
```smoke/test_vpc_redundant.py```:
* test_04_rvpc_network_garbage_collector_nics
* test_05_rvpc_multi_tiers
The test ```test_04_rvpc_network_garbage_collector_nics``` depends on the
global settings for the network.gc.interval and gc.wait. If one wants the test
to run quicker, please change the settings (default is 600 seconds for each)
and restart the Management Server before running the tests.
In addition, the NetworkGarbageCollector was redefining the settings above
mentioned and not reading their values through ConfigDao. Due to that, the
settings were not being applied properly and the test was waiting to long to
check the VPC routers.
You can merge this pull request into a Git repository by running:
$ git pull https://github.com/ekholabs/cloudstack
fix/rvpc-net-gc-CLOUDSTACK-9154
Alternatively you can review and apply these changes as the patch at:
https://github.com/apache/cloudstack/pull/1259.patch
To close this pull request, make a commit to your master/trunk branch
with (at least) the following in the commit message:
This closes #1259
----
commit 2818b7fc39927b0ed7fedcf8306dddebd77c0839
Author: Wilder Rodrigues <[email protected]>
Date: 2015-12-17T13:20:59Z
CLOUDSTACK-9154 - Returns the guest iterface that is marked as added
- Force a restart of keepalived if conntrackd is not running or
configuration has changed
commit f4b77a7d09ab88180309063b5eb32d405a5b9346
Author: Wilder Rodrigues <[email protected]>
Date: 2015-12-18T09:37:13Z
CLOUDSTACK-9154 - Adds test to cover nics state after GC
commit 0f11cdb6c793cf49681547675bb15e7df3af1696
Author: Wilder Rodrigues <[email protected]>
Date: 2015-12-18T17:32:29Z
CLOUDSTACK-9187 - Adds test to cover multiple nics and nic removal
commit f837b9bdd6d3694fe3041e6fa5541f4c8fdede67
Author: Wilder Rodrigues <[email protected]>
Date: 2015-12-18T17:36:02Z
CLOUDSTACK-9187 - Fixes interface allocation to VRRP instances
commit a48137f39765668d9118f69a027329a2204ee8f4
Author: Wilder Rodrigues <[email protected]>
Date: 2015-12-18T18:56:06Z
CLOUDSTACK-9188 - Reads network GC interval and wait from configDao
commit d414d027ed77d6818ea28c0c40e390c483907cf5
Author: Wilder Rodrigues <[email protected]>
Date: 2015-12-18T19:18:24Z
CLOUDSTACK-9187 - Makes code ready for more something like ethXXXX, if we
ever get that far
- Adds log info to NetworkOrchestrator in order to make the work of the
Net-Scavenger more visible.
commit 8848c4f11342e8ebb0b231b5df07c91649b560ef
Author: Wilder Rodrigues <[email protected]>
Date: 2015-12-19T10:21:18Z
CLOUDSTACK-9154 - Sets the pub interface down when all guest nets are gone
- Refactors the set_backup, set_master and set_fault methods to have
better names for the variable
- Increase the sleep on the test in order to wait for the routers to be
ready. It's now 3 times the GC settings
----
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at [email protected] or file a JIRA ticket
with INFRA.
---
