[Pkg-ceph-commits] [ceph] 05/10: wrap-and-sort inline with master branch
James Downing Page
jamespage at moszumanska.debian.org
Tue Jun 16 10:32:10 UTC 2015
This is an automated email from the git hooks/post-receive script.
jamespage pushed a commit to branch experimental
in repository ceph.
commit ed8779d7b418516a60566c7a17eab09634dddb78
Author: James Page <james.page at ubuntu.com>
Date: Tue Jun 16 09:10:40 2015 +0100
wrap-and-sort inline with master branch
---
debian/ceph.NEWS | 56 ++++++++++++++++++
debian/ceph.dirs | 10 ++--
debian/control | 167 +++++++++++++++++++++++++---------------------------
debian/radosgw.dirs | 2 +-
4 files changed, 142 insertions(+), 93 deletions(-)
diff --git a/debian/ceph.NEWS b/debian/ceph.NEWS
new file mode 100644
index 0000000..4943633
--- /dev/null
+++ b/debian/ceph.NEWS
@@ -0,0 +1,56 @@
+ceph (0.80.9-2) unstable; urgency=medium
+
+ ## CRUSH fixes in 0.80.9
+
+ The 0.80.9 point release fixes several issues with CRUSH that trigger excessive
+ data migration when adjusting OSD weights. These are most obvious when a very
+ small weight change (e.g., a change from 0 to .01) triggers a large amount of
+ movement, but the same set of bugs can also lead to excessive (though less
+ noticeable) movement in other cases.
+
+ However, because the bug may already have affected your cluster, fixing it
+ may trigger movement back to the more correct location. For this reason, you
+ must manually opt-in to the fixed behavior.
+
+ In order to set the new tunable to correct the behavior:
+
+ ceph osd crush set-tunable straw_calc_version 1
+
+ Note that this change will have no immediate effect. However, from this
+ point forward, any ‘straw’ bucket in your CRUSH map that is adjusted will get
+ non-buggy internal weights, and that transition may trigger some rebalancing.
+
+ You can estimate how much rebalancing will eventually be necessary on your
+ cluster with:
+
+ ceph osd getcrushmap -o /tmp/cm
+ crushtool -i /tmp/cm --num-rep 3 --test --show-mappings > /tmp/a 2>&1
+ crushtool -i /tmp/cm --set-straw-calc-version 1 -o /tmp/cm2
+ crushtool -i /tmp/cm2 --reweight -o /tmp/cm2
+ crushtool -i /tmp/cm2 --num-rep 3 --test --show-mappings > /tmp/b 2>&1
+ wc -l /tmp/a # num total mappings
+ diff -u /tmp/a /tmp/b | grep -c ^+ # num changed mappings
+
+ Divide the total number of lines in /tmp/a with the number of lines
+ changed. We've found that most clusters are under 10%.
+
+ You can force all of this rebalancing to happen at once with:
+
+ ceph osd crush reweight-all
+
+ Otherwise, it will happen at some unknown point in the future when
+ CRUSH weights are next adjusted.
+
+ ## Mapping rbd devices with rbdmap on systemd systems
+
+ If you have setup rbd mappings in /etc/ceph/rbdmap and corresponding mounts
+ in /etc/fstab things might break with systemd because systemd waits for the
+ rbd device to appear before the legacy rbdmap init file has a chance to run
+ and drops into emergency mode if it times out.
+
+ This can be fixed by adding the nofail option in /etc/fstab to all rbd
+ backed mount points. With this systemd does not wait for the device and
+ proceeds with the boot process. After rbdmap mapped the device, systemd
+ detects the new device and mounts the file system.
+
+ -- Gaudenz Steinlin <gaudenz at debian.org> Mon, 04 May 2015 22:49:48 +0200
diff --git a/debian/ceph.dirs b/debian/ceph.dirs
index ca7a880..c8999fd 100644
--- a/debian/ceph.dirs
+++ b/debian/ceph.dirs
@@ -1,8 +1,8 @@
etc/ceph
-var/log/ceph
-var/lib/ceph/tmp
+var/lib/ceph/bootstrap-mds
+var/lib/ceph/bootstrap-osd
+var/lib/ceph/mds
var/lib/ceph/mon
var/lib/ceph/osd
-var/lib/ceph/mds
-var/lib/ceph/bootstrap-osd
-var/lib/ceph/bootstrap-mds
+var/lib/ceph/tmp
+var/log/ceph
diff --git a/debian/control b/debian/control
index 00b81bf..06330f6 100644
--- a/debian/control
+++ b/debian/control
@@ -7,49 +7,48 @@ Uploaders: Laszlo Boszormenyi (GCS) <gcs at debian.org>,
Homepage: http://ceph.com/
Vcs-Git: git://anonscm.debian.org/pkg-ceph/ceph.git
Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-ceph/ceph.git
-Build-Depends:
- debhelper (>= 9~),
- default-jdk,
- dh-autoreconf,
- dh-python,
- dh-systemd (>= 1.5),
- dpkg-dev (>= 1.16.1~),
- javahelper,
- junit4,
- libaio-dev,
- libatomic-ops-dev,
- libbabeltrace-ctf-dev,
- libbabeltrace-dev,
- libblkid-dev,
- libboost-dev,
- libboost-program-options-dev,
- libboost-system-dev,
- libboost-thread-dev,
- libbz2-dev,
- libcurl4-gnutls-dev,
- libedit-dev,
- libexpat1-dev,
- libfcgi-dev,
- libfuse-dev,
- libgoogle-perftools-dev [i386 amd64 powerpc armhf arm64 ppc64el],
- libkeyutils-dev,
- libleveldb-dev,
- libnss3-dev,
- libs3-dev,
- libsnappy-dev,
- libtool,
- libudev-dev,
- libxml2-dev,
- pkg-config,
- python-all (>= 2.6.6-3~),
- python-nose,
- uuid-dev,
- uuid-runtime,
- xfslibs-dev,
- yasm [amd64],
- zlib1g-dev,
- valgrind [amd64 armhf i386 powerpc],
- virtualenv
+Build-Depends: debhelper (>= 9~),
+ default-jdk,
+ dh-autoreconf,
+ dh-python,
+ dh-systemd (>= 1.5),
+ dpkg-dev (>= 1.16.1~),
+ javahelper,
+ junit4,
+ libaio-dev,
+ libatomic-ops-dev,
+ libbabeltrace-ctf-dev,
+ libbabeltrace-dev,
+ libblkid-dev,
+ libboost-dev,
+ libboost-program-options-dev,
+ libboost-system-dev,
+ libboost-thread-dev,
+ libbz2-dev,
+ libcurl4-gnutls-dev,
+ libedit-dev,
+ libexpat1-dev,
+ libfcgi-dev,
+ libfuse-dev,
+ libgoogle-perftools-dev [i386 amd64 powerpc armhf arm64 ppc64el],
+ libkeyutils-dev,
+ libleveldb-dev,
+ libnss3-dev,
+ libs3-dev,
+ libsnappy-dev,
+ libtool,
+ libudev-dev,
+ libxml2-dev,
+ pkg-config,
+ python-all (>= 2.6.6-3~),
+ python-nose,
+ uuid-dev,
+ uuid-runtime,
+ valgrind [amd64 armhf i386 powerpc],
+ virtualenv,
+ xfslibs-dev,
+ yasm [amd64],
+ zlib1g-dev
Build-Conflicts: libcrypto++-dev
Standards-Version: 3.9.6
X-Python-Version: >= 2.6
@@ -57,29 +56,27 @@ XS-Testsuite: autopkgtest
Package: ceph
Architecture: linux-any
-Depends:
- binutils,
- ceph-common (= ${binary:Version}),
- cryptsetup-bin | cryptsetup,
- gdisk,
- hdparm | sdparm,
- parted,
- python-flask,
- uuid-runtime,
- xfsprogs,
- ${misc:Depends},
- ${python:Depends},
- ${shlibs:Depends}
+Depends: binutils,
+ ceph-common (= ${binary:Version}),
+ cryptsetup-bin | cryptsetup,
+ gdisk,
+ hdparm | sdparm,
+ parted,
+ python-flask,
+ uuid-runtime,
+ xfsprogs,
+ ${misc:Depends},
+ ${python:Depends},
+ ${shlibs:Depends}
Pre-Depends: ${misc:Pre-Depends}
Breaks: python-ceph (<< 0.94.1-1~)
Conflicts: gceph, librgw-dev, librgw1, librgw1-dbg, obsync
-Replaces:
- gceph,
- librgw-dev,
- librgw1,
- librgw1-dbg,
- obsync,
- python-ceph (<< 0.94.1-1~)
+Replaces: gceph,
+ librgw-dev,
+ librgw1,
+ librgw1-dbg,
+ obsync,
+ python-ceph (<< 0.94.1-1~)
Recommends: libcephfs1, librados2, librbd1, ntp | time-daemon | chrony
Suggests: logrotate
Description: distributed storage and file system
@@ -106,25 +103,22 @@ Description: debugging symbols for ceph
Package: ceph-common
Architecture: linux-any
-Depends:
- librbd1 (= ${binary:Version}),
- python-cephfs (= ${binary:Version}),
- python-rados (= ${binary:Version}),
- python-rbd (= ${binary:Version}),
- python-requests,
- ${misc:Depends},
- ${python:Depends},
- ${shlibs:Depends}
+Depends: librbd1 (= ${binary:Version}),
+ python-cephfs (= ${binary:Version}),
+ python-rados (= ${binary:Version}),
+ python-rbd (= ${binary:Version}),
+ python-requests,
+ ${misc:Depends},
+ ${python:Depends},
+ ${shlibs:Depends}
Conflicts: ceph-client-tools
-Breaks:
- ceph (<< 0.93-0ubuntu3~),
- librbd1 (<< 0.94.1-1~),
- python-ceph (<< 0.94.1-1~)
-Replaces:
- ceph (<< 0.93-0ubuntu3~),
- ceph-client-tools,
- librbd1 (<< 0.94.1-1~),
- python-ceph (<< 0.94.1-1~)
+Breaks: ceph (<< 0.93-0ubuntu3~),
+ librbd1 (<< 0.94.1-1~),
+ python-ceph (<< 0.94.1-1~)
+Replaces: ceph (<< 0.93-0ubuntu3~),
+ ceph-client-tools,
+ librbd1 (<< 0.94.1-1~),
+ python-ceph (<< 0.94.1-1~)
Suggests: ceph, ceph-mds
Description: common utilities to mount and interact with a ceph storage cluster
Ceph is a distributed storage and file system designed to provide
@@ -482,12 +476,11 @@ Description: debugging symbols for ceph-test
Package: python-ceph
Architecture: all
Section: python
-Depends:
- python-cephfs (>= ${binary:Version}),
- python-rados (>= ${binary:Version}),
- python-rbd (>= ${binary:Version}),
- ${misc:Depends},
- ${python:Depends}
+Depends: python-cephfs (>= ${binary:Version}),
+ python-rados (>= ${binary:Version}),
+ python-rbd (>= ${binary:Version}),
+ ${misc:Depends},
+ ${python:Depends}
Description: Meta-package for python libraries for the Ceph libraries
Ceph is a massively scalable, open-source, distributed
storage system that runs on commodity hardware and delivers object,
diff --git a/debian/radosgw.dirs b/debian/radosgw.dirs
index f54add5..b99cc97 100644
--- a/debian/radosgw.dirs
+++ b/debian/radosgw.dirs
@@ -1,3 +1,3 @@
+var/lib/ceph/radosgw
var/log/ceph
var/log/radosgw
-var/lib/ceph/radosgw
--
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