ceph.spec.in: add a bcond_with for jemalloc

jemalloc like tcmalloc is a high performance replacement for glibc malloc.
Which is better for ceph can only be told via benchmarks and testing.
This patch makes it easer to test this as an rpm install.

Signed-off-by: Owen Synge <osynge@suse.com>
(cherry picked from commit 7b24b9bfc0a49c9eac6f07eee4d5a52eceddbb34)

Conflicts:
ceph.spec.in
            _udevrulesdir

ceph.spec.in:Add %bcond_with librocksdb

librocksdb is an experimental feature that is not by default enabled in configure.

Therefore if some one wants to enable it in the spec file they should enable it in the build rpm flags also.

Signed-off-by: Owen Synge <osynge@suse.com>
(cherry picked from commit e600743330336a5d7d0c68dd4c8eee2193723eb1)

ceph.spec.in: systemd-related mods to ceph and ceph-common %files

without introducing duplicate %{_initrddir}/ceph

Signed-off-by: Nathan Cutler <ncutler@suse.com>
(cherry picked from commit 897815774b2c8eb76503628ff3b82092b24effed)

Conflicts:
ceph.spec.in
            refrain from duplicating %{_sbindir}/rcceph

ceph.spec.in: systemd-ify radosgw

without introducing a second %preun radosgw

Signed-off-by: Owen Synge <osynge@suse.com>
Signed-off-by: Nathan Cutler <ncutler@suse.com>
(cherry picked from commit 6d7a07203da2fc268a9c51246694f693389b4426)

Conflicts:
ceph.spec.in
            omit old sysvinit stuff

ceph.spec.in: add systemd %pre, %post, and %preun scripts

Signed-off-by: Owen Synge <osynge@suse.com>
Reviewed-by: Nathan Cutler <ncutler@suse.com>
(cherry picked from commit 58c1fdedfae0dd7b5734d0d760efd73089a2df08)

Conflicts:
ceph.spec.in

ceph.spec.in: systemd/sysvinit installs

Signed-off-by: Owen Synge <osynge@suse.com>
Signed-off-by: Nathan Cutler <ncutler@suse.com>
(cherry picked from commit 321708f426b2b11df0bc18ca9af93287dd84b767)

Conflicts:
ceph.spec.in
            Always install /etc/ceph/rbdmap

ceph.spec.in: use MAKE_JOBS for make check-local, too

Signed-off-by: Nathan Cutler <ncutler@suse.com>
(cherry picked from commit 3f50c1983c178960991ccbad6f63163e9522d3f0)

ceph.spec.in: do not run %debug_package

And remove superfluous 0%{?opensuse} conditionals.

Signed-off-by: Nathan Cutler <ncutler@suse.com>
(cherry picked from commit e8dd6f0fc82286559938eec7e848ccbcdce83516)

ceph.spec.in: clean up suse_version conditionals

Use 0%{?suse_version} throughout for consistency.

Signed-off-by: Nathan Cutler <ncutler@suse.com>
(cherry picked from commit 75f2a983211668bd127336ff07d447a0f5525734)

Conflicts:
ceph.spec.in

ceph.spec.in: make systemd a BuildRequires as well as a Requires

Factory and Tumbleweed builds attempt to run systemd-tmpfiles -- probably
because they run %post -- and were failing with "command not found".

Signed-off-by: Nathan Cutler <ncutler@suse.com>
(cherry picked from commit fa9d84913f4289f211f4e97950f9c6538db77a67)

buildtool:define variable for setting make jobs

OBS build hosts are memory-limited, limiting the jobs to 6 prevents build errors.
Original work by Thorsten

Signed-off-by: Owen Synge <osynge@suse.com>
(cherry picked from commit ea851029823c335bde2c70f684fc2bb307f5037d)
(cherry picked from commit 351b2b7a418b4dad3271c4eec1830d4f4bf32cdf)

ceph.spec.in: strip out all instances of %{epoch}:

Signed-off-by: Nathan Cutler <ncutler@suse.com>
(cherry picked from commit 7ec18822f33bd30df04463dd9d02cde90d71986b)

