Commit Graph

94 Commits

Author SHA1 Message Date
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
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 407b45ee2e Fix ping in cloud-early-config
The old ping don't have -w option
2011-08-12 13:47:13 -07:00
Sheng Yang 11dfba635c Fix ping in cloud-early-config
The old ping don't have -w option
2011-08-12 13:47:01 -07:00
Sheng Yang 2aa349f769 bug 11083: Fix broadcast address is 0.0.0.0
The reason is:
1. In redundant router, we won't enable eth2(public network interface) until
keepalived determine the router is MASTER.
2. ipassoc.sh normally kick in before keepalived process running. And it would
set eth2's IP address using "ip addr add $dev $ip"
3. "ip addr add $dev $ip" won't add mask for the device, then there is no way to
update broadcast address for eth2. Then broadcast address is 0.0.0.0.
4. As long as "ip addr add $dev $ip" executed, later executed "ifconfig $dev $ip
netmask $mask" won't calculated the broadcast address from $ip and $mask.

To fix this, we enable and configure eth2 temporaily when cloud-early-config
executed, then disable eth2 interface. By this way, broadcast address of should
be calculated and set correctly.

status 11083: resolved fixed
2011-08-12 00:11:52 -07:00
Sheng Yang ccdd7ce17f bug 11083: Fix broadcast address is 0.0.0.0
The reason is:
1. In redundant router, we won't enable eth2(public network interface) until
keepalived determine the router is MASTER.
2. ipassoc.sh normally kick in before keepalived process running. And it would
set eth2's IP address using "ip addr add $dev $ip"
3. "ip addr add $dev $ip" won't add mask for the device, then there is no way to
update broadcast address for eth2. Then broadcast address is 0.0.0.0.
4. As long as "ip addr add $dev $ip" executed, later executed "ifconfig $dev $ip
netmask $mask" won't calculated the broadcast address from $ip and $mask.

To fix this, we enable and configure eth2 temporaily when cloud-early-config
executed, then disable eth2 interface. By this way, broadcast address of should
be calculated and set correctly.

status 11083: resolved fixed
2011-08-12 00:11:39 -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
Sheng Yang 17f12b99fe Fix sometime system VM is up but mgmt server can't reach it 2011-08-11 12:49:04 -07:00
Sheng Yang 4e4a44f2c4 Fix sometime system VM is up but mgmt server can't reach it 2011-08-11 11:01:14 -07:00
Abhinandan Prateek 16803387c6 bug 10812: changes to dhcp option 15 and 119 2011-08-11 10:23:20 +05:30
Sheng Yang 9f6dc993ab Fix dhcp_entry.sh fail on redundant router
And don't worry about "chkconfig dnsmasq off", because keepalived script should
take care of it.
2011-08-10 17:13:45 -07:00
Sheng Yang 78f88d3985 Fix dhcp_entry.sh fail on redundant router
And don't worry about "chkconfig dnsmasq off", because keepalived script should
take care of it.
2011-08-10 17:13:34 -07:00
Sheng Yang 34682b3bb0 Fix ping commandline parameter 2011-08-10 12:07:43 -07:00
Sheng Yang ab4c4de989 Fix redundant router start up
commit e4fe14a9ce19fbbdb15bbfaad586d80031ca9fbc break redundant router, because
at time of ping, the network is not up for redundant router.

Add timout for ping
2011-08-10 12:07:37 -07:00
Sheng Yang 5cf6feb2e5 Fix "RTNETLINK answers: No such process" when starting redundant router
The issue happened quite rare, but indeed can show.

And when the issue happen, the status of redundant router would be "Status:
FAULT".

It's due to ipassoc.sh wasn't executed before the system bring eth2 up and go to
master mode, then eth2 wasn't configured correctly. Then "ip route add default
xx" can't complete.

This commit should fixes the issue.
2011-08-10 12:06:53 -07:00
Abhinandan Prateek 014554928f bug 10812: adding the domain serach order to option 15, now the dhcp client is able to set this for search entry 2011-08-10 15:43:04 +05:30
Sheng Yang 5a1978382b Fix "RTNETLINK answers: No such process" when starting redundant router
The issue happened quite rare, but indeed can show.

And when the issue happen, the status of redundant router would be "Status:
FAULT".

It's due to ipassoc.sh wasn't executed before the system bring eth2 up and go to
master mode, then eth2 wasn't configured correctly. Then "ip route add default
xx" can't complete.

This commit should fixes the issue.
2011-08-09 22:28:47 -07:00
Sheng Yang 5bc28e8a7e Fix ping commandline parameter 2011-08-09 21:42:32 -07:00
Sheng Yang 493538ec64 Fix redundant router start up
commit e4fe14a9ce19fbbdb15bbfaad586d80031ca9fbc break redundant router, because
at time of ping, the network is not up for redundant router.

Add timout for ping
2011-08-09 21:02:23 -07:00
Kelven Yang adfb6a1f03 bug 11017: kick VMware vSwitch by pinging the default gateway to work around mysterous VMware network problem 2011-08-09 15:47:22 -07:00
Kelven Yang 8d37b98300 bug 11017: kick VMware vSwitch by pinging the default gateway to work around mysterous VMware network problem 2011-08-09 15:46:59 -07:00
Sheng Yang e62f828e52 bug 11003: Fix HAproxy with new template
New debian package didn't create directory /var/lib/haproxy, which result in
haproxy fail to work.

