Apache
/
hbase
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HBASE-27046 The filenum in AbstractFSWAL should be monotone increasing (#4449) 

Signed-off-by: Xin Sun <ddupgs@gmail.com>
Signed-off-by: GeorryHuang <huangzhuoyue@apache.org>
(cherry picked from commit 313a37f7ac)
This commit is contained in:
Duo Zhang 2022-06-02 23:55:23 +08:00
parent 8bf5256c24
commit 2625c67e73
3 changed files with 1 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/AbstractFSWAL.java
View File

@ -596,12 +596,8 @@ public abstract class AbstractFSWAL<W extends WriterBase> implements WAL {
* retrieve the next path to use for writing. Increments the internal filenum.
*/
private Path getNewPath() throws IOException {
this.filenum.set(EnvironmentEdgeManager.currentTime());
this.filenum.set(Math.max(getFilenum() + 1, EnvironmentEdgeManager.currentTime()));
Path newPath = getCurrentFileName();
while (fs.exists(newPath)) {
this.filenum.incrementAndGet();
newPath = getCurrentFileName();
}
return newPath;
}

2
hbase-server/src/test/java/org/apache/hadoop/hbase/quotas/TestClusterScopeQuotaThrottle.java
View File

@ -43,11 +43,9 @@ import org.junit.After;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.ClassRule;
import org.junit.Ignore;
import org.junit.Test;
import org.junit.experimental.categories.Category;
@Ignore // disable for now, see HBASE-27045
@Category({ RegionServerTests.class, LargeTests.class })
public class TestClusterScopeQuotaThrottle {

2
hbase-server/src/test/java/org/apache/hadoop/hbase/quotas/TestQuotaThrottle.java
View File

@ -44,13 +44,11 @@ import org.junit.After;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.ClassRule;
import org.junit.Ignore;
import org.junit.Test;
import org.junit.experimental.categories.Category;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@Ignore // Disabled because flakey. Fails ~30% on a resource constrained GCE though not on Apache.
@Category({ RegionServerTests.class, MediumTests.class })
public class TestQuotaThrottle {