cleanup unused links (#2549)

Omarabdul3ziz · web-flow · commit b4aa7c746a0d · 2025-03-10T15:18:43.000+02:00
* cleanup unused links

* update zosbase

* pass zbus client to NewSystemMonitor

method modified to accept zbus client due to feature in zoslight but it
was not passed in zos3 cmds
diff --git a/cmds/modules/networkd/main.go b/cmds/modules/networkd/main.go
@@ -68,6 +68,10 @@ func action(cli *cli.Context) error {
 		return errors.Wrap(err, "failed to migrate older dhcp service")
 	}
 
+	if err := network.CleanupUnusedLinks(); err != nil {
+		return errors.Wrap(err, "failed to cleanupUnusedLinks")
+	}
+
 	if err := bootstrap.DefaultBridgeValid(); err != nil {
 		return errors.Wrap(err, "invalid setup")
 	}
diff --git a/cmds/modules/noded/main.go b/cmds/modules/noded/main.go
@@ -59,7 +59,6 @@ var Module cli.Command = cli.Command{
 }
 
 func registerationServer(ctx context.Context, msgBrokerCon string, env environment.Environment, info registrar.RegistrationInfo) error {
-
 	redis, err := zbus.NewRedisClient(msgBrokerCon)
 	if err != nil {
 		return errors.Wrap(err, "fail to connect to message broker server")
@@ -221,7 +220,7 @@ func action(cli *cli.Context) error {
 	}
 	go events.Start(ctx)
 
-	system, err := monitord.NewSystemMonitor(node, 2*time.Second)
+	system, err := monitord.NewSystemMonitor(node, 2*time.Second, redis)
 	if err != nil {
 		log.Fatal().Err(err).Msg("failed to initialize system monitor")
 	}
diff --git a/go.mod b/go.mod
@@ -17,7 +17,7 @@ require (
 	github.com/threefoldtech/tfchain/clients/tfchain-client-go v0.0.0-20241127100051-77e684bcb1b2
 	github.com/threefoldtech/tfgrid-sdk-go/rmb-sdk-go v0.16.1-0.20241229121208-76ac3fea5e67
 	github.com/threefoldtech/zbus v1.0.1
-	github.com/threefoldtech/zosbase v0.1.3-0.20250225115916-9520b6446e32
+	github.com/threefoldtech/zosbase v0.1.3-0.20250310105717-bb132c3be10d
 	github.com/urfave/cli/v2 v2.17.2-0.20221006022127-8f469abc00aa
 	gopkg.in/yaml.v2 v2.4.0
 )
diff --git a/go.sum b/go.sum
@@ -542,8 +542,10 @@ github.com/threefoldtech/tfgrid-sdk-go/rmb-sdk-go v0.16.1-0.20241229121208-76ac3
 github.com/threefoldtech/tfgrid-sdk-go/rmb-sdk-go v0.16.1-0.20241229121208-76ac3fea5e67/go.mod h1:93SROfr+QjgaJ5/jIWtIpLkhaD8Pv8WbdfwvwMNG2p4=
 github.com/threefoldtech/zbus v1.0.1 h1:3KaEpyOiDYAw+lrAyoQUGIvY9BcjVRXlQ1beBRqhRNk=
 github.com/threefoldtech/zbus v1.0.1/go.mod h1:E/v/xEvG/l6z/Oj0aDkuSUXFm/1RVJkhKBwDTAIdsHo=
-github.com/threefoldtech/zosbase v0.1.3-0.20250225115916-9520b6446e32 h1:2QOr/zpJyO0IODr00fuc59ClbIlJIsJtsC9jwQ+bN3U=
-github.com/threefoldtech/zosbase v0.1.3-0.20250225115916-9520b6446e32/go.mod h1:rxc49wA04S4IsBOYe0omVO7nu7GXridueh2PJh34gSo=
+github.com/threefoldtech/zosbase v0.1.2 h1:JTwL3FFpYCmsGKsNSzXSDAsuL26LmXDjjGXaGxXtIMU=
+github.com/threefoldtech/zosbase v0.1.2/go.mod h1:rxc49wA04S4IsBOYe0omVO7nu7GXridueh2PJh34gSo=
+github.com/threefoldtech/zosbase v0.1.3-0.20250310105717-bb132c3be10d h1:pMuSAM/NPD5GhheJRY8KUEdfwNdSSEBwwLnP+WADEvY=
+github.com/threefoldtech/zosbase v0.1.3-0.20250310105717-bb132c3be10d/go.mod h1:rxc49wA04S4IsBOYe0omVO7nu7GXridueh2PJh34gSo=
 github.com/tinylib/msgp v1.1.5 h1:2gXmtWueD2HefZHQe1QOy9HVzmFrLOVvsXwXBQ0ayy0=
 github.com/tinylib/msgp v1.1.5/go.mod h1:eQsjooMTnV42mHu917E26IogZ2930nFyBQdofk10Udg=
 github.com/tklauser/go-sysconf v0.3.11 h1:89WgdJhk5SNwJfu+GKyYveZ4IaJ7xAkecBo+KdJV0CM=

Original file line number	Diff line number	Diff line change
`@@ -68,6 +68,10 @@ func action(cli *cli.Context) error {`
`68`	`68`	`return errors.Wrap(err, "failed to migrate older dhcp service")`
`69`	`69`	`}`
`70`	`70`
	`71`	`+ if err := network.CleanupUnusedLinks(); err != nil {`
	`72`	`+ return errors.Wrap(err, "failed to cleanupUnusedLinks")`
	`73`	`+ }`
	`74`	`+`
`71`	`75`	`if err := bootstrap.DefaultBridgeValid(); err != nil {`
`72`	`76`	`return errors.Wrap(err, "invalid setup")`
`73`	`77`	`}`
Original file line number	Diff line number	Diff line change
`@@ -59,7 +59,6 @@ var Module cli.Command = cli.Command{`
`59`	`59`	`}`
`60`	`60`
`61`	`61`	`func registerationServer(ctx context.Context, msgBrokerCon string, env environment.Environment, info registrar.RegistrationInfo) error {`
`62`		`-`
`63`	`62`	`redis, err := zbus.NewRedisClient(msgBrokerCon)`
`64`	`63`	`if err != nil {`
`65`	`64`	`return errors.Wrap(err, "fail to connect to message broker server")`
`@@ -221,7 +220,7 @@ func action(cli *cli.Context) error {`
`221`	`220`	`}`
`222`	`221`	`go events.Start(ctx)`
`223`	`222`
`224`		`- system, err := monitord.NewSystemMonitor(node, 2*time.Second)`
	`223`	`+ system, err := monitord.NewSystemMonitor(node, 2*time.Second, redis)`
`225`	`224`	`if err != nil {`
`226`	`225`	`log.Fatal().Err(err).Msg("failed to initialize system monitor")`
`227`	`226`	`}`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ require (`
`17`	`17`	`github.com/threefoldtech/tfchain/clients/tfchain-client-go v0.0.0-20241127100051-77e684bcb1b2`
`18`	`18`	`github.com/threefoldtech/tfgrid-sdk-go/rmb-sdk-go v0.16.1-0.20241229121208-76ac3fea5e67`
`19`	`19`	`github.com/threefoldtech/zbus v1.0.1`
`20`		`- github.com/threefoldtech/zosbase v0.1.3-0.20250225115916-9520b6446e32`
	`20`	`+ github.com/threefoldtech/zosbase v0.1.3-0.20250310105717-bb132c3be10d`
`21`	`21`	`github.com/urfave/cli/v2 v2.17.2-0.20221006022127-8f469abc00aa`
`22`	`22`	`gopkg.in/yaml.v2 v2.4.0`
`23`	`23`	`)`