Conflicts:
ceph.spec.in
            missing -{%release} in libradosstriper1 requires

ceph.spec.in: add SUSE header boilerplate

Signed-off-by: Nathan Cutler <ncutler@suse.com>
(cherry picked from commit fe7d760c15e035f46ed0e4f2456ea4d9da475d2f)

ceph.spec.in: move specific BuildRequires to where they belong

Move distro-specific BuildRequires out of "common" section and
into the appropriate %if statement in the "specific" section.
Also remove a duplicated "Requires: gdisk".

Signed-off-by: Nathan Cutler <ncutler@suse.com>
Reviewed-by: Loic Dachary <ldachary@redhat.com>
(cherry picked from commit e1cb7e51041c4e646ac9b9b32a525ec0bbd46149)

Conflicts:
     ceph.spec.in
         reinstated missing libbz2-devel build dependency

ceph.spec.in: remove the right stray %endif

While making sure CentOS, etc. get their proper BuildRequires.

This replaces upstream commits f94f232, 75e87a2 and 34e4dd9.

Signed-off-by: Nathan Cutler <ncutler@suse.com>
(cherry picked from commit 9a83b0ac268704f01a42ef952502722f5f852d0e)

Add rpm conditionals : libs_compat

Extracted conditionals from SUSE rpm spec file to forward port.
Original work done by Thorsten Behrens <tbehrens@suse.com>

Signed-off-by: Owen Synge <osynge@suse.com>
(cherry picked from commit c6c3a3bca2078f5dbd991a5062f9f2f4e66cca35)

Add rpm conditionals : tcmalloc

Extracted conditionals from SUSE rpm spec file to forward port.
Original work done by Thorsten Behrens <tbehrens@suse.com>

Signed-off-by: Owen Synge <osynge@suse.com>
(cherry picked from commit d8abde3338b0c7df373b762e35099ad5123866bf)

Add rpm conditionals : tests

Extracted conditionals from SUSE rpm spec file to forward port.
Original work done by Thorsten Behrens <tbehrens@suse.com>

Signed-off-by: Owen Synge <osynge@suse.com>
(cherry picked from commit 5747ea1910c842cf8db38bdff367c3ca150ddaf6)

ceph.spec.in summary-ended-with-dot

RPM spec files summary should not end with a dot.
This was inconsistent across the ceph rpm packages
and creates errors with rpm lint.

Signed-off-by: Owen Synge <osynge@suse.com>
(cherry picked from commit 042e8ff4dc71795d957bbfac12fade2bc0fc4674)

ceph.spec.in libcephfs_jni1 has no %post and %postun

/usr/lib64/libcephfs_jni.so.1.0.0 requires /sbin/ldconfig to be
run after installing and after removing.

Signed-off-by: Owen Synge <osynge@suse.com>
(cherry picked from commit 0742d82b5561634a5f4ed73fc6cbe4d4f26b0d42)

Template systemd/ceph-osd@.service with autotools,

The libexec path is different for different distributions.
systemd. This path is defined by a new variable on the
configure path.

This variable can be set with enviroment SYSTEMD_LIBEXEC_DIR.
The parameter --with-systemd-libexec-dir overrides the enviroment
variable.

Appropriate conditionals are set for SUSE and RHEL derivatives.

This is then used to template out systemd/ceph-osd@.service

Signed-off-by: Owen Synge <osynge@suse.com>
(cherry picked from commit ac347dc3402a50fa0ba8c04cf2f93c36283eca87)

Conflicts:
configure.ac
            do not include doc/Makefile

ceph.spec.in: rm EOL Fedoras; add OBS RHEL5 instead

Fedora 12 has been EOL for a long time. Remove the reference in the
RPM .spec file.

Since RHEL 5 support for Ceph is a work in progress, we won't remove
this entire python_sitelib / python_sitearch conditional for now, since
those are still needed on RHEL 5.

Add the rhel_version macro to make the conditional compatible with
SUSE's OBS.

Signed-off-by: Ken Dreyer <kdreyer@redhat.com>
(cherry picked from commit 353a3258968f76deaea4542d2165e9ab32b88de8)

