This is an automated email from the ASF dual-hosted git repository.
yiguolei pushed a commit to branch branch-1.1-lts
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/branch-1.1-lts by this push:
new 0c83509e98 [fix](plugin) Fix dirty uninstallation of plugin for
1.1-lts (#13619)
0c83509e98 is described below
commit 0c83509e98c2967546307769bf680649d5cf05bb
Author: wxy <dut.xian...@gmail.com>
AuthorDate: Tue Oct 25 16:06:43 2022 +0800
[fix](plugin) Fix dirty uninstallation of plugin for 1.1-lts (#13619)
* [fix](plugin) bugfix for dirty uninstallation of dynamic plugin (#13540)
* [fix](plugin) bugfix for dirty uninstallation of dynamic plugin (#13540)
Co-authored-by: wangxian...@360shuke.com <wangxian...@360shuke.com>
---
.../java/org/apache/doris/plugin/DynamicPluginLoader.java | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/plugin/DynamicPluginLoader.java
b/fe/fe-core/src/main/java/org/apache/doris/plugin/DynamicPluginLoader.java
index cfb2c25d77..2ce00fd760 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/plugin/DynamicPluginLoader.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/plugin/DynamicPluginLoader.java
@@ -111,14 +111,15 @@ public class DynamicPluginLoader extends PluginLoader {
movePlugin();
- plugin = dynamicLoadPlugin(true);
+ try {
+ plugin = dynamicLoadPlugin(true);
+
+ pluginInstallValid();
- pluginInstallValid();
+ pluginContext.setPluginPath(installPath.toString());
- pluginContext.setPluginPath(installPath.toString());
- try {
plugin.init(pluginInfo, pluginContext);
- } catch (Error e) {
+ } catch (Throwable e) {
throw new UserException(e.getMessage());
}
}
@@ -152,7 +153,7 @@ public class DynamicPluginLoader extends PluginLoader {
/**
* reload plugin if plugin has already been installed, else will
re-install.
* Notice that this method will create a new instance of plugin.
- *
+ *
* @throws PluginException
*/
public void reload() throws IOException, UserException {
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org
