Repository: hadoop Updated Branches: refs/heads/branch-2 9cab25a63 -> a8531d5d5
HDFS-11333. Print a user friendly error message when plugins are not found. Contributed by Wei-Chiu Chuang. (cherry picked from commit 859bd159ae554174200334b5eb1d7e8dbef958ad) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/a8531d5d Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/a8531d5d Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/a8531d5d Branch: refs/heads/branch-2 Commit: a8531d5d52fb219c2adb5b6025cfc3fad264e8aa Parents: 9cab25a Author: Wei-Chiu Chuang <weic...@apache.org> Authored: Wed Feb 15 02:50:35 2017 -0800 Committer: Wei-Chiu Chuang <weic...@apache.org> Committed: Wed Feb 15 02:59:45 2017 -0800 ---------------------------------------------------------------------- .../org/apache/hadoop/hdfs/server/datanode/DataNode.java | 10 +++++++++- .../org/apache/hadoop/hdfs/server/namenode/NameNode.java | 11 +++++++++-- 2 files changed, 18 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/a8531d5d/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DataNode.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DataNode.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DataNode.java index 6683a0e..d9a3bcc 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DataNode.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DataNode.java @@ -928,7 +928,15 @@ public class DataNode extends ReconfigurableBase } private void startPlugins(Configuration conf) { - plugins = conf.getInstances(DFS_DATANODE_PLUGINS_KEY, ServicePlugin.class); + try { + plugins = conf.getInstances(DFS_DATANODE_PLUGINS_KEY, + ServicePlugin.class); + } catch (RuntimeException e) { + String pluginsValue = conf.get(DFS_DATANODE_PLUGINS_KEY); + LOG.error("Unable to load DataNode plugins. Specified list of plugins: " + + pluginsValue, e); + throw e; + } for (ServicePlugin p: plugins) { try { p.start(this); http://git-wip-us.apache.org/repos/asf/hadoop/blob/a8531d5d/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/NameNode.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/NameNode.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/NameNode.java index f04f65b..b66d0e8 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/NameNode.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/NameNode.java @@ -810,8 +810,15 @@ public class NameNode extends ReconfigurableBase implements httpServer.setFSImage(getFSImage()); } rpcServer.start(); - plugins = conf.getInstances(DFS_NAMENODE_PLUGINS_KEY, - ServicePlugin.class); + try { + plugins = conf.getInstances(DFS_NAMENODE_PLUGINS_KEY, + ServicePlugin.class); + } catch (RuntimeException e) { + String pluginsValue = conf.get(DFS_NAMENODE_PLUGINS_KEY); + LOG.error("Unable to load NameNode plugins. Specified list of plugins: " + + pluginsValue, e); + throw e; + } for (ServicePlugin p: plugins) { try { p.start(this); --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-commits-h...@hadoop.apache.org
