You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ozone.apache.org by ad...@apache.org on 2021/01/22 08:35:57 UTC
[ozone] branch master updated: HDDS-4688. Update Hadoop version to
3.2.2 (#1795)
This is an automated email from the ASF dual-hosted git repository.
adoroszlai pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ozone.git
The following commit(s) were added to refs/heads/master by this push:
new bd00a04 HDDS-4688. Update Hadoop version to 3.2.2 (#1795)
bd00a04 is described below
commit bd00a04b2be168ded501bb4249741b7694e79ea4
Author: Symious <yi...@foxmail.com>
AuthorDate: Fri Jan 22 16:35:39 2021 +0800
HDDS-4688. Update Hadoop version to 3.2.2 (#1795)
---
.../apache/hadoop/hdds/scm/TestStorageContainerManagerHttpServer.java | 2 ++
hadoop-ozone/dist/src/main/compose/ozone-mr/hadoop32/.env | 2 +-
hadoop-ozone/dist/src/main/compose/ozonesecure-mr/.env | 2 +-
.../java/org/apache/hadoop/ozone/om/TestOzoneManagerHttpServer.java | 2 ++
pom.xml | 2 +-
5 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/TestStorageContainerManagerHttpServer.java b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/TestStorageContainerManagerHttpServer.java
index c21788a..70b8ad4 100644
--- a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/TestStorageContainerManagerHttpServer.java
+++ b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/TestStorageContainerManagerHttpServer.java
@@ -32,6 +32,7 @@ import org.apache.hadoop.hdds.scm.server.StorageContainerManagerHttpServer;
import org.apache.hadoop.hdfs.web.URLConnectionFactory;
import org.apache.hadoop.http.HttpConfig;
import org.apache.hadoop.http.HttpConfig.Policy;
+import org.apache.hadoop.metrics2.lib.DefaultMetricsSystem;
import org.apache.hadoop.net.NetUtils;
import org.apache.hadoop.ozone.OzoneConfigKeys;
import org.apache.hadoop.security.ssl.KeyStoreTestUtil;
@@ -102,6 +103,7 @@ public class TestStorageContainerManagerHttpServer {
StorageContainerManagerHttpServer server = null;
try {
+ DefaultMetricsSystem.initialize("TestStorageContainerManagerHttpServer");
server = new StorageContainerManagerHttpServer(conf);
server.start();
diff --git a/hadoop-ozone/dist/src/main/compose/ozone-mr/hadoop32/.env b/hadoop-ozone/dist/src/main/compose/ozone-mr/hadoop32/.env
index 6cee80d..01941ef 100644
--- a/hadoop-ozone/dist/src/main/compose/ozone-mr/hadoop32/.env
+++ b/hadoop-ozone/dist/src/main/compose/ozone-mr/hadoop32/.env
@@ -16,6 +16,6 @@
HDDS_VERSION=@hdds.version@
HADOOP_IMAGE=flokkr/hadoop
-HADOOP_VERSION=3.2.1
+HADOOP_VERSION=3.2.2
OZONE_RUNNER_VERSION=@docker.ozone-runner.version@
OZONE_OPTS=
diff --git a/hadoop-ozone/dist/src/main/compose/ozonesecure-mr/.env b/hadoop-ozone/dist/src/main/compose/ozonesecure-mr/.env
index 106193f..43a4a9c 100644
--- a/hadoop-ozone/dist/src/main/compose/ozonesecure-mr/.env
+++ b/hadoop-ozone/dist/src/main/compose/ozonesecure-mr/.env
@@ -16,6 +16,6 @@
HDDS_VERSION=${hdds.version}
HADOOP_IMAGE=flokkr/hadoop
-HADOOP_VERSION=3.2.1
+HADOOP_VERSION=3.2.2
OZONE_RUNNER_VERSION=${docker.ozone-runner.version}
OZONE_OPTS=
diff --git a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/TestOzoneManagerHttpServer.java b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/TestOzoneManagerHttpServer.java
index 2d0a72b..4ee9a4b 100644
--- a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/TestOzoneManagerHttpServer.java
+++ b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/TestOzoneManagerHttpServer.java
@@ -30,6 +30,7 @@ import org.apache.hadoop.hdds.conf.OzoneConfiguration;
import org.apache.hadoop.hdfs.web.URLConnectionFactory;
import org.apache.hadoop.http.HttpConfig;
import org.apache.hadoop.http.HttpConfig.Policy;
+import org.apache.hadoop.metrics2.lib.DefaultMetricsSystem;
import org.apache.hadoop.net.NetUtils;
import org.apache.hadoop.ozone.OzoneConfigKeys;
import org.apache.hadoop.security.ssl.KeyStoreTestUtil;
@@ -101,6 +102,7 @@ public class TestOzoneManagerHttpServer {
OzoneManagerHttpServer server = null;
try {
server = new OzoneManagerHttpServer(conf, null);
+ DefaultMetricsSystem.initialize("TestOzoneManagerHttpServer");
server.start();
Assert.assertTrue(implies(policy.isHttpEnabled(),
diff --git a/pom.xml b/pom.xml
index d1b1270..25c867c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -69,7 +69,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs
</organization>
<properties>
- <hadoop.version>3.2.1</hadoop.version>
+ <hadoop.version>3.2.2</hadoop.version>
<!-- version for hdds/ozone components -->
<hdds.version>${ozone.version}</hdds.version>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@ozone.apache.org
For additional commands, e-mail: commits-help@ozone.apache.org