]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
9 years agoMerge pull request #7852 from xiexingguo/xxg-wip-14928
Haomai Wang [Tue, 1 Mar 2016 09:53:20 +0000 (17:53 +0800)]
Merge pull request #7852 from xiexingguo/xxg-wip-14928

msg: async: start over after failing to bind a port in specified range

Reviewed-by: Haomai Wang <haomai@xsky.com>
Reviewed-by: Kefu Chai <kefu@redhat.com>
9 years agomsg: async: start over after failing to bind a port in specified range 7852/head
xie xingguo [Tue, 1 Mar 2016 11:03:00 +0000 (19:03 +0800)]
msg: async: start over after failing to bind a port in specified range

The original report associated with this fix can be found at
http://tracker.ceph.com/issues/13002. I reopen one in case it
needs to be backported or something alike.

Fixes: #14928
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
9 years agoMerge pull request #7778 from marcan/pybind-fixes
Josh Durgin [Tue, 1 Mar 2016 06:48:53 +0000 (22:48 -0800)]
Merge pull request #7778 from marcan/pybind-fixes

pybind/rados: fix object lifetime issues and other bugs in aio

Reviewed-by: Mehdi Abaakouk <sileht@redhat.com>
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
9 years agoMerge pull request #7855 from tchaikov/wip-fix-ftbfs
Kefu Chai [Tue, 1 Mar 2016 06:39:29 +0000 (14:39 +0800)]
Merge pull request #7855 from tchaikov/wip-fix-ftbfs

test/TestPGLog: fix the FTBFS

Reviewed-by: Loic Dachary <ldachary@redhat.com>
9 years agotest/TestPGLog: fix the FTBFS 7855/head
Kefu Chai [Tue, 1 Mar 2016 04:10:26 +0000 (12:10 +0800)]
test/TestPGLog: fix the FTBFS

the new pure virtual method was introduced by e7edf20.

Fixes: #14930
Signed-off-by: Kefu Chai <kchai@redhat.com>
9 years agoMerge pull request #7781 from ceph/wip-fix-rbd-cli-tests
Josh Durgin [Tue, 1 Mar 2016 01:30:09 +0000 (17:30 -0800)]
Merge pull request #7781 from ceph/wip-fix-rbd-cli-tests

rbd/run_cli_tests.sh: Reflect test failures

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
9 years agoMerge pull request #7769 from somnathr/wip-make-shared
Samuel Just [Mon, 29 Feb 2016 23:04:28 +0000 (15:04 -0800)]
Merge pull request #7769 from somnathr/wip-make-shared

Use make_shared while creating shared_ptr

Reviewed-by: Samuel Just <sjust@redhat.com>
9 years agoMerge pull request #7765 from athanatos/wip-lost-unfound-repop
Samuel Just [Mon, 29 Feb 2016 18:42:01 +0000 (10:42 -0800)]
Merge pull request #7765 from athanatos/wip-lost-unfound-repop

Repop and lost-unfound overhaul

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #7824 from dillaman/wip-aio-watch-notify
Samuel Just [Mon, 29 Feb 2016 15:42:08 +0000 (07:42 -0800)]
Merge pull request #7824 from dillaman/wip-aio-watch-notify

librados: fix test failure with new aio watch/unwatch API

Reviewed-by: Samuel Just <sjust@redhat.com>
9 years agoMerge pull request #7832 from trociny/wip-journal-register-async
Jason Dillaman [Mon, 29 Feb 2016 13:53:17 +0000 (08:53 -0500)]
Merge pull request #7832 from trociny/wip-journal-register-async

journal: async methods to (un)register and update client

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
9 years agoMerge pull request #7829 from xiexingguo/xxg-wip-doc
Kefu Chai [Mon, 29 Feb 2016 13:13:10 +0000 (21:13 +0800)]
Merge pull request #7829 from xiexingguo/xxg-wip-doc

doc: fix typo, indention etc.

Reviewed-by: Abhishek Lekshmanan <abhishek@suse.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agodoc: fix typo, indention etc. 7829/head
xiexingguo [Sat, 27 Feb 2016 12:03:30 +0000 (20:03 +0800)]
doc: fix typo, indention etc.

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
9 years agoMerge pull request #7747 from vsjulu/master
Kefu Chai [Sat, 27 Feb 2016 16:01:55 +0000 (00:01 +0800)]
Merge pull request #7747 from vsjulu/master

