outdated version, obsoleted by packages in CentOS Storage SIG
This commit is contained in:
parent
58456ef90e
commit
1a49ee3c38
2
.gitignore
vendored
2
.gitignore
vendored
@ -1,2 +0,0 @@
|
|||||||
ceph-*.tar.*
|
|
||||||
*.src.rpm
|
|
@ -1,10 +0,0 @@
|
|||||||
|
|
||||||
This ceph package is deprecated in epel-7.
|
|
||||||
|
|
||||||
Packages of newer versions of Ceph are available in the
|
|
||||||
CentOS Storage SIG[1] and Ceph's download site[2].
|
|
||||||
|
|
||||||
[1] https://wiki.centos.org/SpecialInterestGroup/Storage
|
|
||||||
[2] http://download.ceph.com/
|
|
||||||
|
|
||||||
|
|
@ -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
|
|
||||||
|
|
@ -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"
|
|
@ -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
|
|
||||||
|
|
@ -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
|
|
||||||
|
|
1
dead.package
Normal file
1
dead.package
Normal file
@ -0,0 +1 @@
|
|||||||
|
outdated version, obsoleted by packages in CentOS Storage SIG
|
Loading…
Reference in New Issue
Block a user