This is an automated email from the ASF dual-hosted git repository.
iwasakims pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/bigtop.git
The following commit(s) were added to refs/heads/master by this push:
new 1fa599423 BIGTOP-4014. Add Fedora 38 support and drop 36. (#1187)
1fa599423 is described below
commit 1fa5994234c81bf5228520f4da1ac42f1330363a
Author: Kengo Seki <[email protected]>
AuthorDate: Sat Dec 23 23:21:39 2023 +0900
BIGTOP-4014. Add Fedora 38 support and drop 36. (#1187)
---
.../src/common/hadoop/patch9-HDFS-17226.diff | 48 ++++++++++++++++++++++
bigtop_toolchain/bin/puppetize.sh | 2 +-
docker/bigtop-puppet/build.sh | 2 +-
packages.gradle | 10 ++---
provisioner/docker/config_fedora-35.yaml | 24 -----------
...config_fedora-36.yaml => config_fedora-38.yaml} | 4 +-
6 files changed, 57 insertions(+), 33 deletions(-)
diff --git a/bigtop-packages/src/common/hadoop/patch9-HDFS-17226.diff
b/bigtop-packages/src/common/hadoop/patch9-HDFS-17226.diff
new file mode 100644
index 000000000..a09936bfa
--- /dev/null
+++ b/bigtop-packages/src/common/hadoop/patch9-HDFS-17226.diff
@@ -0,0 +1,48 @@
+diff --git
a/hadoop-hdfs-project/hadoop-hdfs-native-client/src/main/native/libhdfspp/include/hdfspp/content_summary.h
b/hadoop-hdfs-project/hadoop-hdfs-native-client/src/main/native/libhdfspp/include/hdfspp/content_summary.h
+index 6762a65ca908b..d9809bab59291 100644
+---
a/hadoop-hdfs-project/hadoop-hdfs-native-client/src/main/native/libhdfspp/include/hdfspp/content_summary.h
++++
b/hadoop-hdfs-project/hadoop-hdfs-native-client/src/main/native/libhdfspp/include/hdfspp/content_summary.h
+@@ -19,6 +19,7 @@
+ #define HDFSPP_CONTENT_SUMMARY_H_
+
+ #include <string>
++#include <cstdint>
+
+ namespace hdfs {
+
+diff --git
a/hadoop-hdfs-project/hadoop-hdfs-native-client/src/main/native/libhdfspp/include/hdfspp/fsinfo.h
b/hadoop-hdfs-project/hadoop-hdfs-native-client/src/main/native/libhdfspp/include/hdfspp/fsinfo.h
+index 103cf133bec22..156ed445181a3 100644
+---
a/hadoop-hdfs-project/hadoop-hdfs-native-client/src/main/native/libhdfspp/include/hdfspp/fsinfo.h
++++
b/hadoop-hdfs-project/hadoop-hdfs-native-client/src/main/native/libhdfspp/include/hdfspp/fsinfo.h
+@@ -19,6 +19,7 @@
+ #define HDFSPP_FSINFO_H_
+
+ #include <string>
++#include <cstdint>
+
+ namespace hdfs {
+
+diff --git
a/hadoop-hdfs-project/hadoop-hdfs-native-client/src/main/native/libhdfspp/include/hdfspp/statinfo.h
b/hadoop-hdfs-project/hadoop-hdfs-native-client/src/main/native/libhdfspp/include/hdfspp/statinfo.h
+index 1da1f18a592bd..5924d1db00587 100644
+---
a/hadoop-hdfs-project/hadoop-hdfs-native-client/src/main/native/libhdfspp/include/hdfspp/statinfo.h
++++
b/hadoop-hdfs-project/hadoop-hdfs-native-client/src/main/native/libhdfspp/include/hdfspp/statinfo.h
+@@ -19,6 +19,7 @@
+ #define HDFSPP_STATINFO_H_
+
+ #include <string>
++#include <cstdint>
+
+ namespace hdfs {
+
+diff --git
a/hadoop-hdfs-project/hadoop-hdfs-native-client/src/main/native/libhdfspp/include/hdfspp/uri.h
b/hadoop-hdfs-project/hadoop-hdfs-native-client/src/main/native/libhdfspp/include/hdfspp/uri.h
+index bc3d8b96d3f66..a7f735afb5dbc 100644
+---
a/hadoop-hdfs-project/hadoop-hdfs-native-client/src/main/native/libhdfspp/include/hdfspp/uri.h
++++
b/hadoop-hdfs-project/hadoop-hdfs-native-client/src/main/native/libhdfspp/include/hdfspp/uri.h
+@@ -22,6 +22,7 @@
+ #include <iostream>
+ #include <string>
+ #include <vector>
++#include <cstdint>
+ #include <stdexcept>
+
+ namespace hdfs
diff --git a/bigtop_toolchain/bin/puppetize.sh
b/bigtop_toolchain/bin/puppetize.sh
index b8c39c5a9..78adc69ed 100755
--- a/bigtop_toolchain/bin/puppetize.sh
+++ b/bigtop_toolchain/bin/puppetize.sh
@@ -21,7 +21,7 @@ if [ -f /etc/os-release ]; then
fi
case ${ID}-${VERSION_ID} in
- fedora-35|fedora-36)
+ fedora-38)
dnf -y install yum-utils
dnf -y check-update
dnf -y install hostname diffutils findutils curl sudo unzip wget
puppet procps-ng libxcrypt-compat systemd
diff --git a/docker/bigtop-puppet/build.sh b/docker/bigtop-puppet/build.sh
index a97fdde42..879edafe1 100755
--- a/docker/bigtop-puppet/build.sh
+++ b/docker/bigtop-puppet/build.sh
@@ -53,7 +53,7 @@ EOF
# modify the Dockerfile according to the OS/version
case "${OS}-${VERSION}" in
- fedora-36*)
+ fedora-38*)
# use java 8 during build if the os's default java version is newer
sed -i -e "s|RUN bash /tmp/puppetize.sh|ENV PATH
/usr/lib/jvm/java-1.8.0/bin:\$PATH\nRUN bash /tmp/puppetize.sh|" Dockerfile
# add initd
diff --git a/packages.gradle b/packages.gradle
index ba929452b..f3d9ea9f5 100644
--- a/packages.gradle
+++ b/packages.gradle
@@ -677,7 +677,7 @@ def genTasks = { target ->
}
task "$target-pkg-ind" (
description: "Invoking a native binary packaging for $target in
Docker. Usage: \$ ./gradlew " +
- "-POS=[centos-7|fedora-35|debian-10|ubuntu-18.04] " +
+ "-POS=[centos-7|fedora-38|debian-10|ubuntu-18.04] " +
"-Pprefix=[trunk|1.4.0|1.3.0|1.2.1|...] $target-pkg-ind " +
"-Pnexus=[true|false]" +
"[-Ppreferred-java-version=[8|11]]" +
@@ -685,7 +685,7 @@ def genTasks = { target ->
group: PACKAGES_GROUP) doLast {
def _prefix = project.hasProperty("prefix") ? prefix : "trunk"
def _OS = project.hasProperty("OS") ? OS : "centos-7"
- if (_OS == "fedora-35" || _OS == "ubuntu-22.04") {
+ if (_OS == "fedora-38" || _OS == "ubuntu-22.04") {
logger.warn(_OS + ' requires privileged mode, pass
`-Pdocker-run-option="--privileged"` to gradle option')
}
def _target_pkg = "$target-pkg"
@@ -913,13 +913,13 @@ if (nativePackaging) {
task "repo-ind" (
description: "Invoking a native repository in Docker. Usage: \$ ./gradlew
" +
- "-POS=[centos-7|fedora-35|debian-10|ubuntu-18.04] " +
+ "-POS=[centos-7|fedora-38|debian-10|ubuntu-18.04] " +
"-Pprefix=[trunk|1.4.0|1.3.0|1.2.1|...] repo-ind",
group: PACKAGES_GROUP) doLast {
def _prefix = project.hasProperty("prefix") ? prefix : "trunk"
def _OS = project.hasProperty("OS") ? OS : "centos-7"
- if (_OS == "fedora-35") {
- logger.warn('fedora-35 requires privileged mode, pass
`-Pdocker-run-option="--privileged"` to gradle option')
+ if (_OS == "fedora-38") {
+ logger.warn('fedora-38 requires privileged mode, pass
`-Pdocker-run-option="--privileged"` to gradle option')
}
def _docker_run_option = project.hasProperty("docker-run-option") ?
this.'docker-run-option' : ""
def command = [
diff --git a/provisioner/docker/config_fedora-35.yaml
b/provisioner/docker/config_fedora-35.yaml
deleted file mode 100644
index 552de2fc2..000000000
--- a/provisioner/docker/config_fedora-35.yaml
+++ /dev/null
@@ -1,24 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-docker:
- memory_limit: "4g"
- image: "bigtop/puppet:trunk-fedora-35"
-
-repo: "http://repos.bigtop.apache.org/releases/3.2.1/fedora/35/$basearch";
-distro: centos
-components: [hdfs, yarn, mapreduce]
-enable_local_repo: false
-smoke_test_components: [hdfs, yarn, mapreduce]
diff --git a/provisioner/docker/config_fedora-36.yaml
b/provisioner/docker/config_fedora-38.yaml
similarity index 89%
rename from provisioner/docker/config_fedora-36.yaml
rename to provisioner/docker/config_fedora-38.yaml
index f8d9a477d..da2c34db8 100644
--- a/provisioner/docker/config_fedora-36.yaml
+++ b/provisioner/docker/config_fedora-38.yaml
@@ -15,9 +15,9 @@
docker:
memory_limit: "4g"
- image: "bigtop/puppet:trunk-fedora-36"
+ image: "bigtop/puppet:trunk-fedora-38"
-repo: "http://repos.bigtop.apache.org/releases/3.2.1/fedora/36/$basearch";
+repo: "http://repos.bigtop.apache.org/releases/3.3.0/fedora/38/$basearch";
distro: centos
components: [hdfs, yarn, mapreduce]
enable_local_repo: false