ceph.spec.in: add missing -%{release}

We have it everywhere else and I can't think of any reason why
it should be omitted here.

Signed-off-by: Nathan Cutler <ncutler@suse.com>
(cherry picked from commit d952d59ae95d5f66aa4b98fd7aa4f4ecb36a4848)

ceph.spec.in: remove duplicate BuildRequires: sharutils

Signed-off-by: Nathan Cutler <ncutler@suse.com>
(cherry picked from commit c418bd9615e6f23f3c14ae9e71003c66d31d4b78)

Conflicts:
        ceph.spec.in

ceph.spec.in: fix python-flask dependency for SUSE

In SLE and openSUSE, the package is called python-Flask with an upper-case F.

Signed-off-by: Nathan Cutler <ncutler@suse.com>
(cherry picked from commit 39c28b9faf0fb069d91ac069a4d8df7bf03fb490)

Conflicts:
ceph.spec.in
            add missing SUSE-specific build deps

ceph.spec.in: clarify two important comments

First, the terms "common" and "specific" are vague. Second,
"common" can easily be confused with the ceph-common subpackage.

Fix this by rephrasing to "distro-unconditional dependencies" and
"distro-conditional dependencies", respectively.

Third, move the "distro-unconditional dependencies" header so it
is above the part where these dependencies are actually defined.

Signed-off-by: Nathan Cutler <ncutler@suse.com>
(cherry picked from commit dd212fd1d367f70c61f65a97599959668b44aa53)

Conflicts:
ceph.spec.in

ceph.spec.in: rm reference to EOL Fedoras (< 20)

Fedora 19 is EOL, so there's no need to refer to Fedoras less than 20.
"%{fedora}" effectively implies "Fedora 20 and above".

Reported-by: Ira Cooper <ira@samba.org>
Signed-off-by: Ken Dreyer <kdreyer@redhat.com>
(cherry picked from commit f3e4a91c458ca7b11706fe4608cb739499f5d3cc)

Conflicts:
ceph.spec.in
           added xmlstarlet dependency to ceph-test package

ceph.spec.in: package rbd-replay-prep on all Fedoras

This reverts the change in commit
85517d611b7bf4cb6cbffcd2c65303be0d038264. Since we BuildRequire:
libbabeltrace-devel, autoconf will see that babeltrace is available
during the build, and make will build/install the rbd-replay-prep
utility.

This change also simplifies Fedora selection logic, because Fedora 19 is
EOL, so "%{fedora}" implies "Fedora 20 and above".

Reported-by: Ira Cooper <ira@samba.org>
Signed-off-by: Ken Dreyer <kdreyer@redhat.com>
(cherry picked from commit 2db9480fa2646de776f0076d82747e202e574ddd)

ceph.spec.in: rbd-replay-prep is not being built on f21+

Signed-off-by: Boris Ranto <branto@redhat.com>
(cherry picked from commit 85517d611b7bf4cb6cbffcd2c65303be0d038264)

ceph.spec.in:BuildRequires sharutils

The uudecode binary is used to build Java-related components, and
uudecode is provided by the sharutils package on all supported
RPM platforms. When building with "--without=cephfs_java",
sharutils is not needed.

Thanks to Nathan Cutler <ncutler@suse.cz> for going into the
details with me.

On OBS without this patch we get the error message:

[  170s] -----------------------------------------------------------------
[  170s] ----- building ceph.spec (user abuild)
[  170s] -----------------------------------------------------------------
[  170s] -----------------------------------------------------------------
[  170s] + exec rpmbuild -ba --define '_srcdefattr (-,root,root)' --nosignature --define 'disturl obs://build.opensuse.org/home:osynge:ceph:wip:wip_obs_fedora/Fedora_20/c0bbbc1e62228ca956ac3d367edc4fba-master' /home/abuild/rpmbuild/SOURCES/ceph.spec
[  170s] error: Failed build dependencies:
[  170s]    sharutils is needed by ceph-1:2+git.1435043747.c1bd02c-1.1.x86_64

