Alex Huang
5495f10bce
Revert "Reverting the range of commits that broke the build"
...
This reverts commit b59e3aaefc .
2013-08-08 15:02:40 -07:00
Prasanna Santhanam
b59e3aaefc
Reverting the range of commits that broke the build
...
This reverts commits 30c33415..f6a2c817bc
Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-08-08 14:46:56 +05:30
Alex Huang
942f282a6e
Moved config into it's own package
2013-08-07 16:41:02 -07:00
Mice Xia
51e4f597e0
fix CLOUDSTACK-3591 add usage recording for VM snapshots
...
Conflicts:
plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
server/src/com/cloud/vm/snapshot/VMSnapshotManagerImpl.java
setup/db/db/schema-410to420.sql
2013-08-01 10:47:36 +08:00
Bharat Kumar
980b227817
recalculate the capacity after overcomit change.
...
Conflicts:
server/src/com/cloud/capacity/CapacityManager.java
server/src/com/cloud/capacity/CapacityManagerImpl.java
server/src/com/cloud/resource/ResourceManagerImpl.java
server/src/com/cloud/vm/VirtualMachineManagerImpl.java
2013-07-31 18:39:14 +05:30
Harikrishna Patnala
b4662af0a9
CLOUDSTACK-3551: scaling up VM to service offering with 2gbram
...
Fixed the type overflow of Ram value.
Signed off by : Nitin Mehta<nitin.mehta@citrix.com>
2013-07-18 15:04:20 +05:30
Edison Su
0c1ae20e77
add inital swift support
...
Conflicts:
server/src/com/cloud/resource/ResourceManagerImpl.java
server/test/com/cloud/resource/MockResourceManagerImpl.java
2013-07-13 02:07:03 -07:00
Wei Zhou
ac438a6d1d
CLOUDSTACK-3372: CapacityManager does not count destroyed volumes when deploy VMs
2013-07-05 09:49:56 +02:00
Alex Huang
43ab9506ab
Moved HostAllocator and PodAllocator from server to api package, where they are supposed to be. In the process, I had to change the VO objects used by these two itnerfaces to interface equivalent. This makes sense because there's really no reasons why allocators require write access to the database. One of the files have been reformatted because it contained a bunch of tabs instead of spaces for indentation.
2013-07-03 17:48:53 -07:00
Prachi Damle
8780fef05a
CLOUDSTACK-3047 java.lang.NullPointerException encountered when executing capacityChecker thread.
...
Changes:
- Added null check around clusterId, since its possible to have null clusterId for storagepool and host records
2013-07-02 16:36:58 -07:00
Min Chen
98af424053
Merge branch 'master' into object_store.
2013-05-23 18:00:15 -07:00
Prasanna Santhanam
6ea2b06aab
Fixing multiple minor annoyances:
...
1. Keeping the description consistent - Memory not RAM when referring to
overcommit
2. getters And setters grouped, provided right casing.
3. Removed wildcard imports
Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-05-19 18:34:26 +05:30
Edison Su
f7c1b711ad
merge to master
2013-05-16 23:56:20 -07:00
Prachi Damle
a2eb7bab1e
CLOUDSTACK-2056: DeploymentPlanner choice via ServiceOffering
...
- Changes merged from planner_reserve branch
- Exposing deploymentplanner as an optional parameter while creating a service offering
- changes to DeploymentPlanningManagerImpl to make sure host reserve-release happens between conflicting planner usages.
2013-05-16 15:02:17 -07:00
Kishan Kavala
d078f92167
CLOUDSTACK-2544: Fix NPE while comparing lastHostId during capacity calculation
2013-05-16 19:14:41 +05:30
Mice Xia
6d57393629
instead of using '==', use equals() to test Long value equality
2013-05-16 16:00:02 +08:00
Nitin Mehta
c11dbad9c9
merge master
2013-05-11 15:28:43 +05:30
Alex Huang
3047929367
Merged
2013-05-10 16:21:43 -07:00
Alex Huang
572e71e57d
Moved most of the VOs and DAOs from server package into engine-schema as well
2013-05-06 16:34:26 -07:00
Alex Huang
ad2777c547
Moved agent commands to core and out of api
2013-05-06 16:34:20 -07:00
Nitin Mehta
b16ccc9fa6
CLOUDSTACK-2036 - Adding storage storage.overprovisioning.factor configurable at zone level.
2013-05-01 14:21:09 +05:30
Harikrishna Patnala
deaf9106ca
CLOUDSTACK-741: Granular Global Parameters and adding fixes for CLOUDSTACK-2176, CLOUDSTACK-2198, CLOUDSTACK-2200
...
Adding the zone, cluster, account level parameters
The parameters at scope (zone/cluster/pool/account) can be updated by updateConfiguration API with additional parameter zoneid/clusterid/accountid/storagepoolid
Whenever these scoped parameters are used in CS they get value from the corresponding details table if not defined get value from global parameter.
Same with the listConfiguration API with additional parameter zoneid/clusterid/accountid/storagepoolid
2013-04-29 14:11:51 +05:30
Edison Su
abf40435f3
refactor downloadlistener, sync system vm templates when adding a new image store
2013-04-21 22:46:02 -07:00
Edison Su
409ec9c6b6
CLOUDSTACK-1426: We has strong implication that VO must implement an interface, otherwise EntityManagerImpl can't the vo
2013-03-07 18:25:57 -08:00
Mice Xia
91417115ef
CLOUDSTACK-1401 NPE: listCapacity
2013-02-28 11:46:10 +08:00
Bharat Kumar
23e54bb0f4
Cloudstack-711: Cpu and Ram Overcommit Ratio.
2013-02-22 17:31:06 +05:30
Edison Su
a22403edcd
squash changes into one giant patch
2013-02-21 11:22:48 -08:00
Prachi Damle
a621048869
CLOUDSTACK-1307 Noticed NPE when we put host in maintenance mode in clustered management setup
...
Changes:
- Use of class variable of type GenericSearchBuilder causes issues when multiple threads invoke this method to findCapacity
- Changing the scope of the variable to be local to these methods.
2013-02-15 20:38:19 -08:00
Mice Xia
9a12756ae4
CLOUDSTACK-684 support vm snapshot
2013-02-14 01:26:30 +08:00
Kelven Yang
176523254e
Improve component lifecycle management with system run-level concept
2013-01-30 15:21:02 -08:00
Alex Huang
56e5fbdee2
removed import of componentlocator and inject from all files
2013-01-10 11:44:47 -08:00
Kelven Yang
259e6d5f74
Fix a few Spring bootstrap issues
2012-12-27 17:46:52 -08:00
Kelven Yang
cea8f3bf37
Switch inject annotation to javax and let ComponentLocator to recognize both the new and original inject annotation
2012-11-07 15:03:22 -08:00
Kelven Yang
aab02e2743
Add Spring annotation to major components
2012-11-07 14:53:39 -08:00
Prachi Damle
083cef37f1
CS 16158: Load Test - Adding host takes much longer in 3.0.x compared to 2.2.14.
...
Reviewed-By: Alena
Changes:
- Removing unnecessary search over op_host_capacity table in StorageCapacitylistener.
2012-08-31 13:40:18 -07:00
Nitin Mehta
a50cf618ec
bug CS-15278: For removing clusters crossing threshold find out the list of cluster through db instead of iteratting cluster one by one in the java code.
2012-08-13 16:20:57 +05:30
Mice Xia
a74687128e
Fix bug CS-15679 Max guest limit of hypervisor capabilities does not work properly
2012-08-10 16:50:47 +08:00
Chip Childers
8f71a2927f
License header updates for the server folder.
2012-07-02 08:58:10 -04:00
Nitin Mehta
e04822eb70
bug CS-14530: Whenver adding a new capacity check the state of the resource - if its disabled/enabled.
...
Reviewed By: Kishan
2012-04-19 14:24:12 +05:30
Alena Prokharchyk
98fd5cf959
bug 14622: introduced ha tagging for host
...
status 14622: resolved fixed
Conflicts:
server/src/com/cloud/host/dao/HostDao.java
2012-04-09 15:18:01 -07:00
David Nalley
59436be4ee
fixing line endings in server
2012-04-07 20:13:10 -04:00
frank
2f634c0913
Switch to Apache license
2012-04-03 04:50:05 -07:00
Edison Su
bc73ac7e59
bug 13910: release cpu/memory after expunged
...
status 13910: resolved fixed
Reviewed-by: prachi
2012-02-21 16:22:49 -08:00
Nitin Mehta
d5a7419b1f
Bug 13692: Query was giving cluster id weven when it was pod level information.
...
Reviewed-By: Kishan
2012-02-16 14:47:15 +05:30
Nitin Mehta
faaa7593de
Bug 13059: Used and total capacity were not showing in some cases becuae the constructor was not setting it.
...
Reviewed-By: Kishan
2012-02-09 20:55:51 +05:30
Nitin Mehta
78e79856af
Bug 13059: Removed the code which was deleting capacity entries on every MS restart.
...
Reviewed-By: Kishan
2012-02-08 20:44:57 +05:30
Nitin Mehta
e6beb08f1b
Bug 13059: Keeping the param name more intuitive Also adding the ciode for listing used and total capacity as well.
...
Reviewed-By: Kishan
2012-02-08 18:03:22 +05:30
Nitin Mehta
cbc47b9021
Bug 13059: For listing top consumed resources only uyse enabled zone for sec storage Also improve the transaction logic.
...
Reviewed-By: Kishan
2012-02-08 15:34:56 +05:30
Alena Prokharchyk
bd765999ba
Fixed listTopConsumedResources to work w/o specifying page/pageSize
2012-02-07 14:38:23 -08:00
Nitin Mehta
ce26703e5c
Bug 13059: Make DB changes to list top consumed resources for enabled resources only. For this introdiuced a new state called capacity state in the op_host_capacity table and would be updated on every operation of zone pod cluster and host
...
Reviewed-By: Kishan
2012-02-07 20:53:25 +05:30