GitList

Browse code

Merge pull request #40867 from BurtonQin/double-lock

plugin: Add No-Lock version of resolvePluginID to fix double Rlock

Sebastiaan van Stijn authored on 2020/05/16 01:07:39
Showing 1 changed files

plugin/store.go index ecdf809..114fcf1 100644

@@ -249,10 +249,8 @@ func (ps *Store) CallHandler(p *v2.Plugin) {
 	}
 }
 
+// resolvePluginID must be protected by ps.RLock
 func (ps *Store) resolvePluginID(idOrName string) (string, error) {
-	ps.RLock() // todo: fix
-	defer ps.RUnlock()
-
 	if validFullID.MatchString(idOrName) {
 		return idOrName, nil
 	}

...	...	@@ -249,10 +249,8 @@ func (ps Store) CallHandler(p v2.Plugin) {
249	249	}
250	250	}
251	251
	252	+// resolvePluginID must be protected by ps.RLock
252	253	func (ps *Store) resolvePluginID(idOrName string) (string, error) {
253		- ps.RLock() // todo: fix
254		- defer ps.RUnlock()
255		-
256	254	if validFullID.MatchString(idOrName) {
257	255	return idOrName, nil
258	256	}