Commit Graph

34084 Commits

Author SHA1 Message Date
Anthony Xu c74dada854 add logs for lock acquire and release 2014-09-24 10:28:04 -07:00
Bharat Kumar 476733cb92 CLOUDSTACK-7571 changing value of cpu/mem.overprovisioning.factor for xen cluster is not affecting total memory at zone level 2014-09-24 16:45:28 +05:30
Harikrishna Patnala c55bc0b2d1 CLOUDSTACK-7534: ResetVM for VM with attached datadisk fails when enable.ha.storage.migration is false
Separate global config to enable/disable Storage Migration during normal deployment
Introduced a configuration parameter named enable.storage.migration
2014-09-24 16:35:23 +05:30
Hugo Trippaers 3a5401f8f9 Merge branch 'bugfix/CID-1240106' 2014-09-24 09:07:20 +02:00
Hugo Trippaers 5a6ff41689 Merge branch 'bugfix/CID-1232333' 2014-09-24 09:07:05 +02:00
Hugo Trippaers 2503aaafef Revert "removed unused class"
This reverts commit 093fa6f0a5.
2014-09-24 08:41:55 +02:00
Anthony Xu d8ad3e32bc throw timeout exception when lock acquire times out 2014-09-23 18:01:32 -07:00
Pierre-Luc Dion b3c117a11e remove table baremetal_rct crate from schema-440to441.sql,already in schema-441to450.sql 2014-09-23 20:42:09 -04:00
Pierre-Luc Dion 872b48b0c3 CLOUDSTACK-7574, CREATE TABLE cloud.baremetal_rct 2014-09-23 20:41:47 -04:00
Sheng Yang d2fbe5ccd3 CLOUDSTACK-7436: Fix automation test on RvR status detection
Everytime when checking the RvR status, you must wait some time for RvR to
update it's status. The polling thread would update the status only every 30
seconds by default.
2014-09-23 16:50:04 -07:00
Anthony Xu 093fa6f0a5 removed unused class
ramework/db/src/com/cloud/utils/db/TransactionContextInterceptor.java
2014-09-23 16:48:14 -07:00
Sheng Yang aaeadc5c44 CLOUDSTACK-7605: Fix basic zone multiple pod network restart with cleanup=true
1. getRouters() doesn't handle RestartNetwork with cleanup=true for basic zone,
because pod wouldn't be specific at the time.

2. The regression caused by the following fix. The variable "routers" was
overrided with some local values, result in only one of the routers in multiple
pods would return, thus only one router would be started.

commit 6dd5c3fd42
Author: Rohit Yadav <bhaisaab@apache.org>
Date: Thu Oct 11 18:30:00 2012 +0530
CLOUDSTACK-70: Improve restart network behaviour for basic network
2014-09-23 14:17:42 -07:00
Frank Zhang 9425f06d77 CLOUDSTACK-6278
Baremetal Advanced Networking support
2014-09-23 11:37:26 -07:00
Frank Zhang 6f413c22e1 CLOUDSTACK-6278
Baremetal Advanced Networking support

move baremetal rct schema from schema-430to440.sql to schema-441to450.sql
2014-09-23 10:44:28 -07:00
sanjeev 5fb2b3a0d2 Test to verify fix for issue "Exception when attaching data disk to RHEL vm on vSphere
Added Rhel6 template details to test_data.py

Signed-off-by: sanjeev <sanjeev@apache.org>

Fixed review comments provided in RR 25536
2014-09-23 17:17:16 +05:30
sanjeev 2d19bcb46a CLOUDSTACK-6172: Adding new test case to verify this fix
Conflicts:

	test/integration/component/test_volumes.py

Signed-off-by: sanjeev <sanjeev@apache.org>

