Commit Graph

313 Commits

Author SHA1 Message Date
Abhinandan Prateek b3592b2073 CLOUDSTACK-8592: bootstrapping the balance entries 2015-10-29 19:18:09 +05:30
Abhinandan Prateek 5161da6abf CLOUDSTACK-8592: misc fixes, mainly related to review comments on db
transactions
2015-10-29 12:40:17 +05:30
Abhinandan Prateek 75ea734809 CLOUDSTACK-8592: safer handling of transaction 2015-10-24 18:26:16 +05:30
Abhinandan Prateek 59d99915bb CLOUDSTACK-8592: removing use of deprecated methods 2015-10-21 14:47:09 +05:30
Abhinandan Prateek c3364324e6 CLOUDSTACK-8592: further review fixes 2015-10-21 14:27:05 +05:30
Abhinandan Prateek 6c246acc16 CLOUDSTACK-8592: fixed various Quota*DaoImpls to use the new Transaction
callback mechanism
2015-10-21 14:26:50 +05:30
Abhinandan Prateek cb0fde68f8 CLOUDSTACK-8592: fixed QuotaBalanceDaoImpl to use the new Transaction 2015-10-21 14:26:35 +05:30
Abhinandan Prateek 86e2e279a7 CLOUDSTACK-8592: fixed QuotaTariffDao to use the new Transaction
callback pattern
2015-10-21 14:26:05 +05:30
Abhinandan Prateek f6c1073106 CLOUDSTACK-8592: Added database switch to Transaction and fixed
QuotaTariffDao to use the callback.
2015-10-21 14:25:55 +05:30
Abhinandan Prateek 677564f7ee CLOUDSTACK-8592: fix sort order for tariff 2015-10-21 14:25:37 +05:30
Abhinandan Prateek 722805e418 CLOUDSTACK-8592: Incorporating PR changes for quota plugin 2015-10-21 14:25:13 +05:30
Rohit Yadav 7a228f66d2 CLOUDSTACK-8592: Incorporate changes from PR in quota framework and plugin
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2015-10-21 14:24:59 +05:30
Rohit Yadav 892a6ebbe5 CLOUDSTACK-8592: Add more unit tests
- unit tests for UsageTypes
- unit tests for all Cmd classes
- unit tests for all service and manager impls
- try-catch-finally or try-with-resource in dao impls for failsafe db switching
- remove dead code
- add missing quota calculation case (regression fixed)
- replace tabs with spaces in pom.xmls

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2015-10-21 14:22:53 +05:30
Abhinandan Prateek 9808321cf3 CLOUDSTACK-8592: Add changes from review
- added marvin test for quota plugin API
- removed unused commented code
- debug messages in debug enabled check
- checks for nulls, fixed access to member variables and feature
- changes based on PR comments
2015-10-21 14:22:37 +05:30
Abhinandan Prateek 43c893cc31 quota: by default make the global quota enforement flag as false. fix
the condition so that the uasage generated records are picked up in
quota calc cycle
2015-08-07 12:34:18 +05:30
Rohit Yadav 74c34d797a quota;e2etesting
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2015-08-07 10:58:36 +05:30
Rohit Yadav bf5d388d91 quota: check if quota is enabled, only then expose APIs
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2015-08-07 10:58:36 +05:30
Abhinandan Prateek 731d9b80d6 quota: +send last month statement at the start of the month 2015-08-05 14:29:19 +05:30
Abhinandan Prateek f0467c8a2b quota: streamlined emailing 2015-08-04 16:24:14 +05:30
Abhinandan Prateek 173f6ba730 quota:fixes 2015-08-04 11:45:25 +05:30
Abhinandan Prateek b38f73805a quota: added checks for quota enforce and threshold per account 2015-08-04 10:29:33 +05:30
Abhinandan Prateek b0a8598c3c quota: even if there is no usage for some resources show them in the
statement.
2015-08-03 13:32:00 +05:30
Abhinandan Prateek bd1d12d830 quota: added min_balance and quota enforce for each account 2015-08-03 09:42:39 +05:30
Abhinandan Prateek 92269d2636 quota: fixing warped up db 2015-08-01 22:12:34 +05:30
Abhinandan Prateek eaf3d21b55 quota: tariff fix 2015-08-01 18:57:54 +05:30
Abhinandan Prateek 5535e81c8b quota: fixing account bean 2015-08-01 16:13:30 +05:30
Abhinandan Prateek 9deed58fad quota: added quota_account 2015-07-31 17:39:14 +05:30
Abhinandan Prateek 8c81b02d9e quota: fine tuning dates 2015-07-31 12:42:35 +05:30
Abhinandan Prateek 50c579de3d quota: restructured/refactored to make quota run inside the usage server 2015-07-30 16:40:39 +05:30
Abhinandan Prateek df79834df9 CLOUDSTACK-8592: reverting debug statement 2015-07-14 11:35:52 +05:30
Abhinandan Prateek 135af2ceed CLOUDSTACK-8592: calculation of quota 2015-07-14 11:35:52 +05:30
Rohit Yadav 76868f5767 cloudstack: Change version to 4.5.2
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2015-06-29 13:43:49 +02:00
Rohit Yadav 4ba72a877c Updating pom.xml version numbers for release 4.5.2-SNAPSHOT
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2015-05-07 15:33:01 +02:00
Rohit Yadav 0eb4eb2370 Updating pom.xml version numbers for release 4.5.1
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2015-05-04 12:17:03 +02:00
Koushik Das 6378d37c5e CLOUDSTACK-8425: Job framework: Same internal job can execute simultaneously
The same internal job was simultaneously getting executed by 2 worked threads.
The fix is to ensure that job gets scheduled for execution from a single place.

