Index: hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/TableSnapshotInputFormat.java =================================================================== --- hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/TableSnapshotInputFormat.java (revision 1586738) +++ hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/TableSnapshotInputFormat.java (working copy) @@ -235,10 +235,8 @@ scan.setCacheBlocks(false); scanner = new ClientSideRegionScanner(conf, fs, tmpRootDir, htd, hri, scan, null); - if (context != null) { - this.context = context; - getCounter = TableRecordReaderImpl.retrieveGetCounterWithStringsParams(context); - } + this.context = context; + getCounter = TableRecordReaderImpl.retrieveGetCounterWithStringsParams(context); } @Override @@ -300,7 +298,6 @@ FileSystem fs = rootDir.getFileSystem(conf); Path snapshotDir = SnapshotDescriptionUtils.getCompletedSnapshotDir(snapshotName, rootDir); - SnapshotDescription snapshotDesc = SnapshotDescriptionUtils.readSnapshotInfo(fs, snapshotDir); Set snapshotRegionNames = SnapshotReferenceUtil.getSnapshotRegionNames(fs, snapshotDir);