Skip to content

vrouter: remove a POSTROUTING rule for port forwarding in VPC router#3952

Merged
yadvr merged 2 commits into
apache:4.14from
ustcweizhou:4.14-remove-a-rule-vpc-router
Aug 4, 2020
Merged

vrouter: remove a POSTROUTING rule for port forwarding in VPC router#3952
yadvr merged 2 commits into
apache:4.14from
ustcweizhou:4.14-remove-a-rule-vpc-router

Conversation

@ustcweizhou
Copy link
Copy Markdown
Contributor

Description

As discussed in #3937 (comment)
a rule for port forwarding in VPC router might not be needed.

This fixes the failed result of health check for network VRs.

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)

Screenshots (if appropriate):

How Has This Been Tested?

@weizhouapache
Copy link
Copy Markdown
Member

@DaanHoogland can you kick off test for this PR ?

Comment thread systemvm/debian/opt/cloud/bin/configure.py
@DaanHoogland
Copy link
Copy Markdown
Contributor

@blueorangutan package

@blueorangutan
Copy link
Copy Markdown

@DaanHoogland 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-1038

@DaanHoogland
Copy link
Copy Markdown
Contributor

@blueorangutan test

@blueorangutan
Copy link
Copy Markdown

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

@apache apache deleted a comment from blueorangutan Mar 10, 2020
@apache apache deleted a comment from blueorangutan Mar 10, 2020
@apache apache deleted a comment from blueorangutan Mar 10, 2020
@apache apache deleted a comment from blueorangutan Mar 10, 2020
@apache apache deleted a comment from blueorangutan Mar 10, 2020
@apache apache deleted a comment from blueorangutan Mar 10, 2020
@blueorangutan
Copy link
Copy Markdown

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

Test Result Time (s) Test File
test_05_rvpc_multi_tiers Failure 490.68 test_vpc_redundant.py
test_05_rvpc_multi_tiers Error 518.61 test_vpc_redundant.py

@andrijapanicsb
Copy link
Copy Markdown
Contributor

Testing this one, instead of #3937 - we removed the offending rule, so additional code to handle VPC vs Isolated network VR is not needed.

@andrijapanicsb
Copy link
Copy Markdown
Contributor

@weizhouapache testing this one - and after configuring port forward (and stopping iptables on the guest VM) - I can't connect via PF rule to the VM (works fine for VPC though).

Can you please take a look? Otherwise, since we are 1 day from the freeze for 4.14., I'll have to go with #3937 (but I prefer your PR with removed extra lines) ?

@weizhouapache
Copy link
Copy Markdown
Member

@weizhouapache testing this one - and after configuring port forward (and stopping iptables on the guest VM) - I can't connect via PF rule to the VM (works fine for VPC though).

Can you please take a look? Otherwise, since we are 1 day from the freeze for 4.14., I'll have to go with #3937 (but I prefer your PR with removed extra lines) ?

@andrijapanicsb I will look into it today.
one suggestion, can we easily remove a line in systemvm/debian/root/health_checks/iptables_check.py as a workaround ? health check will pass in both network and vpc vr.

https://github.com/apache/cloudstack/pull/3952/files#diff-cf7b342df9a0681cd60e083d7f746bd2

@andrijapanicsb
Copy link
Copy Markdown
Contributor

I see it should work @weizhouapache , but let me ping @Pearl1594 for the opinion

thx

@andrijapanicsb
Copy link
Copy Markdown
Contributor

We'll do another PR with just that one change, thanks @weizhouapache

@andrijapanicsb
Copy link
Copy Markdown
Contributor

@weizhouapache the PR was made, tested (by you and @Pearl1594 - thanks ) and merged - here #3963

Do you want to close this one now or... ?
I will remove the milestone from it - thanks!

@weizhouapache
Copy link
Copy Markdown
Member

@weizhouapache the PR was made, tested (by you and @Pearl1594 - thanks ) and merged - here #3963

Do you want to close this one now or... ?
I will remove the milestone from it - thanks!

considering we have merged #3963 , I think we can move this to 4.14.1

by the way, I have tested the failed test test_vpc_redundant.py in my local testing environment, no issue at all.

@yadvr yadvr changed the base branch from master to 4.14 June 13, 2020 00:41
@yadvr
Copy link
Copy Markdown
Member

yadvr commented Jun 13, 2020

