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

HADOOP-18039. Upgrade hbase2 version and fix TestTimelineWriterHBaseDown (#3768) 

Signed-off-by: Akira Ajisaka <aajisaka@apache.org>
This commit is contained in:
Viraj Jasani 2021-12-13 10:33:32 +05:30 committed by GitHub
parent a03579e9b5
commit 4e326f0c97
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 28 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
hadoop-project/pom.xml
View File

@ -200,7 +200,7 @@
<swagger-annotations-version>1.5.4</swagger-annotations-version> <swagger-annotations-version>1.5.4</swagger-annotations-version>
<snakeyaml.version>1.26</snakeyaml.version> <snakeyaml.version>1.26</snakeyaml.version>
<hbase.one.version>1.7.1</hbase.one.version> <hbase.one.version>1.7.1</hbase.one.version>
<hbase.two.version>2.0.2</hbase.two.version> <hbase.two.version>2.2.4</hbase.two.version>
<junit.version>4.13.2</junit.version> <junit.version>4.13.2</junit.version>
<junit.jupiter.version>5.5.1</junit.jupiter.version> <junit.jupiter.version>5.5.1</junit.jupiter.version>
<junit.vintage.version>5.5.1</junit.vintage.version> <junit.vintage.version>5.5.1</junit.vintage.version>
@ -2427,9 +2427,10 @@
</activation> </activation>
<properties> <properties>
<hbase.version>${hbase.two.version}</hbase.version> <hbase.version>${hbase.two.version}</hbase.version>
<hbase-compatible-hadoop.version>3.0.0</hbase-compatible-hadoop.version> <hbase-compatible-hadoop.version>2.8.5</hbase-compatible-hadoop.version>
<hbase-compatible-guava.version>11.0.2</hbase-compatible-guava.version> <hbase-compatible-guava.version>11.0.2</hbase-compatible-guava.version>
<hbase-server-artifactid>hadoop-yarn-server-timelineservice-hbase-server-2</hbase-server-artifactid> <hbase-server-artifactid>hadoop-yarn-server-timelineservice-hbase-server-2</hbase-server-artifactid>
<hbase-compatible-jetty.version>9.3.27.v20190418</hbase-compatible-jetty.version>
</properties> </properties>
<dependencyManagement> <dependencyManagement>
<dependencies> <dependencies>

24
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice-hbase-tests/pom.xml
View File

@ -515,6 +515,30 @@
<artifactId>mockito-core</artifactId> <artifactId>mockito-core</artifactId>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-server</artifactId>
<scope>test</scope>
<version>${hbase-compatible-jetty.version}</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-servlet</artifactId>
<scope>test</scope>
<version>${hbase-compatible-jetty.version}</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-webapp</artifactId>
<scope>test</scope>
<version>${hbase-compatible-jetty.version}</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-util</artifactId>
<scope>test</scope>
<version>${hbase-compatible-jetty.version}</version>
</dependency>
</dependencies> </dependencies>
</profile> </profile>

2
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice-hbase-tests/src/test/java/org/apache/hadoop/yarn/server/timelineservice/storage/TestTimelineWriterHBaseDown.java
View File

@ -43,12 +43,12 @@ public class TestTimelineWriterHBaseDown {
HBaseTestingUtility util = new HBaseTestingUtility(); HBaseTestingUtility util = new HBaseTestingUtility();
HBaseTimelineWriterImpl writer = new HBaseTimelineWriterImpl(); HBaseTimelineWriterImpl writer = new HBaseTimelineWriterImpl();
try { try {
util.startMiniCluster();
Configuration c1 = util.getConfiguration(); Configuration c1 = util.getConfiguration();
c1.setLong(TIMELINE_SERVICE_READER_STORAGE_MONITOR_INTERVAL_MS, 5000); c1.setLong(TIMELINE_SERVICE_READER_STORAGE_MONITOR_INTERVAL_MS, 5000);
writer.init(c1); writer.init(c1);
writer.start(); writer.start();
util.startMiniCluster();
DataGeneratorForTest.createSchema(util.getConfiguration()); DataGeneratorForTest.createSchema(util.getConfiguration());
TimelineStorageMonitor storageMonitor = writer. TimelineStorageMonitor storageMonitor = writer.