apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

router: do not restart conntrackd if no guest networks (issue 6702) (#7265)

Browse Source 
This PR fixes #6702

The service conntrackd will be started by the script /opt/cloud/bin/cs/CsRedundant.py, therefore add it to disabled_svcs so it is not started automatically when VR is started.
This commit is contained in:
Wei Zhou 2023-05-11 09:29:32 +02:00 committed by GitHub
parent d9e0a3e6c3
commit 8c546bd5a6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
systemvm/debian/opt/cloud/bin/cs/CsHelper.py
View File

@ -86,7 +86,7 @@ def mkdir(name, mode, fatal):
os.makedirs(name, mode)
except OSError as e:
if e.errno != 17:
print "failed to make directories " + name + " due to :" + e.strerror
print("failed to make directories " + name + " due to :" + e.strerror)
if(fatal):
sys.exit(1)

16
systemvm/debian/opt/cloud/bin/cs/CsRedundant.py
View File

@ -85,7 +85,7 @@ class CsRedundant(object):
# No redundancy if there is no guest network
if guest is None:
self.set_backup()
self.set_backup(restart_conntrackd=False)
self._redundant_off()
return
@ -111,9 +111,9 @@ class CsRedundant(object):
CsHelper.service("keepalived", "stop")
return
CsHelper.mkdir(self.CS_RAMDISK_DIR, 0755, False)
CsHelper.mkdir(self.CS_RAMDISK_DIR, 0o755, False)
CsHelper.mount_tmpfs(self.CS_RAMDISK_DIR)
CsHelper.mkdir(self.CS_ROUTER_DIR, 0755, False)
CsHelper.mkdir(self.CS_ROUTER_DIR, 0o755, False)
for s in self.CS_TEMPLATES:
d = s
if s.endswith(".templ"):
@ -222,10 +222,9 @@ class CsRedundant(object):
s = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM)
s.bind('/tmp/primary_lock')
return s
except socket.error, e:
except socket.error as e:
error_code = e.args[0]
error_string = e.args[1]
print "Process already running (%d:%s). Exiting" % (error_code, error_string)
logging.info("Primary is already running, waiting")
sleep(time_between)
@ -261,7 +260,7 @@ class CsRedundant(object):
interfaces = [interface for interface in self.address.get_interfaces() if interface.is_public()]
CsHelper.reconfigure_interfaces(self.cl, interfaces)
def set_backup(self):
def set_backup(self, restart_conntrackd=True):
""" Set the current router to backup """
if not self.cl.is_redundant():
logging.error("Set backup called on non-redundant router")
@ -282,7 +281,10 @@ class CsRedundant(object):
self._remove_ipv6_guest_gateway()
CsHelper.service("conntrackd", "restart")
if restart_conntrackd:
CsHelper.service("conntrackd", "restart")
else:
CsHelper.service("conntrackd", "stop")
CsHelper.service("ipsec", "stop")
CsHelper.service("xl2tpd", "stop")

6
systemvm/debian/opt/cloud/bin/setup/common.sh
View File

@ -702,11 +702,11 @@ routing_svcs() {
echo "cloud nfs-common portmap" > /var/cache/cloud/disabled_svcs
if [ "$RROUTER" -eq "1" ]
then
echo "keepalived conntrackd" >> /var/cache/cloud/enabled_svcs
echo "dnsmasq" >> /var/cache/cloud/disabled_svcs
echo "keepalived" >> /var/cache/cloud/enabled_svcs
echo "dnsmasq conntrackd" >> /var/cache/cloud/disabled_svcs
else
echo "dnsmasq" >> /var/cache/cloud/enabled_svcs
echo "keepalived conntrackd " >> /var/cache/cloud/disabled_svcs
echo "keepalived conntrackd" >> /var/cache/cloud/disabled_svcs
fi
}