change getConf as first sequence instead of jobContext in TableOutputFormat.checkOutputSpec, add unit tests
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/9e3b2880 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/9e3b2880 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/9e3b2880 Branch: refs/heads/branch-2.0 Commit: 9e3b28804d28ad586d12df24a2e5417c25cff857 Parents: 9653a4d Author: michael.jin <michael....@zoom.us> Authored: Fri May 4 11:33:50 2018 +0800 Committer: Mike Drob <md...@apache.org> Committed: Tue May 8 10:27:26 2018 -0500 ---------------------------------------------------------------------- .../org/apache/hadoop/hbase/mapreduce/TableOutputFormat.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/9e3b2880/hbase-mapreduce/src/main/java/org/apache/hadoop/hbase/mapreduce/TableOutputFormat.java ---------------------------------------------------------------------- diff --git a/hbase-mapreduce/src/main/java/org/apache/hadoop/hbase/mapreduce/TableOutputFormat.java b/hbase-mapreduce/src/main/java/org/apache/hadoop/hbase/mapreduce/TableOutputFormat.java index 0a1928b..78be5af 100644 --- a/hbase-mapreduce/src/main/java/org/apache/hadoop/hbase/mapreduce/TableOutputFormat.java +++ b/hbase-mapreduce/src/main/java/org/apache/hadoop/hbase/mapreduce/TableOutputFormat.java @@ -174,9 +174,9 @@ implements Configurable { @Override public void checkOutputSpecs(JobContext context) throws IOException, InterruptedException { - Configuration hConf = context.getConfiguration(); - if(hConf == null) { - hConf = this.conf; + Configuration hConf = getConf(); + if (hConf == null) { + hConf = context.getConfiguration(); } try (Admin admin = ConnectionFactory.createConnection(hConf).getAdmin()) {