Repository navigation
Fix #9214: Avoid bogus "NoDefault" plugin load on every attach and unnecessary loadModuleMutex locks - #9224
Open
mariuz wants to merge 1 commit into
Open
Fix #9214: Avoid bogus "NoDefault" plugin load on every attach and unnecessary loadModuleMutex locks#9224mariuz wants to merge 1 commit into
mariuz wants to merge 1 commit into
Conversation
…tach and unnecessary loadModuleMutex locks 1. In ClntAuthBlock::ClientCrypt (src/remote/remote.h), pass "" instead of "NoDefault" to GetPlugins<IKeyHolderPlugin>. GetPlugins does not treat "NoDefault" specially, so PluginSet treated it as a literal plugin name and attempted to LoadLibrary/dlopen "plugins/NoDefault" while holding loadModuleMutex on every attach before ClientCrypt::create() replaced the iterator with the configured KeyHolderPlugin. 2. In PluginSet::next() (src/yvalve/PluginManager.cpp), only acquire loadModuleMutex when a plugin is not already present in the configured plugins map, and avoid acquiring any mutex when namesList is empty.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Fixes #9214
Cause
ClntAuthBlock::ClientCrypt(src/remote/remote.h), the constructor initializedGetPlugins<IKeyHolderPlugin>with"NoDefault"(introduced in0453bbec9e/ CORE-6220 as a placeholder beforeClientCrypt::create()later callspluginItr.set(conf)). BecauseGetPluginsonly treatsnullptrspecially,"NoDefault"was passed directly toPluginSetas a literal plugin name. On everyClntAuthBlockconstruction (every attach),PluginSet::next()attempted to loadplugins/NoDefaultviaModuleLoader::loadModule(LoadLibraryEx/dlopen) while holdingloadModuleMutex, right beforepluginItr.set(clntConfig)replaced the iterator with the configuredKeyHolderPlugin(which defaults to"").PluginSet::next()(src/yvalve/PluginManager.cpp),loadModuleMutexandplugins->mutexwere acquired unconditionally before checking ifnamesListhad any words or if the plugin was already present in the configuredpluginsmap.Fix
""(empty plugin list) instead of"NoDefault"inClntAuthBlock::ClientCrypt::ClientCrypt().PluginSet::next(), iteratecurrentName.getWord(namesList, " \t,;")first (so an emptynamesListdoes not acquire any mutex) and checkplugins->get(...)underplugins->mutexbefore acquiringloadModuleMutexfor the slow module-loading path.