Merge branch 'testing' into unstable

ceph.spec.in

@@ -70,7 +70,7 @@ find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'
 find $RPM_BUILD_ROOT -type f -name "*.a" -exec rm -f {} ';'
 install -D src/init-ceph $RPM_BUILD_ROOT%{_initrddir}/ceph
 chmod 0644 $RPM_BUILD_ROOT%{_sysconfdir}/ceph/sample.ceph.conf
-install -m 0644 -D debian/ceph.logrotate $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/ceph
+install -m 0644 -D src/logrotate.conf $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/ceph
 mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/lib/ceph/tmp/
 mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/log/ceph/
 mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/log/ceph/stat
@@ -118,11 +118,11 @@ fi
 %{_libdir}/libcrush.so.*
 %{_libdir}/librados.so.*
 %{_libdir}/rados-classes/libcls_rbd.so.*
-%{_sbindir}/mkcephfs
+/sbin/mkcephfs
 /sbin/mount.ceph
 %{_libdir}/ceph
-%config(noreplace) %{_sysconfdir}/ceph/sample.ceph.conf
-%config(noreplace) %{_sysconfdir}/ceph/sample.fetch_config
+%{_docdir}/sample.ceph.conf
+%{_docdir}/sample.fetch_config
 %config(noreplace) %{_sysconfdir}/logrotate.d/ceph
 %{_mandir}/man8/cmon.8*
 %{_mandir}/man8/cmds.8*

debian/ceph.dirs

@@ -1,3 +1,4 @@
+etc/ceph
 var/log/ceph
 var/log/ceph/stat
 var/lib/ceph/tmp

debian/ceph.install

@@ -14,11 +14,11 @@ usr/bin/cauthtool
 usr/bin/rados
 usr/bin/rbd
 sbin/mount.ceph
