Skip to content

kvm: fix/optimize propogating configs - #3911

Merged
yadvr merged 1 commit into
apache:4.13from
ustcweizhou:4.13.0-kvm-fix-issue-propogating-to-agent
Mar 5, 2020
Merged

kvm: fix/optimize propogating configs#3911
yadvr merged 1 commit into
apache:4.13from
ustcweizhou:4.13.0-kvm-fix-issue-propogating-to-agent

Conversation

@ustcweizhou

@ustcweizhouustcweizhou commented Feb 24, 2020

Copy link
Copy Markdown
Contributor

Description

Make some changes based on @nvazquez 's comments in PR #3491
Fix a bug in #3491

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?

@yadvryadvr added this to the 4.13.1.0 milestone Mar 3, 2020
@yadvr

yadvr commented Mar 3, 2020

Copy link
Copy Markdown
Member

@blueorangutan package

@blueorangutan

blueorangutan commented Mar 3, 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 Mar 3, 2020

Copy link
Copy Markdown

Packaging result: ✖centos6 ✔centos7 ✔debian. JID-984

@DaanHoogland

DaanHoogland commented Mar 3, 2020

Copy link
Copy Markdown
Contributor

@blueorangutan test

@blueorangutan

blueorangutan commented Mar 3, 2020

Copy link
Copy Markdown

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

@DaanHoogland

DaanHoogland commented Mar 3, 2020

Copy link
Copy Markdown
Contributor

is this an implementation for #3896 , @weizhouapache ?

@blueorangutan

blueorangutan commented Mar 3, 2020

Copy link
Copy Markdown

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

TestResultTime (s)Test File
test_02_vpc_privategw_static_routesFailure174.22test_privategw_acl.py
test_03_vpc_privategw_restart_vpc_cleanupFailure173.28test_privategw_acl.py
test_04_rvpc_privategw_static_routesFailure238.77test_privategw_acl.py

@yadvr

yadvr commented Mar 4, 2020

Copy link
Copy Markdown
Member

@nvazquez can you review? cc @DaanHoogland@andrijapanicsb

GabrielBrascher
GabrielBrascher approved these changes Mar 5, 2020
View reviewed changes

@GabrielBrascherGabrielBrascher left a comment

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.

Added a minor observation. Code LGTM, though.

Comment threadcore/src/main/java/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResource.java
if (_params.get("router.aggregation.command.each.timeout") != null) {
String value = (String)params.get("router.aggregation.command.each.timeout");
_eachTimeout = Duration.standardSeconds(NumbersUtil.parseInt(value, 10));
_eachTimeout = Duration.standardSeconds(NumbersUtil.parseLong(value, 600));

@GabrielBrascherGabrielBrascherMar 5, 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.

I am +1 on externalizing 600 into a constant.

yadvr
yadvr approved these changes Mar 5, 2020
View reviewed changes

@yadvryadvr left a comment

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.

LGTM checked #3491 (review)

@yadvr
yadvr merged commit b4fdf22 into apache:4.13Mar 5, 2020
@yadvr

yadvr commented Mar 5, 2020

Copy link
Copy Markdown
Member

I'm not sure what happened, I squashed merge this PR on 4.13 and the commit now says I authored it. What just happened cc @ustcweizhou@weizhouapache@DaanHoogland@andrijapanicsb

@DaanHoogland

DaanHoogland commented Mar 5, 2020

Copy link
Copy Markdown
Contributor

no idea, @rhtyd . time skew? you stole apache code?

@yadvr

yadvr commented Mar 5, 2020

Copy link
Copy Markdown
Member

I certainly did not steal the commit, if you see git history it clearly hints github did the squash+merge. I would blame bug in @github@DaanHoogland. I'll try and use rebase+merge in future where PRs have single commit.

@DaanHoogland

DaanHoogland commented Mar 5, 2020

Copy link
Copy Markdown
Contributor

i wouldn't worry to much @rhtyd . let's keep an eye out on it.

Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@yadvryadvryadvr approved these changes
@GabrielBrascherGabrielBrascherGabrielBrascher approved these changes
@nvazqueznvazquezAwaiting requested review from nvazquez

Assignees

No one assigned

Labels

component:agentcomponent:kvmtype:bug

Projects

None yet

Milestone

4.13.1.0

Development

Successfully merging this pull request may close these issues.

6 participants

@ustcweizhou@yadvr@blueorangutan@DaanHoogland@GabrielBrascher@svenvogel