Skip to content

cleanup VM IP after expunge in redundant VPC #10183

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
DaanHoogland merged 5 commits into from
Feb 9, 2025
Merged

cleanup VM IP after expunge in redundant VPC #10183

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
3b1a83a
add workaround from issue reporter
DaanHoogland Jan 14, 2025
ecb725f
Update systemvm/debian/opt/cloud/bin/cs/CsDhcp.py
DaanHoogland Jan 14, 2025
f4af74b
uncomment dnsmasq leases file in conf
Pearl1594 Jan 31, 2025
c8a023b
uncomment dnsmasq leases file in conf for isolated router
DaanHoogland Feb 3, 2025
72a370e
Apply suggestions from code review
DaanHoogland Feb 6, 2025
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
3 changes: 1 addition & 2 deletions systemvm/debian/opt/cloud/bin/cs/CsDhcp.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,8 +139,7 @@ def configure_server(self):
# Listen Address
if self.cl.is_redundant():
listen_address.append(gateway)
else:
listen_address.append(ip)
listen_address.append(ip)
# Add localized "data-server" records in /etc/hosts for VPC routers
if self.config.is_vpc() or self.config.is_router():
self.add_host(gateway, "%s data-server" % CsHelper.get_hostname())
Expand Down
2 changes: 2 additions & 0 deletions systemvm/debian/opt/cloud/bin/setup/router.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,8 @@ setup_router() {
sed -i "s#^OnCalendar=.*#OnCalendar=$LOGROTATE_FREQUENCY#g" /usr/lib/systemd/system/logrotate.timer
sed -i 's#^AccuracySec=.*#AccuracySec=5m#g' /usr/lib/systemd/system/logrotate.timer

sed -i 's/^#\(dhcp-leasefile=\/var\/lib\/misc\/dnsmasq.leases\)/\1/' /etc/dnsmasq.conf

Comment thread
DaanHoogland marked this conversation as resolved.
Outdated
# reload daemon
/usr/bin/systemctl daemon-reload

Expand Down
2 changes: 2 additions & 0 deletions systemvm/debian/opt/cloud/bin/setup/vpcrouter.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,8 @@ setup_vpcrouter() {
sed -i "s#^OnCalendar=.*#OnCalendar=$LOGROTATE_FREQUENCY#g" /usr/lib/systemd/system/logrotate.timer
sed -i 's#^AccuracySec=.*#AccuracySec=5m#g' /usr/lib/systemd/system/logrotate.timer

sed -i 's/^#\(dhcp-leasefile=\/var\/lib\/misc\/dnsmasq.leases\)/\1/' /etc/dnsmasq.conf
Copy link
Copy Markdown
Member

@weizhouapache weizhouapache Feb 3, 2025

Choose a reason for hiding this comment

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

just curious, this setting does not exist in VR of isolated networks as well

root@r-1171-VM:~# grep -r dnsmasq.leases /etc/dnsmasq*
/etc/dnsmasq.conf:#dhcp-leasefile=/var/lib/misc/dnsmasq.leases
/etc/dnsmasq.conf.tmpl:#dhcp-leasefile=/var/lib/misc/dnsmasq.leases

Does the issue exist with redundant VRs of isolated network as well ?

Copy link
Copy Markdown
Contributor Author

@DaanHoogland DaanHoogland Feb 3, 2025

Choose a reason for hiding this comment

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

good point @weizhouapache . Let's test that as well.

Copy link
Copy Markdown
Contributor Author

@DaanHoogland DaanHoogland Feb 3, 2025

Choose a reason for hiding this comment

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

good call @weizhouapache in the redundant isolated VR the issue remains. cc @Pearl1594

Copy link
Copy Markdown
Contributor Author

@DaanHoogland DaanHoogland Feb 3, 2025

Choose a reason for hiding this comment

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

added, but now I will have to look at shared networks as well, don't I?

Copy link
Copy Markdown
Member

@weizhouapache weizhouapache Feb 3, 2025

Choose a reason for hiding this comment

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

maybe not needed, as redundant VRs are not supported

Copy link
Copy Markdown
Contributor Author

@DaanHoogland DaanHoogland Feb 3, 2025

Choose a reason for hiding this comment

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

no, but the script is not only for redundant VRs. I'd like to give it a bash anyway.

Copy link
Copy Markdown
Contributor Author

@DaanHoogland DaanHoogland Feb 4, 2025 •
edited
Loading

Choose a reason for hiding this comment

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

this fails for isolated VRs :(

Copy link
Copy Markdown
Contributor Author

@DaanHoogland DaanHoogland Feb 4, 2025

Choose a reason for hiding this comment

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

so to specify, it does not fail for shared networks, it fails for redundant isolated networks.
backup router:
image
primary:
image

Copy link
Copy Markdown
Contributor Author

@DaanHoogland DaanHoogland Feb 4, 2025

Choose a reason for hiding this comment

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

note that after expunging the second VM both entries disappeared.

Comment thread
DaanHoogland marked this conversation as resolved.
Outdated

# reload daemon
/usr/bin/systemctl daemon-reload

Expand Down