proxmox-mirrors/ceph
1
0
Fork 0
mirror of https://git.proxmox.com/git/ceph.git synced 2025-04-28 16:34:15 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

drop patches applied upstream

Browse Source
This commit is contained in:
Fabian Grünbichler 2017-12-04 10:27:58 +01:00
parent 3efd99882e
commit 8045dd35b5
3 changed files with 0 additions and 84 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
patches/0005-ceph-disk-fix-runtime-omission-for-ceph-osd-service.patch
View File

@ -1,36 +0,0 @@
From 1f438fee7b3b7ffb589ae7af942fca836521117d Mon Sep 17 00:00:00 2001
From: Carl Xiong <xiongc05@gmail.com>
Date: Fri, 22 Sep 2017 11:55:33 +0800
Subject: [PATCH 5/6] ceph-disk: fix '--runtime' omission for ceph-osd service
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
f425a127b introduces a regression that ceph-disk omits "--runtime" when
enabling ceph-osd@$ID.service units for device-backed OSDs.
Fixes: http://tracker.ceph.com/issues/21498
Signed-off-by: Carl Xiong <cxiong@suse.com>
(cherry picked from commit a385b5b0c35106c9b44d81655983b2f7566b21cd)
Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
---
src/ceph-disk/ceph_disk/main.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/ceph-disk/ceph_disk/main.py b/src/ceph-disk/ceph_disk/main.py
index 8b0c5dbc38..6482ba7dee 100755
--- a/src/ceph-disk/ceph_disk/main.py
+++ b/src/ceph-disk/ceph_disk/main.py
@@ -3248,7 +3248,7 @@ def systemd_start(
osd_id,
):
systemd_disable(path, osd_id)
- if is_mounted(path):
+ if os.path.ismount(path):
style = ['--runtime']
else:
style = []
--
2.14.1

46
patches/0006-mon-MgrMonitor-read-cmd-descs-if-empty-on-update_fro.patch
View File

@ -1,46 +0,0 @@
From 9b015f1ad4d9b9912f2b49b65e5349cc1b4c74db Mon Sep 17 00:00:00 2001
From: Joao Eduardo Luis <joao@suse.de>
Date: Wed, 20 Sep 2017 17:53:40 +0100
Subject: [PATCH 6/6] mon/MgrMonitor: read cmd descs if empty on
update_from_paxos()
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
If the MgrMonitor's `command_descs` is empty, the monitor will not send
the mgr commands to clients on `get_descriptions`. This, in turn, has
the clients sending the commands to the monitors, which will have no
idea how to handle them.
Therefore, make sure to read the `command_descs` from disk if the vector
is empty.
Fixes: http://tracker.ceph.com/issues/21300
Signed-off-by: Joao Eduardo Luis <joao@suse.de>
(cherry picked from commit 3d06079bae0fbc096d6c3639807d9be3597e841a)
(cherry picked from commit 86d143722e1f16a19a56ed7a163d1dc9327c0c90)
Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
---
src/mon/MgrMonitor.cc | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/mon/MgrMonitor.cc b/src/mon/MgrMonitor.cc
index 3840b642b9..55bce43920 100644
--- a/src/mon/MgrMonitor.cc
+++ b/src/mon/MgrMonitor.cc
@@ -85,8 +85,9 @@ void MgrMonitor::update_from_paxos(bool *need_bootstrap)
check_subs();
if (version == 1
- || (map.get_available()
- && (!old_available || old_gid != map.get_active_gid()))) {
+ || command_descs.empty()
+ || (map.get_available()
+ && (!old_available || old_gid != map.get_active_gid()))) {
dout(4) << "mkfs or daemon transitioned to available, loading commands"
<< dendl;
bufferlist loaded_commands;
--
2.14.1

2
patches/series
View File

@ -2,5 +2,3 @@
0002-cmake-disable-version-from-git.patch
0003-enable-systemd-targets-by-default.patch
0004-msg-async-rdma-uninitialized-variable-fix.patch
0005-ceph-disk-fix-runtime-omission-for-ceph-osd-service.patch
0006-mon-MgrMonitor-read-cmd-descs-if-empty-on-update_fro.patch