This is an automated email from the ASF dual-hosted git repository.
aajisaka pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/hadoop.git
The following commit(s) were added to refs/heads/trunk by this push:
new 4e326f0 HADOOP-18039. Upgrade hbase2 version and fix
TestTimelineWriterHBaseDown (#3768)
4e326f0 is described below
commit 4e326f0c970bf319690601482ed548e6a84125a4
Author: Viraj Jasani <[email protected]>
AuthorDate: Mon Dec 13 10:33:32 2021 +0530
HADOOP-18039. Upgrade hbase2 version and fix TestTimelineWriterHBaseDown
(#3768)
Signed-off-by: Akira Ajisaka <[email protected]>
---
hadoop-project/pom.xml | 5 +++--
.../pom.xml | 24 ++++++++++++++++++++++
.../storage/TestTimelineWriterHBaseDown.java | 2 +-
3 files changed, 28 insertions(+), 3 deletions(-)
diff --git a/hadoop-project/pom.xml b/hadoop-project/pom.xml
index 62e0472..ec64857 100644
--- a/hadoop-project/pom.xml
+++ b/hadoop-project/pom.xml
@@ -200,7 +200,7 @@
<swagger-annotations-version>1.5.4</swagger-annotations-version>
<snakeyaml.version>1.26</snakeyaml.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.jupiter.version>5.5.1</junit.jupiter.version>
<junit.vintage.version>5.5.1</junit.vintage.version>
@@ -2427,9 +2427,10 @@
</activation>
<properties>
<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-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>
<dependencyManagement>
<dependencies>
diff --git
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice-hbase-tests/pom.xml
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice-hbase-tests/pom.xml
index 8eebb78..fee9625 100644
---
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice-hbase-tests/pom.xml
+++
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice-hbase-tests/pom.xml
@@ -515,6 +515,30 @@
<artifactId>mockito-core</artifactId>
<scope>test</scope>
</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>
</profile>
diff --git
a/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
b/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
index cb89ba4..5d658b9 100644
---
a/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
+++
b/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
@@ -43,12 +43,12 @@ public class TestTimelineWriterHBaseDown {
HBaseTestingUtility util = new HBaseTestingUtility();
HBaseTimelineWriterImpl writer = new HBaseTimelineWriterImpl();
try {
+ util.startMiniCluster();
Configuration c1 = util.getConfiguration();
c1.setLong(TIMELINE_SERVICE_READER_STORAGE_MONITOR_INTERVAL_MS, 5000);
writer.init(c1);
writer.start();
- util.startMiniCluster();
DataGeneratorForTest.createSchema(util.getConfiguration());
TimelineStorageMonitor storageMonitor = writer.
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