(cherry picked from commit 6dfb8ab03e)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2015-04-29 16:50:40 +02:00
Santhosh Edukulla 86943da26e Fixed few coverity issues
Signed-off-by: Santhosh Edukulla <santhosh.edukulla@gmail.com>
(cherry picked from commit 0a9742f914)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2015-04-27 14:43:48 +02:00
Rohit Yadav 6c5cf04d62 CLOUDSTACK-8372: Encrypt key column when saving key in keystore table
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2015-04-08 14:35:17 +05:30
Jayapal 32fe64ce1b Avoid logging password when adding srx device
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2015-03-13 15:01:06 +05:30
Rohit Yadav cfd4573335 engine: Add Upgrade path from 4.5.0 to 4.5.1
Encrypts:
- Remote access vpn preshared key
- StoragePool's user info
- Keystore's key

This closes #112

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2015-03-12 12:13:28 +05:30
Rohit Yadav c198dfdb7a Update pom and version usage to 4.5.1-SNAPSHOT
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2015-03-12 12:13:18 +05:30
Rohit Yadav 68b5440d44 fix NPE cases, throw exceptions early on
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2015-02-05 17:44:32 +05:30
Rohit Yadav 46cd98b163 jobs: fix corner cases, add NPE checks
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2015-02-05 16:20:47 +05:30
Santhosh Edukulla bd190192b9 Fixed Resource Leaks
Signed-off-by: Santhosh Edukulla <santhosh.edukulla@gmail.com>
(cherry picked from commit 350ac4c4b0)

Conflicts:
	engine/schema/src/com/cloud/upgrade/dao/Upgrade441to450.java
2015-02-05 13:47:22 +05:30
Santhosh Edukulla 737edd90dc Fixed few coverity patches
NPE in delete firewall rules observed, cherry-picking fix from master.

(cherry picked from commit 31a42d2b7a)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2015-02-02 12:48:38 +05:30
Rohit Yadav bf88be5b25 Revert "CLOUDSTACK-8011: Upgrade maven dependencies"
This reverts commit 482815d084.
2014-12-04 19:47:23 +05:30
Rohit Yadav 482815d084 CLOUDSTACK-8011: Upgrade maven dependencies
Changes;
- Upgrades maven-war plugin to 4.5 (faster war packaging)
- Upgrade spring framework to latest minor release
- Upgrade ehcache, jasypt, httpclient, httpcore and other core dependencies
- Upgrade to latest ipv6 library, fix unit test NetUtilsTest
- httpcore and httpclient are sharing same version variable
- commons-httpclient is different that httpclient, the fix gives it a separate var
- Apidocs failed to generate and get stuck with new reflections version, for now
  we will continue using 0.9.8

Newer dependencies can be listed using:
mvn versions:display-dependency-updates -Dnoredist -Dsimulator -P developer,systemvm

Testing;
- Tested using Maven 3.2.1
- Local noredist build with unit tests succeeds
- CloudStack mgmt server started, basic business layer tests work
- Observed 10-15% build time improvement using new maven-war plugin

Branch: bugfix/4.5-8011 (commits are squashed in favour of a linear history)

Pull request:
https://github.com/apache/cloudstack/pull/50

This closes #50

TravisCI build summary:
https://travis-ci.org/shapeblue/cloudstack/builds/42902172

- Build passes with unit tests
- Apidocs generates successfully
- Most integration tests pass, some fail due to timeout errors, second re-run
  passes some of them

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
(cherry picked from commit fac7bfc5d5)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>

Conflicts:
	pom.xml
2014-12-04 02:14:54 +05:30
Edison Su d856a2acad CLOUDSTACK-7946:
remove leftover state in volume and snapshot table in case of mgt server
shutdown during storage operation.
Reviewed-by: Min
2014-11-19 16:08:27 -08:00
Min Chen 0c45c96ec7 CLOUDSTACK-7864: CPVM continues to be in Stopped state after a failure to start because of a management server restart. Added optimization to purge queue items for cancelled jobs. 2014-11-11 11:11:18 -08:00
Min Chen f2cedda9ef CLOUDSTACK-7884: Cloudstack MS is not responding (happening randomly) after some restart. 2014-11-11 09:19:21 -08:00
Damodar cdabb2407a CLOUDSTACK-7843: sync Job Failures always reported as success on Event Bus 2014-11-10 15:07:13 +05:30