Skip to content
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

Jump to bottom

cgroups/systemd: replace deprecated dbus functions #2926

Merged
merged 1 commit into from
Apr 30, 2021
Merged

cgroups/systemd: replace deprecated dbus functions #2926

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
13 changes: 7 additions & 6 deletions libcontainer/cgroups/systemd/common.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ package systemd

import (
"bufio"
"context"
"fmt"
"math"
"os"
Expand Down Expand Up @@ -321,7 +322,7 @@ func isUnitExists(err error) bool {
func startUnit(cm *dbusConnManager, unitName string, properties []systemdDbus.Property) error {
statusChan := make(chan string, 1)
err := cm.retryOnDisconnect(func(c *systemdDbus.Conn) error {
_, err := c.StartTransientUnit(unitName, "replace", properties, statusChan)
_, err := c.StartTransientUnitContext(context.TODO(), unitName, "replace", properties, statusChan)
Copy link
Member Author

Choose a reason for hiding this comment

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

Possibly we can use a context.WithTimeout() to replace the handling below, but I didn't want to make larger changes, because the last changes were fixing a bug, so didn't want to jinx it.

/cc @kolyshkin

Copy link
Contributor

Choose a reason for hiding this comment

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

I was taking a look at it earlier this week, and I am not sure if the timeout can be replaced with a context.WithTimeout(). I read the code and don't quite understand it.

return err
})
if err == nil {
Expand All @@ -331,7 +332,7 @@ func startUnit(cm *dbusConnManager, unitName string, properties []systemdDbus.Pr
select {
case s := <-statusChan:
close(statusChan)
// Please refer to https://godoc.org/github.com/coreos/go-systemd/dbus#Conn.StartUnit
// Please refer to https://pkg.go.dev/github.com/coreos/go-systemd/v22/dbus#Conn.StartUnit
if s != "done" {
resetFailedUnit(cm, unitName)
return errors.Errorf("error creating systemd unit `%s`: got `%s`", unitName, s)
Expand All @@ -350,14 +351,14 @@ func startUnit(cm *dbusConnManager, unitName string, properties []systemdDbus.Pr
func stopUnit(cm *dbusConnManager, unitName string) error {
statusChan := make(chan string, 1)
err := cm.retryOnDisconnect(func(c *systemdDbus.Conn) error {
_, err := c.StopUnit(unitName, "replace", statusChan)
_, err := c.StopUnitContext(context.TODO(), unitName, "replace", statusChan)
return err
})
if err == nil {
select {
case s := <-statusChan:
close(statusChan)
// Please refer to https://godoc.org/github.com/coreos/go-systemd/dbus#Conn.StartUnit
// Please refer to https://godoc.org/github.com/coreos/go-systemd/v22/dbus#Conn.StartUnit
if s != "done" {
logrus.Warnf("error removing unit `%s`: got `%s`. Continuing...", unitName, s)
}
Expand All @@ -370,7 +371,7 @@ func stopUnit(cm *dbusConnManager, unitName string) error {

func resetFailedUnit(cm *dbusConnManager, name string) {
err := cm.retryOnDisconnect(func(c *systemdDbus.Conn) error {
return c.ResetFailedUnit(name)
return c.ResetFailedUnitContext(context.TODO(), name)
})
if err != nil {
logrus.Warnf("unable to reset failed unit: %v", err)
Expand All @@ -379,7 +380,7 @@ func resetFailedUnit(cm *dbusConnManager, name string) {

func setUnitProperties(cm *dbusConnManager, name string, properties ...systemdDbus.Property) error {
return cm.retryOnDisconnect(func(c *systemdDbus.Conn) error {
return c.SetUnitProperties(name, true, properties...)
return c.SetUnitPropertiesContext(context.TODO(), name, true, properties...)
})
}

Expand Down