From patchwork Tue Apr 2 17:13:50 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexandre Oliva X-Patchwork-Id: 2379601 Return-Path: X-Original-To: patchwork-ceph-devel@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id 694E6DF2A1 for ; Tue, 2 Apr 2013 17:14:06 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932387Ab3DBROF (ORCPT ); Tue, 2 Apr 2013 13:14:05 -0400 Received: from linux-libre.fsfla.org ([208.118.235.54]:58329 "EHLO linux-libre.fsfla.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1761176Ab3DBROE (ORCPT ); Tue, 2 Apr 2013 13:14:04 -0400 Received: from freie (home.lxoliva.fsfla.org [172.31.160.22]) by linux-libre.fsfla.org (8.14.3/8.14.3/Debian-9.1ubuntu1) with ESMTP id r32HDvfM012866; Tue, 2 Apr 2013 17:13:58 GMT Received: from livre.home (livre.home [172.31.160.2]) by freie (8.14.6/8.14.6) with ESMTP id r32HDp5q008783; Tue, 2 Apr 2013 14:13:52 -0300 From: Alexandre Oliva To: Sage Weil Cc: ceph-users@ceph.com, ceph-devel@vger.kernel.org Subject: Re: v0.60 released Organization: Free thinker, not speaking for the GNU Project References: Date: Tue, 02 Apr 2013 14:13:50 -0300 In-Reply-To: (Sage Weil's message of "Mon, 1 Apr 2013 19:16:49 -0700 (PDT)") Message-ID: User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.2 (gnu/linux) MIME-Version: 1.0 Sender: ceph-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: ceph-devel@vger.kernel.org On Apr 1, 2013, Sage Weil wrote: > * mds, ceph-fuse: fix bugs with replayed requests after MDS restart (Sage > Weil) There's a brown paperbag bug in the session_info_t compat decoding code, that caused mds to crash on start up for me. Here's a fix. I also patched the spec file so that rpms would build. Package ceph_test_snap_mapper, drop dir dupes From: Alexandre Oliva rpmbuild failed on ceph 0.60 because ceph_test_snap_mapper was installed but not packaged. rpm also complained about some directories packaged twice. Some names used rpm macros, others mentioned /etc and /var explicitly. I consolidated them all into the placeholder directories group, and changed them to use the rpm macros. Signed-off-by: Alexandre Oliva --- ceph.spec.in | 26 ++++++++++++-------------- 1 file changed, 12 insertions(+), 14 deletions(-) diff --git a/ceph.spec.in b/ceph.spec.in index cb998c4..48aed35 100644 --- a/ceph.spec.in +++ b/ceph.spec.in @@ -413,13 +413,7 @@ fi %{_mandir}/man8/ceph-debugpack.8* %{_mandir}/man8/ceph-clsinfo.8.gz %{_mandir}/man8/librados-config.8.gz -%dir %{_localstatedir}/lib/ceph/ -%dir %{_localstatedir}/lib/ceph/tmp/ -%dir %{_localstatedir}/log/ceph/ -%ghost %dir %{_localstatedir}/run/ceph/ -%dir %{_sysconfdir}/ceph/ /usr/sbin/rcceph -%dir %{_libdir}/rados-classes %{_libdir}/rados-classes/libcls_rbd.so* %{_libdir}/rados-classes/libcls_rgw.so* %{_libdir}/rados-classes/libcls_lock.so* @@ -432,14 +426,17 @@ fi #set up placeholder directories %defattr(-,root,root,755) -%dir /etc/ceph -%dir /var/log/ceph -%dir /var/lib/ceph/tmp -%dir /var/lib/ceph/mon -%dir /var/lib/ceph/osd -%dir /var/lib/ceph/mds -%dir /var/lib/ceph/bootstrap-osd -%dir /var/lib/ceph/bootstrap-mds +%dir %{_sysconfdir}/ceph/ +%dir %{_libdir}/rados-classes +%dir %{_localstatedir}/lib/ceph/ +%dir %{_localstatedir}/lib/ceph/tmp/ +%dir %{_localstatedir}/log/ceph/ +%dir %{_localstatedir}/lib/ceph/mon +%dir %{_localstatedir}/lib/ceph/osd +%dir %{_localstatedir}/lib/ceph/mds +%dir %{_localstatedir}/lib/ceph/bootstrap-osd +%dir %{_localstatedir}/lib/ceph/bootstrap-mds +%ghost %dir %{_localstatedir}/run/ceph/ ################################################################################# %files fuse @@ -610,6 +607,7 @@ fi %{_bindir}/ceph_test_rados_api_stat %{_bindir}/ceph_test_rados_api_watch_notify %{_bindir}/ceph_test_rewrite_latency +%{_bindir}/ceph_test_snap_mapper %{_bindir}/ceph_test_stress_watch %{_bindir}/ceph_test_trans %{_bindir}/ceph_test_crypto