From b7237c47aca8aae1cba6be65a118b3372add8d1f Mon Sep 17 00:00:00 2001 From: dervoeti Date: Tue, 11 Feb 2025 15:43:15 +0100 Subject: [PATCH 1/2] chore: support for hbase 2.6.1 --- CHANGELOG.md | 2 ++ docs/modules/hbase/partials/supported-versions.adoc | 5 ++--- .../templates/kuttl/snapshot-export/30_test-export.sh | 2 ++ tests/test-definition.yaml | 10 +++++----- 4 files changed, 11 insertions(+), 8 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 446139d5..3ca027c6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,7 @@ - Run a `containerdebug` process in the background of each HBase container to collect debugging information ([#605]). - Aggregate emitted Kubernetes events on the CustomResources ([#612]). - Support configuring JVM arguments ([#620]). +- Added support for HBase 2.6.1 ([#627]): ### Removed @@ -25,6 +26,7 @@ [#611]: https://github.com/stackabletech/hbase-operator/pull/611 [#612]: https://github.com/stackabletech/hbase-operator/pull/612 [#620]: https://github.com/stackabletech/hbase-operator/pull/620 +[#627]: https://github.com/stackabletech/hbase-operator/pull/627 ## [24.11.1] - 2025-01-09 diff --git a/docs/modules/hbase/partials/supported-versions.adoc b/docs/modules/hbase/partials/supported-versions.adoc index 6f491e07..ca33eed1 100644 --- a/docs/modules/hbase/partials/supported-versions.adoc +++ b/docs/modules/hbase/partials/supported-versions.adoc @@ -2,6 +2,5 @@ // This is a separate file, since it is used by both the direct HBase-Operator documentation, and the overarching // Stackable Platform documentation. -- 2.6.0 (Experimental) -- 2.4.18 (LTS) -- 2.4.17 (Deprecated) +- 2.6.1 (LTS) +- 2.4.18 (Deprecated) diff --git a/tests/templates/kuttl/snapshot-export/30_test-export.sh b/tests/templates/kuttl/snapshot-export/30_test-export.sh index 92529c09..554f181a 100755 --- a/tests/templates/kuttl/snapshot-export/30_test-export.sh +++ b/tests/templates/kuttl/snapshot-export/30_test-export.sh @@ -14,6 +14,7 @@ hbase shell create-snapshot.hbase 2>&1 | \ # Export local snapshot to S3 export-snapshot-to-s3 \ + --no-checksum-verify \ # needed for HBase 2.6.1 until this is fixed: https://issues.apache.org/jira/browse/HBASE-28998 --snapshot snap \ --copy-to s3a://hbase/snap \ --overwrite 2>&1 | \ @@ -25,6 +26,7 @@ hbase shell delete-snapshot.hbase 2>&1 | \ # Import snapshot from S3 export-snapshot-to-s3 \ + --no-checksum-verify \ # needed for HBase 2.6.1 until this is fixed: https://issues.apache.org/jira/browse/HBASE-28998 --snapshot snap \ --copy-from s3a://hbase/snap \ --copy-to hdfs://test-hdfs/hbase \ diff --git a/tests/test-definition.yaml b/tests/test-definition.yaml index 8b8821d0..cbef7a1e 100644 --- a/tests/test-definition.yaml +++ b/tests/test-definition.yaml @@ -2,19 +2,19 @@ dimensions: - name: hbase values: - - 2.6.0 - 2.4.18 + - 2.6.1 # To use a custom image, add a comma and the full name after the product version - # - 2.6.0,oci.stackable.tech/sandbox/hbase:2.6.0-stackable0.0.0-dev + # - 2.6.1,oci.stackable.tech/sandbox/hbase:2.6.1-stackable0.0.0-dev # - 2.4.18,oci.stackable.tech/sandbox/hbase:2.4.18-stackable0.0.0-dev - name: hbase-opa values: - - 2.6.0 + - 2.6.1 # To use a custom image, add a comma and the full name after the product version - # - 2.6.0,oci.stackable.tech/sandbox/hbase:2.6.0-stackable0.0.0-dev + # - 2.6.1,oci.stackable.tech/sandbox/hbase:2.6.1-stackable0.0.0-dev - name: hbase-latest values: - - 2.6.0 + - 2.6.1 # - 2.4.18,oci.stackable.tech/sandbox/hbase:2.4.18-stackable0.0.0-dev - name: hdfs values: From 1b9b07ac53f2da4ccb0e313644eb96278297ecc3 Mon Sep 17 00:00:00 2001 From: Razvan-Daniel Mihai <84674+razvan@users.noreply.github.com> Date: Wed, 12 Feb 2025 13:07:20 +0100 Subject: [PATCH 2/2] cannot have comments in multiline commands --- tests/templates/kuttl/snapshot-export/30_test-export.sh | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/tests/templates/kuttl/snapshot-export/30_test-export.sh b/tests/templates/kuttl/snapshot-export/30_test-export.sh index 554f181a..647ebc09 100755 --- a/tests/templates/kuttl/snapshot-export/30_test-export.sh +++ b/tests/templates/kuttl/snapshot-export/30_test-export.sh @@ -13,8 +13,9 @@ hbase shell create-snapshot.hbase 2>&1 | \ grep '=> \["snap"\]' > /dev/null # Export local snapshot to S3 +# --no-checksum-verify is needed for HBase 2.6.1 until this is fixed: https://issues.apache.org/jira/browse/HBASE-28998 export-snapshot-to-s3 \ - --no-checksum-verify \ # needed for HBase 2.6.1 until this is fixed: https://issues.apache.org/jira/browse/HBASE-28998 + --no-checksum-verify \ --snapshot snap \ --copy-to s3a://hbase/snap \ --overwrite 2>&1 | \ @@ -25,8 +26,9 @@ hbase shell delete-snapshot.hbase 2>&1 | \ grep '=> \[\]' > /dev/null # Import snapshot from S3 +# --no-checksum-verify is needed for HBase 2.6.1 until this is fixed: https://issues.apache.org/jira/browse/HBASE-28998 export-snapshot-to-s3 \ - --no-checksum-verify \ # needed for HBase 2.6.1 until this is fixed: https://issues.apache.org/jira/browse/HBASE-28998 + --no-checksum-verify \ --snapshot snap \ --copy-from s3a://hbase/snap \ --copy-to hdfs://test-hdfs/hbase \