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 390b5891b BIGTOP-4160: Auto switch docker compose yaml with host's
cgroup version (#1289)
390b5891b is described below
commit 390b5891b098924eb332c69e994bdcfb4bd898e2
Author: Shuhei Yamasaki <[email protected]>
AuthorDate: Thu Aug 29 23:11:02 2024 +0900
BIGTOP-4160: Auto switch docker compose yaml with host's cgroup version
(#1289)
---
provisioner/docker/docker-hadoop.sh | 24 +++++++++++++++++++-----
1 file changed, 19 insertions(+), 5 deletions(-)
diff --git a/provisioner/docker/docker-hadoop.sh
b/provisioner/docker/docker-hadoop.sh
index 6a6080c27..38ece152d 100755
--- a/provisioner/docker/docker-hadoop.sh
+++ b/provisioner/docker/docker-hadoop.sh
@@ -79,6 +79,22 @@ create() {
fi
export MEM_LIMIT=${memory_limit}
+ if [ -z ${distro+x} ]; then
+ distro=$(get-yaml-config distro)
+ fi
+
+ if [ "${enable_manual_docker_compose}" != true ]; then
+ docker_cgroup_version=`docker info | grep "Cgroup Version:" | awk
'{print $3}'`
+ if [ ${docker_cgroup_version} == "1" ]; then
+ DOCKER_COMPOSE_CMD="${DOCKER_COMPOSE_CMD} -f docker-compose.yml"
+ elif [ ${docker_cgroup_version} == "2" ]; then
+ DOCKER_COMPOSE_CMD="${DOCKER_COMPOSE_CMD} -f
docker-compose-cgroupv2.yml"
+ else
+ log "Unknown cgroup version. cgroup v1 is used as default."
+ fi
+ fi
+
+
# Startup instances
$DOCKER_COMPOSE_CMD -p $PROVISION_ID up -d --scale bigtop=$1 --no-recreate
if [ $? -ne 0 ]; then
@@ -99,9 +115,6 @@ create() {
if [ -z ${components+x} ]; then
components="[`echo $(get-yaml-config components) | sed 's/ /, /g'`]"
fi
- if [ -z ${distro+x} ]; then
- distro=$(get-yaml-config distro)
- fi
if [ -z ${enable_local_repo+x} ]; then
enable_local_repo=$(get-yaml-config enable_local_repo)
fi
@@ -353,14 +366,15 @@ while [ $# -gt 0 ]; do
echo "Alternative config file for config.yaml" 1>&2
usage
fi
- yamlconf=$2
+ yamlconf=$2
shift 2;;
-F|--docker-compose-yml)
if [ $# -lt 2 ]; then
echo "Alternative config file for docker-compose.yml" 1>&2
usage
fi
- DOCKER_COMPOSE_CMD="${DOCKER_COMPOSE_CMD} -f ${2}"
+ enable_manual_docker_compose=true
+ DOCKER_COMPOSE_CMD="${DOCKER_COMPOSE_CMD} -f ${2}"
shift 2;;
-d|--destroy)
destroy