status 11003: resolved fixed
2011-08-08 17:59:25 -07:00
Chiradeep Vittal 8277584b8a merge ELB / nectarine branch 2011-08-08 15:20:56 -07:00
Sheng Yang 55eb0e4b65 bug 11003: Fix HAproxy with new template
New debian package didn't create directory /var/lib/haproxy, which result in
haproxy fail to work.

status 11003: resolved fixed
2011-08-08 13:36:53 -07:00
Chiradeep Vittal 5552b650ff Merge branch 'guru' into 2.2.8.nectarine 2011-08-05 12:27:47 -07:00
Chiradeep Vittal ac8b833fb0 Ensure lb vm enables only those services that are necessary. ensure default route 2011-08-05 12:16:55 -07:00
Abhinandan Prateek dae2f4d958 bug 10748: fixed it when the VM acts as a dhcp server only
status 10748: resolved fixed
2011-08-05 12:07:59 +05:30
Abhinandan Prateek 0f2a9b6a69 bug 10748: fixed it when the VM acts as a dhcp server only
status 10748: resolved fixed
2011-08-05 12:02:54 +05:30
Abhinandan Prateek c460a1b80b bug 10748: fixed it when the VM acts as a dhcp server only
status 10748: resolved fixed
2011-08-05 11:58:48 +05:30
Chiradeep Vittal 0c408d8da5 handle elb vm restart 2011-08-04 22:05:48 -07:00
Chiradeep Vittal 61fd6a79c8 ensure elb vm is managed by elb manager 2011-08-04 17:02:27 -07:00
Chiradeep Vittal e936a52f10 merge changes from parent branch 2011-08-04 12:39:25 -07:00
Abhinandan Prateek f6303c13fb bug 10812: putting key in ZoneConfig and other nomenclature changes 2011-08-03 14:42:29 +05:30
Abhinandan Prateek cd78c5cb9b bug 10812: putting key in ZoneConfig and other nomenclature changes 2011-08-03 14:32:28 +05:30
Abhinandan Prateek 6dd519ddd4 bug 10812: putting key in ZoneConfig and other nomenclature changes 2011-08-03 14:16:08 +05:30
Abhinandan Prateek 7e727be42c bug 10748: use external dnses if set thru global config (dhcp otpion 6) 2011-08-03 12:34:02 +05:30
Abhinandan Prateek 2f804dd799 bug 10748: use external dns, configurable thru global param 2011-08-02 16:21:55 +05:30
Abhinandan Prateek 9009026eba bug 10748: use external dns
status 10748: resolved fixed
2011-08-02 15:35:13 +05:30
Abhinandan Prateek 4f3dec5f1c bug 10812: adding domain suffixes to zone's router conf 2011-08-02 11:34:38 +05:30
Abhinandan Prateek 5cb3882349 bug 10812: adding domain suffixes to zone's router conf 2011-08-02 11:23:33 +05:30
Abhinandan Prateek 46be774ce8 bug 10812: adding domain suffixes to zone's router conf 2011-08-02 11:08:24 +05:30
Chiradeep Vittal 56d7be35f1 WIP 2011-07-29 11:04:54 -07:00
Sheng Yang 4bc8686513 bug 10429: Backport redundant virtual router
Part 1

This backport contained:

commit 52317c718c25111c2535657139b541db0c9d1e1f
    bug 9154: Initial check in for enabling redundant virtual router

commit 54199112055d754371bfb141168fb5538bf6d6ea
    Add host verification for CheckRouterCommand

commit cef978a228c90056ead9be10cbc4de74c2b8de76
    Fix CheckRouterAnswer's isMaster report

commit 4072f0a6991ac3b63601a1764fbe14188965f62f
    Some build fixes and code refactoring for redundant router

commit 4d3350b7cd8ee2706a9bace4437fc194e36c8dd5
    Redundant Router: Fix OVS

commit 6a228830e7c46d819fa0c3317e159e041337e887
    Fix findByNetwork()/findByNetworkAndPod()'s return

commit c627777b3d5bdbcd60db4032cebd349a5b1ecd83
    Redundant Router: Fix isVmAlive()

commit e1275d2514adc41f8744f5107d4069c38be195f1
    Only issue CheckRouterCommand to redundant routers

And all modification to the scripts till
commit 4e3942462ed3fde3a3d7011e95839e2128fba514
logging changes

in the master branch.
2011-07-18 18:29:56 -07:00
Kelven Yang 1e9efb2f86 bug 10214: merge fixes from 2.2.8/2.2.4 2011-06-10 14:29:01 -07:00
Kelven Yang 5f7f885c6a bug 10214: merge fix from 2.2.4 branch 2011-06-10 12:08:22 -07:00
Sheng Yang 3106df1c72 bug 9495: Fix DomR logging error on boot
status: resolved fixed
2011-06-09 15:10:06 -07:00
Sheng Yang e92d00d3bf bug 9495: Fix DomR logging error on boot
status: resolved fixed
2011-06-09 15:04:35 -07:00
Sheng Yang 8542c9ca13 Fix keepalived start up issue
Sometime when keepalived start up(during system boot up period), it would fail
to(likely due to unable to receive the packet), and think itself is the only
router, then make itself master.

Add 10 seconds delay after start up to work around the issue.
2011-06-07 14:47:46 -07:00