From 3e14c48865b975d72e3b57e86d4a6e2feef2d260 Mon Sep 17 00:00:00 2001 From: Razvan-Daniel Mihai <84674+razvan@users.noreply.github.com> Date: Wed, 8 Oct 2025 10:14:02 +0200 Subject: [PATCH 1/4] move hbck2.env to hbase-operator-tools --- hbase/hbase-operator-tools/Dockerfile | 2 +- hbase/{hbase => hbase-operator-tools}/stackable/bin/hbck2.env | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename hbase/{hbase => hbase-operator-tools}/stackable/bin/hbck2.env (100%) mode change 100755 => 100644 diff --git a/hbase/hbase-operator-tools/Dockerfile b/hbase/hbase-operator-tools/Dockerfile index c708db176..e05f4963e 100644 --- a/hbase/hbase-operator-tools/Dockerfile +++ b/hbase/hbase-operator-tools/Dockerfile @@ -21,7 +21,7 @@ ARG DELETE_CACHES="true" # The variable names are intentionally passed to envsubst in single-quotes, # so that they are not expanded. Disabling ShellCheck rules in a Dockerfile # does not work, so please ignore the according warning (SC2016). -COPY --chown=${STACKABLE_USER_UID}:0 hbase/hbase/stackable/bin/hbck2.env /stackable/bin/ +COPY --chown=${STACKABLE_USER_UID}:0 hbase/hbase-operator-tools/stackable/bin/hbck2.env /stackable/bin/ COPY --chown=${STACKABLE_USER_UID}:0 hbase/hbase-operator-tools/stackable/patches/patchable.toml /stackable/src/hbase/hbase-operator-tools/stackable/patches/patchable.toml COPY --chown=${STACKABLE_USER_UID}:0 hbase/hbase-operator-tools/stackable/patches/${HBASE_OPERATOR_TOOLS_VERSION} /stackable/src/hbase/hbase-operator-tools/stackable/patches/${HBASE_OPERATOR_TOOLS_VERSION} COPY --chown=${STACKABLE_USER_UID}:0 hbase/hbase/stackable/bin/hbase-entrypoint.sh /stackable/bin/ diff --git a/hbase/hbase/stackable/bin/hbck2.env b/hbase/hbase-operator-tools/stackable/bin/hbck2.env old mode 100755 new mode 100644 similarity index 100% rename from hbase/hbase/stackable/bin/hbck2.env rename to hbase/hbase-operator-tools/stackable/bin/hbck2.env From 17aec2bd221b6e09ca11256b66362ca9dfbbb53d Mon Sep 17 00:00:00 2001 From: Razvan-Daniel Mihai <84674+razvan@users.noreply.github.com> Date: Wed, 8 Oct 2025 10:53:59 +0200 Subject: [PATCH 2/4] add log4j2-hbck.properties --- hbase/hbase-operator-tools/Dockerfile | 5 +++++ hbase/hbase-operator-tools/stackable/bin/hbck2.env | 2 ++ .../stackable/conf/log4j2-hbck.properties | 13 +++++++++++++ 3 files changed, 20 insertions(+) create mode 100644 hbase/hbase-operator-tools/stackable/conf/log4j2-hbck.properties diff --git a/hbase/hbase-operator-tools/Dockerfile b/hbase/hbase-operator-tools/Dockerfile index e05f4963e..e831813ca 100644 --- a/hbase/hbase-operator-tools/Dockerfile +++ b/hbase/hbase-operator-tools/Dockerfile @@ -25,6 +25,7 @@ COPY --chown=${STACKABLE_USER_UID}:0 hbase/hbase-operator-tools/stackable/bin/hb COPY --chown=${STACKABLE_USER_UID}:0 hbase/hbase-operator-tools/stackable/patches/patchable.toml /stackable/src/hbase/hbase-operator-tools/stackable/patches/patchable.toml COPY --chown=${STACKABLE_USER_UID}:0 hbase/hbase-operator-tools/stackable/patches/${HBASE_OPERATOR_TOOLS_VERSION} /stackable/src/hbase/hbase-operator-tools/stackable/patches/${HBASE_OPERATOR_TOOLS_VERSION} COPY --chown=${STACKABLE_USER_UID}:0 hbase/hbase/stackable/bin/hbase-entrypoint.sh /stackable/bin/ +COPY --chown=${STACKABLE_USER_UID}:0 hbase/hbase-operator-tools/stackable/conf/log4j2-hbck.properties /tmp/log4j2-hbck.properties COPY --from=hbase-builder --chown=${STACKABLE_USER_UID}:0 /stackable/patched-libs/maven/org/apache/hbase /stackable/patched-libs/maven/org/apache/hbase COPY --from=hadoop-builder --chown=${STACKABLE_USER_UID}:0 /stackable/patched-libs/maven/org/apache/hadoop /stackable/patched-libs/maven/org/apache/hadoop @@ -84,6 +85,10 @@ if [ "${DELETE_CACHES}" = "true" ] ; then rm -rf /stackable/.cache/* fi +mkdir -p /stackable/hbase-operator-tools-${FULL_HBASE_OPERATOR_TOOLS_VERSION}/conf +mv /tmp/log4j2-hbck.properties /stackable/hbase-operator-tools-${FULL_HBASE_OPERATOR_TOOLS_VERSION}/conf/log4j2-hbck.properties + # set correct groups chmod --recursive g=u /stackable EOF + diff --git a/hbase/hbase-operator-tools/stackable/bin/hbck2.env b/hbase/hbase-operator-tools/stackable/bin/hbck2.env index 097a045b8..9b8bdd449 100644 --- a/hbase/hbase-operator-tools/stackable/bin/hbck2.env +++ b/hbase/hbase-operator-tools/stackable/bin/hbck2.env @@ -1,5 +1,7 @@ #!/bin/sh +export LOG4J_CONFIGURATION_FILE=/stackable/hbase-operator-tools/conf/log4j2-hbck.properties + exec /stackable/hbase-${PATCHED_HBASE_VERSION}/bin/hbase hbck \ -j /stackable/hbase-operator-tools-${FULL_HBASE_OPERATOR_TOOLS_VERSION}/hbase-hbck2/hbase-hbck2-${PATCHED_HBASE_OPERATOR_TOOLS_VERSION}.jar \ "$@" diff --git a/hbase/hbase-operator-tools/stackable/conf/log4j2-hbck.properties b/hbase/hbase-operator-tools/stackable/conf/log4j2-hbck.properties new file mode 100644 index 000000000..881cc31e3 --- /dev/null +++ b/hbase/hbase-operator-tools/stackable/conf/log4j2-hbck.properties @@ -0,0 +1,13 @@ +status = warn +dest = err +name = PropertiesConfig + +# Console appender +appender.console.type = Console +appender.console.target = SYSTEM_ERR +appender.console.name = console +appender.console.layout.type = PatternLayout +appender.console.layout.pattern = %d{ISO8601} %-5p [%t%notEmpty{ %X}] %c{2}: %.1000m%n + +rootLogger = WARN,console + From 38d66f966e7e250cf84850b19a003edd3ffd8522 Mon Sep 17 00:00:00 2001 From: Razvan-Daniel Mihai <84674+razvan@users.noreply.github.com> Date: Wed, 8 Oct 2025 12:01:45 +0200 Subject: [PATCH 3/4] update changelog --- CHANGELOG.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 523db2075..a991242f8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -21,7 +21,7 @@ All notable changes to this project will be documented in this file. - opa: Add `1.8.0` ([#1279]). - spark: Add `3.5.7` ([#1280]). - spark-connect-client: Add `3.5.7` ([#1280]). -- superset: Add `4.1.4` ([#1284]). +- superset: Add `4.1.4` ([#1284]). - spark: Add `4.0.1` ([#1286]). - spark-connect-client: Add `4.0.1` ([#1286]). - trino/trino-storage-connector: Add `477` ([#1285]). @@ -43,6 +43,7 @@ All notable changes to this project will be documented in this file. - trino-cli: Bump to 477 ([#1285]). - tools: Bump dependency versions - kubectl to `1.34.1`, yq to `4.47.2`, and jq to `1.8.1` ([#1290]). - testing-tools: Update keycloak dependency to `26.3.5` and `python:3.12-slim-bullseye` base image ([#1289]). +- hbase: move hbck2.env to hbase-operator-tools image and add log4j2 properties for this tool ([#1300]). ### Removed @@ -89,6 +90,7 @@ All notable changes to this project will be documented in this file. [#1292]: https://github.com/stackabletech/docker-images/pull/1292 [#1293]: https://github.com/stackabletech/docker-images/pull/1293 [#1296]: https://github.com/stackabletech/docker-images/pull/1296 +[#1300]: https://github.com/stackabletech/docker-images/pull/1300 ## [25.7.0] - 2025-07-23 From 48c41979e481dc2683768d87912384c0d21098b1 Mon Sep 17 00:00:00 2001 From: Razvan-Daniel Mihai <84674+razvan@users.noreply.github.com> Date: Wed, 8 Oct 2025 12:06:17 +0200 Subject: [PATCH 4/4] fix pre-commit hooks --- hbase/hbase-operator-tools/Dockerfile | 1 - hbase/hbase-operator-tools/stackable/conf/log4j2-hbck.properties | 1 - 2 files changed, 2 deletions(-) diff --git a/hbase/hbase-operator-tools/Dockerfile b/hbase/hbase-operator-tools/Dockerfile index e831813ca..62e487346 100644 --- a/hbase/hbase-operator-tools/Dockerfile +++ b/hbase/hbase-operator-tools/Dockerfile @@ -91,4 +91,3 @@ mv /tmp/log4j2-hbck.properties /stackable/hbase-operator-tools-${FULL_HBASE_OPER # set correct groups chmod --recursive g=u /stackable EOF - diff --git a/hbase/hbase-operator-tools/stackable/conf/log4j2-hbck.properties b/hbase/hbase-operator-tools/stackable/conf/log4j2-hbck.properties index 881cc31e3..8350a723b 100644 --- a/hbase/hbase-operator-tools/stackable/conf/log4j2-hbck.properties +++ b/hbase/hbase-operator-tools/stackable/conf/log4j2-hbck.properties @@ -10,4 +10,3 @@ appender.console.layout.type = PatternLayout appender.console.layout.pattern = %d{ISO8601} %-5p [%t%notEmpty{ %X}] %c{2}: %.1000m%n rootLogger = WARN,console -