@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: ✖centos7 ✖debian. JID-1366

@yadvr yadvr closed this Jul 2, 2020
@yadvr yadvr reopened this Jul 2, 2020
@yadvr
Copy link
Copy Markdown
Member

yadvr commented Jul 2, 2020

@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: ✔centos7 ✔debian. JID-1509

@yadvr
Copy link
Copy Markdown
Member

yadvr commented Jul 2, 2020

@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
Copy link
Copy Markdown
Member

yadvr commented Jul 4, 2020

@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-1975)
Environment: kvm-centos7 (x2), Advanced Networking with Mgmt server 7
Total time taken: 46271 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr3952-t1975-kvm-centos7.zip
Intermittent failure detected: /marvin/tests/smoke/test_password_server.py
Intermittent failure detected: /marvin/tests/smoke/test_privategw_acl.py
Intermittent failure detected: /marvin/tests/smoke/test_secondary_storage.py
Intermittent failure detected: /marvin/tests/smoke/test_service_offerings.py
Intermittent failure detected: /marvin/tests/smoke/test_vm_deployment_planner.py
Intermittent failure detected: /marvin/tests/smoke/test_vm_life_cycle.py
Intermittent failure detected: /marvin/tests/smoke/test_hostha_kvm.py
Smoke tests completed. 78 look OK, 5 have error(s)
Only failed tests results shown below:

Test Result Time (s) Test File
test_01_sys_vm_start Failure 0.06 test_secondary_storage.py
ContextSuite context=TestCpuCapServiceOfferings>:setup Error 0.00 test_service_offerings.py
test_01_deploy_vm_on_specific_host Error 35.91 test_vm_deployment_planner.py
test_04_deploy_vm_on_host_override_pod_and_cluster Error 6.27 test_vm_deployment_planner.py
test_11_migrate_vm Error 6.30 test_vm_life_cycle.py
test_hostha_enable_ha_when_host_disconected Error 936.27 test_hostha_kvm.py
test_hostha_enable_ha_when_host_in_maintenance Error 300.74 test_hostha_kvm.py

@yadvr
Copy link
Copy Markdown
Member

yadvr commented Jul 7, 2020

@ustcweizhou can you review the test failures?

@weizhouapache
Copy link
Copy Markdown
Member

@ustcweizhou can you review the test failures?

@rhtyd can you re-kick off the tests ?

@yadvr
Copy link
Copy Markdown
Member

yadvr commented Jul 28, 2020

@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: ✔centos7 ✔debian. JID-1613

@yadvr
Copy link
Copy Markdown
Member

yadvr commented Jul 29, 2020

@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-2223)
Environment: kvm-centos7 (x2), Advanced Networking with Mgmt server 7
Total time taken: 33746 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr3952-t2223-kvm-centos7.zip
Intermittent failure detected: /marvin/tests/smoke/test_vm_life_cycle.py
Smoke tests completed. 82 look OK, 1 have error(s)
Only failed tests results shown below:

Test Result Time (s) Test File
ContextSuite context=Test01DeployVM>:setup Error 0.00 test_vm_life_cycle.py
ContextSuite context=Test02VMLifeCycle>:setup Error 0.00 test_vm_life_cycle.py
ContextSuite context=Test03SecuredVmMigration>:setup Error 0.00 test_vm_life_cycle.py

@yadvr
Copy link
Copy Markdown
Member

yadvr commented Jul 30, 2020

Test LGTM the failure is due to a regression in Trillian/ansible overiding file (the test_vm_life_cycle.py and has been fixed).

@yadvr yadvr requested a review from DaanHoogland July 30, 2020 05:23
Copy link
Copy Markdown
Member

@yadvr yadvr left a comment

Choose a reason for hiding this comment

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

LGTM did not test is manually

Copy link
Copy Markdown
Contributor

@DaanHoogland DaanHoogland left a comment

Choose a reason for hiding this comment

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

code looks good and appears to do what it says on the tin.
@andrijapanicsb @Pearl1594 can one of you have a look at testing?

@yadvr
Copy link
Copy Markdown
Member

yadvr commented Aug 4, 2020

The regression has been fixed, failures not related to this PR.

@yadvr yadvr added this to the 4.14.1.0 milestone Aug 4, 2020
@yadvr yadvr merged commit 407e34d into apache:4.14 Aug 4, 2020
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.

7 participants