From: "Owen Synge" <osynge@suse.com>
Date: Thu, 4 Sep 2014 09:06:34 +0000 (+0200)
Subject: - Drop ceph-disk.patch which interfere with external SSD journals|43578
X-Git-Tag: suse_cloud4~2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=e7c537f4e809717996a5ebb392ad011422431784;p=ceph.git

- Drop ceph-disk.patch which interfere with external SSD journals|43578
---

diff --git a/ceph-disk.patch b/ceph-disk.patch
deleted file mode 100644
index 2b9247a7cab..00000000000
--- a/ceph-disk.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-From 3217378e6bc23c65e657933bc12ef8ced15f0d5f Mon Sep 17 00:00:00 2001
-From: Michal Jura <mjura@suse.com>
-Date: Thu, 5 Jun 2014 00:25:15 +0200
-Subject: [PATCH 1/2] Merge distro patches into git
-
-This was ceph-disk.patch
----
- src/ceph-disk | 17 ++++++++++-------
- 1 file changed, 10 insertions(+), 7 deletions(-)
-
-diff --git a/src/ceph-disk b/src/ceph-disk
-index f79e341..152e0e7 100755
---- a/src/ceph-disk
-+++ b/src/ceph-disk
-@@ -51,7 +51,7 @@ Activate:
-  - triggered by admin 'ceph-disk activate <path>'
-  - triggered on ceph service startup with 'ceph-disk activate-all'
- 
--We rely on /dev/disk/by-partuuid to find partitions by their UUID;
-+We rely on /dev/disk/by-uuid to find partitions by their UUID;
- this is what the journal symlink inside the osd data volume normally
- points to.
- 
-@@ -63,7 +63,7 @@ udev triggers 'ceph-disk activate <dev>' or 'ceph-disk
- activate-journal <dev>' based on the partition type.
- 
- On old distros (e.g., RHEL6), the blkid installed does not recognized
--GPT partition metadata and the /dev/disk/by-partuuid etc. links aren't
-+GPT partition metadata and the /dev/disk/by-uuid etc. links aren't
- present.  We have a horrible hack in the form of ceph-disk-udev that
- parses gparted output to create the symlinks above and triggers the
- 'ceph-disk activate' etc commands that udev normally would do if it
-@@ -952,6 +952,10 @@ def prepare_journal_dev(
-             num=num,
-             size=journal_size,
-             )
-+        journal_symlink = '{data}{num}'.format(
-+            data=data,
-+            num=num,
-+            )
-     else:
-         # sgdisk has no way for me to say "whatever is the next
-         # free index number" when setting type guids etc, so we
-@@ -964,6 +968,9 @@ def prepare_journal_dev(
-             num=num,
-             size=journal_size,
-             )
-+        journal_symlink = '/dev/disk/by-uuid/{journal_uuid}'.format(
-+            journal_uuid=journal_uuid,
-+            )
-         LOG.warning('OSD will not be hot-swappable if journal is not the same device as the osd data')
- 
-     try:
-@@ -1022,10 +1029,6 @@ def prepare_journal_dev(
-                 ],
-             )
- 
--        journal_symlink = '/dev/disk/by-partuuid/{journal_uuid}'.format(
--            journal_uuid=journal_uuid,
--            )
--
-         journal_dmcrypt = None
-         if journal_dm_keypath:
-             journal_dmcrypt = journal_symlink
-@@ -1982,7 +1985,7 @@ def main_activate_journal(args):
-     activate_lock.acquire()
-     try:
-         osd_uuid = get_journal_osd_uuid(args.dev)
--        path = os.path.join('/dev/disk/by-partuuid/', osd_uuid.lower())
-+        path = os.path.join('/dev/disk/by-uuid/', osd_uuid.lower())
- 
-         (cluster, osd_id) = mount_activate(
-             dev=path,
--- 
-1.8.4.5
-
diff --git a/ceph.changes b/ceph.changes
index 99209fea6ba..6a6d8127d8e 100644
--- a/ceph.changes
+++ b/ceph.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Thu Sep  4 08:53:14 UTC 2014 - mjura@suse.com
+
+- Drop ceph-disk.patch which interfere with external SSD journals
+
 -------------------------------------------------------------------
 Thu Aug  7 10:37:32 UTC 2014 - osynge@suse.com
 
diff --git a/ceph.spec b/ceph.spec
index bd9573e8f1a..56c1b87e7a7 100644
--- a/ceph.spec
+++ b/ceph.spec
@@ -95,8 +95,6 @@ BuildRequires:  xfsprogs-devel
 BuildRequires:  xz
 %if 0%{?suse_version} >= 1310
 BuildRequires:  systemd
-%else
-Patch9999:      ceph-disk.patch
 %endif
 # This patch queue is auto-generated from https://github.com/SUSE/ceph
 Patch0001:      0001-Rcfiles-remove-from-runlevel-2.patch
@@ -338,9 +336,6 @@ This package contains Ceph benchmarks and test tools.
 #################################################################################
 %prep
 %setup -q
-%if 0%{?suse_version} < 1310
-%patch9999 -p1
-%endif
 %patch0001 -p1
 %patch0002 -p1
 %patch0003 -p1
diff --git a/ceph.spec.in b/ceph.spec.in
index 4a329b98617..2b5f2fbd80e 100644
--- a/ceph.spec.in
+++ b/ceph.spec.in
@@ -95,8 +95,6 @@ BuildRequires:  xfsprogs-devel
 BuildRequires:  xz
 %if 0%{?suse_version} >= 1310
 BuildRequires:  systemd
-%else
-Patch9999:      ceph-disk.patch
 %endif
 # This patch queue is auto-generated from https://github.com/SUSE/ceph
 PATCH_FILES
@@ -322,9 +320,6 @@ This package contains Ceph benchmarks and test tools.
 #################################################################################
 %prep
 %setup -q
-%if 0%{?suse_version} < 1310
-%patch9999 -p1
-%endif
 PATCH_EXEC
 
 %build