Skip to content

vr: Fix vpc router in UNKNOWN state - #3465

Merged
yadvr merged 2 commits into
apache:masterfrom
ustcweizhou:4.11-vr-unknown-state
Jul 10, 2019
Merged

yadvr merged 2 commits into
apache:masterfrom
ustcweizhou:4.11-vr-unknown-state

Conversation

@ustcweizhou

Copy link
Copy Markdown
Contributor

Description

If there are more than 10 vpc tiers or public ip subnets in a VPC, eth1X will be added in vpc router.
The redundant state is UNKNOWN in this case.

Types of changes

  • Breaking change (fix or feature that would cause existing functionality to change)
  • New feature (non-breaking change which adds functionality)
  • Bug fix (non-breaking change which fixes an issue)
  • Enhancement (improves an existing feature and functionality)
  • Cleanup (Code refactoring and cleanup, that may add test cases)

How Has This Been Tested?

creaete more than 10 vpc tiers, then vpc router will be UNKNOWN
it can be fixed by this commit.

@yadvr

yadvr commented Jul 4, 2019

Copy link
Copy Markdown
Member

@blueorangutan package

@yadvr yadvr added this to the 4.13.0.0 milestone Jul 4, 2019
@yadvr

yadvr commented Jul 4, 2019

Copy link
Copy Markdown
Member

@blueorangutan package

@borisstoyanov borisstoyanov left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This LGTM, but it needs to be verified with marvin smoketests

@blueorangutan

Copy link
Copy Markdown

@rhtyd a Jenkins job has been kicked to build packages. I'll keep you posted as I make progress.

@blueorangutan

Copy link
Copy Markdown

Packaging result: ✔centos6 ✔centos7 ✔debian. JID-83

@yadvr

yadvr commented Jul 4, 2019

Copy link
Copy Markdown
Member

@blueorangutan test

@blueorangutan

Copy link
Copy Markdown

@rhtyd a Trillian-Jenkins test job (centos7 mgmt + kvm-centos7) has been kicked to run smoke tests

@yadvr

yadvr commented Jul 8, 2019

Copy link
Copy Markdown
Member

@blueorangutan test

@blueorangutan

Copy link
Copy Markdown

@rhtyd a Trillian-Jenkins test job (centos7 mgmt + kvm-centos7) has been kicked to run smoke tests

@yadvr

yadvr commented Jul 9, 2019

Copy link
Copy Markdown
Member

I've tried kicking at least 5 environments/builds now. For some reason the systemvms fail to start with this PR, can you check @ustcweizhou

@yadvr
yadvr changed the base branch from 4.11 to master July 9, 2019 09:08
@yadvr

yadvr commented Jul 9, 2019

Copy link
Copy Markdown
Member

Let try again against master
@blueorangutan package

@blueorangutan

Copy link
Copy Markdown

@rhtyd a Jenkins job has been kicked to build packages. I'll keep you posted as I make progress.

@ustcweizhou

Copy link
Copy Markdown
Contributor Author

@rhtyd if it still fails I will update the PR to use "grep -w eth0/eth1"

@blueorangutan

Copy link
Copy Markdown

Packaging result: ✔centos6 ✔centos7 ✔debian. JID-104

@yadvr

yadvr commented Jul 9, 2019

Copy link
Copy Markdown
Member

Okay @ustcweizhou let me test one more time.
@blueorangutan test

@blueorangutan

Copy link
Copy Markdown

@rhtyd a Trillian-Jenkins test job (centos7 mgmt + kvm-centos7) has been kicked to run smoke tests

If there are more than 10 vpc tiers or public ip subnets in a VPC, eth1X will be added in vpc router.
The redundant state is UNKNOWN in this case.
@ustcweizhou
ustcweizhou force-pushed the 4.11-vr-unknown-state branch from 940724e to 3c8655e Compare July 9, 2019 19:10
@ustcweizhou

Copy link
Copy Markdown
Contributor Author

