Commit Graph

16576 Commits

Author SHA1 Message Date
Marcus Sorensen 75832c893b CLOUDSTACK-2281: Fix NPE in the planner, in the case that pool ID cannot be looked up in database when deploying a VM
This fixes a null pointer if selected pool on which to deploy is unable
to be looked up via id. Used the same coding style found in the original
code (large if/else block).

If this is accepted, I'll fix master too. This patch doesn't apply
cleanly, but the code is very similar.

Testing:

Fixed broken system, tested against devcloud to ensure that it didn't
break a stock/fresh install (advanced zone with 3 storage pools).
Restarted VMs to ensure that the planner still functioned that way as
well.

Signed-off-by: Chip Childers <chip.childers@gmail.com>
2013-04-30 15:19:30 +01:00
Chip Childers 7d877cea8a Adding tools/transifex/.tx/config to the rat exclude list
Signed-off-by: Chip Childers <chipchilders@apache.org>
2013-04-29 16:56:37 -04:00
Marcus Sorensen c7f43d8d69 Look for null pointer on account id before trying to update usage when releasing
an IP. This seems to be possible if expunge fails at some point after freeing
an IP, on subsequent expunge tries the IP is freed already and gets null pointer
when looking for account id.

BUG-ID: CLOUDSTACK-2279
Bugfix-for: 4.1,4.2
Signed-off-by: Marcus Sorensen <marcus@betterservers.com> 1367251304 -0600
2013-04-29 17:24:15 +01:00
Chip Childers 06371babe8 CLOUDSTACK-2207: Correcting the release notes to include the correct system VM template numbers for 2.x and 3.x to 4.1 upgrade instructions
Signed-off-by: Chip Childers <chipchilders@apache.org>
2013-04-29 12:21:43 -04:00
Milamber 2dc278e986 Update l10n resource file Web-UI with latest version from transifex. 2013-04-29 16:23:19 +01:00
Milamber a94433cdc0 Needs to force the download of l10n resource files 2013-04-29 16:18:55 +01:00
Sebastien Goasguen 09044f2713 Adding arabic keys to properties file 2013-04-29 10:42:17 -04:00
Milamber 9ac03ffe07 CLOUDSTACK-2138 - backport automate script to sync L10N resource files CS repo/transifex. First sync (upload source lang / download L10N resource files) 2013-04-29 15:36:26 +01:00
Chip Childers 29be94f3ba Revert "Updating pom.xml version numbers for release 4.1.0"
This reverts commit 9d8c8f2042.
2013-04-26 15:14:00 -04:00
Chip Childers 9d8c8f2042 Updating pom.xml version numbers for release 4.1.0
Signed-off-by: Chip Childers <chipchilders@apache.org>
2013-04-26 15:09:47 -04:00
Edison Su 457e85922b CLOUDSTACK-2194: Defer ApiDiscoveryServiceImpl load after db upgrade
Signed-off-by: Chip Childers <chip.childers@gmail.com>
2013-04-26 19:52:56 +01:00
Marcus Sorensen 2aeb46072c CLOUDSTACK-2195: Don't return a UserVM object if we fail to stop vm
pass back null if we fail to connect to agent or stop the vm, rather
than something that looks like success to the stopVirtualMachine api
command.

Testing:

Applied to 4.1 branch, attempted to stop VM with KVM agent disconnected,
finally saw it fail. The logs also showed why, which is good:

2013-04-25 17:37:09,933 ERROR [cloud.vm.VirtualMachineManagerImpl]
(Job-Executor-1:job-44) Unable to stop vm, agent unavailable:
com.cloud.exception.AgentUnavailableException: Resource [Host:1] is
unreachable: Host 1: Host with specified id is not in the right state:
Disconnected

Started the KVM agent, and stopping succeeded.

Signed-off-by: Chip Childers <chip.childers@gmail.com>
2013-04-26 17:25:52 +01:00
Prachi Damle 15c791d7f5 CLOUDSTACK-2158: 'userconcentratedpod_firstfit failed to find alternate host to run VM
In the applicationContext .xml , the context of the 'UserConcentratedPodPlanner' needs to include the list of allocators.
This will ensure that when this component is loaded by Spring, the allocators gets initialized.
2013-04-26 01:15:05 +01:00
Min Chen 6dbf3e7b35 CLOUDSTACK-2196 and CLOUDSTACK-2126: fix missing async job status in listXXX api and incorrect async job status in other async api. 2013-04-26 00:56:01 +01:00
Chip Childers 3eeaff03ec CLOUDSTACK-2190: Syncing AWSAPI packaging from master to 4.1
Signed-off-by: Chip Childers <chip.childers@gmail.com>
2013-04-25 17:16:32 +01:00
Nicolas Lamirault 41e6e9f30f CLOUDSTACK-2172: adding database upgrade to 4.1.0 in PremiumDatabaseUpgradeChecker
Add migration to 4.1.0 in the PremiumDatabaseUpgradeChecker, like in the
DatabaseUpgradeChecker.

