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

fix(ci): restore the Kafka 4.0.0 FV #3055

Merged
merged 4 commits into from
Jan 7, 2025
+28 −19
Merged

fix(ci): restore the Kafka 4.0.0 FV #3055

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f8e8e78
fix(test): set offset topic replication factor to 2
dnwe Jan 6, 2025
3878621
chore(ci): call docker compose as cli-plugin
dnwe Jan 7, 2025
3e3c21d
fix(ci): use per-version per-image cache scope
dnwe Jan 7, 2025
40117de
fix(ci): pin Kafka 4.0.0 version in build
dnwe Jan 7, 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
11 changes: 6 additions & 5 deletions .github/workflows/fvt.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,18 +42,19 @@ jobs:
load: true
targets: kafka-1
set: |
*.cache-from=type=gha,scope=${{ github.workflow }}
*.cache-to=type=gha,scope=${{ github.workflow }},mode=max
*.cache-from=type=gha,scope=fvt-kafka-${{ inputs.kafka-version }}
*.cache-to=type=gha,scope=fvt-kafka-${{ inputs.kafka-version }},mode=max
- name: Setup Go
uses: actions/setup-go@3041bf56c941b39c61721a86cd11f3bb1338122a # v5.2.0
with:
go-version: ${{ inputs.go-version }}
- name: Setup Docker Compose
run: |
curl --fail -sSL "https://github.com/docker/compose/releases/download/v2.29.1/docker-compose-$(uname -s)-$(uname -m)" -o /tmp/docker-compose
sudo install -m755 /tmp/docker-compose "$(dirname $(which docker))"
curl --fail -sSL "https://github.com/docker/compose/releases/download/v2.32.1/docker-compose-$(uname -s)-$(uname -m)" -o /tmp/docker-compose
mkdir -p $HOME/.docker/cli-plugins
install -m755 /tmp/docker-compose $HOME/.docker/cli-plugins
docker version --format 'Docker Engine version v{{.Server.Version}}'
docker-compose version
docker compose version
- name: Test (Functional)
run: |
nohup sudo tcpdump -i lo -w "fvt-kafka-${{ inputs.kafka-version }}.pcap" portrange 29091-29095 >/dev/null 2>&1 &
Expand Down
7 changes: 5 additions & 2 deletions Dockerfile.kafka
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,12 @@ RUN --mount=type=bind,target=.,rw=true \
&& chmod a+rw "/opt/kafka-${KAFKA_VERSION}" \
&& if [ "$KAFKA_VERSION" = "4.0.0" ]; then \
microdnf install -y java-17-openjdk-devel \
&& git clone --depth=1 --single-branch -b 4.0 https://github.com/apache/kafka /usr/src/kafka \
&& git clone --depth=50 --single-branch -b 4.0 https://github.com/apache/kafka /usr/src/kafka \
&& cd /usr/src/kafka \
&& : PIN TO COMMIT BEFORE KAFKA-17616 ZOOKEEPER REMOVAL STARTED \
&& git reset --hard d1504649fb \
&& export JAVA_TOOL_OPTIONS=-XX:MaxRAMPercentage=80 \
&& cd /usr/src/kafka && sed -e '/version=/s/-SNAPSHOT//' -e '/org.gradle.jvmargs/d' -e '/org.gradle.parallel/s/true/false/' -i gradle.properties && ./gradlew -PmaxParallelForks=1 -PmaxScalacThreads=1 --no-daemon releaseTarGz -x siteDocsTar -x javadoc \
&& sed -e '/version=/s/-SNAPSHOT//' -e '/org.gradle.jvmargs/d' -e '/org.gradle.parallel/s/true/false/' -i gradle.properties && ./gradlew -PmaxParallelForks=1 -PmaxScalacThreads=1 --no-daemon releaseTarGz -x siteDocsTar -x javadoc \
&& tar xzf core/build/distributions/kafka_${SCALA_VERSION}-${KAFKA_VERSION}.tgz --strip-components=1 -C "/opt/kafka-${KAFKA_VERSION}" \
&& cp /tmp/server.properties "/opt/kafka-${KAFKA_VERSION}/config/" \
&& microdnf remove -y java-17-openjdk-devel \
Expand Down
5 changes: 5 additions & 0 deletions docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,7 @@ services:
KAFKA_CFG_INTER_BROKER_LISTENER_NAME: 'LISTENER_INTERNAL'
KAFKA_CFG_LISTENER_SECURITY_PROTOCOL_MAP: 'LISTENER_INTERNAL:PLAINTEXT,LISTENER_LOCAL:PLAINTEXT'
KAFKA_CFG_DEFAULT_REPLICATION_FACTOR: '2'
KAFKA_CFG_OFFSETS_TOPIC_REPLICATION_FACTOR: '2'
KAFKA_CFG_TRANSACTION_STATE_LOG_REPLICATION_FACTOR: '2'
KAFKA_CFG_BROKER_ID: '1'
KAFKA_CFG_BROKER_RACK: '1'
Expand Down Expand Up @@ -120,6 +121,7 @@ services:
KAFKA_CFG_INTER_BROKER_LISTENER_NAME: 'LISTENER_INTERNAL'
KAFKA_CFG_LISTENER_SECURITY_PROTOCOL_MAP: 'LISTENER_INTERNAL:PLAINTEXT,LISTENER_LOCAL:PLAINTEXT'
KAFKA_CFG_DEFAULT_REPLICATION_FACTOR: '2'
KAFKA_CFG_OFFSETS_TOPIC_REPLICATION_FACTOR: '2'
KAFKA_CFG_TRANSACTION_STATE_LOG_REPLICATION_FACTOR: '2'
KAFKA_CFG_BROKER_ID: '2'
KAFKA_CFG_BROKER_RACK: '2'
Expand Down Expand Up @@ -166,6 +168,7 @@ services:
KAFKA_CFG_INTER_BROKER_LISTENER_NAME: 'LISTENER_INTERNAL'
KAFKA_CFG_LISTENER_SECURITY_PROTOCOL_MAP: 'LISTENER_INTERNAL:PLAINTEXT,LISTENER_LOCAL:PLAINTEXT'
KAFKA_CFG_DEFAULT_REPLICATION_FACTOR: '2'
KAFKA_CFG_OFFSETS_TOPIC_REPLICATION_FACTOR: '2'
KAFKA_CFG_TRANSACTION_STATE_LOG_REPLICATION_FACTOR: '2'
KAFKA_CFG_BROKER_ID: '3'
KAFKA_CFG_BROKER_RACK: '3'
Expand Down Expand Up @@ -212,6 +215,7 @@ services:
KAFKA_CFG_INTER_BROKER_LISTENER_NAME: 'LISTENER_INTERNAL'
KAFKA_CFG_LISTENER_SECURITY_PROTOCOL_MAP: 'LISTENER_INTERNAL:PLAINTEXT,LISTENER_LOCAL:PLAINTEXT'
KAFKA_CFG_DEFAULT_REPLICATION_FACTOR: '2'
KAFKA_CFG_OFFSETS_TOPIC_REPLICATION_FACTOR: '2'
KAFKA_CFG_TRANSACTION_STATE_LOG_REPLICATION_FACTOR: '2'
KAFKA_CFG_BROKER_ID: '4'
KAFKA_CFG_BROKER_RACK: '4'
Expand Down Expand Up @@ -258,6 +262,7 @@ services:
KAFKA_CFG_INTER_BROKER_LISTENER_NAME: 'LISTENER_INTERNAL'
KAFKA_CFG_LISTENER_SECURITY_PROTOCOL_MAP: 'LISTENER_INTERNAL:PLAINTEXT,LISTENER_LOCAL:PLAINTEXT'
KAFKA_CFG_DEFAULT_REPLICATION_FACTOR: '2'
KAFKA_CFG_OFFSETS_TOPIC_REPLICATION_FACTOR: '2'
KAFKA_CFG_TRANSACTION_STATE_LOG_REPLICATION_FACTOR: '2'
KAFKA_CFG_BROKER_ID: '5'
KAFKA_CFG_BROKER_RACK: '5'
Expand Down
24 changes: 12 additions & 12 deletions functional_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,16 +156,16 @@ func prepareDockerTestEnvironment(ctx context.Context, env *testEnvironment) err
env.KafkaVersion = "3.5.1"
}

