dragonflyoss
/
dragonfly
mirror of https://github.com/dragonflyoss/dragonfly.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Load source plugins (#894) 

* unit test

Signed-off-by: sunwp <244372610@qq.com>
This commit is contained in:
sunwp 2021-12-09 14:21:51 +08:00 committed by Gaius
parent ca2f196aff
commit eaca95d24e
No known key found for this signature in database
GPG Key ID: 8B4E5D1290FA2FFB
2 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
pkg/source/source_client.go
View File

@ -147,28 +147,36 @@ func WithPluginDir(dir string) Option {
} }
func (m *clientManager) Register(scheme string, resourceClient ResourceClient, adaptor requestAdapter, hooks ...Hook) error { func (m *clientManager) Register(scheme string, resourceClient ResourceClient, adaptor requestAdapter, hooks ...Hook) error {
scheme = strings.ToLower(scheme)
m.mu.Lock() m.mu.Lock()
defer m.mu.Unlock() defer m.mu.Unlock()
if client, ok := m.clients[strings.ToLower(scheme)]; ok { if client, ok := m.clients[scheme]; ok {
if client.(*clientWrapper).rc != resourceClient { if client.(*clientWrapper).rc != resourceClient {
return errors.Errorf("client with scheme %s already exist, current client: %#v", scheme, client) return errors.Errorf("client with scheme %s already exist, current client: %#v", scheme, client)
} }
logger.Warnf("client with scheme %s already exist, no need register again", scheme)
return nil
} }
m.clients[strings.ToLower(scheme)] = &clientWrapper{ m.doRegister(scheme, &clientWrapper{
adapter: adaptor, adapter: adaptor,
hooks: hooks, hooks: hooks,
rc: resourceClient, rc: resourceClient,
} })
return nil return nil
} }
func (m *clientManager) doRegister(scheme string, resourceClient ResourceClient) {
m.clients[strings.ToLower(scheme)] = resourceClient
}
func (m *clientManager) UnRegister(scheme string) { func (m *clientManager) UnRegister(scheme string) {
m.mu.Lock() m.mu.Lock()
defer m.mu.Unlock() defer m.mu.Unlock()
if client, ok := m.clients[strings.ToLower(scheme)]; ok { scheme = strings.ToLower(scheme)
if client, ok := m.clients[scheme]; ok {
logger.Infof("remove client %#v for scheme %s", client, scheme) logger.Infof("remove client %#v for scheme %s", client, scheme)
} }
delete(m.clients, strings.ToLower(scheme)) delete(m.clients, scheme)
} }
func (m *clientManager) GetClient(scheme string, options ...Option) (ResourceClient, bool) { func (m *clientManager) GetClient(scheme string, options ...Option) (ResourceClient, bool) {
@ -198,7 +206,7 @@ func (m *clientManager) GetClient(scheme string, options ...Option) (ResourceCli
m.mu.Unlock() m.mu.Unlock()
return nil, false return nil, false
} }
m.clients[scheme] = client m.doRegister(scheme, client)
m.mu.Unlock() m.mu.Unlock()
return client, true return client, true
} }

1
test/e2e/e2e_test.go
View File

@ -68,6 +68,7 @@ var _ = BeforeSuite(func() {
rawDfgetVersion, err := pod.Command("dfget", "version").CombinedOutput() rawDfgetVersion, err := pod.Command("dfget", "version").CombinedOutput()
Expect(err).NotTo(HaveOccurred()) Expect(err).NotTo(HaveOccurred())
dfgetGitCommit := strings.Fields(string(rawDfgetVersion))[7] dfgetGitCommit := strings.Fields(string(rawDfgetVersion))[7]
fmt.Printf("raw dfget version: %s\n", rawDfgetVersion)
fmt.Printf("dfget merge commit: %s\n", dfgetGitCommit) fmt.Printf("dfget merge commit: %s\n", dfgetGitCommit)
if mode == dfdaemonCompatibilityTestMode { if mode == dfdaemonCompatibilityTestMode {