treewide: wait possible zombies

This commit is contained in:
Yousong Zhou
2021-04-20 19:19:04 +08:00
parent 941f502960
commit 0b8988a1ff
8 changed files with 39 additions and 6 deletions
+5
View File
@@ -15,9 +15,14 @@
package main
import (
"context"
"yunion.io/x/onecloud/pkg/ansibleserver/service"
"yunion.io/x/onecloud/pkg/util/procutils"
)
func main() {
go procutils.WaitZombieLoop(context.TODO())
service.StartService()
}
+5
View File
@@ -15,12 +15,17 @@
package main
import (
"context"
"yunion.io/x/onecloud/pkg/baremetal/service"
"yunion.io/x/onecloud/pkg/util/atexit"
"yunion.io/x/onecloud/pkg/util/procutils"
)
func main() {
defer atexit.Handle()
go procutils.WaitZombieLoop(context.TODO())
service.New().StartService()
}
+5
View File
@@ -15,12 +15,17 @@
package main
import (
"context"
"yunion.io/x/onecloud/pkg/esxi/service"
"yunion.io/x/onecloud/pkg/util/atexit"
"yunion.io/x/onecloud/pkg/util/procutils"
)
func main() {
defer atexit.Handle()
go procutils.WaitZombieLoop(context.TODO())
service.New().StartService()
}
+5
View File
@@ -15,12 +15,17 @@
package main
import (
"context"
"yunion.io/x/onecloud/pkg/image/service"
"yunion.io/x/onecloud/pkg/util/atexit"
"yunion.io/x/onecloud/pkg/util/procutils"
)
func main() {
defer atexit.Handle()
go procutils.WaitZombieLoop(context.TODO())
service.StartService()
}
+8 -1
View File
@@ -14,9 +14,16 @@
package main
import "yunion.io/x/onecloud/pkg/hostman/hostdeployer/deployserver"
import (
"context"
"yunion.io/x/onecloud/pkg/hostman/hostdeployer/deployserver"
"yunion.io/x/onecloud/pkg/util/procutils"
)
func main() {
go procutils.WaitZombieLoop(context.TODO())
deployer := deployserver.NewDeployService()
deployer.StartService()
}
+5
View File
@@ -15,14 +15,19 @@
package main
import (
"context"
"yunion.io/x/onecloud/pkg/cloudcommon/service"
"yunion.io/x/onecloud/pkg/hostman"
"yunion.io/x/onecloud/pkg/util/atexit"
"yunion.io/x/onecloud/pkg/util/procutils"
)
func main() {
defer atexit.Handle()
go procutils.WaitZombieLoop(context.TODO())
var srv = &hostman.SHostService{}
srv.SServiceBase = &service.SServiceBase{
Service: srv,
+6 -1
View File
@@ -26,6 +26,7 @@ import (
app_common "yunion.io/x/onecloud/pkg/cloudcommon/app"
common_options "yunion.io/x/onecloud/pkg/cloudcommon/options"
"yunion.io/x/onecloud/pkg/util/atexit"
"yunion.io/x/onecloud/pkg/util/procutils"
"yunion.io/x/onecloud/pkg/vpcagent/options"
_ "yunion.io/x/onecloud/pkg/vpcagent/ovn"
"yunion.io/x/onecloud/pkg/vpcagent/worker"
@@ -52,8 +53,12 @@ func main() {
}
{
ctx := context.Background()
ctx, cancelFunc := context.WithCancel(ctx)
go procutils.WaitZombieLoop(ctx)
wg := &sync.WaitGroup{}
ctx, cancelFunc := context.WithCancel(context.Background())
ctx = context.WithValue(ctx, "wg", wg)
wg.Add(1)
go w.Start(ctx)
-4
View File
@@ -15,7 +15,6 @@
package service
import (
"context"
"os"
_ "github.com/go-sql-driver/mysql"
@@ -28,7 +27,6 @@ import (
common_app "yunion.io/x/onecloud/pkg/cloudcommon/app"
"yunion.io/x/onecloud/pkg/cloudcommon/db"
common_options "yunion.io/x/onecloud/pkg/cloudcommon/options"
"yunion.io/x/onecloud/pkg/util/procutils"
)
func StartService() {
@@ -49,7 +47,5 @@ func StartService() {
db.EnsureAppInitSyncDB(app, dbOpts, models.InitDB)
defer cloudcommon.CloseDB()
go procutils.WaitZombieLoop(context.TODO())
common_app.ServeForever(app, baseOpts)
}