bd439831ad
bug 11181: batching the select statements
2011-08-24 16:34:28 +05:30
470ffcb652
bug 11191:
...
Added global config to enable/disable rp_filter for domR.
previous commit: d966906374d4a0cb8fa57326a1f7625c871f64fd
Test Case-1 :
1) Set network.disable.rpfilter global config to true
2) Restart the domR
3) check the settings reflected in proc filesystem
- for public interface like eth2,eth3 : /proc/sys/net/ipv4/conf/eth2/rp_filter should have 0 , and rest other interfaces should have value of 1
Test Case-2 :
1) set network.disable.rpfilter global config to false
2) Restart the domR
3) check the settings reflected in proc filesystem
- for public interface like eth2,eth3 : /proc/sys/net/ipv4/conf/eth2/rp_filter should have 1 , and rest other interfaces should also have value of 1
2011-08-24 13:32:07 +05:30
145a4aad37
bug 11191: Added global config to disable/enable rp_filter for domR(public interfaces)
2011-08-24 13:30:23 +05:30
4169be9e49
bug 11191: Added global config to disable/enable rp_filter for domR(public interfaces)
...
Conflicts:
setup/db/db/schema-228to229.sql
2011-08-24 13:28:48 +05:30
b3478c377e
Full opensource
2011-08-23 19:52:19 -07:00
fb6fb03175
bug 11214: Don't try to start the running router again
...
It's very like caused by StartRouterCmd sent to the running router. I can
reproduce it by issue a StartRouterCmd to a running redundant router. And this
patch should the following exception:
Exception: com.cloud.exception.ResourceUnavailableException: Resource
[VirtualNetworkApplianceManagerImpl$$EnhancerByCGLIB$$565b4d45:0] is
unreachable: There are already two redundant routers with IP 10.91.32.126, they
are r-5-VM(5) and r-4-VM(4)
status 11214: resolved fixed
2011-08-23 18:20:34 -07:00
2888247b74
Add more debug info
2011-08-23 17:59:54 -07:00
5c12f07462
Added environment variables to not control pool master
2011-08-23 15:49:45 -07:00
4f8a52f94c
Move VMware/Premium Secondary storage VM to opensource
2011-08-23 14:43:39 -07:00
d3eb9db7fa
bug 11204: when search for domR/dhcp, include Role to the corresponding search to eliminate getting "LB" network element in the response
...
status 11204: resolved fixed
Conflicts:
server/src/com/cloud/network/element/VirtualRouterElement.java
server/src/com/cloud/network/router/VirtualNetworkApplianceManager.java
2011-08-23 12:05:53 -07:00
40d348ff8b
Bug 11213 - UserConcentratedPod returning wrong list of pods
...
Changes:
- Needed to add parentheses to the query to get correct results.
2011-08-23 11:53:48 -07:00
ac826a721e
TESTClient: async job threads can exit after job pool is empty
2011-08-23 11:45:12 -07:00
3ed2385582
bug 11212: disable vlan network when vm fails to start. It is still possible for it leak. For example, if the VM object wasn't constructed and we already failed but those cases are less likely and it's not absolutely necessary to disable vlan.
2011-08-23 11:29:29 -07:00
e4fccab0a1
cloudStack - sync instance.js from 2.2.y branch to master branch.
2011-08-23 10:44:24 -07:00
c9e60d703d
Fixed listNetwork by id
2011-08-23 01:03:40 -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
b93c7bc613
Merge branch '2.2.10' into 2.2.y
...
Conflicts:
api/src/com/cloud/api/commands/CreateIpForwardingRuleCmd.java
2011-08-22 14:14:12 -07:00
24edb0071d
cloudStack - merge UI change from 2.2.10 branch to master branch.
2011-08-22 14:09:59 -07:00
7184d073b9
bug 11202: cloudStack - Service Offering page - fix a bug that Network Rate didn't get refreshed when another service offering is selected.
2011-08-22 13:56:03 -07:00
fc6086067c
bug 11202: cloudStack - Service Offering page - add Network Rate in grid.
2011-08-22 13:56:01 -07:00
47776f5814
bug 11202: cloudStack - Create Service Offering dialog - add Network Rate field.
2011-08-22 13:56:00 -07:00
4e0a12f94e
cloudStack - add new localization labels.
2011-08-22 13:55:59 -07:00
101b7e38d8
bug 11202: cloudStack - Service Offering page - fix a bug that Network Rate didn't get refreshed when another service offering is selected.
2011-08-22 13:48:06 -07:00
409964eff5
bug 11202: cloudStack - Service Offering page - add Network Rate in grid.
2011-08-22 13:37:55 -07:00
001a5777c7
bug 11202: added "networkRate" param to service offering api responses
2011-08-22 13:36:00 -07:00
c2732850f4
bug 11202: added "networkRate" param to service offering api responses
2011-08-22 13:35:43 -07:00
0b061529b1
bug 11202: added "networkRate" param to service offering api responses
2011-08-22 13:34:47 -07:00
dde63dce90
bug 11202: cloudStack - Create Service Offering dialog - add Network Rate field.
2011-08-22 13:30:07 -07:00
b0cf6080fe
cloudStack - add new localization labels.
2011-08-22 13:29:43 -07:00
31a022c720
Added networkRate parameter to createServiceOffering api command
...
Conflicts:
server/src/com/cloud/configuration/ConfigurationManager.java
server/src/com/cloud/configuration/ConfigurationManagerImpl.java
2011-08-22 12:05:34 -07:00
033765f93f
Added networkRate parameter to createServiceOffering api command
2011-08-22 12:02:08 -07:00
65afbc529e
Added networkRate parameter to createServiceOffering api command
2011-08-22 11:58:08 -07:00
0998b04098
Fixed security issue in listNetworks
...
Conflicts:
server/src/com/cloud/network/NetworkManagerImpl.java
2011-08-22 10:51:44 -07:00
20a518f3ac
Fixed security issue in listNetworks
2011-08-22 10:50:30 -07:00
67e3936ae1
Fixed security issue in listNetworks
2011-08-22 10:49:27 -07:00
009e60266d
fix for the problem of locking connection being gone
2011-08-22 10:08:22 -07:00
29a0f8b1f8
fix for the problem of locking connection being gone
2011-08-22 10:07:30 -07:00
40dac77872
fix for the problem of locking connection being gone
2011-08-22 10:05:37 -07:00
8755044ea9
Merge Bug 11186 from 2.2.8mango
...
Bug 11186- Cannot restart existing VM if the cluster is disabled after the
VM has been created
Changes:
- We should not check for the cluster 'allocation_state' while starting an
existing VM provided it has storage already allocated. But if volumes are
deleted and new storage needs to be allocated, then we will not allow the
VM
start.
- However we should still prohibit adding new VMs in that cluster.
2011-08-20 21:12:15 -07:00
3d4767c94c
Merge Bug 11186 from 2.2.8mango
...
Bug 11186- Cannot restart existing VM if the cluster is disabled after the
VM has been created
Changes:
- We should not check for the cluster 'allocation_state' while starting an
existing VM provided it has storage already allocated. But if volumes are
deleted and new storage needs to be allocated, then we will not allow the VM
start.
- However we should still prohibit adding new VMs in that cluster.
2011-08-20 21:02:09 -07:00
7084c270d3
reversed funtion parameter
2011-08-19 18:48:49 -07:00
2e2e550cc4
reversed funtion parameter
2011-08-19 18:41:59 -07:00
3ccc790b1d
add sample code to config advanced zone
2011-08-19 18:06:11 -07:00
2317c426db
reversed funtion parameter
2011-08-19 18:05:39 -07:00
49f283f364
add sample code to config advanced zone
2011-08-19 18:05:37 -07:00
b607e4aa1c
Merge branch '2.2.y' of ssh://git.cloud.com/var/lib/git/cloudstack-oss into 2.2.y
2011-08-19 17:29:57 -07:00
32ee2dbe2c
Remove baremetal specific parameters from AddHostCmd
2011-08-19 17:12:23 -07:00
cbbf80cee3
Use class.getSimpleName in ResourceListener
2011-08-19 17:06:58 -07:00
016700737c
Bug 8966 - Oracle VM (OVM) support
...
OCFS2 support -- reconfigure OCFS2 nodes when delete host
2011-08-19 17:06:48 -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
Abhinandan Prateek
Naredula Janardhana Reddy
frank
Sheng Yang
Alex Huang
Kelven Yang
alena
prachi
Edison Su
Jessica Wang
anthony