Skip to content

Fix single container config creates failing peon tasks #17794

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

Merged
FrankChen021 merged 2 commits into from
Mar 17, 2025
+12 −1
Merged

Fix single container config creates failing peon tasks #17794

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bb0d829
Fix single container config creates failing peon tasks
GWphua Mar 12, 2025
e7fcdf6
More obvious array error output
GWphua Mar 17, 2025
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
6 changes: 5 additions & 1 deletion distribution/docker/peon.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,4 +161,8 @@ fi
# If TASK_JSON is not set, CliPeon will pull the task.json file from deep storage.
mkdir -p ${TASK_DIR}; [ -n "$TASK_JSON" ] && echo ${TASK_JSON} | base64 -d | gzip -d > ${TASK_DIR}/task.json;

exec bin/run-java ${JAVA_OPTS} -cp $COMMON_CONF_DIR:$SERVICE_CONF_DIR:lib/*: org.apache.druid.cli.Main internal peon --taskId ${TASK_ID} $@
if [ -n "$TASK_ID" ]; then
exec bin/run-java ${JAVA_OPTS} -cp $COMMON_CONF_DIR:$SERVICE_CONF_DIR:lib/*: org.apache.druid.cli.Main internal peon --taskId "${TASK_ID}" "$@"
else
exec bin/run-java ${JAVA_OPTS} -cp $COMMON_CONF_DIR:$SERVICE_CONF_DIR:lib/*: org.apache.druid.cli.Main internal peon "$@"
fi
7 changes: 7 additions & 0 deletions services/src/main/java/org/apache/druid/cli/CliPeon.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
import com.github.rvesse.airline.annotations.Command;
import com.github.rvesse.airline.annotations.Option;
import com.github.rvesse.airline.annotations.restrictions.Required;
import com.google.common.base.Preconditions;
import com.google.common.base.Supplier;
import com.google.common.base.Throwables;
import com.google.common.collect.ImmutableList;
Expand Down Expand Up @@ -234,6 +235,12 @@ protected List<? extends Module> getModules()
public void configure(Binder binder)
{
ServerRunnable.validateCentralizedDatasourceSchemaConfig(getProperties());
Preconditions.checkArgument(
taskAndStatusFile.size() >= 2,
"taskAndStatusFile array should contain 2 or more elements. Current array elements: [%s]",
taskAndStatusFile.toString()
);

taskDirPath = taskAndStatusFile.get(0);
attemptId = taskAndStatusFile.get(1);

Expand Down
Loading