Compare commits

...

24 Commits

Author SHA1 Message Date
Kaleb S. KEITHLEY 1a49ee3c38 outdated version, obsoleted by packages in CentOS Storage SIG 2017-09-27 09:00:36 -04:00
Kaleb S. KEITHLEY 58456ef90e add README.deprecated, prepare for retirement in epel 2017-08-26 06:53:53 -04:00
Kaleb S. KEITHLEY 7381689411 add provides for -devel packages 2017-08-18 09:22:26 -04:00
Boris Ranto dc6776ed68 add provides for -devel packages 2016-12-08 21:40:47 +01:00
Boris Ranto 4f098bea06 only remove the {librados2,librbd1}-devel and python-{rados,rbd} on x86_64
- resolves: rhbz#1299820
2016-02-24 00:39:17 +01:00
Boris Ranto c31627732a Remove python-rados and python-rbd packages to avoid package conflicts
These two cause issues when you try to install ceph-devel with upstream
repos + epel enabled.
2015-10-27 17:13:12 +01:00
Boris Ranto 8986c308e9 Remove python-rados and python-rbd packages to avoid package conflicts
See http://tracker.ceph.com/issues/11104#change-59701 for details.
2015-10-06 23:10:05 +02:00
Ken Dreyer c9a91bad2f add version numbers to Obsoletes
The ceph-devel and python-ceph packages were split out, but there were
no version numbers added to the Obsoletes during the split.

This means that we obsolete packages that are far newer than us. This
impacts packages coming from upstream's "gitbuilder" system (for
example), as well as any other upstream RPMs until this package split is
done upstream.

Add version numbers to the Obsoletes. I've chosen to use a
version+release number that's lower than what we currently ship in EPEL
(0.80.7-0.4), but newer than what we shipped in the last EPEL update
(0.80.5).
2015-04-01 09:06:55 -06:00
Boris Ranto 0d466b4dd8 Remove release from version comparison strings to allow cooperation with base rhel packages 2015-01-20 21:52:07 +01:00
Boris Ranto 15c95d8f23 Revert "Deprecate the package"
This reverts commit 50eb9a7e7b.
Based on high demand, we have decided to keep shipping ceph
in epel 7.
2015-01-20 18:08:19 +01:00
Boris Ranto 2c3bf8c826 Revert "Fix up obsoletes"
This reverts commit 2b75f339d3.
Based on high demand, we have decided to keep shipping ceph
in epel 7.
2015-01-20 17:54:43 +01:00
Boris Ranto 2b75f339d3 Fix up obsoletes 2015-01-19 11:40:08 +01:00
Boris Ranto 50eb9a7e7b Deprecate the package
The client part of the package will be provided in rhel 7.1.
Keep a virtual ceph package to allow clean update for 7.0 as
well as 7.1 users.
2015-01-16 15:17:37 +01:00
Pádraig Brady 120ad0de01 Merge branch 'f21' into epel7
Conflicts:
	ceph.spec
	sources
2015-01-14 19:19:41 +00:00
Dan Horák e6a39bd1e3 - update Requires for s390(x) 2014-09-09 10:17:46 +02:00
Boris Ranto 92888198f8 Fix bz 1136811 (incorrect symlink on fedora) 2014-09-03 15:37:55 +02:00
Boris Ranto dd9644bc02 Second attempt to fix selinux issue (bz 1118504) 2014-08-22 02:05:10 +02:00
Kalev Lember 25b47f32a9 Obsolete ceph-libcephfs
Correct the name of the obsoleted package. It used to be called
"ceph-libcephfs" and not "libcephfs".