With this patch we can build fedora 22 and fedora 20 rpms fine.

Signed-off-by: Owen Synge <osynge@suse.com>
(cherry picked from commit 43c1784640538b813f0575c50f721ac911a30b3e)

Conflicts:
ceph.spec.in
            _with_systemd -> trivial resolution

ceph.spec.in: fix:Add missing directories breaking build

SUSE builds on OBS are failing with the missing dir entries:

    /usr/share/ceph
    /usr/lib/ceph

On suse these correspond to:

    %dir %{_datarootdir}/ceph/
    %dir %{_libexecdir}/ceph/

Signed-off-by: Owen Synge <osynge@suse.com>
(cherry picked from commit f1ff3e4dcb5dd7eddd2c346a05cfa78d860a5ce6)

packaging: make logrotate a hard dependency across all distros

Given ceph's reputation for voluminous logs, it makes sense for
logrotate to be a hard dependency for all distros.

Signed-off-by: Nathan Cutler <ncutler@suse.com>
(cherry picked from commit 0734cd1ec3ca3bd012686dc1bdda675909224a49)

Conflicts:
debian/control

ceph.spec.in: make /var/run/ceph conditional

/var/run/ceph should only be installed on Fedora, RH/CentOS, and
all supported SUSE distros that do not have systemd (e.g. SLE11-SP3).

Signed-off-by: Nathan Cutler <ncutler@suse.com>
(cherry picked from commit 1abaebd86956d159998560e78f18ac41bccb195b)

ceph.spec.in: fix _with_systemd conditional

Signed-off-by: Nathan Cutler <ncutler@suse.com>
(cherry picked from commit 4dd1e67de5afbe147e898421df6635fd6273dd8b)

ceph.spec.in: consolidate centos/rhel macros

0%{?rhel} || 0%{?centos} can be simplified to just 0%{?rhel}, since
CentOS defines that macro for compatibility with RHEL.

Signed-off-by: Nathan Cutler <ncutler@suse.cz>
(cherry picked from commit 46404dd381e240634d224e77adc69f0ba4807045)

Conflicts:
ceph.spec.in
            https://github.com/ceph/ceph/pull/4068 has not been backported

ceph.spec.in: include SUSE in _with_systemd

The master specfile newly defines a _with_systemd variable that should be true
for the set of distros that are using systemd. Since this set of distros
includes SUSE/openSUSE (at least for the more recent versions where ceph is
supported), this commit sets _with_systemdto true on SUSE/openSUSE.

http://tracker.ceph.com/issues/11610 Fixes: #11610

Signed-off-by: Nathan Cutler <ncutler@suse.cz>
(cherry picked from commit 61303656faa913880008e6a6a1725d2fd7002c1f)

Conflicts:
ceph.spec.in
            _udevrulesdir definition has been added -> trivial resolution

ceph.spec.in: set _with_systemd on RHEL 7 and Fedora

Commit 71a5090bca049a43e30a7f0cf99141950ef9c5dd added a "_with_systemd"
conditional to the RPMs, but I erred with the version comparison
operator, so this only applied to RHEL 8+, not RHEL 7+.

Adjust the conditional so that it will really apply to RHEL 7+. While
we're here, add Fedora as well.

Signed-off-by: Ken Dreyer <kdreyer@redhat.com>
Reported-by: Boris Ranto <branto@redhat.com>
(cherry picked from commit aa88364f30e2d2f254ade185a83ba263b48e2a73)

packaging: Add rgw placeholder dirs in proper packages

Automatically create /var/lib/ceph/radosgw with the
ceph-radosgw package, and /var/lib/ceph/bootstrap-rgw
via the ceph package.

Signed-off-by: Travis Rhoden <trhoden@redhat.com>
(cherry picked from commit bf93128f664ac74383806530a1f974edde8df5b6)

ceph.spec.in: fix _with_systemd conditional

The RPM conditional needs a "?" in the event that it is not defined.

(cherry picked from commit c5cf81dd91b5fceab2125e8cb435b2691f152e71)

ceph.spec.in: fix handling of /var/run/ceph

