Skip to content

VR: do not restart conntrackd if no guest networks #7265

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
yadvr merged 1 commit into from
May 11, 2023
Merged

VR: do not restart conntrackd if no guest networks #7265

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion systemvm/debian/opt/cloud/bin/cs/CsHelper.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
16 changes: 9 additions & 7 deletions systemvm/debian/opt/cloud/bin/cs/CsRedundant.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ def _redundant_on(self):

# 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

Expand All @@ -111,9 +111,9 @@ def _redundant_on(self):
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"):
Expand Down Expand Up @@ -222,10 +222,9 @@ def set_lock(self):
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)

Expand Down Expand Up @@ -261,7 +260,7 @@ def set_fault(self):
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")
Expand All @@ -282,7 +281,10 @@ def set_backup(self):

self._remove_ipv6_guest_gateway()

CsHelper.service("conntrackd", "restart")
if restart_conntrackd:
CsHelper.service("conntrackd", "restart")
else:
CsHelper.service("conntrackd", "stop")
Copy link
Copy Markdown
Contributor

@DaanHoogland DaanHoogland May 8, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

isn´t ignoring the contracd service here enough?

Copy link
Copy Markdown
Member Author

@weizhouapache weizhouapache May 8, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@DaanHoogland
it is better to stop it

Copy link
Copy Markdown
Contributor

@DaanHoogland DaanHoogland May 8, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ok

CsHelper.service("ipsec", "stop")
CsHelper.service("xl2tpd", "stop")

Expand Down
6 changes: 3 additions & 3 deletions systemvm/debian/opt/cloud/bin/setup/common.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}

Expand Down