doc: batch small fixes, including typo, syntax etc.

Signed-off-by: xiexingguo <xie.xingguo@zte.com.cn>

doc: fix typo

Signed-off-by: xiexingguo <xie.xingguo@zte.com.cn>

Merge pull request #7808 from cbodley/wip-cmake-jerasure

cmake: add ErasureCode.cc to jerasure plugins

cmake: add ErasureCode.cc to jerasure plugins

Signed-off-by: Casey Bodley <cbodley@redhat.com>

Merge pull request #7748 from ceph/wip-cmake-2-22-16

cmake: fix paths to various EC source files

cmake: installing _tp libraries into lib

Signed-off-by: Ali Maredia <amaredia@redhat.com>

cmake: Removed _tp libraries from linking

Signed-off-by: Ali Maredia <amaredia@redhat.com>

Merge pull request #7793 from tchaikov/wip-fix-dencoder-MirrorImage

cls_rbd: fix the test for ceph-dencoder

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

cls_rbd: fix the test for ceph-dencoder

initialize MirrorImage::state to a certain value, otherwise the
generated test instances would be undetermined, and hence fail
the dencoder tests.

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

Merge pull request #7792 from tchaikov/wip-13505

fix FTBFS introduced by d0af316

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

Merge pull request #7731 from SUSE/wip-shebang

ceph_detect_init/__init__.py: remove shebang

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

osd: always cleanup the scrub results

the destructor of Scrub::Store asserts that `this->results` should
always be empty when it is free'd. before this change, if we are
repairing, the results is not flushed or cleaned up, this crashes
osd daemon when a new PG internval comes. also we should not keep
the results around even we don't want to populate them to the omap
if we are repairing, it's just a waste.

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

pybind: fix the FTBFS introduced by d0af316

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

Merge pull request #7734 from dachary/wip-14834-pidfile-test

tests: test_pidfile.sh lingering processes

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

librados: add missing tracpoint for scrub APIs

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

tests: test_pidfile.sh lingering processes

For the mon, using ps aux to find the process will only show part of the
command line and the $RUNID may be missing. For the OSD, the $RUNID is
passed using an environment variable and will not show at all.

There is no need to test both ceph-osd and ceph-mon since they both end
up in the same code path, pidfile_write. Add a log line that only shows
when the --pid-file is empty and grep for it in the simplest possible
way.

The TEST_pidfile test failed to kill a process because there was
no pidfile with its pid. This is fixed by backuping the pidfile before
it is modified.

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

Signed-off-by: Loic Dachary <loic@dachary.org>

Merge pull request #6898 from tchaikov/wip-13505

add scrub persist/query API

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

rados: add "list-inconsistent-snapset" cmd

to list inconsistent snapsets of a given PG, this command exposes
get_inconsistent_snapsets() rados API to user.

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

rados: add "list-inconsistent-obj" cmd

to list inconsistent objects of a given PG, this command exposes
get_inconsistent_objects() rados API to user.

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

librados: add get_inconsistent_snapsets() API

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

librados: add get_inconsistent_objects() API

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

osd: add CEPH_OSD_OP_SCRUBLS pg op

it is a new pg op which returns the encoded objects stored when
scrubbing.

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

osd: persist inconsistent snapsets using omap

the inconsistent snapsets are identified in ReplicatedPG::_scrub()
after we compared the authorized objects with their replica/shards.
these inconsistent information are stored in the omap of objects
with prefix "SCRUB_SS_".

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

librados: add `inconsistent_snapset_t` type

for presenting the inconsistent snapsets found in scrub

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

osd/: clear scrub store safetly

Signed-off-by: Samuel Just <sjust@redhat.com>

osd: persist inconsistent objs using omap

persist inconsistent objects found when comparing the ScrubMaps
collected from replica/shards. the discrepancies between the auth
copy and the replica are identified as inconsistencies. and hence
encoded into the omap of an object of the temp coll of the PG in
question.
scrub_types.{h,cpp} are introduced to hide the details of how we
persist the scrub types from the librados client.

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

osd: more constness to spg_t

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

librados: add `inconsistent_obj_t` types

which present the inconsistent objects found in scrub

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

rados: add "list-inconsistent-pg" command

to list inconsistent PGs of a given pool. this command exposes
the underlying get_inconsistent_pgs() API to user.

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

pybind: add Rados.get_inconsistent_pgs method

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

librados: add get_inconsistent_pgs() to librados

to list the inconsistent PGs of given pool, it's a wrapper
around the "ceph pg ls" command.

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

tools/rados: support more --format options

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

Merge pull request #7597 from rzarzynski/wip-rgw-keystone-proper-fail

rgw: improve error handling in S3/Keystone integration

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

Merge pull request #7051 from wonzhq/scrub-cmp-map

osd: avoid FORCE updating digest been overwritten by MAYBE when comparing scrub map

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

Merge pull request #7617 from liewegas/wip-14745

osd: fix forced prmootion for CALL ops

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

Merge pull request #7286 from ktdreyer/wip-10587-init-ceph-disk

init-ceph.in: skip ceph-disk if it is not present

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

Merge pull request #7599 from ifed01/wip-14707

log: fix stack overflow when flushing large log lines

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

Merge pull request #7643 from jazeltq/add_count_github

osd: filejournal: report journal entry count

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

Merge pull request #7658 from majianpeng/bluestore

osd: bluestore: misc fixes

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

Merge pull request #7677 from xiexingguo/xxg-wip-14786

osd: fix fusestore hanging during stop/quit

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

Merge pull request #7680 from ceph/wip-da-SCA-20160203

common: various fixes from SCA runs

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Jason Dillaman <jdillama@redhat.com>
Reviewed-by: Greg Farnum <gfarnum@redhat.com>

Merge pull request #7681 from jjhuo/kstore-updates

osd: kstore: sync up kstore with recent bluestore updates

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

Merge pull request #7759 from trociny/wip-rbd-mirror-image-replayer-improvements

rbd-mirror: ImageReplayer improvements

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

Merge pull request #7736 from trociny/fix-librbd-asok-empty-name

librbd: retrieve image name when opening by id

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

Merge pull request #7620 from jdurgin/wip-14419

cls_rbd: mirroring directory

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

cls_rbd: add methods for keeping track of mirrored images

These will track whether local images should be mirrored, and map them
to a unique global id. There's a state field for safely disabling
mirroring while operating on multiple objects.

Fixes: #14419
Signed-off-by: Josh Durgin <jdurgin@redhat.com>

librbd: rename rbd_pool_settings object to rbd_mirroring

We'll use this object only for mirroring-related purposes, not generic
settings on a pool.

Refs: #14419
Signed-off-by: Josh Durgin <jdurgin@redhat.com>

Merge pull request #7762 from ErwanAliasr1/evelu-check

Improving 'make check' for ceph-disk

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

librbd: init asok_hook on open so name is always known

Signed-off-by: Mykola Golub <mgolub@mirantis.com>

librbd: get image name on open if it is opened by id

Signed-off-by: Mykola Golub <mgolub@mirantis.com>

Merge pull request #7743 from JiYou/open-test-for-bug-2339

test: enable test for bug #2339 which has been resolved.

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

Merge pull request #7773 from roidayan/xio_remove_redundant_magic_methods

xio: remove redundant magic methods

Reviewed-by: Haomai Wang<haomai@xsky.com>

Merge pull request #7771 from xiexingguo/xxg-wip-fixawatch

librados: do not clear handle for aio_watch()

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

xio: remove redundant magic methods

The same methods are inherited from Messenger.

Signed-off-by: Roi Dayan <roid@mellanox.com>

librados: remove unused local variables

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>

librados: do not clear handle for aio_watch()

which is needed for aio_unwatch() to work.

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>

tests/ceph-disk: Let teardown clearing data

When running the ceph-disk check suite, 'test_mark_init' & 'test_activate_dir' had a
permission denied of the freshly created stuff like in :

tests/ceph-disk.sh:237: test_mark_init:  /bin/rm -fr /ceph/src/ceph-disk/test-ceph-disk/dir
/bin/rm: cannot remove « /ceph/src/ceph-disk/test-ceph-disk/dir/snap_1 »: Permission denied
/bin/rm: cannot remove « /ceph/src/ceph-disk/test-ceph-disk/dir/current »: Permission denied
/bin/rm: cannot remove « /ceph/src/ceph-disk/test-ceph-disk/dir/snap_2 »: Permission denied

Those two tests are starting a mon with run_mon.
Trying to delete the files while the daemon are still alive is impossible.
This patch removes the explicit 'rm' and let the teardown doing the cleaning
stuff by stopping daemons & cleaning content.

By using this patch, make check is now sucessful on ceph-disk.

Signed-off-by: Erwan Velu <erwan@redhat.com>

tests/ceph-disk: Using dummy device mappers

When doing a make test, if your local setup was running a "dm-0" or "dm-1",
the make check was failing.

The detection of the local "dm-x" were leading to a wrong comparaison with
the expected simulated values.

The fix is using a dummy name for that "dm" to prevent any collision with the local setup.

Prior that patch, a typical output of that error looked like :

>               assert expect == main.list_devices()
E               assert [{'partitions...: '/dev/Xda'}] == [{'partitions'...: '/dev/Xda'}]
E                 At index 0 diff: {'partitions': [{'dmcrypt': {'holders': ['dm-0'], 'type': 'plain'}, 'ptype': '4fbd7e29-9d25-41b8-afd0-5ec00ceff05d', 'path': '/dev/Xda1', 'is_partition': True, 'mount': None, 'uuid': '56244cf5-83ef-4984-888a-2d8b8e0e04b2', 'type': 'data', 'state': 'unprepared', 'fs_type': None}], 'path': '/dev/Xda'} != {'partitions': [{'ptype': '4fbd7e29-9d25-41b8-afd0-5ec00ceff05d', 'whoami': None, 'path': '/dev/Xda1', 'is_partition': True, 'mount': '/var/cache/ccache', 'uuid': '56244cf5-83ef-4984-888a-2d8b8e0e04b2', 'ceph_fsid': None, 'fs_type': 'btrfs', 'dmcrypt': {'holders': ['dm-0'], 'type': 'plain'}, 'type': 'data', 'state': 'active'}], 'path': '/dev/Xda'}
E                 Full diff:
E                 - [{'partitions': [{'dmcrypt': {'holders': ['dm-0'], 'type': 'plain'},
E                 + [{'partitions': [{'ceph_fsid': None,
E                 +                   'dmcrypt': {'holders': ['dm-0'], 'type': 'plain'},
E                 -                   'fs_type': None,
E                 ?                              ^^^^
E                 +                   'fs_type': 'btrfs',
E                 ?                              ^^^^^^^
E                 'is_partition': True,
E                 -                   'mount': None,
E                 +                   'mount': '/var/cache/ccache',
E                 'path': '/dev/Xda1',
E                 'ptype': '4fbd7e29-9d25-41b8-afd0-5ec00ceff05d',
E                 -                   'state': 'unprepared',
E                 ?                             ^^^^ -----
E                 +                   'state': 'active',
E                 ?                             ^^^^^
E                 'type': 'data',
E                 -                   'uuid': '56244cf5-83ef-4984-888a-2d8b8e0e04b2'}],
E                 ?                                                                 --
E                 +                   'uuid': '56244cf5-83ef-4984-888a-2d8b8e0e04b2',
E                 +                   'whoami': None}],
E                 'path': '/dev/Xda'}]

tests/test_main.py:342: AssertionError

Signed-off-by: Erwan Velu <erwan@redhat.com>

tests/ceph-disk: Creating missing working dir

When running run-tox.sh in a very simple env,
the test will fail if '/var/lib/ceph/tmp' doesn't exist.

This patch adds a check to create this directory if required as mkdtemp doesn't do it for you.

Prior this patch, the following behavior was seen :

tests/test_main.py:342:
_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _
ceph_disk/main.py:3753: in list_devices
    fstype=fs_type, options='')
ceph_disk/main.py:1217: in mount
    dir=STATEDIR + '/tmp',
_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _

suffix = '', prefix = 'mnt.', dir = '/var/lib/ceph/tmp'

    def mkdtemp(suffix="", prefix=template, dir=None):
        """User-callable function to create and return a unique temporary
        directory.  The return value is the pathname of the directory.

        Arguments are as for mkstemp, except that the 'text' argument is
        not accepted.

        The directory is readable, writable, and searchable only by the
        creating user.

        Caller is responsible for deleting the directory when done with it.
        """

        if dir is None:
            dir = gettempdir()

        names = _get_candidate_names()

        for seq in xrange(TMP_MAX):
            name = names.next()
            file = _os.path.join(dir, prefix + name + suffix)
            try:
>               _os.mkdir(file, 0700)
E               OSError: [Errno 2] No such file or directory: '/var/lib/ceph/tmp/mnt.KoAV85'

/usr/lib64/python2.7/tempfile.py:333: OSError

Signed-off-by: Erwan Velu <erwan@redhat.com>

Merge pull request #7649 from yuyuyu101/wip-async-watch

librados: implement async watch/unwatch

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

test: enable test for bug #2339 which has been resolved.

Signed-off-by: You Ji <jiyou09@gmail.com>

Merge pull request #7761 from dillaman/wip-14847

librbd: fix state machine race conditions during shut down

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

RadosClient: call watch_flush before finisher stop

Signed-off-by: Haomai Wang <haomai@xsky.com>

cls_rbd: async version of dir_get_name

Signed-off-by: Mykola Golub <mgolub@mirantis.com>

cmake: fix paths & make object libs of various EC files

Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>

Merge pull request #7632 from zaitcev/cleanup-dead-code-3

rgw: Drop unused usage_exit from rgw_admin.cc

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

Merge pull request #7285 from magicrobotmonkey/patch-1

Increase verbosity level on RGWObjManifest line

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

Merge pull request #7618 from zaitcev/wip-5073-subuser-bis

rgw: Fix subuser harder with tenants

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

Merge pull request #7763 from dachary/wip-releases

doc: fix 0.94.4 and 0.94.5 ordering

Merge pull request #7364 from javenwu/master

common: default cluster name to config file prefix

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

Merge pull request #7548 from yuyuyu101/librbd-avoid-memcpy

librbd: reduce mem copies to user-buffer during read

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

Merge pull request #7667 from jdurgin/wip-14780

Revert "librbd: use task finisher per CephContext"

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

Merge pull request #7625 from branch-predictor/bp-async-more

msg/async: smarter MSG_MORE

Reviewed-by: Haomai Wang <haomai@xsky.com>

doc: fix 0.94.4 and 0.94.5 ordering

Signed-off-by: Loic Dachary <loic@dachary.org>

Merge pull request #7760 from theanalyst/fix/rgw-fcgi-build

rgw: fcgi should include acconfig

librbd: deterministically unblock writes on snap set

Previously this was handled in the state machine's destructor,
but that can lead to nondeterministic behavior due to interactions
between threads.

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

librbd: avoid close race-condition within ImageState

The lock was previously unlocked/locked to avoid lock cycles. This
creates an issue when closing the image because the another thread
might have already deleted the ImageState before the lock could be
re-locked.

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

rgw: fcgi should include acconfig

As it references FASTCGI_INCLUDE_DIR which is referenced from it

Signed-off-by: Abhishek Lekshmanan <abhishek@suse.com>

doc/release-notes: v0.94.6 final notes

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

Merge pull request #7689 from dachary/wip-release-notes

release-notes: draft v0.94.6 release notes

msg/async: cut the middle-man

Get rid of complete_bl and let messenger write directly to outcoming_bl of
a connection. Also, if message bufferlist is small enough, append its
contents to outcoming_bl directly, so we'll use less iovecs and in best
case, pack entire message (together with header and footer added in
write_message()) in single bufferptr.

Signed-off-by: Piotr Dałek <piotr.dalek@ts.fujitsu.com>

Merge pull request #7725 from ceph/wip-fix-async-valgrind

AsyncMessenger: fix valgrind leak

Merge pull request #7758 from dachary/wip-ceph-disk-prepare-help

ceph-disk: fix prepare --help

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

ceph-disk: fix prepare --help

Signed-off-by: Loic Dachary <loic@dachary.org>

Merge pull request #7756 from dachary/wip-ceph-disk-args

ceph-disk: deactivate / destroy PATH arg are optional

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

ceph-disk: deactivate / destroy PATH arg are optional

And the mandatory positional arguments need not be == 1, it is enough to
leave the nargs parameter out.

Signed-off-by: Loic Dachary <loic@dachary.org>

test: image_replay: use flush to speedup commit position update

Signed-off-by: Mykola Golub <mgolub@mirantis.com>

rbd-mirror: add asok commands to get image replyer status and flush

Signed-off-by: Mykola Golub <mgolub@mirantis.com>

rbd-mirror: store sync snapshot name in registered client

Signed-off-by: Mykola Golub <mgolub@mirantis.com>

librbd: add field to MirrorPeerClientMeta to store snap name

Signed-off-by: Mykola Golub <mgolub@mirantis.com>

rbd-mirror: ImageReplayer: pass registered client ID as external param

Signed-off-by: Mykola Golub <mgolub@mirantis.com>

Merge pull request #7687 from yangdongsheng/ceph-disk_nargs

ceph-disk: make some arguments as required if necessary

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

Merge pull request #7640 from batrick/vstart-btrfs-missing

vstart.sh: silence a harmless msg where btrfs is not found

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

Merge pull request #7737 from trociny/wip-librados_test_stub-debug

test: more debug logging for TestWatchNotify

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

Merge pull request #7714 from SUSE/wip-qa-typo

doc: standardize @param (not @parma, @parmam, @params)

Reviewed-by: Abhishek Lekshmanan <abhishek@suse.com>

Merge pull request #7738 from trociny/test-librbd-poolname

test: create pools for rbd tests with different prefix

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

Merge pull request #7727 from jmunhoz/ceph-fix-14829

vstart.sh: avoid race condition starting rgw via vstart.sh

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

Merge pull request #7614 from trociny/wip-rbd-mirroring-image-reply

rbd-mirror: implement ImageReplayer

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

Merge pull request #7744 from dachary/wip-14838-ceph-disk-dmcrypt

ceph-disk: s/dmcrpyt/dmcrypt/

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

ceph-disk: s/dmcrpyt/dmcrypt/

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

Signed-off-by: Frode Sandholtbraaten <fsa@basefarm.no>
Signed-off-by: Loic Dachary <loic@dachary.org>