Prior to this commit, we didn't install /var/run/ceph as a normal
directory. We used the %ghost directive and created the directory with
a "mkdir" command in %post.

This was lacking in several ways:

  1) Simplicy: there is no need to use %ghost; other packages (eg.
     mariadb) simply use a normal %dir for their socket directory.

  2) RPM does not have control over the permissions of the /var/run/ceph
     directory. This does not interact well with "rpm -V". Moreover,
     once Ceph itself gets unprivileged user support, RPM itself won't
     be able to set the permissions of the directory for a (future)
     unprivileged UID.

  3) On distributions that use systemd as an init system, /var/run is a
     symlink to /run, which is tmpfs. This means that /var/run/ceph does
     not persist across reboots on those systems.

Remove the %ghost directive; it makes more sense for RPM to simply
install this directory like the rest of the %files.

Add a "_with_systemd" conditional so we know which distros use systemd
as their init system.  Add the /etc/tmpfiles.d/ceph.conf file on those
distros. See
http://www.freedesktop.org/software/systemd/man/tmpfiles.d.html

Signed-off-by: Ken Dreyer <kdreyer@redhat.com>
(cherry picked from commit 71a5090bca049a43e30a7f0cf99141950ef9c5dd)

Conflicts:
ceph.spec.in
            _udevrulesdir definition has been added -> trivial resolution

logrotate.conf: fixes for systemd

Before this patch, the command 'logrotate -f /etc/logrotate.d/ceph'
was generating an error "Failed to reload ceph.target: Job type reload is not
applicable for unit ceph.target".

Before we issue systemctl reload, check that there is at least
one active ceph-* service. (The hyphen is significant.)

Since we use grep, make the grep package a dependency.

http://tracker.ceph.com/issues/12173 Fixes: #12173

Signed-off-by: Tim Serong <tserong@suse.com>
Signed-off-by: Lars Marowsky-Bree <lmb@suse.com>
Signed-off-by: Nathan Cutler <ncutler@suse.com>
(cherry picked from commit 05424a803b817068f0a06b0ac6709aa8a8a3a717)

logrotate.conf: prefer service over invoke-rc.d

On trusty 14.04, service works but invoke-rc.d does not (but is present).

Fixes: #11330
Reported-by: Wim Heirman <wim@heirman.net>
Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit 6063a21f9edbbf80e44d45ff52a9f4ba1a1cb2c9)

New rich init system detection.

Uses both a database and detecting management commands to find init system.
Logs error is one of these two systems fails.
Raises error if both systems disgree.

Testing notes:
- works on SLE12
- works on openSUSE 13.1
- works on Scientific 6.4
- works on debian 7.7 (wheezy)
- works on debian 8 (jessie)

Signed-off-by: Owen Synge <osynge@suse.com>
(cherry picked from commit a818d4327b29056cfdb4ad54872a65eb277efe7b)

radosgw systemd support

Added a radosgw systemd support and associated prestart script.
  - With improved checking over first revison.
  - ceph-radosgw-prestart.sh now installed in /usr/lib/ceph-radosgw

Signed-off-by: Owen Synge <osynge@suse.com>
(cherry picked from commit cd3cb8bb009a55a6eb6fe3c650b4611a33fab374)

ceph-osd-prestart.sh: check OSD exists.

if the directory ${dir_osd-/var/lib/ceph/osd/}/${cluster:-ceph}-${id}
does not exist fail with a clear error message.

https://bugzilla.suse.com/show_bug.cgi?id=895759 fixes # 895759

Signed-off-by: Owen Synge <osynge@suse.com>
(cherry picked from commit 460ef1c25014060c14b9217224355ef3e1ca7284)

Fix overflowing journel partitions.

This fixes bnc#896406. When useing ceph-disk to create a journel
parititon in the next available partition and thier is not enough
space ceph-disk did not provide a clear error message.

Signed-off-by: Owen Synge <osynge@suse.com>
(cherry picked from commit 5690eb1c4d40ea3fd2e84894fa24400289357802)

0.94.5

Merge pull request #6348 from dillaman/wip-13567-hammer

