You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by pa...@apache.org on 2020/02/26 15:07:09 UTC
[hbase] branch branch-2 updated: HBASE-23740 Invalid StoreFile WARN log message printed for recovered.… (#1198)
This is an automated email from the ASF dual-hosted git repository.
pankajkumar pushed a commit to branch branch-2
in repository https://gitbox.apache.org/repos/asf/hbase.git
The following commit(s) were added to refs/heads/branch-2 by this push:
new 8b7cdc9 HBASE-23740 Invalid StoreFile WARN log message printed for recovered.… (#1198)
8b7cdc9 is described below
commit 8b7cdc9781004fbf3bbddf419a30dc09dac0f5ec
Author: Pankaj <pa...@apache.org>
AuthorDate: Wed Feb 26 17:52:21 2020 +0530
HBASE-23740 Invalid StoreFile WARN log message printed for recovered.… (#1198)
* HBASE-23740 Invalid StoreFile WARN log message printed for recovered.hfiles directory
* HBASE-23740 Invalid StoreFile WARN log message printed for recovered.hfiles directory
(cherry picked from commit 3c3aae9a2f35bf63c7a10374701f89c0aa8b71a4)
---
.../apache/hadoop/hbase/regionserver/HRegionFileSystem.java | 12 ++++++++++--
1 file changed, 10 insertions(+), 2 deletions(-)
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionFileSystem.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionFileSystem.java
index 3f699fb..8402a64 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionFileSystem.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionFileSystem.java
@@ -245,7 +245,11 @@ public class HRegionFileSystem {
ArrayList<StoreFileInfo> storeFiles = new ArrayList<>(files.length);
for (FileStatus status: files) {
if (validate && !StoreFileInfo.isValid(status)) {
- LOG.warn("Invalid StoreFile: " + status.getPath());
+ // recovered.hfiles directory is expected inside CF path when hbase.wal.split.to.hfile to
+ // true, refer HBASE-23740
+ if (!HConstants.RECOVERED_HFILES_DIR.equals(status.getPath().getName())) {
+ LOG.warn("Invalid StoreFile: {}", status.getPath());
+ }
continue;
}
StoreFileInfo info = ServerRegionReplicaUtil.getStoreFileInfo(conf, fs, regionInfo,
@@ -278,7 +282,11 @@ public class HRegionFileSystem {
List<LocatedFileStatus> validStoreFiles = Lists.newArrayList();
for (LocatedFileStatus status : locatedFileStatuses) {
if (validate && !StoreFileInfo.isValid(status)) {
- LOG.warn("Invalid StoreFile: " + status.getPath());
+ // recovered.hfiles directory is expected inside CF path when hbase.wal.split.to.hfile to
+ // true, refer HBASE-23740
+ if (!HConstants.RECOVERED_HFILES_DIR.equals(status.getPath().getName())) {
+ LOG.warn("Invalid StoreFile: {}", status.getPath());
+ }
} else {
validStoreFiles.add(status);
}