xio: fix incorrect ip being assigned in case of multiple RDMA ports

Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agoMerge pull request #7630 from rzarzynski/wip-rgw-admin-token-cache
Yehuda Sadeh [Sat, 27 Feb 2016 14:22:09 +0000 (06:22 -0800)]
Merge pull request #7630 from rzarzynski/wip-rgw-admin-token-cache

rgw: add support for caching of Keystone admin token.

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
9 years agoMerge pull request #7825 from ceph/wip-rgw-openssl
Yehuda Sadeh [Sat, 27 Feb 2016 14:17:15 +0000 (06:17 -0800)]
Merge pull request #7825 from ceph/wip-rgw-openssl

rgw: link civetweb with openssl (Sage, Marcus Watts)

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
9 years agotest: add tests to (un)register and update journal client 7832/head
Mykola Golub [Sat, 27 Feb 2016 12:55:44 +0000 (14:55 +0200)]
test: add tests to (un)register and update journal client

Signed-off-by: Mykola Golub <mgolub@mirantis.com>
9 years agojournal: async methods to (un)register and update client
Mykola Golub [Thu, 25 Feb 2016 08:27:29 +0000 (10:27 +0200)]
journal: async methods to (un)register and update client

Signed-off-by: Mykola Golub <mgolub@mirantis.com>
9 years agocls::journal: async client_unregister
Mykola Golub [Sat, 27 Feb 2016 10:20:49 +0000 (12:20 +0200)]
cls::journal: async client_unregister

Signed-off-by: Mykola Golub <mgolub@mirantis.com>
9 years agocmake fix: build civetweb with the right include path. 7825/head
Marcus Watts [Sat, 27 Feb 2016 07:34:14 +0000 (02:34 -0500)]
cmake fix: build civetweb with the right include path.

In an earlier commit, civetweb.c got moved into a separate cmake 'object'
library civetweb_common_objs so that it could be built just once for use
with several different targets.  At the time, there was a separate global
"include_directory" to give the right include path for including "civetweb.h".
A later commit in master created an rgw_a library, and restricted civetweb.h's
include path for only building rgw_a objects.  So, as the product of
these these two commits, the target_include_directories command for the
civetweb include path now needs to be applied to civetweb_common_objs
and not rgw_a.

Signed-off-by: Marcus Watts <mwatts@redhat.com>
9 years agoMerge pull request #7650 from avnerbh/fix1_rand
Sage Weil [Fri, 26 Feb 2016 23:58:28 +0000 (18:58 -0500)]
Merge pull request #7650 from avnerbh/fix1_rand

msg: add thread safety for "random" Messenger + fix wrong usage of random functions

Reviewed-by: Haomai Wang <haomai@xsky.com>
9 years agoMerge pull request #7651 from xiexingguo/xxg-wip-fixtypecheck
Sage Weil [Fri, 26 Feb 2016 23:57:19 +0000 (18:57 -0500)]
Merge pull request #7651 from xiexingguo/xxg-wip-fixtypecheck

osd: bluestore: improve fs-type verification and tidy up

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #7654 from rldleblanc/wip-wpq-optimization
Sage Weil [Fri, 26 Feb 2016 23:36:52 +0000 (18:36 -0500)]
Merge pull request #7654 from rldleblanc/wip-wpq-optimization

osd: WeightedPriorityQueue: move to intrusive containers

9 years agoMerge pull request #7821 from rzarzynski/wip-rgw-14903
Yehuda Sadeh [Fri, 26 Feb 2016 21:37:44 +0000 (13:37 -0800)]
Merge pull request #7821 from rzarzynski/wip-rgw-14903

rgw: fix wrong handling of limit=0 during listing of Swift account.

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
9 years agorgw: change naming of utility functions in rgw_keystone.cc. 7630/head
Radoslaw Zarzynski [Fri, 26 Feb 2016 21:17:09 +0000 (22:17 +0100)]
rgw: change naming of utility functions in rgw_keystone.cc.

Slightly improve code formatting and const-correctness as well.

Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
9 years agoUse fixed version of civetweb to avoid warning. 6757/head
Marcus Watts [Tue, 23 Feb 2016 23:35:21 +0000 (18:35 -0500)]
Use fixed version of civetweb to avoid warning.