I opened the ticket CS 2172, and this fix corrects the issue.
Regards.

Signed-off-by: Chip Childers <chip.childers@gmail.com>
2013-04-25 15:14:34 +01:00
Marcus Sorensen 8836c85f2d CLOUDSTACK-2173: Don't do KVM heartbeat on secondary storage sources, primary only
The KVM HA runner uses any NFS secondary storage resource available to a
host to store it's HA data. This causes template deletes to fail because
it cannot delete KVMHA, which is a directory that is not empty. So if
KVMHA directory is found, delete it's contents before trying to delete
it.

Tested with a new 4.1 zone deployment. Verified bug was reproducable
with 4.1 HEAD, applied patch, ran through adding two NFS primary
storages, verified KVM heartbeat was working on them, then ran various
secondary storage operations (register template, download volume, take
snapshot) and verified that they worked, and that KVM heartbeat
operations were NOT acting on them.

Signed-off-by: Chip Childers <chip.childers@gmail.com>
2013-04-25 14:45:42 +01:00
Chip Childers 3be1754626 Revert "Updating pom.xml version numbers for release 4.1.0"
This reverts commit ba7ba61671.
2013-04-23 15:22:01 -04:00
Chip Childers ba7ba61671 Updating pom.xml version numbers for release 4.1.0
Signed-off-by: Chip Childers <chipchilders@apache.org>
2013-04-23 15:18:19 -04:00
Chip Childers 9086343703 Correcting variable escape errors in RC script
Signed-off-by: Chip Childers <chipchilders@apache.org>
2013-04-23 15:15:55 -04:00
Chip Childers 7e5c6b9330 Ensuring the correct dir
Signed-off-by: Chip Childers <chipchilders@apache.org>
2013-04-23 15:06:27 -04:00
Chip Childers e3af51bfc5 Revert "Updating pom.xml version numbers for release 4.1.0"
This reverts commit 88098e0c81.
2013-04-23 14:58:55 -04:00
Chip Childers 75374f1ede Fixing the variable that I'm checking to determine if SNAPSHOT needs to be removed from an RC's deb rules file
Signed-off-by: Chip Childers <chipchilders@apache.org>
2013-04-23 14:57:53 -04:00
Chip Childers 43bf3dd739 Merge branch '4.1' of https://git-wip-us.apache.org/repos/asf/cloudstack into 4.1 2013-04-23 14:57:00 -04:00
Chip Childers 88098e0c81 Updating pom.xml version numbers for release 4.1.0
Signed-off-by: Chip Childers <chipchilders@apache.org>
2013-04-23 14:55:22 -04:00
Prasanna Santhanam ee2816a278 CLOUDSTACK-2154: create account command returns user response
Fix the annotation so cloudmonkey, marvin and apidocs can process the
response of createAccount as AccountResponse and not UserResponse as was
previously mapped.

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-04-23 19:52:55 +01:00
Chip Childers c551f854ab Adding a hack to the RC spin script that removes all references to -SNAPSHOT from the debian/rules file. Also added an automatic revert of the verion bump to sure that I don't forget to do that.
Signed-off-by: Chip Childers <chip.childers@gmail.com>
2013-04-23 19:48:30 +01:00
Chip Childers 51bda0a5cd Adding an optional env variable for DEB packaging to pick up additional profiles to package
Signed-off-by: Chip Childers <chip.childers@gmail.com>
2013-04-23 16:35:39 +01:00
Sanjay Tripathi 799d906ac9 CLOUDSTACK-2147: Missing configuration variable max.project.cpus in configuration table 2013-04-23 15:41:38 +01:00
Hugo Trippaers df2e0108ea CLOUDSTACK-2152 Fix rel number, needs to be present 2013-04-23 15:18:40 +02:00
Hugo Trippaers f9c6d01cfb CLOUDSTACK-2152 Set REALVER properly 2013-04-23 14:54:41 +02:00
Chip Childers 258bcaa784 Fixing apidoc/pom.xml to remove redundant -SNAPSHOT
Signed-off-by: Chip Childers <chipchilders@apache.org>
2013-04-22 19:52:32 -04:00
Chip Childers a5a7105b36 Updating pom.xml version numbers for release 4.1.0-SNAPSHOT
Signed-off-by: Chip Childers <chipchilders@apache.org>
2013-04-22 19:51:20 -04:00
Chip Childers 7048baaa44 Updating pom.xml version numbers for release 4.1.0
Signed-off-by: Chip Childers <chipchilders@apache.org>
2013-04-22 19:45:20 -04:00
Marcus Sorensen 73b7fa9d19 Fixing RPM build process for when there isn't a SNAPSHOT in our version number
Signed-off-by: Chip Childers <chip.childers@gmail.com>
2013-04-23 00:04:00 +01:00
Chip Childers 818a2c86d8 Revert "Updating pom.xml version numbers for release 4.1.0"
Backing out versions to 4.1.0-SNAPSHOT
This reverts commit b7abc3ca1e.
2013-04-22 22:22:32 +01:00
Chip Childers a3c6ab58a1 Revert "Updating pom.xml version numbers for release 4.1.1-SNAPSHOT"
Backing out versions to 4.1.0-SNAPSHOT
This reverts commit 8fe99e6453.
2013-04-22 22:22:06 +01:00
Chip Childers ed6b2bee4f Revert "Fixing XenServerJava pom parent version to correctly be 4.1.1-SNAPSHOT"
Backing out versions to 4.1.0-SNAPSHOT
This reverts commit dacc11a18d.
2013-04-22 22:21:25 +01:00
Chip Childers dacc11a18d Fixing XenServerJava pom parent version to correctly be 4.1.1-SNAPSHOT
Signed-off-by: Chip Childers <chip.childers@gmail.com>
2013-04-22 21:16:01 +01:00
Chip Childers 8fe99e6453 Updating pom.xml version numbers for release 4.1.1-SNAPSHOT
Signed-off-by: Chip Childers <chipchilders@apache.org>
2013-04-22 12:46:11 -04:00
Chip Childers b7abc3ca1e Updating pom.xml version numbers for release 4.1.0
Signed-off-by: Chip Childers <chipchilders@apache.org>
2013-04-22 09:42:23 -04:00
Chip Childers d168119a89 Revert "Updating pom.xml version numbers for release 4.1.0"
Reverting for yet another attempted RC