librbd: potential assertion failure during cache read

Reviewed-by: Sage Weil <sage@redhat.com>

Merge pull request #6362 from liewegas/wip-shut-up-osd-hammer

osd/ReplicatedPG: remove stray debug line

Reviewed-by: Loic Dachary <ldachary@redhat.com>

osd/ReplicatedPG: remove stray debug line

This snuck in

Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit ff9600a6cef613d40e875597b6392778df1bb04c)

librbd: potential assertion failure during cache read

It's possible for a cache read from a clone to trigger a writeback if a
previous read op determined the object doesn't exist in the clone,
followed by a cached write to the non-existent clone object, followed
by another read request to the same object.  This causes the cache to
flush the pending writeback ops while not holding the owner lock.

Fixes: #13559
Backport: hammer
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit 4692c330bd992a06b97b5b8975ab71952b22477a)

tests: reproduce crash during read-induced CoW

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit 382219b6bba09156f8cf3d420c6348738e7ed4c6)

Merge pull request #6330 from dachary/wip-13550-hammer

qemu workunit refers to apt-mirror.front.sepia.ceph.com

Reviewed-by: Jason Dillaman <dillaman@redhat.com>

qa: Use public qemu repo

This would allow some external tests outside of sepia lab

Signed-off-by: Yuan Zhou <yuan.zhou@intel.com>
(cherry picked from commit 4731c1e35539c9506ff3fe3141553fad099d0eee)

0.94.4

Merge pull request #6287 from jcsp/wip-test-fixes

git path backports for hammer

use git://git.ceph.com

Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit 34c467ba06345eacd2fd0e79c162dfd0b22f0486)

qa: http://ceph.com/qa -> http://download.ceph.com/qa

Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit d4d65fbd6ad15320339751c604613ac63511e645)

Merge pull request #6161 from dachary/wip-13227-hammer

With root as default user, unable to have multiple RGW instances running

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Yehuda Sadeh <ysadehwe@redhat.com>
Reviewed-by: Ken Dreyer <kdreyer@redhat.com>

init-radosgw.sysv: remove

Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit 9d8c115b0ab05cfc1db6670d1d367737e61fe0ea)

Merge pull request #6166 from dachary/wip-13046-hammer

RGW : setting max number of buckets for user via ceph.conf option

Merge pull request #6039 from ceph/wip-13015-hammer

rgw: don't preserve acls when copying object

Merge pull request #6042 from dreamhost/wip-hammer-crossftp

rgw: remove trailing :port from host for purposes of subdomain matching

Merge pull request #6160 from dachary/wip-13228-hammer

rgw: segments are read during HEAD on Swift DLO

Merge pull request #6162 from dachary/wip-13226-hammer

Keystone Fernet tokens break auth

Merge pull request #6163 from dachary/wip-13054-hammer

rgw: region data still exist in region-map after region-map update

Merge pull request #6164 from dachary/wip-13053-hammer

rgw: GWWatcher::handle_error -> common/Mutex.cc: 95: FAILED assert(r == 0)

Merge pull request #5718 from dachary/wip-12859-hammer

testGetContentType and testHead failed

Merge pull request #5860 from lebauce/wip-12960-hammer

rgw: add delimiter to prefix only when path is specified

Merge pull request #6165 from dachary/wip-13052-hammer

rgw: init_rados failed leads to repeated delete

Merge pull request #6201 from dachary/wip-13410-hammer

TEST_crush_rule_create_erasure consistently fails on i386 builder

Reviewed-by: Kefu Chai <kchai@redhat.com>

Merge pull request #5885 from Abhishekvrshny/wip-13034-hammer

osd: copy-from doesn't preserve truncate_{seq,size}

Reviewed-by: Sage Weil <sage@redhat.com>

tests: robust test for the pool create crushmap test

The test that goes with f1e86be589803596e86acc964ac5c5c03b4038d8 to
verify that a bugous crush ruleset will prevent the creation of a pool
trying to use it was fragile. I depends on the implementation of the
erasure code lrc plugin and turns out to not work on i386.