CLOUDSTACK-6172: Fixed review comments provided in RR 25771
2014-09-23 16:08:26 +05:30
Hugo Trippaers 9eb2b2763c Fix for CID-1232333, CID-1232334, CID-1232335, CID-1232336 and
CID-1232337
2014-09-23 11:23:20 +02:00
Hugo Trippaers c20336c1ab CID-1240107 Remove unused variable 2014-09-23 11:06:41 +02:00
Hugo Trippaers 9ead2046d4 CID-1240106 Remove unused variable 2014-09-23 11:02:40 +02:00
Rajesh Battala 0c3d0cc954 CLOUDSTACK-6603 [Upgrade]DB Exception while Autoscale monitoring after upgrading from 4.3 to 4.4
(cherry picked from commit c282bb3a12)
(cherry picked from commit fc7d0b2a33)
2014-09-23 10:53:02 +02:00
sanjeev 0d5a435f76 Creating custom disk does not work as expected 2014-09-23 14:15:39 +05:30
Rohit Yadav 49de3ab037 appliance: add license headers to new vbox cleaner rb scripts
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-09-23 02:34:14 +02:00
Jessica Wang 58cb5baae4 CLOUDSTACK-7601: UI > Global Settings > Baremetal Rack Configuration > populate listView by listBaremetalRct API. 2014-09-22 16:51:58 -07:00
Jessica Wang acb68509f0 CS-21121: UI for Baremetal RCT - (1) Global Settings > add new option "Baremetal Rack Configuration" in Select view dropdown. (2) implement "Add Baremetal Rack Configuration" action. 2014-09-22 16:18:28 -07:00
Frank Zhang b8795d8879 CLOUDSTACK-6278
Baremetal Advanced Networking support
2014-09-22 15:56:57 -07:00
Frank Zhang 6655d8f5b0 CLOUDSTACK-6278
Baremetal Advanced Networking support
2014-09-22 15:24:54 -07:00
Frank Zhang 3e6817c878 CLOUDSTACK-6278
Baremetal Advanced Networking support

    add missing license header to systemvm/patches/debian/config/etc/rc.local
2014-09-22 14:44:14 -07:00
Frank Zhang 6155d3ecaa CLOUDSTACK-6278
Baremetal Advanced Networking support
2014-09-22 13:57:32 -07:00
Rohit Yadav cb5597167d appliance: build and export raw systemvm image for OVM
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-09-22 21:58:25 +02:00
Rohit Yadav 1290e10104 Merge branch 'schubergphilis:feature/systemvm-refactor-for-upstream'
This closes #16

Pull request summary:

E-mail thread:
http://mail-archives.apache.org/mod_mbox/cloudstack-dev/201407.mbox/%3C7A6CF878-7A28-4D4A-BCD2-0C264F8C90B7%40schubergphilis.com%3E

This started out as wanting the systemvm build to take
systemvm/patches/debian/{debian,vpn} from the local machine/branch,
rather than downloading from the apache git master [1]. In working out
how on earth to get veewee to do that cleanly (hint: you can’t, hence
resorting to shar usage) I got quite frustrated with the image rebuild
times.

It so happens that veewee has a --skip-to-postinstall instruction which
is quite useful while debugging these scripts. To get that working
requires the post install steps to be retryable/convergent. Of course,
our existing scripts weren’t set up for that. So I had to add a bunch
of tests whether changes had applied already. Which implied a pretty
significant refactor.

Summarizing this kind of thing is always hard...it’s many little
things...the interesting stuff is at the end/bottom, in particular
the two main improvements

schubergphilis@142d087
When working on the systemvm in isolation, or using vagrant or
similar tools, it can be useful to inject a custom SSH key before
merging a management server systemvm.iso into it. This option
allows that. It should not have effect on management-server-
managed vms which always get their SSH keys injected.

schubergphilis@e2240ea
The current build downloads its script from master by fetching a
cloudstack tarball. Besides being an unneeded load on the apache
git server, this is a problem when working on a branch and
wanting to inject a different set of scripts. It also makes it
pretty likely that the injected copy of the script will not match
what a production release wants, so there is very little chance of
not needing to overwrite the scripts.

