cef30956e9
Merge branch 'newagentmgr'
...
Conflicts:
agent-simulator/src/com/cloud/api/commands/ConfigureSimulator.java
ovm/src/com/cloud/ovm/hypervisor/OvmDiscoverer.java
server/src/com/cloud/agent/manager/AgentManagerImpl.java
server/src/com/cloud/capacity/CapacityManagerImpl.java
server/src/com/cloud/network/F5BigIpManagerImpl.java
server/src/com/cloud/network/JuniperSrxManagerImpl.java
server/src/com/cloud/resource/ResourceManagerImpl.java
server/src/com/cloud/server/ManagementServerImpl.java
server/src/com/cloud/storage/snapshot/SnapshotManagerImpl.java
server/src/com/cloud/vm/UserVmManagerImpl.java
server/src/com/cloud/vm/VirtualMachineManagerImpl.java
utils/src/com/cloud/utils/db/GenericDao.java
2011-10-27 11:09:56 -07:00
70aae9666b
bug 10774: On removing storage, local storage, cluster handle deletion of corresponding op_host_capacity rows.
2011-10-27 11:23:26 +05:30
6423631522
bug 10893: Adding a new capacity type - Local Primary storage.
2011-10-27 11:22:18 +05:30
1177d5e779
bug 10848: ListCapacity - Adding the real time usage stuff as well.
2011-10-27 11:19:21 +05:30
3f7ce01f28
bug 10803: using updatehost api to change secondary storage url, the url need to be nfs://host/path format
...
status 10803: resolved fixed
2011-10-26 16:27:28 -07:00
193474a595
Storage migration: if it's basic network and migrate to different pod, need to reallocate network
2011-10-25 19:20:18 -07:00
1460f3950e
Bug 9949 - revert VM to template
...
1. able to restore VM from its original template
2. Only allow to restore when VM is running or stopped
3. after restoring, VM state will not change, e.g. running is still running
status 9949: resolved fixed
2011-10-25 13:52:39 -07:00
92eaf49f29
Add storage migration
2011-10-24 15:59:47 -07:00
25c2734e03
More stuff to Projects feature - added support for adding resources (vms, templates, isos) to the project
2011-10-05 13:24:25 -07:00
89e04458b6
Bug 11522 - New agent manager
...
move all listxxx interface from HostDao to managers(ResourceManager, SecondaryStorageVmManager etc) with decent name using SearchCriteria2
or direct call SearchCriteria2 on demand
2011-10-04 14:35:26 -07:00
ae83246acb
bug 11600: aquirelock before deleting a volume, which can be aquired by snapshot manager
...
status 11600: resolved fixed
2011-10-03 16:43:47 -07:00
683113cc38
Bug 11522 - New agent manager
...
get rid of all secondary storage interface from HostDao, instead, put them in
SecondaryStorageVmManager using SearchCriteria2 with decent name
2011-10-03 11:21:34 -07:00
caa8aaf6fe
Bug 11522 - New agent manager
...
clean up events, status of agent
2011-09-26 15:01:16 -07:00
9f9b60a287
1) Added resource limits for the Projects - the same as for the account
...
2) Added "Project" limit type for the Domain object
2011-09-21 17:09:49 -07:00
b1b11a6928
bug 11047: change the put storage pool into maintenance mode: 1. only look at the available storoge pool in its own dc to decide to start vms created on it. 2. if start vm failed, don't throw exception, as these vms are marked stopped already, admin can start these vm by himself.
...
status 11047: resolved fixed
Reviewed-by: frank
2011-09-21 16:20:33 -07:00
a1331d1cfc
Intermidiate checkin to Project feature:
...
1) Introduce new managers - ProjectManager and DomainManager. Moved all domain related code from AccountManager to DomainManager.
2) Moved some code from ManagementServerImpl to the correct managers.
3) New resource limit for Domain - Project
2011-09-20 18:35:28 -07:00
d6cbd2b6bc
bug 11275:
...
remove heartbeat entry for this Primary Storage, when put this Primary Storage into maintenance mode
create heartbeat entry for this Primary Storage, when cancal maintenance for this Primary Storage
status 11275: resolved fixed
2011-09-13 22:15:21 -07:00
4423da06a2
1. added timeout in Command Class, then each command can configure itself timeout, if timeout is not configed, use the default timeout , which is 30 minute
...
2. added following configurable timeout
PrimaryStorageDownloadWait("Storage", TemplateManager.class, Integer.class, "primary.storage.download.wait", "10800", "In second, timeout for download template to primary storage", null),
CreateVolumeFromSnapshotWait("Storage", StorageManager.class, Integer.class, "create.volume.from.snapshot.wait", "10800", "In second, timeout for create template from snapshot", null),
CopyVolumeWait("Storage", StorageManager.class, Integer.class, "copy.volume.wait", "10800", "In second, timeout for copy volume command", null),
CreatePrivateTemplateFromVolumeWait("Storage", UserVmManager.class, Integer.class, "create.private.template.from.volume.wait", "10800", "In second, timeout for CreatePrivateTemplateFromVolumeCommand", null),
CreatePrivateTemplateFromSnapshotWait("Storage", UserVmManager.class, Integer.class, "create.private.template.from.snapshot.wait", "10800", "In second, timeout for CreatePrivateTemplateFromSnapshotCommand", null),
BackupSnapshotWait("Storage", StorageManager.class, Integer.class, "backup.snapshot.wait", "10800", "In second, timeout for BackupSnapshotCommand", null),
2011-09-07 19:17:54 -07:00
8a7feb8ec1
Merge branch '2.2.y'
...
Conflicts:
agent/src/com/cloud/agent/resource/computing/LibvirtComputingResource.java
api/src/com/cloud/agent/api/routing/LoadBalancerConfigCommand.java
api/src/com/cloud/agent/api/to/FirewallRuleTO.java
api/src/com/cloud/agent/api/to/IpAddressTO.java
api/src/com/cloud/agent/api/to/PortForwardingRuleTO.java
api/src/com/cloud/api/ApiConstants.java
api/src/com/cloud/api/BaseCmd.java
api/src/com/cloud/api/ResponseGenerator.java
api/src/com/cloud/api/commands/CreateFirewallRuleCmd.java
api/src/com/cloud/api/commands/CreateIpForwardingRuleCmd.java
api/src/com/cloud/api/commands/CreateLoadBalancerRuleCmd.java
api/src/com/cloud/api/commands/CreatePortForwardingRuleCmd.java
api/src/com/cloud/api/commands/DeleteLoadBalancerRuleCmd.java
api/src/com/cloud/api/commands/ListCapabilitiesCmd.java
api/src/com/cloud/api/commands/UpdateNetworkCmd.java
api/src/com/cloud/api/response/CapabilitiesResponse.java
api/src/com/cloud/network/Network.java
api/src/com/cloud/network/NetworkService.java
api/src/com/cloud/network/firewall/FirewallService.java
api/src/com/cloud/network/lb/LoadBalancingRule.java
api/src/com/cloud/network/lb/LoadBalancingRulesService.java
api/src/com/cloud/network/rules/FirewallRule.java
api/src/com/cloud/network/rules/RulesService.java
api/src/com/cloud/offering/NetworkOffering.java
client/tomcatconf/commands.properties.in
cloud.spec
core/src/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResource.java
core/src/com/cloud/hypervisor/xen/resource/CitrixHelper.java
core/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
core/src/com/cloud/storage/template/DownloadManagerImpl.java
core/src/com/cloud/vm/DomainRouterVO.java
debian/cloud-deps.install
patches/systemvm/debian/config/etc/init.d/cloud-early-config
patches/systemvm/debian/config/root/ipassoc.sh
patches/systemvm/debian/config/root/loadbalancer.sh
scripts/vm/hypervisor/kvm/rundomrpre.sh
scripts/vm/hypervisor/xenserver/vmops
server/src/com/cloud/agent/manager/AgentAttache.java
server/src/com/cloud/agent/manager/AgentManagerImpl.java
server/src/com/cloud/agent/manager/AgentMonitor.java
server/src/com/cloud/agent/manager/ClusteredAgentManagerImpl.java
server/src/com/cloud/alert/ClusterAlertAdapter.java
server/src/com/cloud/api/ApiResponseHelper.java
server/src/com/cloud/api/ApiServer.java
server/src/com/cloud/cluster/ClusterManagerImpl.java
server/src/com/cloud/configuration/Config.java
server/src/com/cloud/configuration/ConfigurationManager.java
server/src/com/cloud/configuration/ConfigurationManagerImpl.java
server/src/com/cloud/configuration/DefaultComponentLibrary.java
server/src/com/cloud/deploy/FirstFitPlanner.java
server/src/com/cloud/ha/HighAvailabilityManagerImpl.java
server/src/com/cloud/host/dao/HostDaoImpl.java
server/src/com/cloud/hypervisor/xen/discoverer/XcpServerDiscoverer.java
server/src/com/cloud/network/LoadBalancerVO.java
server/src/com/cloud/network/NetworkManager.java
server/src/com/cloud/network/NetworkManagerImpl.java
server/src/com/cloud/network/dao/FirewallRulesDao.java
server/src/com/cloud/network/dao/FirewallRulesDaoImpl.java
server/src/com/cloud/network/element/DhcpElement.java
server/src/com/cloud/network/element/VirtualRouterElement.java
server/src/com/cloud/network/firewall/FirewallManagerImpl.java
server/src/com/cloud/network/lb/LoadBalancingRulesManagerImpl.java
server/src/com/cloud/network/router/VirtualNetworkApplianceManager.java
server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
server/src/com/cloud/network/rules/FirewallManager.java
server/src/com/cloud/network/rules/FirewallRuleVO.java
server/src/com/cloud/network/rules/PortForwardingRuleVO.java
server/src/com/cloud/network/rules/RulesManagerImpl.java
server/src/com/cloud/network/rules/StaticNatRuleImpl.java
server/src/com/cloud/network/security/SecurityGroupListener.java
server/src/com/cloud/network/security/SecurityGroupManagerImpl.java
server/src/com/cloud/offerings/NetworkOfferingVO.java
server/src/com/cloud/server/ConfigurationServerImpl.java
server/src/com/cloud/server/ManagementServerImpl.java
server/src/com/cloud/storage/StorageManager.java
server/src/com/cloud/storage/StorageManagerImpl.java
server/src/com/cloud/storage/dao/VMTemplateHostDaoImpl.java
server/src/com/cloud/storage/download/DownloadMonitorImpl.java
server/src/com/cloud/upgrade/DatabaseUpgradeChecker.java
server/src/com/cloud/upgrade/dao/Upgrade228to229.java
server/src/com/cloud/upgrade/dao/Upgrade229to2210.java
server/src/com/cloud/user/AccountManagerImpl.java
server/src/com/cloud/vm/UserVmManagerImpl.java
server/src/com/cloud/vm/VirtualMachineManagerImpl.java
server/src/com/cloud/vm/dao/DomainRouterDao.java
server/src/com/cloud/vm/dao/DomainRouterDaoImpl.java
setup/db/create-index-fk.sql
setup/db/create-schema.sql
setup/db/db/schema-222to224.sql
setup/db/db/schema-227to228.sql
setup/db/db/schema-228to229.sql
setup/db/db/schema-229to2210.sql
tools/testClient/README
ui/scripts/cloud.core.instance.js
utils/src/com/cloud/utils/SerialVersionUID.java
utils/src/com/cloud/utils/db/ConnectionConcierge.java
utils/src/com/cloud/utils/db/Merovingian2.java
utils/src/com/cloud/utils/db/Transaction.java
utils/src/com/cloud/utils/nio/Link.java
utils/src/com/cloud/utils/nio/NioConnection.java
utils/src/com/cloud/utils/time/InaccurateClock.java
2011-08-22 20:28:30 -07:00
7350d12fff
Bug 8966 - Oracle VM (OVM) support
...
OCFS2 support -- use cluster name as OCFS2 cluster name
2011-08-19 17:06:35 -07:00
18f87c2108
Merge branch 'cvm' into 2.2.y
...
Conflicts:
api/src/com/cloud/api/BaseCmd.java
cloud.spec
core/src/com/cloud/storage/template/DownloadManagerImpl.java
server/src/com/cloud/agent/manager/AgentManagerImpl.java
server/src/com/cloud/configuration/DefaultComponentLibrary.java
server/src/com/cloud/deploy/FirstFitPlanner.java
server/src/com/cloud/host/dao/HostDao.java
server/src/com/cloud/network/security/SecurityGroupListener.java
server/src/com/cloud/storage/StorageManagerImpl.java
server/src/com/cloud/storage/listener/StoragePoolMonitor.java
server/src/com/cloud/vm/UserVmManagerImpl.java
server/src/com/cloud/vm/VirtualMachineManagerImpl.java
utils/src/com/cloud/utils/SerialVersionUID.java
2011-08-19 16:08:35 -07:00
eada883b5e
bug 11183: put volume state into "Creating" state if it's created from snapshot.
...
status 11183: resolved fixed
2011-08-19 13:46:51 -07:00
8bbed3caea
bug 11183: put volume state into "Creating" state if it's created from snapshot.
...
status 11183: resolved fixed
2011-08-19 13:45:35 -07:00
2c1df02ba1
Removed unused imports
2011-08-18 15:02:04 -07:00
48342ff6e2
remove unnecessary transcation
2011-08-16 10:30:52 -07:00
eb28549e6c
Seperate template cleanup control to enable template preloading
2011-08-09 13:42:50 -07:00
fe9ccf33b5
Seperate template cleanup control to enable template preloading
2011-08-09 13:38:27 -07:00
455f9f642c
bug 11014:
...
1. if there is no storage pool, don't try to start system VM
2. not use "consoleproxy.restart" as other meaning
status 11014: resolved fixed
2011-08-08 18:31:14 -07:00
1a070f4c1b
bug 11014:
...
1. if there is no storage pool, don't try to start system VM
2. not use "consoleproxy.restart" as other meaning
status 11014: resolved fixed
2011-08-08 18:28:34 -07:00
7e1fc2ca1a
Bug 8966 - Oracle VM (OVM) support
...
OCFS2 support -- use cluster name as OCFS2 cluster name
2011-08-08 18:22:43 -07:00
6aaf3d5ae0
Merge branch 'cvm'
...
Conflicts:
api/src/com/cloud/api/BaseCmd.java
api/src/com/cloud/storage/Storage.java
cloud.spec
core/src/com/cloud/storage/template/DownloadManagerImpl.java
server/src/com/cloud/agent/manager/AgentManagerImpl.java
server/src/com/cloud/configuration/DefaultComponentLibrary.java
server/src/com/cloud/deploy/FirstFitPlanner.java
server/src/com/cloud/host/dao/HostDao.java
server/src/com/cloud/storage/StorageManagerImpl.java
server/src/com/cloud/vm/UserVmManagerImpl.java
server/src/com/cloud/vm/VirtualMachineManagerImpl.java
utils/src/com/cloud/utils/SerialVersionUID.java
2011-08-08 14:14:09 -07:00
c6fba0fd42
Bug 8966 - Oracle VM (OVM) support
...
OCFS2 support -- prepare OCFS2 nodes
2011-08-05 17:46:29 -07:00
e666cf5e77
bug 10743: default local storage is ext in XenServer 6.0, add ext local storage support
2011-07-21 17:31:43 -07:00
109ef29e86
bug 10632: propagate to 2.2.9
2011-07-20 16:27:06 -07:00
6b4c61a348
bug 10382: Move volume delete events to destroyVolume method
...
status 10382: resolved fixed
2011-07-20 11:22:31 +05:30
ddd416a492
bug 10382: wrapped usage events in txn
2011-07-20 11:19:39 +05:30
427b73a2b9
bug 10372: Added Vm State Machine listener for usage events
...
status 10372: resolved fixed
2011-07-20 11:13:56 +05:30
c48c3edfbc
bug 10271: don't include removed records when search for local storage pool
...
status 10217: resolved fixed
2011-07-19 11:10:53 -07:00
392c03ce6f
propagated db connection savings from master
2011-07-18 14:22:49 -07:00
3b3a99ce43
bug 10727: fixed duplicated usage event generation when create volume from snapshot
...
status 10727: resolved fixed
Conflicts:
server/src/com/cloud/storage/StorageManagerImpl.java
2011-07-14 10:34:55 -07:00
d11ac32f08
bug 10727: fixed duplicated usage event generation when create volume from snapshot
...
status 10727: resolved fixed
2011-07-14 10:28:28 -07:00
1979d1d065
bug 10681: for serviceOfferings, diskOfferings, templates/isos return records with not null Removed field on findById method call
...
status 10681: resolved fixed
Conflicts:
server/src/com/cloud/server/ManagementServerImpl.java
2011-07-13 18:25:13 -07:00
25206e6257
bug 10681: for serviceOfferings, diskOfferings, templates/isos return records with not null Removed field on findById method call
...
status 10681: resolved fixed
2011-07-13 17:16:07 -07:00
ea48d40e5f
connection conierge to deal with connections that are not returned to pools
2011-07-08 18:04:57 -07:00
c679fc078a
bug 10632: allow volume to be recreated when it is in recreating state
2011-07-08 18:04:57 -07:00
a24eef5c81
add new option to force destroy vm when delete host, if the VMs are created on local storage
2011-07-08 13:49:05 -07:00
902f8172e3
bug 10293: don't destroy volume if it's not created
...
status 10293: resolved fixed
2011-07-08 13:19:32 -07:00
fc5c657980
bug 10608:
...
only one primary storage in a cluster can be in PrepareMaintenance mode
2011-07-07 19:43:43 -07:00
f2117197f5
bug 10608:
...
only one primary storage in a cluster can be in PrepareMaintenance mode
2011-07-07 19:40:04 -07:00
01a04935aa
bug 10611: MS puts primary storage into cancelmaintenace mode, then try to start VMs which were running on top of it, but failed because primary storage is in cancelmaintenace mode
...
fixed
status 10611: resolved fixed
2011-07-07 16:21:23 -07:00
frank
Nitin
Edison Su
alena
frank
anthony
Edison Su
Kelven Yang
Alex Huang
kishan