The warning about SSLv23_client_method is because when using dynamic
linking, this should always be non-zero.  That's inside of civetweb,
so this commit is to pull the submodule up to the fix.

Signed-off-by: Marcus Watts <mwatts@redhat.com>
9 years agoFix ssl link error.
Marcus Watts [Sat, 20 Feb 2016 08:29:27 +0000 (03:29 -0500)]
Fix ssl link error.

When linking against -lssl, should also include -lcrypto.

// fixup merge with previous

Signed-off-by: Marcus Watts <mwatts@redhat.com>
9 years agoUse ld.so to link in ssl crypto (cmake changes).
Marcus Watts [Thu, 11 Feb 2016 00:14:06 +0000 (19:14 -0500)]
Use ld.so to link in ssl crypto (cmake changes).

Using dlopen() to load in ssl crypto makes me cringe.
Also it requires either installing the devel package,
or appending library versioning to the library name
civetweb tries to load, which is ugly.  This is only
a license problem for people whose system distribution
does not include openssl.

Signed-off-by: Marcus Watts <mwatts@redhat.com>
9 years agorgw: fix wrong handling of limit=0 during listing of Swift account. 7821/head
Radoslaw Zarzynski [Fri, 26 Feb 2016 15:42:01 +0000 (16:42 +0100)]
rgw: fix wrong handling of limit=0 during listing of Swift account.

Fixes: #14903
Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
9 years agoMerge pull request #7777 from theanalyst/rgw/insecure-keystone
Yehuda Sadeh [Fri, 26 Feb 2016 19:18:05 +0000 (11:18 -0800)]
Merge pull request #7777 from theanalyst/rgw/insecure-keystone

rgw: allow authentication keystone with self signed certs

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
9 years agoMerge pull request #7809 from cbodley/wip-rgw-includes
Yehuda Sadeh [Fri, 26 Feb 2016 18:50:04 +0000 (10:50 -0800)]
Merge pull request #7809 from cbodley/wip-rgw-includes

rgw: use pimpl pattern for RGWPeriodHistory

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
9 years agoMerge pull request #7822 from rzarzynski/wip-rgw-keystone-proper-parse-ordering
Yehuda Sadeh [Fri, 26 Feb 2016 18:44:01 +0000 (10:44 -0800)]
Merge pull request #7822 from rzarzynski/wip-rgw-keystone-proper-parse-ordering

rgw: try to parse Keystone token in order appropriate to configuration.

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
9 years agoMerge pull request #7803 from oritwas/wip-14826
Yehuda Sadeh [Fri, 26 Feb 2016 18:38:12 +0000 (10:38 -0800)]
Merge pull request #7803 from oritwas/wip-14826

rgw: reset return code in when iterating over the bucket the objects

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
9 years agotest: remove doubled unwatch API call 7824/head
Jason Dillaman [Fri, 26 Feb 2016 18:13:23 +0000 (13:13 -0500)]
test: remove doubled unwatch API call

This error was unmasked by the fix included in commit 8caa2e4.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agolibrados: aio watch/unwatch/notify now uses completion objver
Jason Dillaman [Fri, 26 Feb 2016 18:09:59 +0000 (13:09 -0500)]
librados: aio watch/unwatch/notify now uses completion objver

A local variable was used for an async callback operation,
resulting in the potential for memory corruption.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agoXIO: Changes to fix incorrect ip being assigned in case of multiple RDMA ports.remove... 7747/head
vsjulu [Mon, 22 Feb 2016 19:40:41 +0000 (11:40 -0800)]
XIO: Changes to fix incorrect ip being assigned in case of multiple RDMA ports.remove rdma local and return error instead to avoid issues with using rdma_local incase of multiple ports.

Signed-off-by: Subramanyam Varanasi <s.varanasi@ssi.samsung.com>
9 years agorgw: try to parse Keystone token in order appropriate to configuration. 7822/head
Radoslaw Zarzynski [Fri, 26 Feb 2016 14:25:20 +0000 (15:25 +0100)]
rgw: try to parse Keystone token in order appropriate to configuration.

Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
9 years agorgw: add insecure option to the http client 7777/head
Abhishek Lekshmanan [Thu, 25 Feb 2016 10:07:51 +0000 (11:07 +0100)]
rgw: add insecure option to the http client

