Skip to content

Commit dcab322

Browse files
maesenkabeikov
authored andcommitted
HHH-18747 - Update CockroachDB Docker configuration.
Default CockroachDB version is now 24.1.5. Removed the CockroachDB 22.2 release as that is now EOL.
1 parent 1750b2d commit dcab322

File tree

1 file changed

+8
-11
lines changed

1 file changed

+8
-11
lines changed

docker_db.sh

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -789,10 +789,10 @@ hana() {
789789
}
790790

791791
cockroachdb() {
792-
cockroachdb_23_1
792+
cockroachdb_24_1
793793
}
794794

795-
cockroachdb_23_1() {
795+
cockroachdb_24_1() {
796796
$CONTAINER_CLI rm -f cockroach || true
797797
LOG_CONFIG="
798798
sinks:
@@ -802,7 +802,7 @@ sinks:
802802
redact: false
803803
exit-on-error: true
804804
"
805-
$CONTAINER_CLI run -d --name=cockroach -m 6g -p 26257:26257 -p 8080:8080 ${DB_IMAGE_COCKROACHDB_23_1:-docker.io/cockroachdb/cockroach:v23.1.12} start-single-node \
805+
$CONTAINER_CLI run -d --name=cockroach -m 6g -p 26257:26257 -p 8080:8080 ${DB_IMAGE_COCKROACHDB_24_1:-cockroachdb/cockroach:v24.1.5} start-single-node \
806806
--insecure --store=type=mem,size=0.25 --advertise-addr=localhost --log="$LOG_CONFIG"
807807
OUTPUT=
808808
while [[ $OUTPUT != *"CockroachDB node starting"* ]]; do
@@ -812,28 +812,26 @@ sinks:
812812
OUTPUT=$($CONTAINER_CLI logs cockroach 2>&1)
813813
done
814814
echo "Enabling experimental box2d operators and some optimized settings for running the tests"
815-
#settings documented in https://www.cockroachlabs.com/docs/v22.1/local-testing.html#use-a-local-single-node-cluster-with-in-memory-storage
815+
#settings documented in https://www.cockroachlabs.com/docs/v24.1/local-testing#use-a-local-single-node-cluster-with-in-memory-storage
816816
$CONTAINER_CLI exec cockroach bash -c "cat <<EOF | ./cockroach sql --insecure
817817
SET CLUSTER SETTING sql.spatial.experimental_box2d_comparison_operators.enabled = on;
818-
SET CLUSTER SETTING kv.raft_log.disable_synchronization_unsafe = true;
819818
SET CLUSTER SETTING kv.range_merge.queue_interval = '50ms';
820819
SET CLUSTER SETTING jobs.registry.interval.gc = '30s';
821820
SET CLUSTER SETTING jobs.registry.interval.cancel = '180s';
822821
SET CLUSTER SETTING jobs.retention_time = '15s';
823822
SET CLUSTER SETTING sql.stats.automatic_collection.enabled = false;
824823
SET CLUSTER SETTING kv.range_split.by_load_merge_delay = '5s';
825-
SET CLUSTER SETTING sql.defaults.serial_normalization = 'sql_sequence_cached';
826824
ALTER RANGE default CONFIGURE ZONE USING "gc.ttlseconds" = 600;
827825
ALTER DATABASE system CONFIGURE ZONE USING "gc.ttlseconds" = 600;
828826
829827
quit
830828
EOF
831829
"
832830
echo "Cockroachdb successfully started"
833-
834831
}
835832

836-
cockroachdb_22_2() {
833+
834+
cockroachdb_23_1() {
837835
$CONTAINER_CLI rm -f cockroach || true
838836
LOG_CONFIG="
839837
sinks:
@@ -843,7 +841,7 @@ sinks:
843841
redact: false
844842
exit-on-error: true
845843
"
846-
$CONTAINER_CLI run -d --name=cockroach -m 6g -p 26257:26257 -p 8080:8080 ${DB_IMAGE_COCKROACHDB_22_2:-docker.io/cockroachdb/cockroach:v22.2.2} start-single-node \
844+
$CONTAINER_CLI run -d --name=cockroach -m 6g -p 26257:26257 -p 8080:8080 ${DB_IMAGE_COCKROACHDB_23_1:-docker.io/cockroachdb/cockroach:v23.1.28} start-single-node \
847845
--insecure --store=type=mem,size=0.25 --advertise-addr=localhost --log="$LOG_CONFIG"
848846
OUTPUT=
849847
while [[ $OUTPUT != *"CockroachDB node starting"* ]]; do
@@ -866,7 +864,6 @@ SET CLUSTER SETTING kv.range_split.by_load_merge_delay = '5s';
866864
SET CLUSTER SETTING sql.defaults.serial_normalization = 'sql_sequence_cached';
867865
ALTER RANGE default CONFIGURE ZONE USING "gc.ttlseconds" = 600;
868866
ALTER DATABASE system CONFIGURE ZONE USING "gc.ttlseconds" = 600;
869-
SET CLUSTER SETTING sql.defaults.serial_normalization=sql_sequence;
870867
871868
quit
872869
EOF
@@ -968,8 +965,8 @@ if [ -z ${1} ]; then
968965
echo "No db name provided"
969966
echo "Provide one of:"
970967
echo -e "\tcockroachdb"
968+
echo -e "\tcockroachdb_24_1"
971969
echo -e "\tcockroachdb_23_1"
972-
echo -e "\tcockroachdb_22_2"
973970
echo -e "\tdb2"
974971
echo -e "\tdb2_11_5"
975972
echo -e "\tdb2_10_5"

0 commit comments

Comments
 (0)