-usr/sbin/mkcephfs
+sbin/mkcephfs
 usr/lib/ceph/ceph_common.sh
 usr/lib/rados-classes/*
-etc/ceph/sample.ceph.conf
-etc/ceph/sample.fetch_config
+usr/share/doc/ceph/sample.ceph.conf
+usr/share/doc/ceph/sample.fetch_config
 usr/share/man/man8/cmon.8
 usr/share/man/man8/cmds.8
 usr/share/man/man8/cosd.8

debian/ceph.postrm

@@ -0,0 +1,46 @@
+#!/bin/sh
+# postrm script for ceph
+#
+# see: dh_installdeb(1)
+
+set -e
+
+# summary of how this script can be called:
+#        * <postrm> `remove'
+#        * <postrm> `purge'
+#        * <old-postrm> `upgrade' <new-version>
+#        * <new-postrm> `failed-upgrade' <old-version>
+#        * <new-postrm> `abort-install'
+#        * <new-postrm> `abort-install' <old-version>
+#        * <new-postrm> `abort-upgrade' <old-version>
+#        * <disappearer's-postrm> `disappear' <overwriter>
+#          <overwriter-version>
+# for details, see http://www.debian.org/doc/debian-policy/ or
+# the debian-policy package
+
+
+case "$1" in
+    remove)
+    ;;
+
+    purge)
+	rm -rf /var/log/ceph 
+    ;;
+
+    upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
+    ;;
+
+    *)
+        echo "postrm called with unknown argument \`$1'" >&2
+        exit 1
+    ;;
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0
+
+

debian/control

@@ -8,7 +8,7 @@ Standards-Version: 3.8.4
 Package: ceph
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, libedit2, hdparm, binutils
-Recommends: fuse-utils, ceph-fuse, libceph1, librados1, libcrush1, btrfs-tools
+Recommends: ceph-fuse, libceph1, librados1, libcrush1, btrfs-tools
 Description: distributed storage and file system
  Ceph is a distributed storage and network file system designed to provide
  excellent performance, reliability, and scalability.
@@ -30,6 +30,7 @@ Description: debugging symbols for ceph
 Package: ceph-fuse
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, libfuse2
+Recommends: fuse-utils
 Suggests: ceph
 Description: FUSE-based client for the Ceph distributed file system
  Ceph is a distributed network file system designed to provide

debian/copyright

@@ -1,17 +1,10 @@
-This package was debianized for Ubuntu by Clint Byrum <clint@ubuntu.com> on
-Tue Jul 20 12:55:12 UTC 2010
-
-This package was originally debianized by Sage Weil <sage@newdream.net> on
-Mon, 28 Jan 2008 14:58:17 -0800.
-(see changelog.upstream)
-
-It was downloaded from <http://ceph.newdream.net/>.
-
-Upstream Author: Sage Weil <sage@newdream.net>
+Format-Specification: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=135
+Name: ceph
+Maintainer: Sage Weil <sage@newdream.net>
+Source: http://ceph.newdream.net/
 
 Files: *
 Copyright: (c) 2004-2010 by Sage Weil <sage@newdream.net>
-
 License: LGPL2.1 (see /usr/share/common-licenses/LGPL-2.1)
 
 Files: src/client/fuse.cc
@@ -30,7 +23,11 @@ License: LGPL2 or later
 
 Files: src/os/btrfs_ioctl.h
 Copyright: Copyright (C) 2007 Oracle.  All rights reserved.
-License: LGPL2
+License: GPL2
+
+Files: src/include/ceph_hash.cc
+Copyright: None
+License: Public domain
 
 Files: src/common/sctp_crc32.c: 
 Copyright:

debian/rados.install

@@ -1 +0,0 @@
-usr/bin/rados

debian/rules

@@ -13,6 +13,7 @@ build-stamp: configure-stamp
 	./configure --prefix=/usr
 	$(MAKE)
 	cp src/init-ceph debian/ceph.init
+	cp src/logrotate.conf debian/ceph.logrotate
 
 	touch $@
 clean: 
@@ -31,9 +32,6 @@ install: build
 
 	$(MAKE) DESTDIR=$(CURDIR) install
 
-	mkdir -p etc/ceph
-	mv usr/etc/ceph/* etc/ceph
-
 
 # Add here commands to install the package into debian/testpack.
 # Build architecture-independent files here.

man/cauthtool.8

@@ -56,7 +56,7 @@ A client mounting the file system with minimal permissions would need caps like
 .IP
 mds = "allow"
 .IP
-osd = "allow rw; allow rw pool = data_pool_num"
+osd = "allow rw pool=data"
 .IP
 mon = "allow r"
 .PP

src/Makefile.am

@@ -278,13 +278,13 @@ install-data-local:
 	$(install_sh_SCRIPT) -m 0755 cclass $(DESTDIR)$(bindir)/cclass
 	$(install_sh_SCRIPT) -m 0755 cclsinfo $(DESTDIR)$(bindir)/cclsinfo
 	sh -c "if [ \"$(sbindir)\" = \"/usr/sbin\" ]; then mkdir -p $(DESTDIR)/sbin ; $(install_sh_SCRIPT) -m 0755 mount.ceph $(DESTDIR)/sbin/mount.ceph ; else mkdir -p $(DESTDIR)$(sbindir) ; $(install_sh_SCRIPT) -m 0755 mount.ceph $(DESTDIR)$(sbindir)/mount.ceph ; fi"
-	mkdir -p $(DESTDIR)$(sbindir)/ceph
-	$(install_sh_SCRIPT) -m 0755 mkcephfs $(DESTDIR)$(sbindir)/mkcephfs
+	sh -c "if [ \"$(sbindir)\" = \"/usr/sbin\" ]; then mkdir -p $(DESTDIR)/sbin ; $(install_sh_SCRIPT) -m 0755 mkcephfs $(DESTDIR)/sbin/mkcephfs ; else mkdir -p $(DESTDIR)$(sbindir) ; $(install_sh_SCRIPT) -m 0755 mkcephfs $(DESTDIR)$(sbindir)/mkcephfs ; fi"
 	mkdir -p $(DESTDIR)$(libdir)/ceph
 	$(install_sh_SCRIPT) -m 0755 ceph_common.sh $(DESTDIR)$(libdir)/ceph/ceph_common.sh
 	mkdir -p $(DESTDIR)$(sysconfdir)/ceph
-	$(install_sh_SCRIPT) -m 0600 sample.ceph.conf $(DESTDIR)$(sysconfdir)/ceph/sample.ceph.conf
-	$(install_sh_SCRIPT) -m 0755 fetch_config $(DESTDIR)$(sysconfdir)/ceph/sample.fetch_config
+	mkdir -p $(DESTDIR)$(docdir)
+	$(install_sh_SCRIPT) -m 0600 sample.ceph.conf $(DESTDIR)$(docdir)/sample.ceph.conf
+	$(install_sh_SCRIPT) -m 0755 fetch_config $(DESTDIR)$(docdir)/sample.fetch_config
 	mkdir -p $(DESTDIR)$(includedir)/ceph
 	$(install_sh_SCRIPT) -m 0644 client/libceph.h $(DESTDIR)$(includedir)/ceph/libceph.h
 	mkdir -p $(DESTDIR)$(includedir)/rados

src/cclass.in

@@ -85,7 +85,7 @@ load() {
 }
 
 load_all() {
-	all=`find $libdir -name 'libcls_*.so'`;
+	all=`find $libdir -name 'libcls_*.so*' -type f`;
 	if [ -n "$all" ]; then
 		for fn in $all; do
 			echo Loading class: $fn: `$BINDIR/cclsinfo $fn`

src/logrotate.conf

@@ -4,6 +4,6 @@
     compress
     sharedscripts
     postrotate
-        invoke-rc.d ceph reload || service ceph reload
+        invoke-rc.d ceph reload >/dev/null || service ceph reload >/dev/null
     endscript
 }

src/osd/OSD.cc

@@ -1219,8 +1219,10 @@ void OSD::update_heartbeat_peers()
 	       (!osdmap->is_up(p->first) ||
 		osdmap->get_hb_inst(p->first) != old_inst[p->first])) {
       dout(10) << "update_heartbeat_peers: marking down old _to peer " << old_inst[p->first] 
-	       << " as of " << p->second << dendl;      
-      heartbeat_messenger->mark_down(old_inst[p->first].addr);
+	       << " as of " << p->second << dendl;
+      // share latest map with this peer, so they know not to expect
+      // heartbeats from us.  otherwise they may mark us down!
+      _share_map_outgoing(heartbeat_inst[p->first]);
     }
   }
   for (map<int,epoch_t>::iterator p = old_from.begin();
@@ -2158,6 +2160,13 @@ void OSD::handle_osd_map(MOSDMap *m)
 
   state = STATE_ACTIVE;
 
+  // make sure there is something new, here, before we bother flushing the queues and such
+  if (m->get_last() <= osdmap->get_epoch()) {
+    dout(10) << " no new maps here, dropping" << dendl;
+    m->put();
+    return;
+  }
+
   // pause, requeue op queue
   //wait_for_no_ops();