Simulator: Better VR Redundant Status Behaviour#3313
Simulator: Better VR Redundant Status Behaviour#3313andrijapanicsb merged 2 commits intoapache:masterfrom
Conversation
|
Closed-reopend PR to rekick Travis |
|
@rhtyd a Jenkins job has been kicked to build packages. I'll keep you posted as I make progress. |
|
Packaging result: ✔centos6 ✔centos7 ✔debian. JID-2798 |
|
Smoketests are not necessary as changes are purely in simulator, Travis tests should be enough to merge this. |
|
Checked LGTM, no explicit smoketests needed as changes are in simulator code that is tested by Travis. |
|
@richardlawley can you look at the failing marvin tests in Travis and fix or advise if they are related to this PR: |
|
Closed reopen the PR to rekick Travis tests. I believe few failures seen in the travis run were caused by PR changes, can you test/confirm @richardlawley ? |
|
ping @richardlawley |
|
I will get to this, but my other PR is higher on my priority list as this doesn't offer any functionality for 4.13 - it was there so that I could add tests for the password reset only working for one VR issue. |
|
@richardlawley Okay, I'll move this away from 4.13. If you manage to fix the issues before 4.13 RC1 ping me to change the milestone. Thanks. |
|
I'll close+reopen the PR to rekick Travis and see if it passes with the simulator related changes |
|
ping @richardlawley can you do any needed changes/fixes if you need this in 4.14 please - or shall we move it to 4.15 milestone? |
|
@andrijapanicsb , this is just simulator code, no production code. I think we can merge this and forward fix if issues are revealed. |
|
You know better @DaanHoogland - if you feel so, then please move forward with it. (the reason I asked is due to some Travis tests failing, per other guys words due to those changes?) |
|
ok, investigating quickly @andrijapanicsb |
|
All jobs failed due to log length, try insanity to see if that helps. |
|
OK, merging based on 3 x LGTM |
This reverts commit d868cd1.
|
@richardlawley can you have a look at it again and re-submit a new PR. It seem this PR breaks Travis/simulator for some of the tests you can see https://travis-ci.org/apache/cloudstack/builds/622114507?utm_source=github_status&utm_medium=notification |
* Make VRs change redundant status in simulator with start/stop/reboot * Prevent getMockRouters returning null elements
apache#3796) This reverts commit d868cd1.
Description
Before this change, when creating a HA network in the Simulator, both Routers would be in BACKUP mode. Many years ago in f0c3b4c, logic was added to allow the line "router_pr=100" to be added to the bootargs field of mockvm in the Simulator database to allow a VR to become MASTER. This doesn't work automatically (nowhere sets it) and actually fails because the field is too short, and no other statuses can be simulated.
With this PR, Redundant State now comes from the "redundate_state=MASTER" part in bootargs, which is already populated.
Additionally, the Start/Reboot/Stop VM code of the simulator now incldues logic to change the redundant state:
This will allow integration tests to easily change the state of a VR.
With this PR, the simulator will change the redundant state of a VR when it is started or stopped. When a VR is started, if there are no other running VRs that are MASTER then
Types of changes
Screenshots (if appropriate):
How Has This Been Tested?