This allows the http client to turn off ssl certificate peer checking,
which is turned on by default. This is useful in cases like when
Keystone is SSL terminated with a self signed certificate.
The option `rgw_keystone_verify_ssl` (default true) can be toggled if
self signed certs are used, so that swift and s3 apis using keystone
authentication can work.

Fixes: #14583
Reported-by: Karol Mroz <mroz.karol@gmail.com>
Signed-off-by: Abhishek Lekshmanan <abhishek@suse.com>
9 years agorgw: use pimpl pattern for RGWPeriodHistory 7809/head
Casey Bodley [Thu, 25 Feb 2016 18:07:54 +0000 (13:07 -0500)]
rgw: use pimpl pattern for RGWPeriodHistory

this removes the dependency on RGWPeriod from rgw_rados.h, which breaks
a circular dependency between rgw_rados.h -> rgw_metadata.h ->
rgw_period_history.h -> rgw_rados.h

Reported-by: Willem Jan Withagen <wjw@digiware.nl>
Signed-off-by: Casey Bodley <cbodley@redhat.com>
9 years agodoc: final v9.2.1 release notes
Sage Weil [Fri, 26 Feb 2016 15:24:22 +0000 (10:24 -0500)]
doc: final v9.2.1 release notes

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #7694 from Abhishekvrshny/wip-infernalis-release-notes
Sage Weil [Fri, 26 Feb 2016 15:24:20 +0000 (10:24 -0500)]
Merge pull request #7694 from Abhishekvrshny/wip-infernalis-release-notes

release-notes: draft v9.2.1 release notes

9 years agorbd/run_cli_tests.sh: Reflect test failures 7781/head
Zack Cerza [Wed, 24 Feb 2016 19:24:11 +0000 (12:24 -0700)]
rbd/run_cli_tests.sh: Reflect test failures

Signed-off-by: Zack Cerza <zack@redhat.com>
9 years agoMerge pull request #7813 from xiexingguo/xxg-wip-doc
Sage Weil [Fri, 26 Feb 2016 14:54:20 +0000 (09:54 -0500)]
Merge pull request #7813 from xiexingguo/xxg-wip-doc

doc: small fixes

9 years agodoc: batch small fixes, including typo, syntax etc. 7813/head
xiexingguo [Fri, 26 Feb 2016 15:25:02 +0000 (23:25 +0800)]
doc: batch small fixes, including typo, syntax etc.

Signed-off-by: xiexingguo <xie.xingguo@zte.com.cn>
9 years agodoc: fix typo
xiexingguo [Fri, 26 Feb 2016 14:39:57 +0000 (22:39 +0800)]
doc: fix typo

Signed-off-by: xiexingguo <xie.xingguo@zte.com.cn>
9 years agoMerge pull request #7805 from ErwanAliasr1/evelu-check-btrfs
Loic Dachary [Fri, 26 Feb 2016 04:34:42 +0000 (11:34 +0700)]
Merge pull request #7805 from ErwanAliasr1/evelu-check-btrfs

Fixing BTFS issue at 'make check'

Reviewed-by: Loic Dachary <ldachary@redhat.com>
9 years agoMerge pull request #7802 from branch-predictor/bp-increase-async-threads
Haomai Wang [Fri, 26 Feb 2016 02:45:45 +0000 (10:45 +0800)]
Merge pull request #7802 from branch-predictor/bp-increase-async-threads

config: increase default async op threads

Reviewed-by: Haomai Wang <haomai@xsky.com>
9 years agoMerge pull request #7808 from cbodley/wip-cmake-jerasure
Ali Maredia [Thu, 25 Feb 2016 20:09:09 +0000 (15:09 -0500)]
Merge pull request #7808 from cbodley/wip-cmake-jerasure

cmake: add ErasureCode.cc to jerasure plugins

9 years agocmake: add ErasureCode.cc to jerasure plugins 7808/head
Casey Bodley [Thu, 25 Feb 2016 19:57:56 +0000 (14:57 -0500)]
cmake: add ErasureCode.cc to jerasure plugins

