(hadoop) branch branch-3.4 updated: HADOOP-19222. Switch yum repo baseurl due to CentOS 7 sunset (#6932) Contributed by Cheng Pan.
This is an automated email from the ASF dual-hosted git repository. slfan1989 pushed a commit to branch branch-3.4 in repository https://gitbox.apache.org/repos/asf/hadoop.git The following commit(s) were added to refs/heads/branch-3.4 by this push: new 69806dee9da HADOOP-19222. Switch yum repo baseurl due to CentOS 7 sunset (#6932) Contributed by Cheng Pan. 69806dee9da is described below commit 69806dee9da969d4a0050b07e60c5f62a0903844 Author: Cheng Pan AuthorDate: Fri Jul 12 06:16:44 2024 +0800 HADOOP-19222. Switch yum repo baseurl due to CentOS 7 sunset (#6932) Contributed by Cheng Pan. Reviewed-by: Gautham Banasandra Signed-off-by: Shilun Fan --- dev-support/docker/Dockerfile_centos_7 | 16 ++-- .../docker/pkg-resolver/set-vault-as-baseurl-centos.sh | 2 +- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/dev-support/docker/Dockerfile_centos_7 b/dev-support/docker/Dockerfile_centos_7 index ff947637a2c..b97e59969a7 100644 --- a/dev-support/docker/Dockerfile_centos_7 +++ b/dev-support/docker/Dockerfile_centos_7 @@ -30,6 +30,13 @@ COPY pkg-resolver pkg-resolver RUN chmod a+x pkg-resolver/*.sh pkg-resolver/*.py \ && chmod a+r pkg-resolver/*.json +## +# Centos 7 has reached its EOL and the packages +# are no longer available on mirror.centos.org site. +# Please see https://www.centos.org/centos-linux-eol/ +## +RUN pkg-resolver/set-vault-as-baseurl-centos.sh centos:7 + ## # Install packages from yum ## @@ -38,8 +45,13 @@ RUN yum update -y \ && yum groupinstall -y "Development Tools" \ && yum install -y \ centos-release-scl \ -python3 \ -&& yum install -y $(pkg-resolver/resolve.py centos:7) +python3 + +# Apply the script again because centos-release-scl creates new YUM repo files +RUN pkg-resolver/set-vault-as-baseurl-centos.sh centos:7 + +# hadolint ignore=DL3008,SC2046 +RUN yum install -y $(pkg-resolver/resolve.py centos:7) # Set GCC 9 as the default C/C++ compiler RUN echo "source /opt/rh/devtoolset-9/enable" >> /etc/bashrc diff --git a/dev-support/docker/pkg-resolver/set-vault-as-baseurl-centos.sh b/dev-support/docker/pkg-resolver/set-vault-as-baseurl-centos.sh index 4be4cd956b1..905ac5077de 100644 --- a/dev-support/docker/pkg-resolver/set-vault-as-baseurl-centos.sh +++ b/dev-support/docker/pkg-resolver/set-vault-as-baseurl-centos.sh @@ -24,7 +24,7 @@ fi if [ "$1" == "centos:7" ] || [ "$1" == "centos:8" ]; then cd /etc/yum.repos.d/ || exit && sed -i 's/mirrorlist/#mirrorlist/g' /etc/yum.repos.d/CentOS-* && -sed -i 's|#baseurl=http://mirror.centos.org|baseurl=http://vault.centos.org|g' /etc/yum.repos.d/CentOS-* && +sed -i 's|# *baseurl=http://mirror.centos.org|baseurl=http://vault.centos.org|g' /etc/yum.repos.d/CentOS-* && yum update -y && cd /root || exit else - To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-commits-h...@hadoop.apache.org
(hadoop) branch trunk updated: HADOOP-19222. Switch yum repo baseurl due to CentOS 7 sunset (#6932) Contributed by Cheng Pan.
This is an automated email from the ASF dual-hosted git repository. slfan1989 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 4f0ee9d67d9 HADOOP-19222. Switch yum repo baseurl due to CentOS 7 sunset (#6932) Contributed by Cheng Pan. 4f0ee9d67d9 is described below commit 4f0ee9d67d9e7ac4195fe2ed8227760a63064091 Author: Cheng Pan AuthorDate: Fri Jul 12 06:16:44 2024 +0800 HADOOP-19222. Switch yum repo baseurl due to CentOS 7 sunset (#6932) Contributed by Cheng Pan. Reviewed-by: Gautham Banasandra Signed-off-by: Shilun Fan --- dev-support/docker/Dockerfile_centos_7 | 16 ++-- .../docker/pkg-resolver/set-vault-as-baseurl-centos.sh | 2 +- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/dev-support/docker/Dockerfile_centos_7 b/dev-support/docker/Dockerfile_centos_7 index ff947637a2c..b97e59969a7 100644 --- a/dev-support/docker/Dockerfile_centos_7 +++ b/dev-support/docker/Dockerfile_centos_7 @@ -30,6 +30,13 @@ COPY pkg-resolver pkg-resolver RUN chmod a+x pkg-resolver/*.sh pkg-resolver/*.py \ && chmod a+r pkg-resolver/*.json +## +# Centos 7 has reached its EOL and the packages +# are no longer available on mirror.centos.org site. +# Please see https://www.centos.org/centos-linux-eol/ +## +RUN pkg-resolver/set-vault-as-baseurl-centos.sh centos:7 + ## # Install packages from yum ## @@ -38,8 +45,13 @@ RUN yum update -y \ && yum groupinstall -y "Development Tools" \ && yum install -y \ centos-release-scl \ -python3 \ -&& yum install -y $(pkg-resolver/resolve.py centos:7) +python3 + +# Apply the script again because centos-release-scl creates new YUM repo files +RUN pkg-resolver/set-vault-as-baseurl-centos.sh centos:7 + +# hadolint ignore=DL3008,SC2046 +RUN yum install -y $(pkg-resolver/resolve.py centos:7) # Set GCC 9 as the default C/C++ compiler RUN echo "source /opt/rh/devtoolset-9/enable" >> /etc/bashrc diff --git a/dev-support/docker/pkg-resolver/set-vault-as-baseurl-centos.sh b/dev-support/docker/pkg-resolver/set-vault-as-baseurl-centos.sh index 4be4cd956b1..905ac5077de 100644 --- a/dev-support/docker/pkg-resolver/set-vault-as-baseurl-centos.sh +++ b/dev-support/docker/pkg-resolver/set-vault-as-baseurl-centos.sh @@ -24,7 +24,7 @@ fi if [ "$1" == "centos:7" ] || [ "$1" == "centos:8" ]; then cd /etc/yum.repos.d/ || exit && sed -i 's/mirrorlist/#mirrorlist/g' /etc/yum.repos.d/CentOS-* && -sed -i 's|#baseurl=http://mirror.centos.org|baseurl=http://vault.centos.org|g' /etc/yum.repos.d/CentOS-* && +sed -i 's|# *baseurl=http://mirror.centos.org|baseurl=http://vault.centos.org|g' /etc/yum.repos.d/CentOS-* && yum update -y && cd /root || exit else - To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-commits-h...@hadoop.apache.org
(hadoop) branch trunk updated: HDFS-17566. Got wrong sorted block order when StorageType is considered. (#6934). Contributed by Chenyu Zheng.
This is an automated email from the ASF dual-hosted git repository.
hexiaoqiao 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 8913d379fd2 HDFS-17566. Got wrong sorted block order when StorageType
is considered. (#6934). Contributed by Chenyu Zheng.
8913d379fd2 is described below
commit 8913d379fd2d2d1de548637749d5322377395835
Author: zhengchenyu
AuthorDate: Thu Jul 11 17:41:24 2024 +0800
HDFS-17566. Got wrong sorted block order when StorageType is considered.
(#6934). Contributed by Chenyu Zheng.
Signed-off-by: He Xiaoqiao
---
.../org/apache/hadoop/hdfs/server/blockmanagement/DatanodeManager.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/DatanodeManager.java
b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/DatanodeManager.java
index a46a2ce15c6..081f8348258 100644
---
a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/DatanodeManager.java
+++
b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/DatanodeManager.java
@@ -684,7 +684,7 @@ public class DatanodeManager {
} else if (s2 == null) {
return 1;
} else {
- return s2.compareTo(s1);
+ return s1.compareTo(s2);
}
});
secondarySort = list -> Collections.sort(list, comp);
-
To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org
For additional commands, e-mail: common-commits-h...@hadoop.apache.org
