mirrors/dragonfly
1
0
Fork 0
mirror of https://github.com/dragonflydb/dragonfly.git synced 2025-05-10 09:55:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

fix: rpm package setup (#4506)

Browse source 
Also, fix the deadlock problem on shutdown on Oracle Linux 5.15
Fixes #4505

Signed-off-by: Roman Gershman <roman@dragonflydb.io>
This commit is contained in:
Roman Gershman 2025-01-26 12:40:33 +02:00 • committed by GitHub
parent 904775cfe6
commit bafb427a09
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 6 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
helio

@ -1 +1 @@
Subproject commit 2ab4412b78afbf7d3102b472fb0e6f70b194a535 Subproject commit 54a854715599ec724727ca09171f3b54d0855872

4
src/server/rdb_test.cc
View file

@ -458,8 +458,8 @@ TEST_F(RdbTest, JsonTest) {
class HllRdbTest : public RdbTest, public testing::WithParamInterface<string> {}; class HllRdbTest : public RdbTest, public testing::WithParamInterface<string> {};
TEST_P(HllRdbTest, Hll) { TEST_P(HllRdbTest, Hll) {
LOG(INFO) << " max memory: " << max_memory_limit LOG(ERROR) << " max memory: " << max_memory_limit
<< " used_mem_current: " << used_mem_current.load(); << " used_mem_current: " << used_mem_current.load();
auto ec = LoadRdb("hll.rdb"); auto ec = LoadRdb("hll.rdb");
ASSERT_FALSE(ec) << ec.message(); ASSERT_FALSE(ec) << ec.message();

2
tools/packaging/debian/dragonfly.service
View file

@ -6,7 +6,7 @@ Documentation=
[Service] [Service]
Type=simple Type=simple
EnvironmentFile=-/etc/dragonfly/environment EnvironmentFile=-/etc/dragonfly/environment
ExecStart=/usr/bin/dragonfly --flagfile=/etc/dragonfly/dragonfly.conf ExecStart=/usr/local/bin/dragonfly --flagfile=/etc/dragonfly/dragonfly.conf
PIDFile=/var/run/dragonfly/dragonfly.pid PIDFile=/var/run/dragonfly/dragonfly.pid
TimeoutStopSec=infinity TimeoutStopSec=infinity
Restart=always Restart=always

2
tools/packaging/rpm/dragonfly.spec
View file

@ -35,6 +35,8 @@ mv ./dragonfly-%{_arch} ./dragonfly
%install %install
mkdir -p %{buildroot}/usr/local/bin mkdir -p %{buildroot}/usr/local/bin
mkdir -p %{buildroot}/etc/dragonfly mkdir -p %{buildroot}/etc/dragonfly
mkdir -p %{buildroot}/var/log/dragonfly
mkdir -p %{buildroot}/var/lib/dragonfly
install -m 755 ./dragonfly %{buildroot}/usr/local/bin/ install -m 755 ./dragonfly %{buildroot}/usr/local/bin/
mkdir -p %{buildroot}/usr/lib/systemd/system mkdir -p %{buildroot}/usr/lib/systemd/system