// docker-compose v2.17.0 or newer required for `--wait-timeout` support
// docker compose v2.17.0 or newer required for `--wait-timeout` support
c := exec.Command(
"docker-compose", "up", "-d", "--quiet-pull", "--timestamps", "--wait", "--wait-timeout", "600",
"docker", "compose", "up", "-d", "--quiet-pull", "--timestamps", "--wait", "--wait-timeout", "600",
)
c.Stdout = os.Stdout
c.Stderr = os.Stderr
c.Env = append(os.Environ(), fmt.Sprintf("KAFKA_VERSION=%s", env.KafkaVersion))
err := c.Run()
if err != nil {
return fmt.Errorf("failed to run docker-compose to start test environment: %w", err)
return fmt.Errorf("failed to run docker compose to start test environment: %w", err)
}

if err := setupToxiProxies(env, "http://localhost:8474"); err != nil {
Expand Down Expand Up @@ -249,7 +249,7 @@ mainLoop:
}

if !allBrokersUp {
c := exec.Command("docker-compose", "logs", "-t", "kafka-1", "kafka-2", "kafka-3", "kafka-4", "kafka-5")
c := exec.Command("docker", "compose", "logs", "-t", "kafka-1", "kafka-2", "kafka-3", "kafka-4", "kafka-5")
c.Stdout = os.Stdout
c.Stderr = os.Stderr
_ = c.Run()
Expand Down Expand Up @@ -280,42 +280,42 @@ func existingEnvironment(ctx context.Context, env *testEnvironment) (bool, error
}

func tearDownDockerTestEnvironment(ctx context.Context, env *testEnvironment) error {
c := exec.Command("docker-compose", "down", "--volumes")
c := exec.Command("docker", "compose", "down", "--volumes")
c.Stdout = os.Stdout
c.Stderr = os.Stderr
downErr := c.Run()

c = exec.Command("docker-compose", "rm", "-v", "--force", "--stop")
c = exec.Command("docker", "compose", "rm", "-v", "--force", "--stop")
c.Stdout = os.Stdout
c.Stderr = os.Stderr
rmErr := c.Run()
if downErr != nil {
return fmt.Errorf("failed to run docker-compose to stop test environment: %w", downErr)
return fmt.Errorf("failed to run docker compose to stop test environment: %w", downErr)
}
if rmErr != nil {
return fmt.Errorf("failed to run docker-compose to rm test environment: %w", rmErr)
return fmt.Errorf("failed to run docker compose to rm test environment: %w", rmErr)
}
return nil
}

func startDockerTestBroker(ctx context.Context, brokerID int32) error {
service := fmt.Sprintf("kafka-%d", brokerID)
c := exec.Command("docker-compose", "start", service)
c := exec.Command("docker", "compose", "start", service)
c.Stdout = os.Stdout
c.Stderr = os.Stderr
if err := c.Run(); err != nil {
return fmt.Errorf("failed to run docker-compose to start test broker kafka-%d: %w", brokerID, err)
return fmt.Errorf("failed to run docker compose to start test broker kafka-%d: %w", brokerID, err)
}
return nil
}

func stopDockerTestBroker(ctx context.Context, brokerID int32) error {
service := fmt.Sprintf("kafka-%d", brokerID)
c := exec.Command("docker-compose", "stop", service)
c := exec.Command("docker", "compose", "stop", service)
c.Stdout = os.Stdout
c.Stderr = os.Stderr
if err := c.Run(); err != nil {
return fmt.Errorf("failed to run docker-compose to stop test broker kafka-%d: %w", brokerID, err)
return fmt.Errorf("failed to run docker compose to stop test broker kafka-%d: %w", brokerID, err)
}
return nil
}
Expand Down
Loading