The test is modified to use a fake crushtool that always returns false
and validate that it prevents the creation of a pool, which demonstrate
it is used for crushmap validation prior to the pool creation.

http://tracker.ceph.com/issues/12419 Fixes: #12419

Signed-off-by: Loic Dachary <ldachary@redhat.com>
(cherry picked from commit e47903727b5d53f795014bf29b417d357f2bd65a)

Merge pull request #6192 from dachary/wip-13401-hammer

mon: fix crush testing for new pools

Reviewed-by: Sage Weil <sage@redhat.com>

crush/CrushTester: test fewer inputs when running crushtool

If there are a lot of crush rules (say, 100) then the test can
take a long time.  100 values per rule should be enough to catch
most issues.

Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit 0f82f461b33d93d868e185912a2c7e4074d06900)

Conflicts:
src/crush/CrushTester.cc
  in hammer the crushtool validation is via a shell
       and not via an internal subprocess utility

tests: update to match crushmap validation message

http://tracker.ceph.com/issues/13182 Fixes: #13182

Signed-off-by: Loic Dachary <ldachary@redhat.com>
(cherry picked from commit 21a1e75d8a7bad89a48cd9d36902c5d609be5015)

Conflicts:
qa/workunits/cephtool/test.sh
  the test structure in hammer is different, adapt
  the relevant test.

mon/OSDMonitor: fix crush injection error message

Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit 1b3090d50e5bd5ca3e6e396b23d2d9826896c718)

Conflicts:
src/mon/OSDMonitor.cc
  hammer has a separate error message for EINTR
  which is in the context of the fix for error message

mon/OSDMonitor: only test crush ruleset for the newly created pool

Otherwise, we test *all* crush rules.. which might be a lot, and
which is a big waste of time and effort.

Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit 524b0bdcc45c2f4b95f2239c988e93250f337f3d)

Conflicts:
src/mon/OSDMonitor.cc : trivial resolution

crush/CrushTester: allow testing by ruleset

Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit aa238e5ed50f44a94caf84567267e4f6be8732a2)

Conflicts:
src/crush/CrushTester.cc
          in hammer the crushtool validation is via a shell
  and not via an internal subprocess utility
src/tools/crushtool.cc
  ceph_argparse_withint is preferred to ceph_argparse_witharg

Merge pull request #5887 from Abhishekvrshny/wip-13044-hammer

LibCephFS.GetPoolId failure

Reviewed-by: Sage Weil <sage@redhat.com>

Merge pull request #6172 from dachary/wip-13354-hammer

qa/workunits/cephtool/test.sh: don't assume crash_replay_interval=45

Reviewed-by: Loic Dachary <ldachary@redhat.com>

qa/workunits/cephtool/test.sh: don't assume crash_replay_interval=45

e.g., it's 5 in teuthology's ceph.conf.

Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit 80b7237e5e74d12b9d8b1f96ea535c96bdff9c6f)

rgw:add --reset-regions for regionmap update

Fixes: #12964
Signed-off-by: Weijun Duan <duanweijun@h3c.com>
(cherry picked from commit 95685c19d6f1eab50b903e61273b5351bedc2980)

Conflicts:
src/rgw/rgw_admin.cc: usage is on cerr in hammer, not cout
        src/test/cli/radosgw-admin/help.t: remove extra empty line

Merge pull request #6156 from dachary/wip-13170-hammer

doc: update docs to point to download.ceph.com

Reviewed-by: Abhishek Varshney <abhishek.varshney@flipkart.com>

rgw : setting max number of buckets for users via ceph.conf option

This patch adds a new option "rgw_user_max_buckets" for setting
max number of buckets for users via ceph.conf.

Fixes #12714

Signed-off-by: Vikhyat Umrao <vumrao@redhat.com>
(cherry picked from commit f65267c96cbd4cd25036b6bf399692e77bbb9436)

Conflicts:
src/rgw/rgw_admin.cc: usage is on cerr in hammer, not cout

rgw: init_rados failed leads to repeated delete

Fixes: #12978
Signed-off-by: Xiaowei Chen <chen.xiaowei@h3c.com>
(cherry picked from commit ab4232baa7bcc86e90746e13312ac9bda1772872)

