[Pkg-ceph-commits] [ceph] 01/02: new backported patches
Dmitry Smirnov
onlyjob at moszumanska.debian.org
Mon Nov 10 10:42:37 UTC 2014
This is an automated email from the git hooks/post-receive script.
onlyjob pushed a commit to branch experimental
in repository ceph.
commit c1d65cc
Author: Dmitry Smirnov <onlyjob at member.fsf.org>
Date: Tue Nov 4 15:29:34 2014
new backported patches
---
debian/patches/bug-9752.patch | 33 ++++++++++++++++++++++++++++
debian/patches/bug-9869.patch | 40 ++++++++++++++++++++++++++++++++++
debian/patches/bug-9945.patch | 50 +++++++++++++++++++++++++++++++++++++++++++
debian/patches/series | 3 +++
4 files changed, 126 insertions(+)
diff --git a/debian/patches/bug-9752.patch b/debian/patches/bug-9752.patch
new file mode 100644
index 0000000..490bc29
--- /dev/null
+++ b/debian/patches/bug-9752.patch
@@ -0,0 +1,33 @@
+From e0b04414b92018277a0d3b9d82e72ea7529f4ef5 Mon Sep 17 00:00:00 2001
+From: Loic Dachary <loic-201408 at dachary.org>
+Date: Fri, 31 Oct 2014 00:49:21 +0100
+Subject: [PATCH] osd: past_interval display bug on acting
+
+The acting array was incorrectly including the primary and up_primary.
+
+http://tracker.ceph.com/issues/9752 Fixes: #9752
+
+Signed-off-by: Loic Dachary <loic-201408 at dachary.org>
+(cherry picked from commit c5f8d6eded52da451fdd1d807bd4700221e4c41c)
+---
+ src/osd/osd_types.cc | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/osd/osd_types.cc b/src/osd/osd_types.cc
+index ed06c4f..dc9caa5 100644
+--- a/src/osd/osd_types.cc
++++ b/src/osd/osd_types.cc
+@@ -2303,9 +2303,9 @@ void pg_interval_t::dump(Formatter *f) const
+ f->open_array_section("acting");
+ for (vector<int>::const_iterator p = acting.begin(); p != acting.end(); ++p)
+ f->dump_int("osd", *p);
++ f->close_section();
+ f->dump_int("primary", primary);
+ f->dump_int("up_primary", up_primary);
+- f->close_section();
+ }
+
+ void pg_interval_t::generate_test_instances(list<pg_interval_t*>& o)
+--
+2.1.1
+
diff --git a/debian/patches/bug-9869.patch b/debian/patches/bug-9869.patch
new file mode 100644
index 0000000..c2c4ae9
--- /dev/null
+++ b/debian/patches/bug-9869.patch
@@ -0,0 +1,40 @@
+From 905aba2f3d847933f98124f3ea8d1d76d644edb4 Mon Sep 17 00:00:00 2001
+From: Greg Farnum <greg at inktank.com>
+Date: Wed, 22 Oct 2014 17:16:31 -0700
+Subject: [PATCH] client: cast m->get_client_tid() to compare to 16-bit
+ Inode::flushing_cap_tid
+
+m->get_client_tid() is 64 bits (as it should be), but Inode::flushing_cap_tid
+is only 16 bits. 16 bits should be plenty to let the cap flush updates
+pipeline appropriately, but we need to cast in the proper direction when
+comparing these differently-sized versions. So downcast the 64-bit one
+to 16 bits.
+
+Fixes: #9869
+Backport: giant, firefly, dumpling
+
+Signed-off-by: Greg Farnum <greg at inktank.com>
+(cherry picked from commit a5184cf46a6e867287e24aeb731634828467cd98)
+---
+ src/client/Client.cc | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/src/client/Client.cc b/src/client/Client.cc
+index 48e5400..ec3a232 100644
+--- a/src/client/Client.cc
++++ b/src/client/Client.cc
+@@ -3794,9 +3794,10 @@ void Client::handle_cap_flush_ack(MetaSession *session, Inode *in, Cap *cap, MCl
+ int mds = session->mds_num;
+ int dirty = m->get_dirty();
+ int cleaned = 0;
++ uint16_t flush_ack_tid = static_cast<uint16_t>(m->get_client_tid());
+ for (int i = 0; i < CEPH_CAP_BITS; ++i) {
+ if ((dirty & (1 << i)) &&
+- (m->get_client_tid() == in->flushing_cap_tid[i]))
++ (flush_ack_tid == in->flushing_cap_tid[i]))
+ cleaned |= 1 << i;
+ }
+
+--
+2.1.1
+
diff --git a/debian/patches/bug-9945.patch b/debian/patches/bug-9945.patch
new file mode 100644
index 0000000..c9a75a3
--- /dev/null
+++ b/debian/patches/bug-9945.patch
@@ -0,0 +1,50 @@
+From b704f0dd888aacb10c32cdb63cdbf9f06296fc18 Mon Sep 17 00:00:00 2001
+From: John Spray <john.spray at redhat.com>
+Date: Thu, 30 Oct 2014 16:43:21 +0000
+Subject: [PATCH] messages: fix COMPAT_VERSION on MClientSession
+
+This was incorrectly incremented to 2 by omission
+of an explicit COMPAT_VERSION value.
+
+Fixes: #9945
+
+Signed-off-by: John Spray <john.spray at redhat.com>
+(cherry picked from commit 1eb9bcb1d36014293efc687b4331be8c4d208d8e)
+---
+ src/messages/MClientSession.h | 7 ++++---
+ 1 file changed, 4 insertions(+), 3 deletions(-)
+
+diff --git a/src/messages/MClientSession.h b/src/messages/MClientSession.h
+index 0924189..3ef28e9 100644
+--- a/src/messages/MClientSession.h
++++ b/src/messages/MClientSession.h
+@@ -19,6 +19,7 @@
+
+ class MClientSession : public Message {
+ static const int HEAD_VERSION = 2;
++ static const int COMPAT_VERSION = 1;
+
+ public:
+ ceph_mds_session_head head;
+@@ -31,15 +32,15 @@ public:
+ int get_max_caps() const { return head.max_caps; }
+ int get_max_leases() const { return head.max_leases; }
+
+- MClientSession() : Message(CEPH_MSG_CLIENT_SESSION, HEAD_VERSION) { }
++ MClientSession() : Message(CEPH_MSG_CLIENT_SESSION, HEAD_VERSION, COMPAT_VERSION) { }
+ MClientSession(int o, version_t s=0) :
+- Message(CEPH_MSG_CLIENT_SESSION, HEAD_VERSION) {
++ Message(CEPH_MSG_CLIENT_SESSION, HEAD_VERSION, COMPAT_VERSION) {
+ memset(&head, 0, sizeof(head));
+ head.op = o;
+ head.seq = s;
+ }
+ MClientSession(int o, utime_t st) :
+- Message(CEPH_MSG_CLIENT_SESSION, HEAD_VERSION) {
++ Message(CEPH_MSG_CLIENT_SESSION, HEAD_VERSION, COMPAT_VERSION) {
+ memset(&head, 0, sizeof(head));
+ head.op = o;
+ head.seq = 0;
+--
+2.1.1
+
diff --git a/debian/patches/series b/debian/patches/series
index 9ec71ee..1f69b95 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,6 +1,9 @@
## Backported / Upstream
bug-9341.patch
+bug-9752.patch
bug-9814.patch
+bug-9869.patch
+bug-9945.patch
sleep-recover.patch
## Debian
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ceph/ceph.git
More information about the Pkg-ceph-commits
mailing list