From 68c65f02cc564677590072d4870ae8739e629ec8 Mon Sep 17 00:00:00 2001 From: Umesh Agashe Date: Fri, 21 Oct 2016 15:52:52 -0700 Subject: [PATCH] HBASE-16930 Fixed potential infinite recursion in AssignmentManager.checkWals() Tested manually with copy-paste checlWals() code and testing it against local filesystem. --- .../src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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; } -- 2.7.4 (Apple Git-66)