Signed-off-by: Casey Bodley <cbodley@redhat.com>
9 years agorgw: link against system openssl (instead of dlopen at runtime)
Sage Weil [Thu, 29 Oct 2015 05:06:36 +0000 (01:06 -0400)]
rgw: link against system openssl (instead of dlopen at runtime)

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agoosd/: Use MOSDPGUpdateLogMissing to implement mark_unfound_lost_delete safely 7765/head
Samuel Just [Fri, 12 Feb 2016 17:27:01 +0000 (09:27 -0800)]
osd/: Use MOSDPGUpdateLogMissing to implement mark_unfound_lost_delete safely

Using a MOSDPGLog was unsafe since it is not ordered with
respect to repops.  Instead, use a new message sent through
the same paths as repops.

Signed-off-by: Samuel Just <sjust@redhat.com>
9 years agoosd/,messages/: add MOSDPGUpdateLogMissing[Reply]
Samuel Just [Fri, 22 Jan 2016 02:26:45 +0000 (18:26 -0800)]
osd/,messages/: add MOSDPGUpdateLogMissing[Reply]

Signed-off-by: Samuel Just <sjust@redhat.com>
9 years agoos/: add try_rename
Samuel Just [Thu, 28 Jan 2016 22:11:42 +0000 (14:11 -0800)]
os/: add try_rename

Similar to collection_move_rename, except we ignore ENOENT and
don't allow different collections.

Signed-off-by: Samuel Just <sjust@redhat.com>
9 years agoMerge pull request #7748 from ceph/wip-cmake-2-22-16
Casey Bodley [Thu, 25 Feb 2016 19:06:16 +0000 (14:06 -0500)]
Merge pull request #7748 from ceph/wip-cmake-2-22-16

cmake: fix paths to various EC source files

9 years agocmake: installing _tp libraries into lib 7748/head
Ali Maredia [Thu, 25 Feb 2016 19:02:11 +0000 (14:02 -0500)]
cmake: installing _tp libraries into lib

Signed-off-by: Ali Maredia <amaredia@redhat.com>
9 years agoPGLog: factor out claim_log_entries_update_missing
Samuel Just [Mon, 30 Mar 2015 23:58:25 +0000 (16:58 -0700)]
PGLog: factor out claim_log_entries_update_missing

Signed-off-by: Samuel Just <sjust@redhat.com>
9 years agoPGLog::merge_log: update missing, after removing divergent
Samuel Just [Mon, 30 Mar 2015 22:28:03 +0000 (15:28 -0700)]
PGLog::merge_log: update missing, after removing divergent

This should not change behavior at all.  It'll be useful in
the next few commits.

Signed-off-by: Samuel Just <sjust@redhat.com>
9 years agoPG,PGLog: convert to DoutPrefixProviders
Samuel Just [Mon, 30 Mar 2015 23:51:04 +0000 (16:51 -0700)]
PG,PGLog: convert to DoutPrefixProviders

Signed-off-by: Samuel Just <sjust@redhat.com>
9 years agodout.h: add a DoutPrefixProvider and macro to allow passing of prefixes
Samuel Just [Mon, 30 Mar 2015 23:46:10 +0000 (16:46 -0700)]
dout.h: add a DoutPrefixProvider and macro to allow passing of prefixes

This way, we can get proper logging within static functions.

Signed-off-by: Samuel Just <sjust@redhat.com>
9 years agoECBackend: use CEPH_MSG_PRIO_HIGH for write replies
Samuel Just [Wed, 3 Feb 2016 17:35:31 +0000 (09:35 -0800)]
ECBackend: use CEPH_MSG_PRIO_HIGH for write replies

Signed-off-by: Samuel Just <sjust@redhat.com>
9 years agoECBackend: send subop writes and reads at normal priority
Samuel Just [Fri, 8 Jan 2016 21:26:39 +0000 (13:26 -0800)]
ECBackend: send subop writes and reads at normal priority

We want these to be processed ahead of new client ops since
there are resources being held.

Fixes: 14313
Backport: hammer
Signed-off-by: Samuel Just <sjust@redhat.com>
9 years agoReplicatedPG: remove OpContext from Repop
Samuel Just [Tue, 19 Jan 2016 23:33:02 +0000 (15:33 -0800)]
ReplicatedPG: remove OpContext from Repop

Signed-off-by: Samuel Just <sjust@redhat.com>
9 years agoReplicatedPG: s/release_op_ctx_locks/release_object_locks, don't use opcontext
Samuel Just [Tue, 8 Dec 2015 23:31:05 +0000 (15:31 -0800)]
ReplicatedPG: s/release_op_ctx_locks/release_object_locks, don't use opcontext

