Skip to content

CLOUDSTACK-10178: Hotfixes to make 4.10 work#2320

Closed
bwsw wants to merge 9 commits into
apache:4.10from
bwsw:4.10
Closed

CLOUDSTACK-10178: Hotfixes to make 4.10 work#2320
bwsw wants to merge 9 commits into
apache:4.10from
bwsw:4.10

Conversation

@bwsw
Copy link
Copy Markdown
Contributor

@bwsw bwsw commented Nov 11, 2017

This PR implements several fixes which are vital for CS 4.10 to work:

  1. Fixes absent IPv6 network definition bugs for basic zone which lead to exceptions on KVM agent if it uses SGs (management and agent affected)
  2. Fixes the case when template is created from a snapshot (CLOUDSTACK-10140, merged CLOUDSTACK-10140: Fix for when template is created from snapshot template.properties are corrupted #2322)
  3. Fixes ubuntu/debian br_netfilter dependency (CLOUDSTACK-10138, merged CLOUDSTACK-10138: Load br_netfilter in security_group management script)
  4. Fixes quota plugin bug ([CLOUDSTACK-10184] Re-work method QuotaResponseBuilderImpl.startOfNextDay and its test cases #2326)

Documentation=http://www.cloudstack.org/
Requires=libvirtd.service
After=libvirtd.service
Requires=libvirt-bin.service
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.

@bwsw remove these, during packaging for debian/ubuntu the services file is fixed using sed. The libvirtd name for centos 6,7 and most other distros is libvirtd, while it's libvirt-bin for debian and derivatives.

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 went ahead and fixed this to enable packaging+testing on this PR.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Great to hear, I'm not able to code until the next week.

else:
execute('iptables -I ' + vmchain + ' -p icmp --icmp-type ' + range + ' ' + direction + ' ' + ip + ' -j ' + action)
except:
pass
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.

Should we log a warning or error be logged when an exception is hit?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

@rhtyd I believe the code should be improved before inclusion to master, but I believe it should be done in management server side, because agent is too far from API to do it correctly. But warning is probably a good thing. I don't remember why excluded, but probably because 'execute' includes debug.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Basically, these try except for icmpv6, because (-1, -1) doesn't handled right for icmpv6.

@yadvr
Copy link
Copy Markdown
Member

yadvr commented Nov 20, 2017

@blueorangutan package

rafaelweingartner and others added 3 commits November 20, 2017 18:18
…ases

Also, removed @Local annotation that is not needed
Depending on the timezone you're running CS (before GMT timezones) you could experience that some jobs are marked as failed since the parent job got a null result despite its child job having successfully done the job. The child job got deleted by the CleanupTask ahead of time, due to a missing datetime conversion to GMT timezone.

Jobs are failing with this message: Job failed with un-handled exception

The fix intends to correct any datetime used in the code that should be using the GMT timezone instead of the local one since all DB datetime should be stored at GMT.
Conflicts:
	server/src/com/cloud/test/DatabaseConfig.java
Depending on the timezone you're running CS (before GMT timezones) you could experience that some jobs are marked as failed since the parent job got a null result despite its child job having successfully done the job. The child job got deleted by the CleanupTask ahead of time, due to a missing datetime conversion to GMT timezone.

Jobs are failing with this message: Job failed with un-handled exception

The fix intends to correct any datetime used in the code that should be using the GMT timezone instead of the local one since all DB datetime should be stored at GMT.
Conflicts:
	server/src/com/cloud/test/DatabaseConfig.java
@bwsw bwsw changed the title Hotfixes to make 4.10 KVM agent work Hotfixes to make 4.10 work Nov 23, 2017
@GabrielBrascher
Copy link
Copy Markdown
Member

Thanks for the PR @bwsw.

Can you please create a JIRA ticket for this PR and append the ticket id with PR name?

CLOUDSTACK-XXXXX: Hotfixes to make 4.10 work

Additionally, the description This PR implements several fixes which are vital for CS 4.10 to work doesn't tell much about this PR. Can you please provide more details? You can describe fixed bug(s), code improvements that have been done, etc.

Such documentation helps us keeping track of issues and PRs; thus, we can detect what is already being handled. For instance, PR #2355 (avoid sending a null IPv6 address to Security Group Python script) tackles a problem already handled by this PR.

@bwsw bwsw changed the title Hotfixes to make 4.10 work CLOUDSTACK-10178: Hotfixes to make 4.10 work Dec 7, 2017
@bwsw
Copy link
Copy Markdown
Contributor Author

bwsw commented Dec 7, 2017

@GabrielBrascher updated. Please, take a look.

@GabrielBrascher
Copy link
Copy Markdown
Member

Thanks, @bwsw.

@yadvr
Copy link
Copy Markdown
Member

yadvr commented Dec 18, 2017

@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-1409

@yadvr
Copy link
Copy Markdown
Member

yadvr commented Dec 19, 2017

@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-1824)
Environment: kvm-centos7 (x2), Advanced Networking with Mgmt server 7
Total time taken: 25952 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr2320-t1824-kvm-centos7.zip
Smoke tests completed. 54 look OK, 2 have error(s)
Only failed tests results shown below:

Test Result Time (s) Test File
test_02_edit_iso Failure 0.10 test_iso.py
test_05_iso_permissions Failure 0.07 test_iso.py
test_04_rvpc_privategw_static_routes Failure 548.78 test_privategw_acl.py

@yadvr
Copy link
Copy Markdown
Member

yadvr commented Dec 19, 2017

@bwsw I see most of these commits are already in master, do you want to squash your commits and if there are no new changes/commits for master we can merge using -X ours to effective ignore changes in master while forward merging. Thoughts?

@yadvr
Copy link
Copy Markdown
Member

yadvr commented Dec 20, 2017

@wido @GabrielBrascher (and others) are you lgtm on this? My only issue with the change is that it's suppressing exceptions with an except: pass.

@yadvr
Copy link
Copy Markdown
Member

yadvr commented Dec 28, 2017

Any update on this, ping?

@bwsw
Copy link
Copy Markdown
Contributor Author

bwsw commented Jan 7, 2018

@rhtyd @wido @GabrielBrascher
Since it requires more and more PRs to include in 4.10 to fix bugs I would like to close this because It is no sense to keep it open in the perspective of 4.11.

@yadvr
Copy link
Copy Markdown
Member

yadvr commented Jan 8, 2018

Sure thanks @bwsw

@bwsw bwsw closed this Jan 8, 2018
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