Commit Graph

276 Commits

Author SHA1 Message Date
Sheng Yang 4e5ce5690a bug 11305: Stop disconnected redundant virtual router if we can process with the connected one
When we apply rules or start new VM, we may encounter some running routers that
we can't program. That can due to network issue or host is down or vCenter is
disconnected, etc. To keep the synchronization, we would stop them, but only
when there is the other router we've successfully updated. If both routers are
unable to communicate with, we simply give up and report it user.

Conflicts:

	server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
2011-08-31 19:29:32 -07:00
Naredula Janardhana Reddy cbed4c7a44 bug 11253:
Added New value "link-local"  to  global config network.loadbalancer.haproxy.stats.visibility . With this change it can take new parameter "link-local" value apart from the existing 3 values global,guest-network,disabled.
       global -  stats visible from public network
       guest-network - stats visible only to guestnetwork.
       link-local - stats visible only to link local network
       disabled - stats disabled.
2011-08-26 15:21:29 +05:30
alena e3f179844e bug 11236: domainAdmin/regularUser can edit/delete/copy/extract Public template/iso only if it was created by them. They still can use/see public template/iso when execute list/deploy/attachIso commands. Root admin can operate with other people templates w/o any restrictions.
status 11236: resolved fixed
2011-08-24 14:48:35 -07:00
alena 9544d42908 bug 11060: use lockTable instead of rowLock when createDomR/createDhcp
status 11060: resolved fixed
2011-08-24 11:01:23 -07:00
Naredula Janardhana Reddy 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
Naredula Janardhana Reddy 145a4aad37 bug 11191: Added global config to disable/enable rp_filter for domR(public interfaces) 2011-08-24 13:30:23 +05:30
Sheng Yang 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
Sheng Yang 2888247b74 Add more debug info 2011-08-23 17:59:54 -07:00
alena 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
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
Sheng Yang 843e41752f Update redundant router status even router is down
We need to update the status to UNKNOWN if router is down(also ensure we can't
contact the router if the state is Stopped in our database).
2011-08-18 22:51:23 -07:00
Sheng Yang a961dd913f Update redundant router status even router is down
We need to update the status to UNKNOWN if router is down(also ensure we can't
contact the router if the state is Stopped in our database).
2011-08-18 22:51:13 -07:00
Sheng Yang 9366290423 Fix NPE when a router is fail to start
Also enforce the check for restartNetworkCommand
2011-08-16 11:43:47 -07:00
Sheng Yang b10f560be5 Fix NPE when a router is fail to start
Also enforce the check for restartNetworkCommand
2011-08-16 11:43:36 -07:00
alena dfb37faa01 bug 10567: In Basic zone, throw an exception with Pod scope when vm failed to be added to the network - so we retry to start it in a different pod 2011-08-15 11:28:14 -07:00
alena 8f3e83d2bc bug 10567: In Basic zone, throw an exception with Pod scope when vm failed to be added to the network - so we retry to start it in a different pod 2011-08-15 11:20:45 -07:00
Sheng Yang d1721669ea bug 11122: Fix router startup
The new created router got hostId = 0.

status 11122: resolved fixed
2011-08-15 10:21:20 -07:00
Sheng Yang 23674a5386 bug 11105: Fix router with disconnected host
We keep the stopped router there, but continue with the ones we can use.

status bug 11105: resolved fixed
2011-08-15 10:20:34 -07:00
alena 891f02f4d4 Resend firewall rules on domR restart 2011-08-15 10:18:10 -07:00
Sheng Yang bb6c2d48f5 bug 11122: Fix router startup
The new created router got hostId = 0.

status 11122: resolved fixed

Conflicts:

	server/src/com/cloud/network/element/VirtualRouterElement.java
2011-08-13 00:21:35 -07:00
Sheng Yang 08a2f30785 bug 11122: Fix router startup
The new created router got hostId = 0.

status 11122: resolved fixed
2011-08-13 00:15:53 -07:00
Sheng Yang fbd9e2159d bug 11105: Fix router with disconnected host
We keep the stopped router there, but continue with the ones we can use.

status bug 11105: resolved fixed
2011-08-12 19:16:07 -07:00
Sheng Yang ee90c51a77 bug 11105: Fix router with disconnected host
We keep the stopped router there, but continue with the ones we can use.

