Skip to content

Commit a60224c

Browse files
authored
Merge pull request #28070 from WillemKauf/timequery_test_fixes
[CORE-13570] Deflake `test_timequery_with_local_gc`
2 parents 4219a2a + 6fb0292 commit a60224c

1 file changed

Lines changed: 8 additions & 1 deletion

File tree

tests/rptest/tests/timequery_test.py

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,8 @@ def _create_and_produce(
5959
"redpanda.remote.read": "true",
6060
"redpanda.remote.write": "true",
6161
"retention.local.target.bytes": local_retention,
62+
# See comment about disabling `retention.ms` below.
63+
"retention.local.target.ms": -1,
6264
}.items():
6365
self.client().alter_topic_config(topic.name, k, v)
6466
desc = self.client().describe_topic_configs(topic.name)
@@ -357,6 +359,11 @@ def set_up_cluster(self, cloud_storage: bool, batch_cache: bool, spillover: bool
357359
else:
358360
self.redpanda.add_extra_rp_conf({"log_segment_size": self.log_segment_size})
359361

362+
# `test_timequery_with_local_gc` attempts to set the `log_segment_size` lower than the minimum
363+
# value of 1_MiB- disable bounded property checks to allow this.
364+
self.redpanda.set_environment(
365+
{"__REDPANDA_TEST_DISABLE_BOUNDED_PROPERTY_CHECKS": "ON"}
366+
)
360367
self.redpanda.start()
361368

362369
def _do_test_timequery(
@@ -801,7 +808,7 @@ def create_read_replica_topic(self) -> None:
801808
}
802809
rpk_rr_cluster.create_topic(self.topic_name, config=conf)
803810
except:
804-
self.logger.warn(f"Failed to create a read-replica topic")
811+
self.logger.warn("Failed to create a read-replica topic")
805812
return False
806813
return True
807814

0 commit comments

Comments
 (0)