Skip to content

HDDS-14771. Split server-side load testers from freon #9874

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
adoroszlai merged 6 commits into from
Mar 9, 2026
Merged

HDDS-14771. Split server-side load testers from freon #9874

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
f10bfc1
HDDS-14771. Split server-side load testers from freon
adoroszlai Mar 5, 2026
d811c4f
remove unused test dependencies
adoroszlai Mar 6, 2026
58198d8
keep BaseFreonGenerator implements FreonSubcommand
adoroszlai Mar 6, 2026
fce94c3
command backwards compatibility
adoroszlai Mar 8, 2026
7be35c2
add warning
adoroszlai Mar 8, 2026
cbda6f4
fix OPTS
adoroszlai Mar 9, 2026
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
5 changes: 5 additions & 0 deletions hadoop-ozone/dist/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,6 +143,11 @@
<artifactId>ozone-tools</artifactId>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.apache.ozone</groupId>
<artifactId>ozone-vapor</artifactId>
<scope>runtime</scope>
</dependency>
</dependencies>

<build>
Expand Down
1 change: 1 addition & 0 deletions hadoop-ozone/dist/src/main/license/jar-report.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -233,6 +233,7 @@ share/ozone/lib/ozone-recon.jar
share/ozone/lib/ozone-s3-secret-store.jar
share/ozone/lib/ozone-s3gateway.jar
share/ozone/lib/ozone-tools.jar
share/ozone/lib/ozone-vapor.jar
share/ozone/lib/perfmark-api.jar
share/ozone/lib/picocli.jar
share/ozone/lib/picocli-shell-jline3.jar
Expand Down
11 changes: 11 additions & 0 deletions hadoop-ozone/dist/src/shell/ozone/ozone
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@ function ozone_usage
ozone_add_subcommand "debug" client "Ozone debug tool"
ozone_add_subcommand "repair" client "Ozone repair tool"
ozone_add_subcommand "ratis" client "Ozone ratis tool"
ozone_add_subcommand "vapor" client "Ozone server simulator"

ozone_generate_usage "${OZONE_SHELL_EXECNAME}" false
}
Expand Down Expand Up @@ -129,6 +130,11 @@ function ozonecmd_case
OZONE_CLASSNAME=org.apache.hadoop.ozone.freon.Freon
OZONE_FREON_OPTS="${OZONE_FREON_OPTS} ${RATIS_OPTS} ${OZONE_MODULE_ACCESS_ARGS}"
OZONE_RUN_ARTIFACT_NAME="ozone-freon"
if ozone_is_freon_command_moved_to_vapor; then
# backward compatibility
OZONE_CLASSNAME=org.apache.hadoop.ozone.freon.Vapor
OZONE_RUN_ARTIFACT_NAME="ozone-vapor"
fi
;;
getconf)
OZONE_CLASSNAME=org.apache.hadoop.ozone.conf.OzoneGetConf;
Expand Down Expand Up @@ -235,6 +241,11 @@ function ozonecmd_case
OZONE_CLASSNAME=org.apache.hadoop.ozone.shell.OzoneRatis
OZONE_RUN_ARTIFACT_NAME="ozone-tools"
;;
vapor)
OZONE_CLASSNAME=org.apache.hadoop.ozone.freon.Vapor
OZONE_VAPOR_OPTS="${OZONE_VAPOR_OPTS} ${RATIS_OPTS} ${OZONE_MODULE_ACCESS_ARGS}"
OZONE_RUN_ARTIFACT_NAME="ozone-vapor"
;;
*)
OZONE_CLASSNAME="${subcmd}"
if ! ozone_validate_classname "${OZONE_CLASSNAME}"; then
Expand Down
29 changes: 29 additions & 0 deletions hadoop-ozone/dist/src/shell/ozone/ozone-functions.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2940,3 +2940,32 @@ function ozone_set_deprecated_hadoop_vars
ozone_set_deprecated_var "HADOOP_${suffix}" "OZONE_${suffix}"
done
}