Transaction check error:
file /usr/lib64/libcephfs.so.1.0.0 from install of
libcephfs1-1:0.80.5-5.fc21.x86_64 conflicts with file from package
ceph-libcephfs-0.81.0-6.fc21.x86_64
2014-08-16 23:38:39 +02:00
Boris Ranto e44806fede Various fixes:
- Do not require xfsprogs/xfsprogs-devel for el6
- Require gperftools-devel for non-ppc*/s390* architectures only
- Do not require junit -- no need to build libcephfs-test.jar
- Build without libxfs for el6
- Build without tcmalloc for ppc*/s390* architectures
- Location of mkcephfs must depend on a rhel release
- Use epoch in the Requires fields [1130700]
2014-08-16 16:00:20 +02:00
Boris Ranto 830e99f484 Use the proper version name in Obsoletes, the previous one did not obsolete all the packages that it should 2014-08-16 10:32:16 +02:00
Boris Ranto a236dbbbe2 Fix the date in changelog 2014-08-16 03:50:05 +02:00
Peter Robinson c81d313d7c - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild 2014-08-15 23:54:45 +00:00
Boris Ranto 5311ad2942 Add the arm pthread hack 2014-08-16 01:11:30 +02:00
Boris Ranto 08b7207d61 Bump the Epoch, we need to keep the latest stable, not development, ceph version in fedora
- Use the upstream spec file with the ceph-libs split
- Add libs-compat subpackage
- Use fedora in rhel 7 checks
- Obsolete libcephfs
- Depend on redhat-lsb-core for the initscript
2014-08-15 23:07:34 +02:00
9 changed files with 1 additions and 1322 deletions
-2
View File
@@ -1,2 +0,0 @@
ceph-*.tar.*
*.src.rpm
-31
View File
@@ -1,31 +0,0 @@
From 11995b329045341c17553269267cfd3688a51b0f Mon Sep 17 00:00:00 2001
From: Dan Mick <dan.mick@redhat.com>
Date: Wed, 10 Dec 2014 13:19:53 -0800
Subject: [PATCH 2/2] Call Rados.shutdown() explicitly before exit
This is mostly a demonstration of good behavior, as the resources will
be reclaimed on exit anyway.
Signed-off-by: Dan Mick <dan.mick@redhat.com>
(cherry picked from commit b038e8fbf9103cc42a4cde734b3ee601af6019ea)
---
src/ceph.in | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/src/ceph.in b/src/ceph.in
index 82c9085..c5b97ef 100755
--- a/src/ceph.in
+++ b/src/ceph.in
@@ -841,4 +841,8 @@ def main():
return 0
if __name__ == '__main__':
- sys.exit(main())
+ retval = main()
+ # shutdown explicitly; Rados() does not
+ if cluster_handle:
+ cluster_handle.shutdown()
+ sys.exit(retval)
--
1.9.3
@@ -1,27 +0,0 @@
From 922247e25bfb64bdbe43dd8133881aaf405b8a0b Mon Sep 17 00:00:00 2001
From: Boris Ranto <branto@redhat.com>
Date: Mon, 8 Dec 2014 08:36:37 +0100
Subject: [PATCH] Backport pull request #2937 to firefly
---
src/common/RWLock.h | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/src/common/RWLock.h b/src/common/RWLock.h
index f901ac0..4699b66 100644
--- a/src/common/RWLock.h
+++ b/src/common/RWLock.h
@@ -36,7 +36,9 @@ public:
}
virtual ~RWLock() {
- pthread_rwlock_unlock(&L);
+ // The following check is racy but we are about to destroy
+ // the object and we assume that there are no other users.
+ //assert(!is_locked()); -- hacky backport, no is_locked in firefly
pthread_rwlock_destroy(&L);
}
--
2.1.3
-13
View File
@@ -1,13 +0,0 @@
--- ceph-0.80.5/src/perfglue/heap_profiler.cc.orig 2014-08-15 16:05:00.161794290 +0200
+++ ceph-0.80.5/src/perfglue/heap_profiler.cc 2014-08-15 16:05:04.691794305 +0200
@@ -12,8 +12,8 @@
*
*/
-#include <google/heap-profiler.h>
-#include <google/malloc_extension.h>
+#include <gperftools/heap-profiler.h>
+#include <gperftools/malloc_extension.h>
#include "heap_profiler.h"
#include "common/environment.h"
#include "common/LogClient.h"
-11
View File
@@ -1,11 +0,0 @@
--- ceph-0.80.5/src/test/Makefile.am.orig 2014-08-15 16:30:18.831799418 +0200
+++ ceph-0.80.5/src/test/Makefile.am 2014-08-15 16:23:17.758464663 +0200
@@ -642,7 +642,7 @@ bin_DEBUGPROGRAMS += ceph_test_librbd
if LINUX
ceph_test_librbd_fsx_SOURCES = test/librbd/fsx.c
ceph_test_librbd_fsx_LDADD = $(LIBRBD) $(LIBRADOS) -lm
-ceph_test_librbd_fsx_CFLAGS = ${AM_CFLAGS} -Wno-format
+ceph_test_librbd_fsx_CFLAGS = ${AM_CFLAGS}
bin_DEBUGPROGRAMS += ceph_test_librbd_fsx
endif
-61
View File
@@ -1,61 +0,0 @@
From e00270b51896f168d5013b7dc92ec7f8b9e19da3 Mon Sep 17 00:00:00 2001
From: Dan Mick <dan.mick@redhat.com>
Date: Wed, 10 Dec 2014 13:19:16 -0800
Subject: [PATCH 1/2] rados.py: remove Rados.__del__(); it just causes problems
Recent versions of Python contain a change to thread shutdown that
causes ceph to hang on exit; see http://bugs.python.org/issue21963.
As it turns out, this is relatively easy to avoid by not spawning
threads on exit, as Rados.__del__() will certainly do by calling
shutdown(); I suspect, but haven't proven, that the problem is
that shutdown() tries to start() a threading.Thread() that never
makes it all the way back to signal start().
Also add a PendingReleaseNote and extra doc comments to clarify.
Fixes: #8797
Signed-off-by: Dan Mick <dan.mick@redhat.com>
(cherry picked from commit 5ba9b8f21f8010c59dd84a0ef2acfec99e4b048f)
Conflicts:
PendingReleaseNotes
---
src/pybind/rados.py | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/src/pybind/rados.py b/src/pybind/rados.py
index 0fbd10e..ec68919 100644
--- a/src/pybind/rados.py
+++ b/src/pybind/rados.py
@@ -246,7 +246,8 @@ Rados object in state %s." % (self.state))
def shutdown(self):
"""
- Disconnects from the cluster.
+ Disconnects from the cluster. Call this explicitly when a
+ Rados.connect()ed object is no longer used.
"""
if (self.__dict__.has_key("state") and self.state != "shutdown"):
run_in_thread(self.librados.rados_shutdown, (self.cluster,))
@@ -260,9 +261,6 @@ Rados object in state %s." % (self.state))
self.shutdown()
return False
- def __del__(self):
- self.shutdown()
-
def version(self):
"""
Get the version number of the ``librados`` C library.
@@ -410,7 +408,7 @@ Rados object in state %s." % (self.state))
def connect(self, timeout=0):
"""
- Connect to the cluster.
+ Connect to the cluster. Use shutdown() to release resources.
"""
self.require_state("configuring")
ret = run_in_thread(self.librados.rados_connect, (self.cluster,),
--
1.9.3
-1176
View File
File diff suppressed because it is too large Load Diff
+1
View File
@@ -0,0 +1 @@
outdated version, obsoleted by packages in CentOS Storage SIG
-1
View File
@@ -1 +0,0 @@
dc7e46b5804fd5fdb8796416b914c4be ceph-0.80.7.tar.bz2