This reverts commit b654578bd5.
2013-04-22 09:35:21 -04:00
Chip Childers ca3b515bad Revert "Updating pom.xml version numbers for release 4.1.1-SNAPSHOT"
Reverting for yet another attempted RC.
This reverts commit 5a923ca44d.
2013-04-22 09:35:06 -04:00
Chip Childers a9e32fad7d Fixing version scripts to deal with tools/apidoc/pom.xml
Signed-off-by: Chip Childers <chipchilders@apache.org>
2013-04-22 09:34:47 -04:00
Chip Childers 5a923ca44d Updating pom.xml version numbers for release 4.1.1-SNAPSHOT
Signed-off-by: Chip Childers <chipchilders@apache.org>
2013-04-22 09:20:20 -04:00
Chip Childers b654578bd5 Updating pom.xml version numbers for release 4.1.0
Signed-off-by: Chip Childers <chipchilders@apache.org>
2013-04-22 08:55:21 -04:00
Chip Childers e119a53bfd Revert "Updating pom.xml version numbers for release 4.1.0"
Reverting to re-spin 4.1.0 RC

This reverts commit b25d27d80b.
2013-04-22 08:52:17 -04:00
Chip Childers 5755f6e3e8 Revert "Updating pom.xml version numbers for release 4.1.1-SNAPSHOT"
Reverting so that I can re-spin the 4.1.0 RC

This reverts commit c8c77f6b1c.
2013-04-22 08:51:58 -04:00
Chip Childers a051acfa32 Adding additional profiles and properties to mvn version scripts
Signed-off-by: Chip Childers <chipchilders@apache.org>
2013-04-22 08:51:47 -04:00
Chip Childers 0f4dd4c5ec Adding a version folder location for the svn dev dist commit
Signed-off-by: Chip Childers <chipchilders@apache.org>
2013-04-21 16:46:50 -04:00