Skip to content

Commit b40e662

Browse files
committed
Skip libvirt connection on startup
1 parent 676342f commit b40e662

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

internal/controller/hypervisor_controller.go

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -290,12 +290,6 @@ func (r *HypervisorReconciler) Reconcile(ctx context.Context, req ctrl.Request)
290290
// SetupWithManager sets up the controller with the Manager.
291291
func (r *HypervisorReconciler) SetupWithManager(mgr ctrl.Manager) error {
292292
ctx := context.Background()
293-
log := logger.Log.WithName("HypervisorReconciler")
294-
295-
// Initialize Libvirt connection
296-
if err := r.Libvirt.Connect(); err != nil {
297-
log.Error(err, "unable to connect to Libvirt system bus, reconnecting on reconciliation")
298-
}
299293

300294
var err error
301295
if r.osDescriptor, err = r.Systemd.Describe(ctx); err != nil {

internal/libvirt/libvirt.go

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ import (
2222
"fmt"
2323
"os"
2424
"sync"
25+
"time"
2526

2627
v1 "github.com/cobaltcore-dev/openstack-hypervisor-operator/api/v1"
2728
"github.com/digitalocean/go-libvirt"
@@ -51,7 +52,12 @@ func NewLibVirt(k client.Client) *LibVirt {
5152
}
5253
log.Log.Info("Using libvirt unix domain socket", "socket", socketPath)
5354
return &LibVirt{
54-
libvirt.NewWithDialer(dialers.NewLocal(dialers.WithSocket(socketPath))),
55+
libvirt.NewWithDialer(
56+
dialers.NewLocal(
57+
dialers.WithSocket(socketPath),
58+
dialers.WithLocalTimeout(15*time.Second),
59+
),
60+
),
5561
k,
5662
make(map[string]context.CancelFunc),
5763
sync.Mutex{},

0 commit comments

Comments
 (0)