This gets us one step closer to removing OpContext from Repop.

Signed-off-by: Samuel Just <sjust@redhat.com>
9 years agoReplicatedPG: refactor OpContext to use ObcLockManager
Samuel Just [Wed, 13 Jan 2016 19:29:24 +0000 (11:29 -0800)]
ReplicatedPG: refactor OpContext to use ObcLockManager

Signed-off-by: Samuel Just <sjust@redhat.com>
9 years agoReplicatedPG::close_op_ctx: the err argument is unused
Samuel Just [Mon, 23 Nov 2015 23:40:33 +0000 (15:40 -0800)]
ReplicatedPG::close_op_ctx: the err argument is unused

Signed-off-by: Samuel Just <sjust@redhat.com>
9 years agoosd_types: add ObcLockManager
Samuel Just [Wed, 13 Jan 2016 19:16:18 +0000 (11:16 -0800)]
osd_types: add ObcLockManager

Signed-off-by: Samuel Just <sjust@redhat.com>
9 years agosrc/osd: use unique_ptr for backend trasaction, move into submit_transaction
Samuel Just [Mon, 16 Nov 2015 18:06:45 +0000 (10:06 -0800)]
src/osd: use unique_ptr for backend trasaction, move into submit_transaction

submit_transaction takes ownership of the transaction implicitely.  Make
this implicit using an rvalue ref to force usage of std::move and move
constructor.

Signed-off-by: Samuel Just <sjust@redhat.com>
9 years agoReplicatedPG::RepGather: remove on_finish, no more users
Samuel Just [Mon, 16 Nov 2015 17:13:34 +0000 (09:13 -0800)]
ReplicatedPG::RepGather: remove on_finish, no more users

Signed-off-by: Samuel Just <sjust@redhat.com>
9 years agoReplicatedPG: use register_on_finish rather than on_finish for flush/evict
Samuel Just [Fri, 13 Nov 2015 21:56:19 +0000 (13:56 -0800)]
ReplicatedPG: use register_on_finish rather than on_finish for flush/evict

Signed-off-by: Samuel Just <sjust@redhat.com>
9 years agoReplicatedPG::scrub: use register_on_commit rather than on_finish
Samuel Just [Fri, 13 Nov 2015 22:06:57 +0000 (14:06 -0800)]
ReplicatedPG::scrub: use register_on_commit rather than on_finish

Signed-off-by: Samuel Just <sjust@redhat.com>
9 years agoReplicatedPG: move do_osd_op_effects out of eval_repop
Samuel Just [Fri, 13 Nov 2015 18:37:45 +0000 (10:37 -0800)]
ReplicatedPG: move do_osd_op_effects out of eval_repop

This is better anyway, do_osd_op_effects on a non-client op was somewhat
silly without an op (even if you filled in the other fields like
watch_connects, it would just silently skip it).  It also eliminates
another dependence of RepGather on OpContext.

Signed-off-by: Samuel Just <sjust@redhat.com>
9 years agoReplicatedPG: break out complete_disconnect_watches helper
Samuel Just [Fri, 13 Nov 2015 18:18:31 +0000 (10:18 -0800)]
ReplicatedPG: break out complete_disconnect_watches helper

We'll need this shortly when we remove do_osd_op_effects from
eval_repop.

Signed-off-by: Samuel Just <sjust@redhat.com>
9 years agoReplicatedPG: move client reply handling out of eval_repop
Samuel Just [Fri, 12 Feb 2016 17:32:45 +0000 (09:32 -0800)]
ReplicatedPG: move client reply handling out of eval_repop

execute_ctx is the only path which actually has a client op,
let's clarify eval_repop by moving that logic inline there.
This also eliminates most of the repop->ctx users from
eval_repop.

Signed-off-by: Samuel Just <sjust@redhat.com>
9 years agoosd/: replace simple_repop_.* with simple_opc_.*
Samuel Just [Wed, 11 Nov 2015 20:40:16 +0000 (12:40 -0800)]
osd/: replace simple_repop_.* with simple_opc_.*

