Skip to content

kvm: fix router.aggregation.command.each.timeout is reset to 600 when update other kvm configs - #4496

Merged
yadvr merged 2 commits into
apache:4.14from
ustcweizhou:4.14-kvm-reset-router.aggregation.command.each.timeout
Nov 30, 2020
Merged

kvm: fix router.aggregation.command.each.timeout is reset to 600 when update other kvm configs#4496
yadvr merged 2 commits into
apache:4.14from
ustcweizhou:4.14-kvm-reset-router.aggregation.command.each.timeout

Conversation

@ustcweizhou

@ustcweizhouustcweizhou commented Nov 23, 2020

Copy link
Copy Markdown
Contributor

Description

This PR fixes the issue that router.aggregation.command.each.timeout on kvm host is reset to 600, when other kvm config is updated, but router.aggregation.command.each.timeout is not.

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)

Feature/Enhancement Scale or Bug Severity

Feature/Enhancement Scale

  • Major
  • Minor

Bug Severity

  • BLOCKER
  • Critical
  • Major
  • Minor
  • [] Trivial

Screenshots (if appropriate):

How Has This Been Tested?

davidjumani
davidjumani approved these changes Nov 24, 2020
View reviewed changes

@davidjumanidavidjumani 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.

Code LGTM

@DaanHooglandDaanHoogland added this to the 4.14.1.0 milestone Nov 24, 2020
@yadvr

yadvr commented Nov 25, 2020

Copy link
Copy Markdown
Member

@blueorangutan package

@blueorangutan

blueorangutan commented Nov 25, 2020

Copy link
Copy Markdown

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

@blueorangutan

blueorangutan commented Nov 25, 2020

Copy link
Copy Markdown

Packaging result: ✔centos7 ✖centos8 ✖debian. JID-2434

@yadvr

yadvr commented Nov 25, 2020

Copy link
Copy Markdown
Member

@blueorangutan test

@blueorangutan

blueorangutan commented Nov 25, 2020

Copy link
Copy Markdown

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

@blueorangutan

blueorangutan commented Nov 25, 2020

Copy link
Copy Markdown

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

TestResultTime (s)Test File

DaanHoogland
DaanHoogland reviewed Nov 26, 2020
View reviewed changes
Comment threadcore/src/main/java/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResource.java

public boolean configureHostParams(final Map<String, String> params) {
if (_params.get("router.aggregation.command.each.timeout") != null) {
if (params.get("router.aggregation.command.each.timeout") != null) {

@DaanHooglandDaanHooglandNov 26, 2020

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.

should the field _param be removed?

@weizhouapacheweizhouapacheNov 26, 2020

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

@DaanHoogland yes, will remove it

DaanHoogland
DaanHoogland approved these changes Nov 26, 2020
View reviewed changes

@DaanHooglandDaanHoogland 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.

code looks good

@yadvr

yadvr commented Nov 27, 2020

Copy link
Copy Markdown
Member

@blueorangutan package

@blueorangutan

blueorangutan commented Nov 27, 2020

Copy link
Copy Markdown

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

@blueorangutan

blueorangutan commented Nov 27, 2020

Copy link
Copy Markdown

Packaging result: ✔centos7 ✖centos8 ✔debian. JID-2440

@DaanHoogland

DaanHoogland commented Nov 27, 2020

Copy link
Copy Markdown
Contributor

@blueorangutan test

@blueorangutan

blueorangutan commented Nov 27, 2020

Copy link
Copy Markdown

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

@blueorangutan

blueorangutan commented Nov 27, 2020

Copy link
Copy Markdown

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

TestResultTime (s)Test File

@yadvr
yadvr merged commit e82813b into apache:4.14Nov 30, 2020
qrry pushed a commit to qrry/cloudstack that referenced this pull request Dec 4, 2020
@qrrylau
Merge branch 'master' into dev
71956b7
* master: (25 commits)
integration test: skip vlan of public ip range in get_free_vlan
vpc vr: plugin nics by this order: public/private/guest
vpc vr: fix Conflicting device id on private gw nic
Adding zone name to physicalnetworkresponse (apache#4510)
Disallowing udp for lb rules for haproxy (apache#4501)
Make global setting non-dynamic (apache#4505)
Adding cpuallocated percentage and value to host and hostsformigrationresponse (apache#4499)
kvm: fix router.aggregation.command.each.timeout is reset to 600 when update other kvm configs (apache#4496)
fix failures with test_multiple_nic_support.py (apache#4495)
Fix hosts for migration count (apache#4500)
sql: Fix Zones are returned in a random order (apache#3934) (apache#4494)
integration test: update steps
integration test: add private gateway in test
integration test: verify public nics state
bugfix apache#9 vpc vr: Add PREROUTING rule for vm with static nat to multiple private gateways
bugfix apache#8 vpc: add rule for traffic between vm and private gateway
bugfix apache#7 vpc vr: allow servers in private gateway to reach internet via the VPC VR if it is gateway
bugfix apache#6 vpc vr: Add iptables rules for ACL of private gateway
Revert "Fix Policy Based Routing for private gateway static routes (apache#3604)"
Revert "Add private gateway IP to router initialization config"
...
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@weizhouapacheweizhouapacheweizhouapache left review comments
@yadvryadvryadvr approved these changes
@DaanHooglandDaanHooglandDaanHoogland approved these changes
@davidjumanidavidjumanidavidjumani approved these changes

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

4.14.1.0

Development

Successfully merging this pull request may close these issues.

6 participants

@ustcweizhou@yadvr@blueorangutan@DaanHoogland@davidjumani@weizhouapache