Skip to content

Commit 015c335

Browse files
authored
Valkey: disable flaky mem tests (#10873)
1 parent 2a21a73 commit 015c335

2 files changed

Lines changed: 35 additions & 1 deletion

File tree

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
From d9f795c8181d2db70626b7d43ebb2e6e8d2fbed8 Mon Sep 17 00:00:00 2001
2+
From: Rohit Rawat <xordux@gmail.com>
3+
Date: Tue, 29 Oct 2024 14:10:20 +0000
4+
Subject: [PATCH] Disable flaky mem defrag tests
5+
6+
---
7+
tests/unit/memefficiency.tcl | 2 ++
8+
1 file changed, 2 insertions(+)
9+
10+
diff --git a/tests/unit/memefficiency.tcl b/tests/unit/memefficiency.tcl
11+
index d5a6a6e..37e1711 100644
12+
--- a/tests/unit/memefficiency.tcl
13+
+++ b/tests/unit/memefficiency.tcl
14+
@@ -720,6 +720,7 @@ run_solo {defrag} {
15+
}
16+
}
17+
18+
+ if {0} {
19+
start_cluster 1 0 {tags {"defrag external:skip cluster"} overrides {appendonly yes auto-aof-rewrite-percentage 0 save ""}} {
20+
test_active_defrag "cluster"
21+
}
22+
@@ -727,4 +728,5 @@ run_solo {defrag} {
23+
start_server {tags {"defrag external:skip standalone"} overrides {appendonly yes auto-aof-rewrite-percentage 0 save ""}} {
24+
test_active_defrag "standalone"
25+
}
26+
+ }
27+
} ;# run_solo
28+
--
29+
2.39.4
30+

SPECS/valkey/valkey.spec

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,15 @@
11
Summary: advanced key-value store
22
Name: valkey
33
Version: 8.0.0
4-
Release: 1%{?dist}
4+
Release: 2%{?dist}
55
License: BSD
66
Vendor: Microsoft Corporation
77
Distribution: Azure Linux
88
Group: Applications/Databases
99
URL: https://valkey.io/
1010
Source0: https://github.com/valkey-io/valkey/archive/refs/tags/%{version}.tar.gz#/%{name}-%{version}.tar.gz
1111
Patch0: valkey-conf.patch
12+
Patch1: disable-mem-defrag-tests.patch
1213
BuildRequires: gcc
1314
BuildRequires: make
1415
BuildRequires: openssl-devel
@@ -83,6 +84,9 @@ exit 0
8384
%config(noreplace) %attr(0640, %{name}, %{name}) %{_sysconfdir}/valkey.conf
8485

8586
%changelog
87+
* Tue Oct 29 2024 Rohit Rawat <rohitrawat@microsoft.com> - 8.0.0-2
88+
- Add patch to remove flaky mem defrag test.
89+
8690
* Mon Sep 30 2024 Rohit Rawat <rohitrawat@microsoft.com> - 8.0.0-1
8791
- Original version for CBL-Mariner.
8892
- License Verified.

0 commit comments

Comments
 (0)