Skip to content

Commit 4458cda

Browse files
authored
hbase-operator-tools: add log4j properties for hbck2 (#1300)
* move hbck2.env to hbase-operator-tools * add log4j2-hbck.properties * update changelog * fix pre-commit hooks
1 parent 3567aac commit 4458cda

File tree

4 files changed

+22
-2
lines changed

4 files changed

+22
-2
lines changed

CHANGELOG.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ All notable changes to this project will be documented in this file.
2121
- opa: Add `1.8.0` ([#1279]).
2222
- spark: Add `3.5.7` ([#1280]).
2323
- spark-connect-client: Add `3.5.7` ([#1280]).
24-
- superset: Add `4.1.4` ([#1284]).
24+
- superset: Add `4.1.4` ([#1284]).
2525
- spark: Add `4.0.1` ([#1286]).
2626
- spark-connect-client: Add `4.0.1` ([#1286]).
2727
- trino/trino-storage-connector: Add `477` ([#1285]).
@@ -43,6 +43,7 @@ All notable changes to this project will be documented in this file.
4343
- trino-cli: Bump to 477 ([#1285]).
4444
- tools: Bump dependency versions - kubectl to `1.34.1`, yq to `4.47.2`, and jq to `1.8.1` ([#1290]).
4545
- testing-tools: Update keycloak dependency to `26.3.5` and `python:3.12-slim-bullseye` base image ([#1289]).
46+
- hbase: move hbck2.env to hbase-operator-tools image and add log4j2 properties for this tool ([#1300]).
4647

4748
### Removed
4849

@@ -89,6 +90,7 @@ All notable changes to this project will be documented in this file.
8990
[#1292]: https://github.com/stackabletech/docker-images/pull/1292
9091
[#1293]: https://github.com/stackabletech/docker-images/pull/1293
9192
[#1296]: https://github.com/stackabletech/docker-images/pull/1296
93+
[#1300]: https://github.com/stackabletech/docker-images/pull/1300
9294

9395
## [25.7.0] - 2025-07-23
9496

hbase/hbase-operator-tools/Dockerfile

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,11 @@ ARG DELETE_CACHES="true"
2121
# The variable names are intentionally passed to envsubst in single-quotes,
2222
# so that they are not expanded. Disabling ShellCheck rules in a Dockerfile
2323
# does not work, so please ignore the according warning (SC2016).
24-
COPY --chown=${STACKABLE_USER_UID}:0 hbase/hbase/stackable/bin/hbck2.env /stackable/bin/
24+
COPY --chown=${STACKABLE_USER_UID}:0 hbase/hbase-operator-tools/stackable/bin/hbck2.env /stackable/bin/
2525
COPY --chown=${STACKABLE_USER_UID}:0 hbase/hbase-operator-tools/stackable/patches/patchable.toml /stackable/src/hbase/hbase-operator-tools/stackable/patches/patchable.toml
2626
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}
2727
COPY --chown=${STACKABLE_USER_UID}:0 hbase/hbase/stackable/bin/hbase-entrypoint.sh /stackable/bin/
28+
COPY --chown=${STACKABLE_USER_UID}:0 hbase/hbase-operator-tools/stackable/conf/log4j2-hbck.properties /tmp/log4j2-hbck.properties
2829

2930
COPY --from=hbase-builder --chown=${STACKABLE_USER_UID}:0 /stackable/patched-libs/maven/org/apache/hbase /stackable/patched-libs/maven/org/apache/hbase
3031
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,9 @@ if [ "${DELETE_CACHES}" = "true" ] ; then
8485
rm -rf /stackable/.cache/*
8586
fi
8687

88+
mkdir -p /stackable/hbase-operator-tools-${FULL_HBASE_OPERATOR_TOOLS_VERSION}/conf
89+
mv /tmp/log4j2-hbck.properties /stackable/hbase-operator-tools-${FULL_HBASE_OPERATOR_TOOLS_VERSION}/conf/log4j2-hbck.properties
90+
8791
# set correct groups
8892
chmod --recursive g=u /stackable
8993
EOF
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
#!/bin/sh
22

3+
export LOG4J_CONFIGURATION_FILE=/stackable/hbase-operator-tools/conf/log4j2-hbck.properties
4+
35
exec /stackable/hbase-${PATCHED_HBASE_VERSION}/bin/hbase hbck \
46
-j /stackable/hbase-operator-tools-${FULL_HBASE_OPERATOR_TOOLS_VERSION}/hbase-hbck2/hbase-hbck2-${PATCHED_HBASE_OPERATOR_TOOLS_VERSION}.jar \
57
"$@"
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
status = warn
2+
dest = err
3+
name = PropertiesConfig
4+
5+
# Console appender
6+
appender.console.type = Console
7+
appender.console.target = SYSTEM_ERR
8+
appender.console.name = console
9+
appender.console.layout.type = PatternLayout
10+
appender.console.layout.pattern = %d{ISO8601} %-5p [%t%notEmpty{ %X}] %c{2}: %.1000m%n
11+
12+
rootLogger = WARN,console

0 commit comments

Comments
 (0)