This way, we don't expose the RepGather structure
up into the users (which pretty much exclusively
use the repop->ctx member anyway).  This will pave
the way to removing RepGather::ctx.

Part of this involves generalizing the repop callback
members (queue_snap_trimmer and on_applied) to
on_applied, on_committed, on_success, and on_finish
on both OpContext and RepGather.

Signed-off-by: Samuel Just <sjust@redhat.com>
9 years agointroduce CEPH_FEATURE_SERVER_JEWEL feature bit
Samuel Just [Wed, 20 Jan 2016 18:16:21 +0000 (10:16 -0800)]
introduce CEPH_FEATURE_SERVER_JEWEL feature bit

Signed-off-by: Samuel Just <sjust@redhat.com>
9 years agocmake: Removed _tp libraries from linking
Ali Maredia [Thu, 25 Feb 2016 18:48:26 +0000 (13:48 -0500)]
cmake: Removed _tp libraries from linking

Signed-off-by: Ali Maredia <amaredia@redhat.com>
9 years agorgw: add support for caching of Keystone admin token.
Radoslaw Zarzynski [Fri, 12 Feb 2016 18:49:30 +0000 (19:49 +0100)]
rgw: add support for caching of Keystone admin token.

Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
9 years agotest/ceph_objectstore_tool: Deleting btrfs subvolumes before exiting 7805/head
Erwan Velu [Thu, 25 Feb 2016 17:06:17 +0000 (18:06 +0100)]
test/ceph_objectstore_tool: Deleting btrfs subvolumes before exiting

When running the ceph_objectstore_tool test suite, we shall delete the btrfs
subvolumes that have been created before trying deleting the content unless that will generate a permission denied
issue.

Signed-off-by: Erwan Velu <erwan@redhat.com>
9 years agoceph-helpers: Delete remaining subvolumes on destroy_osd()
Erwan Velu [Thu, 25 Feb 2016 15:01:24 +0000 (16:01 +0100)]
ceph-helpers: Delete remaining subvolumes on destroy_osd()

Before deleting $dir/$id, we have to delete the associated subvolumes unless the
rm will fail.

Signed-off-by: Erwan Velu <erwan@redhat.com>
9 years agoMerge pull request #7793 from tchaikov/wip-fix-dencoder-MirrorImage
Jason Dillaman [Thu, 25 Feb 2016 15:33:19 +0000 (10:33 -0500)]
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>
9 years agorgw: reset return code in when iterating over the bucket the objects 7803/head
Orit Wasserman [Thu, 25 Feb 2016 15:02:15 +0000 (16:02 +0100)]
rgw: reset return code in when iterating over the bucket the objects

Fixes: #14826
Signed-off-by: Orit Wasserman <owasserm@redhat.com>
9 years agocls_rbd: fix the test for ceph-dencoder 7793/head
Kefu Chai [Thu, 25 Feb 2016 07:11:44 +0000 (15:11 +0800)]
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>
9 years agoMerge pull request #7792 from tchaikov/wip-13505
Loic Dachary [Thu, 25 Feb 2016 15:04:26 +0000 (22:04 +0700)]
Merge pull request #7792 from tchaikov/wip-13505

fix FTBFS introduced by d0af316

Reviewed-by: Loic Dachary <ldachary@redhat.com>
9 years agoceph-helpers.sh: Deleting forgoten btrfs subvolumes
Erwan Velu [Thu, 25 Feb 2016 13:08:10 +0000 (14:08 +0100)]
ceph-helpers.sh: Deleting forgoten btrfs subvolumes

While running a make check on a btrfs system, many subvolumes are let at the end
of the build. It's pretty common to have several hundreds of those.

btrfs is pretty sensible to the path when requesting a subvolume removal.
The current code was misleading the path and didn't deleted the remaining
volumes.

This patch list the current subvolumes, filter thoses created by the
test process and ajust the path because brtfs reports
  erwan/chroot/ceph/src/testdir/test-7202/dev/osd1/snap_439
while regarding the current working directory we want to delete :
  testdir/test-7202/dev/osd1/snap_439

Signed-off-by: Erwan Velu <erwan@redhat.com>
9 years agoconfig: increase default async op threads 7802/head
Piotr Dałek [Thu, 25 Feb 2016 14:12:52 +0000 (15:12 +0100)]
config: increase default async op threads

