Repository: hbase Updated Branches: refs/heads/master fa3cbd1d8 -> 1b12a6039
HBASE-16930 AssignmentManager#checkWals() function can recur infinitely (Umesh Agashe) Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/1b12a603 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/1b12a603 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/1b12a603 Branch: refs/heads/master Commit: 1b12a6039261e001c66faa7693b596a884fea90f Parents: fa3cbd1 Author: tedyu <yuzhih...@gmail.com> Authored: Mon Oct 24 10:10:03 2016 -0700 Committer: tedyu <yuzhih...@gmail.com> Committed: Mon Oct 24 10:10:03 2016 -0700 ---------------------------------------------------------------------- .../java/org/apache/hadoop/hbase/master/AssignmentManager.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/1b12a603/hbase-server/src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java index 2715aed..82ae03f 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java @@ -611,7 +611,7 @@ public class AssignmentManager { if (files[i].isFile() && files[i].getLen() > 0) { LOG.debug(dir + " has a non-empty file: " + files[i].getPath()); return true; - } else if (files[i].isDirectory() && checkWals(fs, dir)) { + } else if (files[i].isDirectory() && checkWals(fs, files[i].getPath())) { LOG.debug(dir + " is a directory and has a non-empty file: " + files[i].getPath()); return true; }
