etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
14,755 Commits 326 Branches 325 Tags 885 MiB
Commit Graph

103 Commits

Author SHA1 Message Date
Hugo Trippaers 79c7da07ab Phase 1 of Nicira integration 2012-07-11 17:16:06 -07:00
David Nalley e87558256c Patch from Chip Childers 
https://reviews.apache.org/r/5704/
License header updates for the server folder
 2012-07-02 09:51:21 -04:00
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
Alena Prokharchyk 29c61e6341 bug 14369: remove host entry when destroy CPVM/SSVM instances 
status 14369: resolved fixed
 2012-03-20 14:10:18 -07:00
abhi 59c7150af7 bug 13439: full sync at management server restart, disabling hourly sync 2012-02-06 15:01:44 +05:30
frank 7359789541 Bug 13394 - HA XEN- After host is disconnected from network & reconnected to network, host remains in Connecting state 
get current update count before update agent status otherwise the operation would fail because someone before he
update the update count
status 13394: resolved fixed
 2012-01-31 13:57:25 -08:00
kishan e2cb4f94d6 bug 12337: Encrypt only password in host_detail table. Removed unused and duplicate references of HostDetailDao 
status 12337: resolved fixed
reviewed-by: Abhi
 2011-12-20 19:28:41 +05:30
prachi 5eba3d9326 Removing whitespace from tags while storing the Host tags. 2011-11-23 14:21:36 -08:00
prachi f56c3d7bc5 Bug 11126 - Give ability to define tags post storage addition 
Changes:
- Enabled updating storage tags
- All existing tags are wiped out and new ones provided are stored.
- Note that, if tags are updated on the storage, no changes are done to the deployment of already running VMs that were deployed prior to tag addition.
- Also added some validation to host tags update API.
 2011-11-23 14:21:34 -08:00
prachi 4531c9d6f7 Bug 12082 - Not able to deploy Vms with Host tags. 
After recent changes of AgentManager, HostDao was wrongly referring to getState() instead of getResourceState().
Fixed this to refer to getResourceState(). This should fix the IndexOutOfBounds error.
 2011-11-18 19:03:12 -08:00
anthony 46dac852fa Merge branch 'swift' 
Conflicts:
	server/src/com/cloud/agent/AgentManager.java
	server/src/com/cloud/agent/manager/AgentManagerImpl.java
	server/src/com/cloud/host/dao/HostDao.java
	server/src/com/cloud/host/dao/HostDaoImpl.java
	server/src/com/cloud/resource/ResourceManagerImpl.java
	server/src/com/cloud/server/ManagementServerImpl.java
	server/src/com/cloud/storage/download/DownloadMonitorImpl.java
	server/src/com/cloud/storage/snapshot/SnapshotManagerImpl.java
 2011-10-31 15:04:48 -07:00
frank 21de281276 Fix broken compilation by new anget manager merge 2011-10-27 11:24:10 -07:00
frank 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
frank 267216e18e Bug 11522 - New agent manager 
better debug message
 2011-10-26 17:01:33 -07:00
frank 1883afeaa3 Bug 11522 - New agent manager 
add update count into host table in order to make agent status update atomic
 2011-10-26 16:14:57 -07:00
anthony b91dce4f8a Swift: add listtemplate for swift 
add swift configuration
 2011-10-25 20:21:27 -07:00
frank 30f95e638a Bug 11522 - New agent manager 
1. get rid of host allocation state
2. remove Updating status from agent status
 2011-10-24 16:49:32 -07:00
frank 4e595d04ab Bug 11522 - New agent manager 
1.load hosts that in maintenance mode because maintenance is no longer an agent status now
2.don't disconnect agent when entering maintenance mode, again it's no longer an agent status now
 2011-10-19 17:51:20 -07:00
frank 0f5384d086 Bug 11522 - New agent manager 
move findxxx interface from HostDao to Managers
 2011-10-06 11:56:17 -07:00
frank 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
frank 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
frank 3947c9a126 Bug 11522 - New agent manager 
Initailize SearchCriteria2 in order to replace search interface of DAO
 2011-10-03 10:32:27 -07:00