Ideally we would just rsync over some files. However, veewee does
not provide an option to do that. In order to keep a 'cleanly
veewee-only' build possible, and work with any recent veewee
version, in this change we restor to using shar
(http://en.wikipedia.org/wiki/Shar) to produce an archive which
can execute as a script, which we feed to veewee to execute.
In order to avoid having to re-do this cleanup twice, I also ended up
merging the systemvm and systemvm64 template definitions, factoring out
their small differences by inspecting the os architecture.

schubergphilis@f570b39
schubergphilis@50e9121

Everything else…well it pretty much falls into two categories:

general code cleanup without functional changes
general code defensiveness to survive various jenkins build scenarios
All in all it should help with ongoing maintenance, I think.

Most of these commits are now a while old but I wanted to wait with
sending this upstream until we had sufficiently tested the systemvms
built with this changed approach locally.

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-09-22 21:41:39 +02:00
Leo Simons ba009ed51a CLOUDSTACK-7143: attempt to be safer when cleaning up 2014-09-22 21:38:17 +02:00
Leo Simons e43e083893 CLOUDSTACK-7143: protect against old ruby 2014-09-22 21:38:17 +02:00
Leo Simons 64f4fb1af8 CLOUDSTACK-7143: note shar dependency 2014-09-22 21:38:17 +02:00
Leo Simons 362946c52e CLOUDSTACK-7143: don't call rvm from build
It is simpler to expect that rvm setup is done outside of this build.
The buildacloud.org jenkins has rvm installed/enabled by default so
does not invoke rvm.
2014-09-22 21:38:17 +02:00
Leo Simons a8500ed73e CLOUDSTACK-7143: survive / in branch names 2014-09-22 21:38:17 +02:00
Leo Simons 115b2cf8e7 CLOUDSTACK-7143: only archive the zipped hyperv image
Cherry-pick of d09acc44f2b36cd593ebe97ab1673b7757ea2c25.
2014-09-22 21:38:17 +02:00
Leo Simons d56e950e85 CLOUDSTACK-7143: work on vagrant box export
Running --export creates the .ovf and the .vmdk files referenced
from that .ovf in one go. Guessing/predicting the names of the .vmdk
files is not fool-proof.
2014-09-22 21:38:17 +02:00
Ian Southam cab4dd8258 CLOUDSTACK-7143: Fixed box file for virtualbox 2014-09-22 21:38:16 +02:00
Leo Simons 598c472b73 CLOUDSTACK-7143: remove erroneous backticks
The backticks in the Vagrantfile template were getting evaluated by bash.
This caused some harmless but confusing error messages to appear on running
the build. Easy fix is to remove them.
2014-09-22 21:38:16 +02:00
Leo Simons 35347f8350 CLOUDSTACK-7143: try to fix jenkins problems with last 2 commits
* bundle install needs to run before running the vbox cleaning scripts,
  so move prepare step before clean step
* feature branches have / in their name which is a bad character to
  put into filenames
2014-09-22 21:38:16 +02:00
Leo Simons 00b39de0f8 CLOUDSTACK-7143: more reliable support for vagrant box export
Veewee supports exporting vagrant boxes out of virtualbox, out of the box.
However, it assumes that it can export a disk if the shutdown of the vm that
is using that disk has succeeded. This assumption is not strictly always true
(see previous commit). So, we replicate the bit of logic in veewee for making
vagrant boxes.

This has the added side benefit of creating an .ovf export only once, rather
than once for vmware and then again for vagrant.
2014-09-22 21:38:16 +02:00
Leo Simons be8b2d7c21 CLOUDSTACK-7143: more robust box cleanup
Having experimented with many edge cases of running multiple build.sh
commands in parallel / against busy virtualbox setups, the only really
reliable way to produce consistent images is to not do these commands
in parallel and to not do them while the machine is doing many other
things.

If virtualbox or the machine that hosts it is very busy, and/or it has
a lot of disks it knows/knew about, and/or its tuesday, behavior may
be a bit different.

Realizing this reality, this commit adds some scripts that try really
hard to set virtualbox back to known/healthy state before building.
2014-09-22 21:38:16 +02:00
Leo Simons d658fc4637 CLOUDSTACK-7143: attempt to export a vagrant box 2014-09-22 21:38:16 +02:00
Leo Simons 1821f4ec06 CLOUDSTACK-7143: fix a missing apt-get update
In 8e2d06153b3d5ec1540fac1c8fbc97b5d2b58a8e I mistakenly/accidentally
a apt-get update.

As
    https://wiki.debian.org/Multiarch/HOWTO
explains, apt-get update is needed after adding a new architecture.
2014-09-22 21:38:15 +02:00
Leo Simons 91ffedb39c CLOUDSTACK-7143: a better fix for kernel upgrade disk space problems
Increase / and /boot a little bit, to the point that there is enough
space on them to do a kernel upgrade. With this I think we can
decrease total disk space usage back down to 2.5GB.

Docs for the preseed config found at
  http://anonscm.debian.org/gitweb/?p=d-i/debian-installer.git;a=blob_plain;f=doc/devel/partman-auto-recipe.txt;hb=HEAD
2014-09-22 21:38:15 +02:00
Leo Simons d5a4a2521b CLOUDSTACK-7143: fix do_signature to account for change to install_cloud_scripts
The do_signature script required a lingering cloud-scripts.tar that was no longer
there after the git export tarball fiddling magic was gone.
2014-09-22 21:38:15 +02:00
Leo Simons 25bb682cd1 CLOUDSTACK-7143: fix the fix for rvm/ruby/bundler setup on jenkins
The recommended use of --deployment goes along with the requirement to
check Gemfile.lock into source control, which I don't want to do.
2014-09-22 21:38:15 +02:00
Leo Simons 0570d37106 CLOUDSTACK-7143: initial apt-upgrade still running out of space (upgrading the kernel)
I wonder if this is due to the 7.4.0->7.6.0 needing more space. Should see if
there's more stuff that can be cleaned earlier?
2014-09-22 21:38:15 +02:00
Leo Simons b4fceef407 CLOUDSTACK-7143: sometimes the consolidated 'apt' command runs out of space 2014-09-22 21:38:15 +02:00
Leo Simons 41ddb6b768 CLOUDSTACK-7143: make script compatible with linux mktemp 2014-09-22 21:38:15 +02:00