@rhtyd I have updated the code to use "grep -w"

@ustcweizhou

Copy link
Copy Markdown
Contributor Author

@blueorangutan package

@blueorangutan

Copy link
Copy Markdown

@ustcweizhou a Jenkins job has been kicked to build packages. I'll keep you posted as I make progress.

@blueorangutan

Copy link
Copy Markdown

Packaging result: ✔centos6 ✔centos7 ✔debian. JID-108

@ustcweizhou

Copy link
Copy Markdown
Contributor Author

@blueorangutan test

@blueorangutan

Copy link
Copy Markdown

Trillian test result (tid-127)
Environment: kvm-centos7 (x2), Advanced Networking with Mgmt server 7
Total time taken: 35825 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr3465-t127-kvm-centos7.zip
Intermittent failure detected: /marvin/tests/smoke/test_vpc_redundant.py
Intermittent failure detected: /marvin/tests/smoke/test_vpc_vpn.py
Smoke tests completed. 70 look OK, 2 have error(s)
Only failed tests results shown below:

Test Result Time (s) Test File
test_05_rvpc_multi_tiers Failure 416.81 test_vpc_redundant.py
test_05_rvpc_multi_tiers Error 446.28 test_vpc_redundant.py
test_01_redundant_vpc_site2site_vpn Failure 289.16 test_vpc_vpn.py

@yadvr

yadvr commented Jul 10, 2019

Copy link
Copy Markdown
Member

@ustcweizhou the previous show dev syntax LGTM, can you put that back in?

@yadvr

yadvr commented Jul 10, 2019

Copy link
Copy Markdown
Member

Tests lgtm, I'll rekick one more time.
@blueorangutan package

@blueorangutan

Copy link
Copy Markdown

@rhtyd a Jenkins job has been kicked to build packages. I'll keep you posted as I make progress.

@blueorangutan

Copy link
Copy Markdown

Packaging result: ✔centos6 ✔centos7 ✔debian. JID-109

@ustcweizhou

Copy link
Copy Markdown
Contributor Author

@rhtyd ok

@yadvr

yadvr commented Jul 10, 2019

Copy link
Copy Markdown
Member

If the next run passes or does not have common errors from the previous run, we should merge this.
@blueorangutan test

@blueorangutan

Copy link
Copy Markdown

@rhtyd a Trillian-Jenkins test job (centos7 mgmt + kvm-centos7) has been kicked to run smoke tests

@blueorangutan

Copy link
Copy Markdown

Trillian test result (tid-135)
Environment: kvm-centos7 (x2), Advanced Networking with Mgmt server 7
Total time taken: 36656 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr3465-t135-kvm-centos7.zip
Intermittent failure detected: /marvin/tests/smoke/test_internal_lb.py
Intermittent failure detected: /marvin/tests/smoke/test_vpc_redundant.py
Intermittent failure detected: /marvin/tests/smoke/test_vpc_vpn.py
Smoke tests completed. 70 look OK, 2 have error(s)
Only failed tests results shown below:

Test Result Time (s) Test File
test_05_rvpc_multi_tiers Failure 412.58 test_vpc_redundant.py
test_05_rvpc_multi_tiers Error 438.53 test_vpc_redundant.py
test_01_redundant_vpc_site2site_vpn Failure 411.91 test_vpc_vpn.py

@yadvr
yadvr merged commit b7988a3 into apache:master Jul 10, 2019
@ustcweizhou ustcweizhou mentioned this pull request Jan 28, 2020
2 of 5 tasks
yadvr pushed a commit that referenced this pull request Jan 30, 2020
This fixes similar issue with #3465.

Meanwhile change log level of CsHelper.execute2 from DEBUG to INFO and fix some typo.
ustcweizhou added a commit to ustcweizhou/cloudstack that referenced this pull request Feb 28, 2020
This fixes similar issue with apache#3465.

Meanwhile change log level of CsHelper.execute2 from DEBUG to INFO and fix some typo.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants