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>

Merge pull request #5086 from SUSE/wip-12173

logrotate.conf: fixes for systemd

Reviewed-by: Ken Dreyer <kdreyer@redhat.com>

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>

Merge pull request #5091 from yehudasa/wip-multipart-parts-limit

rgw: Multipart Upload: Support to configure and enforce no of parts a…

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>

rgw: Multipart Upload: Support to configure and enforce no of parts allowed

Fixes: #12146
Config parameter added for no of parts limit in multipart upload and checked while
completing multipart upload

Signed-off-by: Abhishek Dixit <dixitabhi@gmail.com>

Merge pull request #4970 from SUSE/wip-12034-master

ceph.spec.in: python-argparse only in Python 2.6

Reviewed-by: Alfredo Deza <adeza@redhat.com>
Reviewed-by: Ken Dreyer <kdreyer@redhat.com>

ceph.spec.in: python-argparse only in Python 2.6

argparse is a widely-used Python module for parsing command-line arguments.
Ceph makes heavy use of Python scripts, both in the build environment and on
cluster nodes and clients.

Until Python 2.6, argparse was distributed separately from Python proper.
As of 2.7 it is part of the Python standard library.

Although the python package in a given distro may or may not Provide:
python-argparse, this cannot be relied upon.

Therefore, this commit puts appropriate conditionals around Requires:
python-argparse and BuildRequires: python-argparse. It does so for Red
Hat/CentOS and SUSE only, because the last Fedora version with Python 2.6
was Fedora 13, which is EOL.

argparse is required by both the ceph and ceph-common packages, but since ceph
requires ceph-common, the argparse Requires and BuildRequires need only appear
once, under ceph-common.

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

Signed-off-by: Nathan Cutler <ncutler@suse.com>

Merge pull request #5035 from yuyuyu101/wip-async-fix-13

AsyncConnection: Fix out-of-sequence problem introduced by send/write separated logic

Merge pull request #5001 from ceph/wip-11985

#11985 Fixes to MDLog (and MDS) shutdown

Merge pull request #5077 from SUSE/wip-spec-comment-clarify

ceph.spec.in: clarify two important comments

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>

Merge pull request #5033 from wuxingyi/fixuserquota

rgw: fix empty json response when getting user quota

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>

Merge pull request #4942 from SUSE/wip-11991

rpm: add missing Java conditionals

Reviewed-by: Ken Dreyer <kdreyer@redhat.com>

mds: fix MDLog shutdown process

We must join threads before completing ::shutdown,
because otherwise these threads might try to use
torn-down resources like the objecter.

The replay/recovery threads may be blocking on
journaler calls like wait_for_readable, so we
must signal them using Journaler::shutdown.  In
order for that to be safe, we must also protect
the assignment of ::journaler from the threads
using the mds_lock.

Fixes: #11985
Signed-off-by: John Spray <john.spray@redhat.com>

mds: drop MDSIOContext on mds->stopping

`stopping` is true once the MDS has entered suicide().  During
this phase, any MDSIOContexts that are called (e.g. from objecter,
journaler) become no-ops.

Signed-off-by: John Spray <john.spray@redhat.com>

mds: refine shutdown, add ::stopping

Add a ::stopping flag, set at start of suicide(),
that other contexts must inspect after taking
mds_lock.

This guards against the possibility of multiple
threads entering suicide, and more generally
against the possibility of other procedures
starting while we're in the middle of shutting down.

Signed-off-by: John Spray <john.spray@redhat.com>

osdc/Journaler: add a shutdown() method

Because consumers may be blocked on the on_readable
condition, it is necessary for Journaler to have
an explicit shutdown method that fires the completion

Signed-off-by: John Spray <john.spray@redhat.com>

common/Thread: print msg on join errors

Signed-off-by: John Spray <john.spray@redhat.com>

Merge pull request #5058 from SUSE/wip-fix-release-notes-blooper

release-notes.txt: fix version number in section heading

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

Merge pull request #5073 from ceph/wip-12105

mds: update CInode::oldest_snap during migration

Reviewed-by: John Spray <john.spray@redhat.com>

mds: update CInode::oldest_snap during migration

Fixes: #12105
Signed-off-by: Yan, Zheng <zyan@redhat.com>

Merge pull request #5036 from ceph/wip-dirfrag-msgs

mds: tweak dirfrag asok messages

Merge pull request #4981 from ceph/wip-fedora-build-fixes

Fix various issues with fedora (f21+) builds

Reviewed-by: Ken Dreyer <kdreyer@redhat.com>

Merge pull request #4898 from SUSE/wip_ceph_spec_sharutils

ceph.spec.in:BuildRequires sharutils

Reviewed-by: Nathan Cutler <ncutler@suse.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Ken Dreyer <kdreyer@redhat.com>
Reviewed-by: Dan Mick <dmick@redhat.com>

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>

Merge pull request #5042 from ceph/wip-final-kw

mds/Migrator: don't use c++11 kw 'final' as var name

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

Merge pull request #5066 from ceph/wip-gitignore-add-ceph_perf_msgr

src/.gitignore: add ceph_perf_msgr_{server,client}

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

Merge pull request #4840 from tchaikov/wip-11833-crush-dump-tree

mon: add an "osd crush dump tree" command

Reviewed-by: Min Chen <minchen@ubuntukylin.com>
Reviewed-by: Haomai Wang <haomaiwang@gmail.com>

src/.gitignore: add ceph_perf_msgr_{server,client}

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

Merge pull request #4965 from xinxinsh/wip-12025

mon/OSDMonitor : error out if pgp_num > pg_num

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

Merge pull request #4923 from dachary/wip-make-check-verbosity

tests: display the output of failed make check runs

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

Merge pull request #5032 from guangyy/wip-cleanup

osd: remove duplicate checks

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

Merge pull request #5064 from vuhuong/wip-xio

xio: sync works

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

move pgp_num, pg_num check to prepare_new_pool method

Signed-off-by: xinxin shu <xinxin.shu@intel.com>

xio: fix to work with commit 626360aa

Fix xio to work with commit 626360aa
"msg, ceph_osd: Support feature bits for all message type's local connection"

Signed-off-by: Vu Pham <vu@mellanox.com>

xio: fix to work with the merge of pull request #4707

fix xio to work with the merge of pull request
" Removed unnecessary inclusion of iostream in several files #4707"

Signed-off-by: Vu Pham <vu@mellanox.com>

xio: sync to work with accellio v1.4

latest master's HEAD - tag v1-4

Signed-off-by: Vu Pham <vu@mellanox.com>

Merge pull request #4747 from ceph/wip-damaged-fixes

MDS metadata damage handling

Reviewed-by: Greg Farnum <gfarnum@redhat.com>

release-notes.txt: fix version number in section heading

From context it is obvious that this section is about upgrading from Giant, not
Firefly, so change the version number to match Giant.

Signed-off-by: Nathan Cutler <ncutler@suse.com>

Merge pull request #5054 from SUSE/wip-release-notes-syntax

doc/release-notes.rst: add missing word to complete sentence

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

doc/release-notes.rst: add missing word to complete sentence

Signed-off-by: Nathan Cutler <ncutler@suse.com>

Merge pull request #4792 from kylinstorage/wip-writeback-throttling-for-cache-tiering

Wip writeback throttling for cache tiering

This patch is to do write back throttling for cache tiering, which is similar to what the Linux kernel does for  page cache write back.  A paramter 'cache_target_dirty_high_ratio'  (default 0.6) is introduced as the high speed flushing threshold, while leave the 'cache_target_dirty_ratio' (default 0.4) to represent the low speed  threshold. The flush speed is controlled by limiting the parallelism of flushing. The maximum parallelism under low speed is half of the parallelism under high speed. If there is at least one PG such that the dirty ratio beyond the high threshold, full speed mode is entered; If there is no PG such that dirty ratio beyond the low threshold, idle mode is entered; In other cases, slow speed mode is entered.

Signed-off-by: Mingxin Liu <mingxinliu@ubuntukylin.com>
Reviewed-by: Li Wang <liwang@ubuntukylin.com>
Suggested-by: Nick Fisk <nick@fisk.me.uk>
Tested-by: Kefu Chai <kchai@redhat.com>

rgw: fix empty json response when getting user quota

Fixes: #12117
Signed-off-by: wuxingyi <wuxingyi@letv.com>

Merge pull request #4290 from XinzeChi/wip-filestore-lat

osd: dout more log info to track io request

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

Merge pull request #5049 from ceph/wip-librbd-reduce-tests

librbd: reduce unit test execution time

Reviewed-by: Josh Durgin <jdurgin@redhat.com>

Merge pull request #3973 from XinzeChi/wip-scrub-pending

