github/containerd
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Use built in atomic.Bool

Browse Source 
Signed-off-by: Maksym Pavlenko <pavlenko.maksym@gmail.com>
This commit is contained in:
Maksym Pavlenko
2023-03-27 12:08:06 -07:00
parent f7f2be7321
commit a11e47b48c
4 changed files with 6 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
pkg/cri/sbserver/service.go
View File

@@ -25,6 +25,7 @@ import (
"os"
"path/filepath"
"sync"
"sync/atomic"
"time"
"github.com/containerd/containerd"
@@ -43,7 +44,6 @@ import (
"github.com/containerd/containerd/pkg/cri/store/label"
"github.com/containerd/containerd/pkg/atomic"
criconfig "github.com/containerd/containerd/pkg/cri/config"
containerstore "github.com/containerd/containerd/pkg/cri/store/container"
imagestore "github.com/containerd/containerd/pkg/cri/store/image"
@@ -138,7 +138,6 @@ func NewCRIService(config criconfig.Config, client *containerd.Client, nri *nri.
snapshotStore: snapshotstore.NewStore(),
sandboxNameIndex: registrar.NewRegistrar(),
containerNameIndex: registrar.NewRegistrar(),
initialized: atomic.NewBool(false),
netPlugin: make(map[string]cni.CNI),
unpackDuplicationSuppressor: kmutex.New(),
sandboxControllers: make(map[criconfig.SandboxControllerMode]sandbox.Controller),
@@ -288,7 +287,7 @@ func (c *criService) Run() error {
}
// Set the server as initialized. GRPC services could start serving traffic.
c.initialized.Set()
c.initialized.Store(true)
var eventMonitorErr, streamServerErr, cniNetConfMonitorErr error
// Stop the whole CRI service if any of the critical service exits.
@@ -340,7 +339,7 @@ func (c *criService) Close() error {
// IsInitialized indicates whether CRI service has finished initialization.
func (c *criService) IsInitialized() bool {
return c.initialized.IsSet()
return c.initialized.Load()
}
func (c *criService) register(s *grpc.Server) error {

7
pkg/cri/server/service.go
View File

@@ -24,6 +24,7 @@ import (
"os"
"path/filepath"
"sync"
"sync/atomic"
"time"
"github.com/containerd/containerd"
@@ -40,7 +41,6 @@ import (
"github.com/containerd/containerd/pkg/cri/store/label"
"github.com/containerd/containerd/pkg/atomic"
criconfig "github.com/containerd/containerd/pkg/cri/config"
containerstore "github.com/containerd/containerd/pkg/cri/store/container"
imagestore "github.com/containerd/containerd/pkg/cri/store/image"
@@ -132,7 +132,6 @@ func NewCRIService(config criconfig.Config, client *containerd.Client, nri *nri.
snapshotStore: snapshotstore.NewStore(),
sandboxNameIndex: registrar.NewRegistrar(),
containerNameIndex: registrar.NewRegistrar(),
initialized: atomic.NewBool(false),
netPlugin: make(map[string]cni.CNI),
unpackDuplicationSuppressor: kmutex.New(),
}
@@ -265,7 +264,7 @@ func (c *criService) Run() error {
}
// Set the server as initialized. GRPC services could start serving traffic.
c.initialized.Set()
c.initialized.Store(true)
var eventMonitorErr, streamServerErr, cniNetConfMonitorErr error
// Stop the whole CRI service if any of the critical service exits.
@@ -318,7 +317,7 @@ func (c *criService) Close() error {
// IsInitialized indicates whether CRI service has finished initialization.
func (c *criService) IsInitialized() bool {
return c.initialized.IsSet()
return c.initialized.Load()
}
func (c *criService) register(s *grpc.Server) error {