Default value of two async threads is enough for light workloads,
but is insufficient for heavy ones, reducing maximum throughput on
slower CPUs that have plenty of logical cores. Three async threads
give noticeable perf jump without any noticeable downsides.

Signed-off-by: Piotr Dałek <piotr.dalek@ts.fujitsu.com>
9 years agoMerge pull request #7731 from SUSE/wip-shebang
Loic Dachary [Thu, 25 Feb 2016 14:03:21 +0000 (21:03 +0700)]
Merge pull request #7731 from SUSE/wip-shebang

ceph_detect_init/__init__.py: remove shebang

Reviewed-by: Loic Dachary <ldachary@redhat.com>
9 years agoosd: always cleanup the scrub results 7792/head
Kefu Chai [Thu, 25 Feb 2016 13:06:04 +0000 (21:06 +0800)]
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>
9 years agopybind: fix the FTBFS introduced by d0af316
Kefu Chai [Thu, 25 Feb 2016 06:28:32 +0000 (14:28 +0800)]
pybind: fix the FTBFS introduced by d0af316

Signed-off-by: Kefu Chai <kchai@redhat.com>
9 years agoMerge pull request #7734 from dachary/wip-14834-pidfile-test
Kefu Chai [Thu, 25 Feb 2016 08:19:08 +0000 (16:19 +0800)]
Merge pull request #7734 from dachary/wip-14834-pidfile-test

tests: test_pidfile.sh lingering processes

Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agolibrados: add missing tracpoint for scrub APIs
Kefu Chai [Thu, 25 Feb 2016 06:26:39 +0000 (14:26 +0800)]
librados: add missing tracpoint for scrub APIs

Signed-off-by: Kefu Chai <kchai@redhat.com>
9 years agotests: test_pidfile.sh lingering processes 7734/head
Loic Dachary [Mon, 22 Feb 2016 04:38:46 +0000 (11:38 +0700)]
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>
9 years agoMerge pull request #6898 from tchaikov/wip-13505
Kefu Chai [Thu, 25 Feb 2016 04:48:14 +0000 (12:48 +0800)]
Merge pull request #6898 from tchaikov/wip-13505

add scrub persist/query API

Reviewed-by: Samuel Just <sjust@redhat.com>
9 years agorados: add "list-inconsistent-snapset" cmd 6898/head
Kefu Chai [Sat, 30 Jan 2016 13:22:19 +0000 (21:22 +0800)]
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>
9 years agorados: add "list-inconsistent-obj" cmd
Kefu Chai [Sat, 30 Jan 2016 08:35:27 +0000 (16:35 +0800)]
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>
9 years agolibrados: add get_inconsistent_snapsets() API
Kefu Chai [Sat, 30 Jan 2016 07:51:33 +0000 (15:51 +0800)]
librados: add get_inconsistent_snapsets() API

Fixes: #13505
Signed-off-by: Kefu Chai <kchai@redhat.com>
9 years agolibrados: add get_inconsistent_objects() API
Kefu Chai [Sat, 30 Jan 2016 07:05:31 +0000 (15:05 +0800)]
librados: add get_inconsistent_objects() API

Fixes: #13505
Signed-off-by: Kefu Chai <kchai@redhat.com>
9 years agoosd: add CEPH_OSD_OP_SCRUBLS pg op
Kefu Chai [Sat, 30 Jan 2016 06:51:17 +0000 (14:51 +0800)]
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>
9 years agoosd: persist inconsistent snapsets using omap
Kefu Chai [Sat, 30 Jan 2016 07:22:49 +0000 (15:22 +0800)]
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>
9 years agolibrados: add `inconsistent_snapset_t` type
Kefu Chai [Sat, 30 Jan 2016 07:09:43 +0000 (15:09 +0800)]
librados: add `inconsistent_snapset_t` type

for presenting the inconsistent snapsets found in scrub

Signed-off-by: Kefu Chai <kchai@redhat.com>
9 years agoosd/: clear scrub store safetly
Samuel Just [Tue, 23 Feb 2016 19:50:46 +0000 (11:50 -0800)]
osd/: clear scrub store safetly

Signed-off-by: Samuel Just <sjust@redhat.com>
9 years agoosd: persist inconsistent objs using omap
Kefu Chai [Sat, 30 Jan 2016 06:38:48 +0000 (14:38 +0800)]
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>