osd: check pending or active scrub before sched_scrub

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

Merge pull request #4847 from ceph/wip-11661

osd: Improve feature bit handling and remove ancient checking including CHUNKY_SCRUB

Reviewed-by: Sage Weil <sweil@redhat.com>
Reviewed-by: Samuel Just <sjust@redhat.com>

tests: reduce duplicate librbd unit test case coverage

The test run for RBD_FEATURES=13 is fully covered by
RBD_FEATURES=45 and the pre deep-flatten cases are covered
by RBD_FEATURES=0 and 1.

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

lockdep: do not automatically collect all backtraces

It is expensive to collect backtraces every time a lock is
checked in order to provide cycle backtraces.  The backtraces
can be forced on for specific locks or globally via the new
config option "lockdep_force_backtrace".

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

Merge pull request #5041 from oritwas/wip-12095

rgw: force content_type for swift bucket stats request

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>

tests: move librbd valgrind test to teuthology

This test can take up to 20 minutes to execute, which is an order of
magnitude longer than other unit tests.  This is slowing down the
build bots.

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

rgw: force content_type for swift bucket stats request

Fixes: 12095
Signed-off-by: Orit Wasserman <owasserm@redhat.com>

mds/Migrator: don't use c++11 kw 'final' as var name

If for no other reason than that it looks weird
in an editor.

Signed-off-by: John Spray <john.spray@redhat.com>

mds: tweak dirfrag asok messages

Signed-off-by: John Spray <john.spray@redhat.com>

AsyncConnection: Fix msgr send bytes perf counter statistic

prepare_send_message may be called twice, we need to move to write_message

Signed-off-by: Haomai Wang <haomaiwang@gmail.com>

AsyncConnection: set out seq for message when sending ready

Otherwise it will result in higher priority but later message to be issued
firstly, then peer will receive out-of-order message seq

Signed-off-by: Haomai Wang <haomaiwang@gmail.com>

test_msgr: Random send different priority message to test sequence

Signed-off-by: Haomai Wang <haomaiwang@gmail.com>

osd: remove duplicate checks

Within pg_has_reset_since, it checkes if the PG is being deleted or not,
no need a duplicate check

Signed-off-by: Guang Yang <yguang@yahoo-inc.com>

ceph_osd: Add required feature bits related to this branch to osd_required mask

Signed-off-by: David Zafman <dzafman@redhat.com>

osd: CEPH_FEATURE_INDEP_PG_MAP feature now required

Feature present since at least the Dumpling release.
A later commit will add it to the osd_required mask

Signed-off-by: David Zafman <dzafman@redhat.com>

osd: CEPH_FEATURE_OSD_PACKED_RECOVERY feature now required

Feature present since at least the Dumpling release.
A later commit will add it to the osd_required mask

Signed-off-by: David Zafman <dzafman@redhat.com>

osd: CEPH_FEATURE_RECOVERY_RESERVATION feature now required

Feature present since at least the Dumpling release.
A later commit will add it to the osd_required mask

Signed-off-by: David Zafman <dzafman@redhat.com>

osd: CEPH_FEATURE_BACKFILL_RESERVATION feature now required

Feature present since at least the Dumpling release.
A later commit will add it to the osd_required mask

Signed-off-by: David Zafman <dzafman@redhat.com>

osd: CEPH_FEATURE_CHUNKY_SCRUB feature now required

Feature present since at least the Dumpling release.
A later commit will add it to the osd_required mask

Fixes: #11661
Signed-off-by: David Zafman <dzafman@redhat.com>

msg, ceph_osd: Support feature bits for all message type's local connection

Signed-off-by: David Zafman <dzafman@redhat.com>

osd: Add tracking of acting_features and upacting_features

Use most appropriate feature intersection depending on context

Signed-off-by: David Zafman <dzafman@redhat.com>

osd: Fix peer_features to include self

This should have no practical effect unless we could have
features getting turned off in a later release, since we
can assume any features being checked for are supported locally.

Signed-off-by: David Zafman <dzafman@redhat.com>

Merge pull request #5019 from zhouyuan/qemu_git_url

qa: Use public qemu repo

Reviewed-by: Josh Durgin <jdurgin@redhat.com>

Merge pull request #4848 from leseb/doc-openstack-kilo

doc: update openstack and rgw keystone

Reviewed-by: Abhishek Lekshmanan <abhishek.lekshmanan@gmail.com>
Reviewed-by: Josh Durgin <jdurgin@redhat.com>