frank a1193149a0 Bug 11522 - New agent manager 
renamce updateResourceState to resourceStateTransitTo
 2011-09-29 11:58:41 -07:00
frank 5efaed1d82 Bug 11522 - New agent manager 
able to add host
 2011-09-27 15:18:21 -07:00
frank e5fca855c1 Bug 11522 - New agent manager 
register/unregister resource state adapter in configure/stop of implementations
 2011-09-27 11:51:03 -07:00
frank caa8aaf6fe Bug 11522 - New agent manager 
clean up events, status of agent
 2011-09-26 15:01:16 -07:00
frank f63e412ac9 Bug 11522 - New agent manager 
moves migration to ResourceManager
 2011-09-23 15:22:39 -07:00
kishan 2b9c0a695f bug 11520: Include TrafficMonitor hosts also while scanning for direct agents to load 
status 11520: resolved fixed
 2011-09-22 13:34:37 +05:30
frank 443385471f Bug 11522 - New agent manager 
change angent state machine to state machine 2
 2011-09-21 16:48:33 -07:00
anthony 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
anthony ae64c56c12 bug 11413: when mark host ad disconnected, set lastping to now - pingtimeout 
status 11413: resolved fixed
 2011-09-12 18:50:07 -07:00
alena 6e6b6ab2ab Fixed the bug in AgentLB: consider only hosts of type=Routing when calculate average load 2011-09-08 14:57:04 -07:00
alena 9ecd2058e7 Reverted wrong commit for logging in HostDaoImpl 2011-08-26 17:49:12 -07:00
prachi 1fefdd628d Bug 11261 - Allow to update host tags 
Changes:
- Changes to updateHostCmd to accepts hosttags parameter
- Changes to wipe out existing tags and save new ones in host_tags DB.
- UpdateHost is Admin only operation - so only root admin can update host tags
 2011-08-25 13:01:57 -07:00
alena 0355c26f03 bug 11242: check if db object is already removed before generating the Debug log. It can happen in case when deleteHost command is called many times in parallel for the same host 
status 11242: resolved fixed
 2011-08-24 15:48:18 -07:00
alena 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
frank 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
frank 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
frank c881bae64e Bug 8966 - Oracle VM (OVM) support 
OCFS2 support -- use ComponentLocater to load OCFS2 manager
 2011-08-08 13:30:15 -07:00
anthony bba811a714 Bug 10197: 
1. don't try HA vms if host hypervisor version changes
    2. fixed a bug related to VM full sync with hosttrack enabled
 2011-08-02 17:29:16 -07:00
anthony 5f9884d97a Bug 10197: 
1. don't try HA vms if host hypervisor version changes
    2. fixed a bug related to VM full sync with hosttrack enabled
 2011-08-02 16:48:27 -07:00
Alex Huang f043f63eaa Merged changes from 2.2.8.zucchini 2011-08-02 15:33:48 -07:00
anthony 80684861cf Bug 10197: do not check timeout against cluster which is not managed 2011-08-01 17:01:22 -07:00
anthony 7d02ed344e Bug 10197: do not check timeout against cluster which is not managed 2011-08-01 17:00:58 -07:00
anthony 93244b5b62 Bug 10197: if VM is already running, just return the host it is running on 2011-07-29 16:33:57 -07:00
anthony 31100824d7 Bug 10197: if VM is already running, just return the host it is running on 2011-07-29 16:33:33 -07:00
frank b0b3f16dae Two things: 
Load non-routing resource in ClusteredAgentManager includes External DHCP, PxeServer, ExternalFirewall, ExternalLoadBalancer

Bug 9887 - baremetal: support for image operation (create template from guest disk) (edit)

changes in line with UI
 2011-07-29 11:28:09 -07:00
frank 055ec48ae8 Two things: 
Load non-routing resource in ClusteredAgentManager includes External DHCP, PxeServer, ExternalFirewall, ExternalLoadBalancer

Bug 9887 - baremetal: support for image operation (create template from guest disk) (edit)

changes in line with UI
 2011-07-29 11:25:35 -07:00