## @description Check if command is one that was moved from freon to vapor
function ozone_is_freon_command_moved_to_vapor
{
local opt subcommand

for opt in "${OZONE_SUBCMD_ARGS[@]}"; do
for subcommand in \
cgdn \
cgom \
cgscm \
cmdw chunk-manager-disk-write \
cr container-replicator \
falg follower-append-log-generator \
lalg leader-append-log-generator \
simulate-datanode \
stb scm-throughput-benchmark \
strmg streaming-generator
do
if [[ "$opt" == "$subcommand" ]]; then
echo "WARN: 'ozone freon $subcommand' is changed to 'ozone vapor $subcommand'." >&2
echo " Please update your scripts since 'ozone freon $subcommand' may no longer" >&2
echo " work in future releases." >&2
return 0
fi
done
done
return 1
}
73 changes: 0 additions & 73 deletions hadoop-ozone/freon/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,10 +42,6 @@
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-annotations</artifactId>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
Expand All @@ -54,10 +50,6 @@
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
</dependency>
<dependency>
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-java</artifactId>
</dependency>
<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
Expand Down Expand Up @@ -86,18 +78,6 @@
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-common</artifactId>
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-hdfs</artifactId>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpcore</artifactId>
</dependency>
<dependency>
<groupId>org.apache.ozone</groupId>
<artifactId>hdds-cli-common</artifactId>
Expand All @@ -114,26 +94,14 @@
<groupId>org.apache.ozone</groupId>
<artifactId>hdds-config</artifactId>
</dependency>
<dependency>
<groupId>org.apache.ozone</groupId>
<artifactId>hdds-container-service</artifactId>
</dependency>
<dependency>
<groupId>org.apache.ozone</groupId>
<artifactId>hdds-interface-client</artifactId>
</dependency>
<dependency>
<groupId>org.apache.ozone</groupId>
<artifactId>hdds-interface-server</artifactId>
</dependency>
<dependency>
<groupId>org.apache.ozone</groupId>
<artifactId>hdds-server-framework</artifactId>
</dependency>
<dependency>
<groupId>org.apache.ozone</groupId>
<artifactId>hdds-server-scm</artifactId>
</dependency>
<dependency>
<groupId>org.apache.ozone</groupId>
<artifactId>ozone-cli-admin</artifactId>
Expand All @@ -154,26 +122,10 @@
<groupId>org.apache.ozone</groupId>
<artifactId>ozone-interface-client</artifactId>
</dependency>
<dependency>
<groupId>org.apache.ozone</groupId>
<artifactId>ozone-interface-storage</artifactId>
</dependency>
<dependency>
<groupId>org.apache.ozone</groupId>
<artifactId>ozone-manager</artifactId>
</dependency>
<dependency>
<groupId>org.apache.ratis</groupId>
<artifactId>ratis-client</artifactId>
</dependency>
<dependency>
<groupId>org.apache.ratis</groupId>
<artifactId>ratis-common</artifactId>
</dependency>
<dependency>
<groupId>org.apache.ratis</groupId>
<artifactId>ratis-proto</artifactId>
</dependency>
<dependency>
<groupId>org.apache.ratis</groupId>
<artifactId>ratis-thirdparty-misc</artifactId>
Expand All @@ -193,31 +145,6 @@
<artifactId>slf4j-reload4j</artifactId>
<scope>runtime</scope>
</dependency>

<!-- Test dependencies -->
<dependency>
<groupId>org.apache.ozone</groupId>
<artifactId>hdds-common</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.ozone</groupId>
<artifactId>hdds-container-service</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.ozone</groupId>
<artifactId>hdds-server-framework</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.ozone</groupId>
<artifactId>hdds-test-utils</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
<build>
<plugins>
Expand Down
1 change: 1 addition & 0 deletions hadoop-ozone/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@
<module>s3-secret-store</module>
<module>s3gateway</module>
<module>tools</module>
<module>vapor</module>
</modules>

<properties>
Expand Down
16 changes: 16 additions & 0 deletions hadoop-ozone/vapor/dev-support/findbugsExcludeFile.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at

http://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License. See accompanying LICENSE file.
-->
<FindBugsFilter>
</FindBugsFilter>
Loading