Merge pull request #5012 from Arshanes/master

doc: Fixed the picture on page http://ceph.com/docs/master/cephfs/

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

doc: Fixed the picture on page http://ceph.com/docs/master/cephfs/

Fixes: #9174
Signed-off-by Valentin Thomas <valentin.arshanes.thomas@gmail.com>

Merge pull request #4918 from SUSE/wip_ceph_spec_directories_not_owned_by_a_package

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

Reviewed-by: Boris Ranto <branto@redhat.com>

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>

Merge pull request #4969 from ceph/wip-frag-asok

mds: add dirfrag split/merge asok commands

Merge pull request #5025 from majianpeng/librbd-remove-iohint

librbd: If objectmap tell object exist, don't send alloc_hint w/ write command

Reviewed-by: Josh Durgin <jdurgin@redhat.com>

librbd: If objectmap tell object exist, don't send alloc_hint w/ write command.

Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>

Merge pull request #4929 from wonzhq/tracked-op

common: tracked op fixes

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

Merge pull request #4249 from wonzhq/rmattr

osd: return with ENOENT if object doesn't exist during rmattr

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

Merge pull request #5002 from SUSE/wip_fixes_to_rcceph

Fixes to rcceph script

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

Merge pull request #4983 from yuyuyu101/wip-setallochint-option

librbd: Add option to allow disabling issuing alloc hint

Reviewed-by: Josh Durgin <jdurgin@redhat.com>

Merge pull request #4993 from ceph/wip-12064

mon: only send MMonMetadata to peer mons that support it

Reviewed-by: Joao Eduardo Luis <joao@suse.de>

Merge pull request #5005 from maxime1992/master

doc: Document include/str_list.h

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

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

Signed-off-by: Boris Ranto <branto@redhat.com>

configure.ac: Fix junit4.jar detection

If a system contains older (3) or later (5) release of junit.jar that is
default in the system, the auto-detection might find it before it finds
junit4.jar. This commit fixes that issue by always preferring the
junit4.jar library.

Signed-off-by: Boris Ranto <branto@redhat.com>

ceph.spec.in: Require git distro-wide

Git is not a SUSE-only dependency, the build process itself requires it.

Signed-off-by: Boris Ranto <branto@redhat.com>

doc: Document include/str_list.h
Fixes: #12050.
Signed-off-by: Claire MASSOT <claire.massot93@gmail.com>
Signed-off-by: Jordan DORNE <jordan.dorne@gmail.com>
Signed-off-by: Kévin CARADANT <kevin.caradant@gmail.com>
Signed-off-by: Gabriel SENTUCQ <perso@kazhord.fr>
Signed-off-by: Maxime ROBERT <maxime.robert1992@gmail.com>

Merge pull request #5017 from JordanDorne/master

doc: Replace requries with requires in python API doc

Reviewed-by: Loic Dachary <ldachary@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>

doc: Replace requries with requires in python API doc
Fixes: #12076
Signed-off-by: Jordan DORNE <jordan.dorne@gmail.com>

Merge pull request #4989 from ltoto2/master

 doc: Adding a link to documentation on admin socket

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

doc: Adding a link to documentation on admin socket

Fixes: #11845
Signed-off-by: Thomas Laumondais <thomas.laumondais@gmail.com>

Bug fix to ceph systemV compatability script.

Was failing with more than one OSD / MON deamon on a single node.
Fixes suse bugzilla #927862

Signed-off-by: Owen Synge <osynge@suse.com>

Merge pull request #5011 from robin974/master

doc: Fixes a missing dot

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

Merge pull request #5006 from Claire1293/master

doc: dev/differences-from-posix

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

Merge pull request #4987 from Aeryax/master

doc: Replaced "disk or drive" by "disk" in ceph-disk.rs

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

doc: Fixes a missing dot

Fixes: #12072
Signed-off-by: Robin Tang <robintang974@gmail.com>

Merge pull request #5008 from jr31/master

doc: Unify ID format

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

Merge pull request #5007 from Cleminou/master

doc: Fixes a missing word in a printed string

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

doc: dev/differences-from-posix
Fixes: #11108
Signed-off-by: Claire MASSOT <claire.massot93@gmail.com>

doc: Unify ID format

Fixes: #12071
Signed-off-by: Jean-Rémi Deveaux <jeanremi.deveaux@gmail.com>