Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -50,15 +50,15 @@ if [ ! -f "${APP_DIR}/runtime.tar.gz" ];then
existing_dirs=()

for dir in "${directories[@]}"; do
if [ -d "$dir" ]; then
if [ -d "${APP_DIR}/${dir}" ]; then
existing_dirs+=("$dir")
fi
done

if [ ${#existing_dirs[@]} -eq 0 ]; then
echo "[connectors,lib,plugins] not existed, skip generate runtime.tar.gz"
else
tar -zcvf runtime.tar.gz "${existing_dirs[@]}"
tar -zcvf "${APP_DIR}/runtime.tar.gz" -C "${APP_DIR}" "${existing_dirs[@]}"
fi
fi

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -50,15 +50,15 @@ if [ ! -f "${APP_DIR}/runtime.tar.gz" ];then
existing_dirs=()

for dir in "${directories[@]}"; do
if [ -d "$dir" ]; then
if [ -d "${APP_DIR}/${dir}" ]; then
existing_dirs+=("$dir")
fi
done

if [ ${#existing_dirs[@]} -eq 0 ]; then
echo "[connectors,lib,plugins] not existed, skip generate runtime.tar.gz"
else
tar -zcvf runtime.tar.gz "${existing_dirs[@]}"
tar -zcvf "${APP_DIR}/runtime.tar.gz" -C "${APP_DIR}" "${existing_dirs[@]}"
fi
fi

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -50,15 +50,15 @@ if [ ! -f "${APP_DIR}/runtime.tar.gz" ];then
existing_dirs=()

for dir in "${directories[@]}"; do
if [ -d "$dir" ]; then
if [ -d "${APP_DIR}/${dir}" ]; then
existing_dirs+=("$dir")
fi
done

if [ ${#existing_dirs[@]} -eq 0 ]; then
echo "[connectors,lib,plugins] not existed, skip generate runtime.tar.gz"
else
tar -zcvf runtime.tar.gz "${existing_dirs[@]}"
tar -zcvf "${APP_DIR}/runtime.tar.gz" -C "${APP_DIR}" "${existing_dirs[@]}"
fi
fi

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
import org.apache.seatunnel.core.starter.flink.args.FlinkCommandArgs;
import org.apache.seatunnel.core.starter.utils.CommandLineUtils;

import java.nio.file.Paths;
import java.util.ArrayList;
import java.util.List;
import java.util.Objects;
Expand Down Expand Up @@ -65,7 +66,10 @@ public List<String> buildCommands() {
if (flinkCommandArgs.getMasterType() == MasterType.YARN_APPLICATION) {
command.add(
String.format("-Dyarn.ship-files=\"%s\"", flinkCommandArgs.getConfigFile()));
command.add(String.format("-Dyarn.ship-archives=%s", RUNTIME_FILE));
command.add(
String.format(
"-Dyarn.ship-archives=\"%s\"",
Paths.get(Common.getSeaTunnelHome(), RUNTIME_FILE)));
}
// set yarn application name
if (flinkCommandArgs.getMasterType() == MasterType.YARN_APPLICATION
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@

import org.apache.seatunnel.shade.com.typesafe.config.Config;

import org.apache.seatunnel.common.config.Common;
import org.apache.seatunnel.common.config.DeployMode;
import org.apache.seatunnel.core.starter.flink.args.FlinkCommandArgs;
import org.apache.seatunnel.core.starter.flink.utils.EnvironmentUtil;
Expand All @@ -31,9 +32,12 @@
import org.junit.jupiter.api.Test;

import java.nio.file.Path;
import java.nio.file.Paths;
import java.util.ArrayList;
import java.util.List;

import static org.apache.seatunnel.core.starter.flink.AbstractFlinkStarter.RUNTIME_FILE;

public class TestFlinkParameter {

@Test
Expand Down Expand Up @@ -83,4 +87,20 @@ public void testFlinkParameter() throws Exception {
ExternalSettingLists.sort(null);
Assertions.assertIterableEquals(checkList, ExternalSettingLists);
}

/** Test the relevant configurations associated with the yarn application mode */
@Test
public void testBuildCommandsWithYarnApplicationMode() {
String[] args = {"--config", "/path/to/config.conf", "--target", "yarn-application"};
FlinkStarter starter = new FlinkStarter(args);

List<String> commands = starter.buildCommands();

// Assert
Assertions.assertTrue(
commands.contains(
String.format(
"-Dyarn.ship-archives=\"%s\"",
Paths.get(Common.getSeaTunnelHome(), RUNTIME_FILE))));
}
}