rgw: delete finisher only after finalizing watches

Fixes: #12208
The watch error path might try to schedule a finisher work, delete finisher
only after watch destruction.

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
(cherry picked from commit 97aed59fb9e865d30d31d2b7f4e93fc9727c96fa)

rgw: be more flexible with iso8601 timestamps

make parsing 8601 more flexible by not restricting the length of seconds
to 5, this allows timestamp to be specified both as ms or us. Newer
keystone backends such as fernet token backend default to microseconds
when publishing iso8601 timestamps, so this allows these timestamps to
be allowed when specifying the token expiry time.

Fixes: #12761
Reported-by: Ian Unruh <ianunruh@gmail.com>
Signed-off-by: Abhishek Lekshmanan <abhishek.lekshmanan@ril.com>
(cherry picked from commit 136242b5612b8bbf260910b1678389361e86d22a)

init-radosgw: specify pid file to start-stop-daemon

This fixes restart when multiple instances are running.

Fixes: #12407
Tested-by: Pavan Rallabhandi <pavan.rallabhandi@sandisk.com>
Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit e17c8e1a7a06db0e2680dedc7e954021610320d1)

rgw: fix radosgw start-up script.

radosgw init script is unable to start radosgw daemon.
as it is relies on requiretty being disabled.
once init script start this daemon with sudo it fails
to start the daemon.

changing 'sudo' to 'su', it will fix this issue and
will also help running radosgw daemon with our new
"ceph" UID project.

Fixes: #10927
Signed-off-by: Vikhyat Umrao <vumrao@redhat.com>
(cherry picked from commit c83542296aeb8f5dd96f5d9e09327e7a89370742)

init-radosgw: unify init-radosgw[.sysv]

Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit 1c45f512a91ee49e9253ba6fd3857af9bd2ae57a)

init-radosgw: look in /var/lib/ceph/radosgw

Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit a4bb992426b39188e750fce9198052ca0d510117)

doc: rgw: fix typo in comments

Signed-off-by: Nathan Cutler <ncutler@suse.cz>
(cherry picked from commit 05cf0db22dc3a9cb2bf4b86b8f240683c23f41ac)

rgw: init script waits until the radosgw stops

Fixes: #11140
Init script waits in stop action until the radowgw daemons stop.

Signed-off-by: Dmitry Yatsushkevich <dyatsushkevich@mirantis.com>
(cherry picked from commit 1cca0c1e91a1e18f82f4d22855e96b2fc947f5ea)

rgw: don't read actual data on user manifest HEAD

Fixes: #12780
We unconditionally read all the data, which is not needed
when doing HEAD operation on user manifest objects.

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
(cherry picked from commit 4a8b08d1dd2511e28e999f1625103fb919fb5465)

doc: remove mention of ceph-extra as a requirement

Signed-off-by: Alfredo Deza <adeza@redhat.com>
(cherry picked from commit a6f07e9fa3bd5e50a2d8cfa387b44a39d383fa65)

doc: remove ceph-extras

Signed-off-by: Alfredo Deza <adeza@redhat.com>
(cherry picked from commit c0ef84fd22aac58b6ec8e58eb4f8dffed306d39e)

doc: correct links to download.ceph.com

Signed-off-by: Alfredo Deza <adeza@redhat.com>
(cherry picked from commit 387d7800359154950431d0984c756f43f21dd9b4)

doc: Added "Hammer" in the list of major releases.

Fixes: #12771
Signed-off-by: ritz303 <ritz_303@yahoo.com>
(cherry picked from commit 582f0f64455079290ad3b4ae7338b716e170911f)

rgw: set default value for env->get() call

Fixes: #13239
This fixes a regression introduced at commit abe4ec293d08b0314bf5c081ace2456073f3a22c.
The host var is a string, env->get() returns a char pointer, shouldn't
pass in NULL.

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
(cherry picked from commit 0d5730efc0054334897315dc23ba04f30548e36e)
Signed-off-by: Robin H. Johnson <robin.johnson@dreamhost.com>