Skip to content

Commit

Permalink
Fix entrypoint
Browse files Browse the repository at this point in the history
`format` commands don't exist in cli anymore, so as job services. Delete some entrypoint code.

Solves Alluxio#18466
			pr-link: Alluxio#18490
			change-id: cid-0ee0b45a012a29df4a793107d7f8cce4ca98fc99
  • Loading branch information
ssz1997 authored Jan 13, 2024
1 parent e4da0e4 commit 4f07b99
Showing 1 changed file with 2 additions and 45 deletions.
47 changes: 2 additions & 45 deletions integration/docker/entrypoint.sh
Original file line number Diff line number Diff line change
Expand Up @@ -185,29 +185,6 @@ function setup_for_dynamic_non_root {
fi
}

#######################################
# Sets the Alluxio ram folder if alluxio top tier is MEM and ram folder isn't explicitly configured.
# Globals:
# ALLUXIO_JAVA_OPTS
# ALLUXIO_HOME
# ALLUXIO_WORKER_JAVA_OPTS
# Arguments:
# None
#######################################
function set_ram_folder_if_needed {
local tier_alias=$("${ALLUXIO_HOME}"/bin/alluxio getConf alluxio.worker.tieredstore.level0.alias)
if [[ "${tier_alias}" != "MEM" ]]; then
# If the top tier is not MEM, skip setting ram folder
return
fi
local full_worker_opts="${ALLUXIO_JAVA_OPTS} ${ALLUXIO_WORKER_JAVA_OPTS}"
if [[ "${full_worker_opts}" != *"alluxio.worker.tieredstore.level0.dirs.path"* ]]; then
# Docker will set this tmpfs up by default. Its size is configurable through the
# --shm-size argument to docker run
export ALLUXIO_RAM_FOLDER=${ALLUXIO_RAM_FOLDER:-/dev/shm}
fi
}

function main {
if [[ "$#" -lt 1 ]]; then
printUsage
Expand All @@ -226,32 +203,12 @@ function main {
local processes
processes=()
case "${service}" in
master)
formatMasterIfSpecified
processes+=("job_master")
processes+=("master")
;;
master-only)
formatMasterIfSpecified
master|master-only)
processes+=("master")
;;
job-master)
processes+=("job_master")
;;
worker)
set_ram_folder_if_needed
formatWorkerIfSpecified
processes+=("job_worker")
worker|worker-only)
processes+=("worker")
;;
worker-only)
set_ram_folder_if_needed
formatWorkerIfSpecified
processes+=("worker")
;;
job-worker)
processes+=("job_worker")
;;
proxy)
processes+=("proxy")
;;
Expand Down

0 comments on commit 4f07b99

Please sign in to comment.