Merge pull request #1564 from endocode/kayrus/list_filtered_units

fleetd: get filtered list of units instead of all units

Author: Dongsu Park

systemd/manager.go

@@ -196,17 +196,25 @@ func (m *systemdUnitManager) GetUnitStates(filter pkg.Set) (map[string]*unit.Uni
 	// operations could mutate the hashes before we've retrieved the state
 	// for every unit in the filter, since they won't necessarily all be
 	// present in the initial ListUnits() call.
+	fallback := false
+
 	m.mutex.Lock()
 	defer m.mutex.Unlock()
-	dbusStatuses, err := m.systemd.ListUnits()
+	dbusStatuses, err := m.systemd.ListUnitsByNames(filter.Values())
 
 	if err != nil {
-		return nil, err
+		fallback = true
+		log.Debugf("ListUnitsByNames is not implemented in your systemd version (requires at least systemd 230), fallback to ListUnits: %v", err)
+		dbusStatuses, err = m.systemd.ListUnits()
+		if err != nil {
+			return nil, err
+		}
 	}
 
 	states := make(map[string]*unit.UnitState)
 	for _, dus := range dbusStatuses {
-		if !filter.Contains(dus.Name) {
+		if fallback && !filter.Contains(dus.Name) {
+			// If filter could not be applied on DBus side, we will filter unit files here
 			continue
 		}
 
@@ -221,21 +229,23 @@ func (m *systemdUnitManager) GetUnitStates(filter pkg.Set) (map[string]*unit.Uni
 		states[dus.Name] = us
 	}
 
-	// grab data on subscribed units that didn't show up in ListUnits, most
+	// grab data on subscribed units that didn't show up in ListUnits in fallback mode, most
 	// likely due to being inactive
-	for _, name := range filter.Values() {
-		if _, ok := states[name]; ok {
-			continue
-		}
-
-		us, err := m.getUnitState(name)
-		if err != nil {
-			return nil, err
-		}
-		if h, ok := m.hashes[name]; ok {
-			us.UnitHash = h.String()
+	if fallback {
+		for _, name := range filter.Values() {
+			if _, ok := states[name]; ok {
+				continue
+			}
+
+			us, err := m.getUnitState(name)
+			if err != nil {
+				return nil, err
+			}
+			if h, ok := m.hashes[name]; ok {
+				us.UnitHash = h.String()
+			}
+			states[name] = us
 		}
-		states[name] = us
 	}
 
 	return states, nil

vendor.manifest

@@ -3,9 +3,9 @@ github.com/coreos/etcd/client b2d33e6dcb24cddc0395f1bbe2213a27aef0fb46
 github.com/coreos/etcd/pkg/pathutil b2d33e6dcb24cddc0395f1bbe2213a27aef0fb46
 github.com/coreos/etcd/pkg/types b2d33e6dcb24cddc0395f1bbe2213a27aef0fb46
 github.com/coreos/go-semver/semver a9a0c39c7e4a2929f73d4b757d1860fbb8e66d06
-github.com/coreos/go-systemd/activation 1f2251651d199b698a0be8c8bf2283178a2a97ed
-github.com/coreos/go-systemd/dbus 1f2251651d199b698a0be8c8bf2283178a2a97ed
-github.com/coreos/go-systemd/unit 1f2251651d199b698a0be8c8bf2283178a2a97ed
+github.com/coreos/go-systemd/activation 6dc8b843c670f2027cc26b164935635840a40526
+github.com/coreos/go-systemd/dbus 6dc8b843c670f2027cc26b164935635840a40526
+github.com/coreos/go-systemd/unit 6dc8b843c670f2027cc26b164935635840a40526
 github.com/godbus/dbus 9bb9dbf0e53309fa81d26e7230cbb6cff9373cad
 github.com/golang/protobuf/proto dda510ac0fd43b39770f22ac6260eb91d377bce3
 github.com/jonboulle/clockwork b473f398c464f1988327f67c9e6aa7fba62f80d2