status bug 11105: resolved fixed
2011-08-12 19:15:52 -07:00
Sheng Yang 12a49668d7 Add alert and log for redundant router state change 2011-08-11 23:37:17 -07:00
Sheng Yang 932f8a7144 Add alert and log for redundant router state change 2011-08-11 23:37:01 -07:00
Sheng Yang 29cc88571f Redundant router script fix, also fix CheckRouterTask 2011-08-11 17:57:12 -07:00
Sheng Yang 23e6b96c98 Redundant router script fix, also fix CheckRouterTask 2011-08-11 17:57:00 -07:00
Chiradeep Vittal 51af0db682 mass merge 2.2.10 2011-08-11 16:41:52 -07:00
Sheng Yang b63b3fcf05 Skip the null Host for CheckRouterTask 2011-08-11 14:29:49 -07:00
Sheng Yang 576aec60e0 Skip the null Host for CheckRouterTask 2011-08-11 13:22:47 -07:00
Sheng Yang d6e99567ce Skip the null Host for CheckRouterTask 2011-08-11 13:22:31 -07:00
Sheng Yang 333510db0e Fix redundant router switch back to single router
The existed redundant router network didn't change.
2011-08-11 12:49:44 -07:00
Sheng Yang 0f0d705ae0 Fix redundant router switch back to single router
The existed redundant router network didn't change.
2011-08-11 12:49:26 -07:00
Sheng Yang f28291cedb Fix redundant router switch back to single router
The existed redundant router network didn't change.
2011-08-11 12:48:56 -07:00
alena 477e5d6389 bug 10561: reapply static nat on the backend as a part of domR restart and network restart 2011-08-11 11:19:09 -07:00
alena 278f2a401f bug 10561: intermediate checkin for enable/disableStaticNat.
1) On enableStaticNat command we actually send the command to the backend (we used to just upgrade the DB in the past). The backend command carries sourceIp and destIp, and creates IP to IP mapping on the domR.
2) On disableStaticNat for the Ip address in addition to cleaning up port ranges, we also delete IP to IP mapping on the domR.
2011-08-11 10:19:22 -07:00
Sheng Yang 76a8738227 Fix existed single router network after enable redundant router feature 2011-08-10 18:08:20 -07:00
Sheng Yang 81a6de4eb7 Fix existed single router network after enable redundant router feature 2011-08-10 18:08:05 -07:00
Sheng Yang 8c70e06572 Fix existed single router network after enable redundant router feature 2011-08-10 18:07:42 -07:00
alena 3c29f00de1 bug 11013: Basic zone setup - pass domRs from other pods to addVirtualMachineToNetwork() method only when network.dns.basiczone.updates is set to "all"
status 11013: resolved fixed
2011-08-10 16:03:48 -07:00
alena 956445960a Throw ResourceUnavailableException when rules/ips fail to apply on the backend 2011-08-10 12:56:25 -07:00
Sheng Yang 39452967b9 bug 11045: Fix exception exit of CheckRouterTask
Catch all the exception and come back to work.

status 11045: resolved fixed
2011-08-10 12:06:13 -07:00
Sheng Yang 87041202c0 bug 11045: Fix exception exit of CheckRouterTask
Catch all the exception and come back to work.

status 11045: resolved fixed
2011-08-10 12:05:44 -07:00
Sheng Yang 6e0eeb132e bug 11045: Fix exception exit of CheckRouterTask
Catch all the exception and come back to work.

status 11045: resolved fixed
2011-08-10 12:05:22 -07:00
Sheng Yang 5f31d5008e bug 10640: Update redundant virtual router allocation algorithm
Try to put routers to two different primary storages with two hosts, not the same
host.
2011-08-09 18:25:47 -07:00
Sheng Yang c76bfbaf15 bug 10640: Update redundant virtual router allocation algorithm
Try to put routers to two different primary storages with two hosts, not the same
host.
2011-08-09 18:25:36 -07:00
Sheng Yang 501dc0d9f4 bug 10640: Update redundant virtual router allocation algorithm
Try to put routers to two different primary storages with two hosts, not the same
host.
2011-08-09 18:21:28 -07:00
keshav 1761024fda Changed RuleTO classes to carry the source VLAN tag. Added guest network gateway to NetworkElementCommand. 2011-08-09 16:38:24 -07:00
Sheng Yang f85880c2a6 Revert "Catch domr creation exception"
This reverts commit 6d55408e1f0e1c98fe2a9d4cf51babc6a3308a14.
2011-08-09 15:58:10 -07:00
Sheng Yang 15cad8ba8e Revert "Catch domr creation exception"
This reverts commit 2eff1d0eb9e39e4a8d702bb9867b9e95bb276b3e.
2011-08-09 15:57:46 -07:00