From 2345fdc3757f3c6d77b500757c8e7b1d724d15d5 Mon Sep 17 00:00:00 2001 From: Rail Aliiev Date: Tue, 17 Dec 2024 11:22:58 -0500 Subject: [PATCH 1/2] release: update docker labels for Red Hat Connect images Recently Red Hat Connect stopped accepting our docker images, because they introduced a new requirement for labels. The current publishing tasks fail with the following error: > HasRequiredLabel: Failed > Checking if the required labels (name, vendor, version, release, summary, description, maintainer) are present in the container metadata and that they do not violate Red Hat trademark. This PR adds a new static label "maintainer" and dynamically adds the "version" label. Fixes: RE-769 Release note: None Release justification: release automation changes --- build/deploy-redhat/Dockerfile.in | 1 + .../internal/cockroach/release/publish/publish-redhat-release.sh | 1 + 2 files changed, 2 insertions(+) diff --git a/build/deploy-redhat/Dockerfile.in b/build/deploy-redhat/Dockerfile.in index edbb19888dfe..5303b27acfbe 100644 --- a/build/deploy-redhat/Dockerfile.in +++ b/build/deploy-redhat/Dockerfile.in @@ -6,6 +6,7 @@ RUN microdnf install -y yum && \ rm -rf /var/cache/yum LABEL name="CockroachDB" +LABEL maintainer="Cockroach Labs" LABEL vendor="Cockroach Labs" LABEL summary="CockroachDB is a distributed SQL database." LABEL description="CockroachDB is a PostgreSQL wire-compatable distributed SQL database." diff --git a/build/teamcity/internal/cockroach/release/publish/publish-redhat-release.sh b/build/teamcity/internal/cockroach/release/publish/publish-redhat-release.sh index d453a5da7071..3ca96d8b16d6 100755 --- a/build/teamcity/internal/cockroach/release/publish/publish-redhat-release.sh +++ b/build/teamcity/internal/cockroach/release/publish/publish-redhat-release.sh @@ -54,6 +54,7 @@ cat build/deploy-redhat/Dockerfile docker build --no-cache \ --pull \ --label release=$rhel_release \ + --label version=$version \ --tag="${rhel_repository}:${version}" \ build/deploy-redhat tc_end_block "Rebuild docker image" From fce7e7d55ae2b01742bba62ba157f0d681448928 Mon Sep 17 00:00:00 2001 From: sumeerbhola Date: Tue, 17 Dec 2024 16:00:24 -0500 Subject: [PATCH 2/2] kvserver: change TestReplicaRaftOverload to use apply_to_elastic This ensures it will pass when the default mode is changed to apply_to_all. Informs #136215 Epic: CRDB-37515 Release note: None --- pkg/kv/kvserver/client_replica_raft_overload_test.go | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkg/kv/kvserver/client_replica_raft_overload_test.go b/pkg/kv/kvserver/client_replica_raft_overload_test.go index ae113446a60f..85d6568d5803 100644 --- a/pkg/kv/kvserver/client_replica_raft_overload_test.go +++ b/pkg/kv/kvserver/client_replica_raft_overload_test.go @@ -59,6 +59,10 @@ func TestReplicaRaftOverload(t *testing.T) { { _, err := tc.ServerConn(0).Exec(`SET CLUSTER SETTING admission.kv.pause_replication_io_threshold = 1.0`) require.NoError(t, err) + // Replica pausing is disabled in apply_to_all mode, so make sure the + // cluster is running with a setting where replica pausing is enabled. + _, err = tc.ServerConn(0).Exec(`SET CLUSTER SETTING kvadmission.flow_control.mode = "apply_to_elastic"`) + require.NoError(t, err) } k := tc.ScratchRange(t) tc.AddVotersOrFatal(t, k, tc.Targets(1, 2)...)