Skip to content

Commit 3c76b9e

Browse files
authored
fix(common): context with time (#22708)
1 parent a6c9fdd commit 3c76b9e

File tree

5 files changed

+13
-10
lines changed

5 files changed

+13
-10
lines changed

pkg/cloudcommon/cronman/cronman.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ import (
3333
"yunion.io/x/onecloud/pkg/mcclient"
3434
"yunion.io/x/onecloud/pkg/mcclient/auth"
3535
"yunion.io/x/onecloud/pkg/mcclient/modules/yunionconf"
36+
"yunion.io/x/onecloud/pkg/util/ctx"
3637
)
3738

3839
var (
@@ -361,7 +362,7 @@ func (self *SCronJobManager) Start2(ctx context.Context, electObj *elect.Elect)
361362
}
362363

363364
func (self *SCronJobManager) Start() {
364-
ctx := context.Background()
365+
ctx := ctx.CtxWithTime()
365366
ctx, self.stopFunc = context.WithCancel(ctx)
366367
self.start(ctx)
367368
}

pkg/cloudcommon/db/rolecache.go

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ import (
3232
"yunion.io/x/onecloud/pkg/mcclient/auth"
3333
"yunion.io/x/onecloud/pkg/mcclient/informer"
3434
modules "yunion.io/x/onecloud/pkg/mcclient/modules/identity"
35+
"yunion.io/x/onecloud/pkg/util/ctx"
3536
"yunion.io/x/onecloud/pkg/util/stringutils2"
3637
)
3738

@@ -192,7 +193,7 @@ func (manager *SRoleCacheManager) OnAdd(obj *jsonutils.JSONDict) {
192193
log.Errorf("unable to get Id: %v", err)
193194
return
194195
}
195-
ctx := context.Background()
196+
ctx := ctx.CtxWithTime()
196197
lockman.LockRawObject(ctx, manager.KeywordPlural(), id)
197198
defer lockman.ReleaseRawObject(ctx, manager.KeywordPlural(), id)
198199
role := new(SRole)
@@ -212,7 +213,7 @@ func (manager *SRoleCacheManager) OnUpdate(oldObj, newObj *jsonutils.JSONDict) {
212213
log.Errorf("unable to get Id: %v", err)
213214
return
214215
}
215-
ctx := context.Background()
216+
ctx := ctx.CtxWithTime()
216217
role, err := manager.fetchRole(ctx, id, true, nil)
217218
if err != nil {
218219
log.Errorf("unable to fetch Role from db: %v", err)
@@ -242,7 +243,7 @@ func (manager *SRoleCacheManager) OnDelete(obj *jsonutils.JSONDict) {
242243
log.Errorf("unable to get Id: %v", err)
243244
return
244245
}
245-
ctx := context.Background()
246+
ctx := ctx.CtxWithTime()
246247
role, err := manager.fetchRole(ctx, id, true, nil)
247248
if err != nil {
248249
log.Errorf("unable to fetch Role from db: %v", err)
@@ -263,7 +264,7 @@ func (manager *SRoleCacheManager) StartWatchRoleInKeystone() error {
263264
if manager.watching {
264265
return nil
265266
}
266-
ctx := context.Background()
267+
ctx := ctx.CtxWithTime()
267268
s := auth.GetAdminSession(ctx, "")
268269
watchMan, err := informer.NewWatchManagerBySession(s)
269270
if err != nil {

pkg/cloudcommon/informer/etcd.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ import (
2525
"yunion.io/x/pkg/errors"
2626

2727
"yunion.io/x/onecloud/pkg/cloudcommon/etcd"
28+
"yunion.io/x/onecloud/pkg/util/ctx"
2829
)
2930

3031
const (
@@ -85,7 +86,7 @@ func NewEtcdBackend(opt *etcd.SEtcdOptions, onKeepaliveFailure func()) (*EtcdBac
8586
if err != nil {
8687
return nil, err
8788
}
88-
ctx := context.Background()
89+
ctx := ctx.CtxWithTime()
8990
be.initClientResources(ctx)
9091
be.StartClientWatch(ctx)
9192
return be, nil

pkg/cloudcommon/syncman/watcher/watcher.go

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,6 @@
1515
package watcher
1616

1717
import (
18-
"context"
19-
2018
"yunion.io/x/jsonutils"
2119
"yunion.io/x/log"
2220
"yunion.io/x/pkg/errors"
@@ -28,6 +26,7 @@ import (
2826
"yunion.io/x/onecloud/pkg/mcclient"
2927
"yunion.io/x/onecloud/pkg/mcclient/auth"
3028
"yunion.io/x/onecloud/pkg/mcclient/informer"
29+
"yunion.io/x/onecloud/pkg/util/ctx"
3130
)
3231

3332
type SInformerSyncManager struct {
@@ -81,7 +80,7 @@ func (manager *SInformerSyncManager) StartWatching(resMan informer.IResourceMana
8180

8281
func (manager *SInformerSyncManager) startWatcher() error {
8382
log.Infof("[%s] Start resource informer watcher for %s", manager.Name(), manager.resourceManager.GetKeyword())
84-
ctx := context.Background()
83+
ctx := ctx.CtxWithTime()
8584
s := auth.GetAdminSession(ctx, consts.GetRegion())
8685
informer.NewWatchManagerBySessionBg(s, func(watchMan *informer.SWatchManager) error {
8786
if err := watchMan.For(manager.resourceManager).AddEventHandler(ctx, manager); err != nil {

pkg/util/logclient/logclient.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ import (
3434
"yunion.io/x/onecloud/pkg/mcclient"
3535
"yunion.io/x/onecloud/pkg/mcclient/auth"
3636
"yunion.io/x/onecloud/pkg/mcclient/modules/logger"
37+
"yunion.io/x/onecloud/pkg/util/ctx"
3738
// "yunion.io/x/onecloud/pkg/mcclient/modules/websocket"
3839
)
3940

@@ -242,7 +243,7 @@ type logTask struct {
242243
}
243244

244245
func (t *logTask) Run() {
245-
ctx := context.Background()
246+
ctx := ctx.CtxWithTime()
246247
ctx = context.WithValue(ctx, appctx.APP_CONTEXT_KEY_APPNAME, consts.GetServiceType())
247248
s := DefaultSessionGenerator(ctx, t.userCred, "")
248249
_, err := t.api.Create(s, t.logentry)

0 commit comments

Comments
 (0)