Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: fix minion default bucket #37693

Closed
wants to merge 3 commits into from
Closed

fix: fix minion default bucket #37693

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
881607d
fix: fix minio client wait
Jun 15, 2023
33e2551
fix: fix minio restart env not same
Jun 15, 2023
7566c90
Update bitnami/minio/2023/debian-11/rootfs/opt/bitnami/scripts/libmin…
yywing Jul 27, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 14 additions & 1 deletion bitnami/minio/2023/debian-11/rootfs/opt/bitnami/scripts/libminio.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,6 +166,9 @@ minio_start_bg() {

########################
# Stop MinIO
# Globals:
# MINIO_DISTRIBUTED_MODE_ENABLED
# MINIO_PID_FILE
# Arguments:
# None
# Returns:
Expand All @@ -174,7 +177,17 @@ minio_start_bg() {
minio_stop() {
if is_minio_running; then
info "Stopping MinIO..."
minio_client_execute_timeout admin service stop local >/dev/null 2>&1 || true

if is_boolean_yes "$MINIO_DISTRIBUTED_MODE_ENABLED"; then
pgrep -f "$(command -v minio) server" >"$MINIO_PID_FILE"
pid="$(get_pid_from_file "$MINIO_PID_FILE")"

if [[ -n "$pid" ]]; then
kill -TERM "$pid"
fi
else
minio_client_execute_timeout admin service stop local >/dev/null 2>&1 || true
fi

local counter=5
while is_minio_running; do
Expand Down
36 changes: 19 additions & 17 deletions bitnami/minio/2023/debian-11/rootfs/opt/bitnami/scripts/minio/setup.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,21 +9,12 @@ set -o pipefail

# Load libraries
. /opt/bitnami/scripts/liblog.sh
. /opt/bitnami/scripts/libos.sh
. /opt/bitnami/scripts/libminio.sh

# Load MinIO environment
. /opt/bitnami/scripts/minio-env.sh

MINIO_SERVER_SCHEME=$(echo "$MINIO_SCHEME" | tr '[:upper:]' '[:lower:]')

export MINIO_SERVER_PORT_NUMBER="$MINIO_API_PORT_NUMBER"
export MINIO_SERVER_ROOT_USER="${MINIO_ROOT_USER:-}"
export MINIO_SERVER_ROOT_PASSWORD="${MINIO_ROOT_PASSWORD:-}"
export MINIO_SERVER_SCHEME

# Load MinIO Client environment
. /opt/bitnami/scripts/minio-client-env.sh

# Validate settings in MINIO_* env vars.
minio_validate

Expand All @@ -33,15 +24,26 @@ minio_regenerate_keys
if is_boolean_yes "$MINIO_SKIP_CLIENT"; then
debug "Skipping MinIO client configuration..."
else
if [[ "$MINIO_SERVER_SCHEME" == "https" ]]; then
[[ ! -d "${MINIO_CLIENT_CONF_DIR}/certs" ]] && mkdir -p "${MINIO_CLIENT_CONF_DIR}/certs"
[[ -d "${MINIO_CERTS_DIR}/CAs" ]] && cp -r "${MINIO_CERTS_DIR}/CAs/" "${MINIO_CLIENT_CONF_DIR}/certs/CAs"
fi
# Start MinIO server in background
minio_start_bg
# Ensure MinIO Client is stopped when this script ends.
trap "minio_stop" EXIT

# set client env
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could you explain the reason for moving this logic after minio starts?

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Because minio will compare all MINIO_* env, it will cause server env not match error when set client env in front.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This could affect initialisation, and the explanation is not clear to me. Could you give more details?

MINIO_SERVER_SCHEME=$(echo "$MINIO_SCHEME" | tr '[:upper:]' '[:lower:]')

export MINIO_SERVER_PORT_NUMBER="$MINIO_API_PORT_NUMBER"
export MINIO_SERVER_ROOT_USER="${MINIO_ROOT_USER:-}"
export MINIO_SERVER_ROOT_PASSWORD="${MINIO_ROOT_PASSWORD:-}"
export MINIO_SERVER_SCHEME
# Load MinIO Client environment
. /opt/bitnami/scripts/minio-client-env.sh

if [[ "$MINIO_SERVER_SCHEME" == "https" ]]; then
[[ ! -d "${MINIO_CLIENT_CONF_DIR}/certs" ]] && mkdir -p "${MINIO_CLIENT_CONF_DIR}/certs"
[[ -d "${MINIO_CERTS_DIR}/CAs" ]] && cp -r "${MINIO_CERTS_DIR}/CAs/" "${MINIO_CLIENT_CONF_DIR}/certs/CAs"
fi

if is_boolean_yes "$MINIO_DISTRIBUTED_MODE_ENABLED" && is_distributed_ellipses_syntax; then
read -r -a drives <<<"$(minio_distributed_drives)"
data_drive="${drives[0]}"
Expand All @@ -53,11 +55,11 @@ else
exit 1
fi

# Create default buckets
minio_create_default_buckets

if is_boolean_yes "$MINIO_DISTRIBUTED_MODE_ENABLED"; then
# Wait for other clients (distribute mode)
sleep 5
fi

# Create default buckets
minio_create_default_buckets
fi
Loading