]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
6 years agorgw: drop getting list-type when get_data is false 28809/head
Jos Collin [Wed, 3 Jul 2019 04:44:21 +0000 (10:14 +0530)]
rgw: drop getting list-type when get_data is false

Signed-off-by: Jos Collin <jcollin@redhat.com>
6 years agorgw: Silence warning: control reaches end of non-void function
Jos Collin [Mon, 1 Jul 2019 09:02:33 +0000 (14:32 +0530)]
rgw: Silence warning: control reaches end of non-void function

Build shows:
[ 53%] Building CXX object src/mds/CMakeFiles/mds.dir/JournalPointer.cc.o
ceph/src/rgw/rgw_rest_s3.cc: In member function ‘RGWOp* RGWHandler_REST_Bucket_S3::get_obj_op(bool)’:
ceph/src/rgw/rgw_rest_s3.cc:3588:5: warning: control reaches end of non-void function [-Wreturn-type]
   }   }
     ^
Fixes: 4ffc765c4c5debc665ade7769c4647c3a7278fd2
Fixes: http://tracker.ceph.com/issues/40747
Signed-off-by: Jos Collin <jcollin@redhat.com>
6 years agoMerge pull request #28800 from tchaikov/wip-crimson-mkfs
Kefu Chai [Mon, 1 Jul 2019 02:04:12 +0000 (10:04 +0800)]
Merge pull request #28800 from tchaikov/wip-crimson-mkfs

crimson: use given osd_fsid when mkfs

Reviewed-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
6 years agoMerge pull request #28774 from falcon78921/wip-doc-40575
Kefu Chai [Mon, 1 Jul 2019 01:41:52 +0000 (09:41 +0800)]
Merge pull request #28774 from falcon78921/wip-doc-40575

doc: fixed broken link in Swift Settings section

Reviewed-by: Kefu Chai <kchai@redhat.com>
6 years agodoc: fixed broken link in Swift Settings section 28774/head
James McClune [Thu, 27 Jun 2019 21:16:46 +0000 (17:16 -0400)]
doc: fixed broken link in Swift Settings section

Fixes: https://tracker.ceph.com/issues/40575
Signed-off-by: James McClune <jmcclune@mcclunetechnologies.net>
6 years agoMerge pull request #28786 from tchaikov/wip-const-head
Kefu Chai [Sun, 30 Jun 2019 15:44:51 +0000 (23:44 +0800)]
Merge pull request #28786 from tchaikov/wip-const-head

osd/PrimaryLogPG: more constness

Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
6 years agocrimson: use given osd_fsid when mkfs 28800/head
Kefu Chai [Sun, 30 Jun 2019 15:34:53 +0000 (23:34 +0800)]
crimson: use given osd_fsid when mkfs

MemStore does not have this feature, but CyanStore needs it. because
`qa/tasks/ceph.py` uses following steps when creating/starting an OSD

1. ceph-osd --mkfs --mkkey -i <osd_id> --monmap <monmap>
2. read the osd_fsid of osd.<osd_id>
3. ceph osd new <osd_fsid> <osd_id>

when we mkfs for the OSD, the osd_fsid is still unknown. so we cannot
use the configured one, as it is always empty. in that case, we need to
use a random uuid, and persist it to both ${osd_data}/fsid and
superblock.osd_fsid

Signed-off-by: Kefu Chai <kchai@redhat.com>
6 years agoMerge pull request #28719 from majianpeng/remove-unused-code-XioMessenger
Kefu Chai [Sun, 30 Jun 2019 07:55:08 +0000 (15:55 +0800)]
Merge pull request #28719 from majianpeng/remove-unused-code-XioMessenger

msg/Message: Remove used code about XioMessenger.

Reviewed-by: Kefu Chai <kchai@redhat.com>
6 years agoMerge pull request #28794 from tchaikov/wip-crimson-option-help-seastar
Kefu Chai [Sun, 30 Jun 2019 07:52:32 +0000 (15:52 +0800)]
Merge pull request #28794 from tchaikov/wip-crimson-option-help-seastar

crimson/osd: add "--help-seastar" command line option

Reviewed-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
6 years agodoc/dev/crimson.rst: update with stuff related to seastar options 28794/head
Kefu Chai [Sat, 29 Jun 2019 15:15:34 +0000 (23:15 +0800)]
doc/dev/crimson.rst: update with stuff related to seastar options

Signed-off-by: Kefu Chai <kchai@redhat.com>
6 years agoMerge pull request #28792 from tchaikov/wip-crimson-logging
Kefu Chai [Sat, 29 Jun 2019 15:02:39 +0000 (23:02 +0800)]
Merge pull request #28792 from tchaikov/wip-crimson-logging

common/config_values: set seastar logging level per that of ceph

Reviewed-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
6 years agoMerge pull request #28790 from tchaikov/wip-crimson-unknown-objectstore
Kefu Chai [Sat, 29 Jun 2019 14:54:15 +0000 (22:54 +0800)]
Merge pull request #28790 from tchaikov/wip-crimson-unknown-objectstore

crimson/osd: abort on unsupported objectstore type

Reviewed-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
6 years agocrimson/osd: add "--help-seastar" command line option
Kefu Chai [Sat, 29 Jun 2019 14:37:02 +0000 (22:37 +0800)]
crimson/osd: add "--help-seastar" command line option

so we can

* have access to the available command line options offered by Seastar.
* tell if the executable we are playing around is ceph-osd or crimson-osd.

Signed-off-by: Kefu Chai <kchai@redhat.com>
6 years agodoc/dev/crimson.rst: update logging related doc 28792/head
Kefu Chai [Sat, 29 Jun 2019 13:40:58 +0000 (21:40 +0800)]
doc/dev/crimson.rst: update logging related doc

as crimson's logging levels are now connected those of ceph, there is no
need to note down the difference between them anymore.

Signed-off-by: Kefu Chai <kchai@redhat.com>
6 years agocommon/config_values: set seastar logging level as well
Kefu Chai [Sat, 29 Jun 2019 13:35:31 +0000 (21:35 +0800)]
common/config_values: set seastar logging level as well

when the logging level of a subsys changes, update seastar accordingly

before this change, seastar logging levels of different logger are not
connected to ceph's logging levels of different subsystem.

after this change, they are connected. whenever a subsys's logging level
changes, the corresponding seastar logger is updated as well.

Signed-off-by: Kefu Chai <kchai@redhat.com>
6 years agocommon/dout.h: extract log level mapping out
Kefu Chai [Sat, 29 Jun 2019 13:34:39 +0000 (21:34 +0800)]
common/dout.h: extract log level mapping out

so we can reuse it.

Signed-off-by: Kefu Chai <kchai@redhat.com>
6 years agocrimson/osd: revert 9813f7d6
Kefu Chai [Sat, 29 Jun 2019 12:25:16 +0000 (20:25 +0800)]
crimson/osd: revert 9813f7d6

since we have a proper PeeringState implementation, there is no need to
fake an active+clean PG anymore.

Signed-off-by: Kefu Chai <kchai@redhat.com>
6 years agocrimson/osd: abort on unsupported objectstore type 28790/head
Kefu Chai [Sat, 29 Jun 2019 11:52:45 +0000 (19:52 +0800)]
crimson/osd: abort on unsupported objectstore type

Signed-off-by: Kefu Chai <kchai@redhat.com>
6 years agocrimson/osd: add editor variables/options
Kefu Chai [Sat, 29 Jun 2019 11:52:16 +0000 (19:52 +0800)]
crimson/osd: add editor variables/options

Signed-off-by: Kefu Chai <kchai@redhat.com>
6 years agocrimson/common: implement "__ceph_abortf()"
Kefu Chai [Sat, 29 Jun 2019 11:50:18 +0000 (19:50 +0800)]
crimson/common: implement "__ceph_abortf()"

the macro of `ceph_abort_msgf()` is implemented using it.

Signed-off-by: Kefu Chai <kchai@redhat.com>
6 years agocrimson/osd: add a space before function name
Kefu Chai [Sat, 29 Jun 2019 07:08:26 +0000 (15:08 +0800)]
crimson/osd: add a space before function name

for better readability

Signed-off-by: Kefu Chai <kchai@redhat.com>
6 years agocrimson/osd: use get_osdmap_epoch()
Kefu Chai [Sat, 29 Jun 2019 07:06:25 +0000 (15:06 +0800)]
crimson/osd: use get_osdmap_epoch()

always prefer using the interface.

Signed-off-by: Kefu Chai <kchai@redhat.com>
6 years agoosd/PrimaryLogPG: more constness 28786/head
Kefu Chai [Sat, 29 Jun 2019 06:30:16 +0000 (14:30 +0800)]
osd/PrimaryLogPG: more constness

use `hobject_t::get_head()` instead of relying on the fact that head
object's snap is `CEPH_NOSNAP`.

Signed-off-by: Kefu Chai <kchai@redhat.com>
6 years agoMerge pull request #28780 from varshar16/wip-doc-update-sepia-link
Kefu Chai [Sat, 29 Jun 2019 04:12:36 +0000 (12:12 +0800)]
Merge pull request #28780 from varshar16/wip-doc-update-sepia-link

doc: Updates link to Sepia lab

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
6 years agoMerge pull request #28664 from linuxbox2/wip-rgwfile-faststats
Matt Benjamin [Fri, 28 Jun 2019 23:09:00 +0000 (19:09 -0400)]
Merge pull request #28664 from linuxbox2/wip-rgwfile-faststats

rgw_file: introduce fast S3 Unix stats (immutable)

6 years agoMerge pull request #28783 from cbodley/wip-rgw-object-lock-get-params
Ali Maredia [Fri, 28 Jun 2019 20:36:32 +0000 (16:36 -0400)]
Merge pull request #28783 from cbodley/wip-rgw-object-lock-get-params

rgw: fix MalformedXML errors in PutBucketObjectLock/PutObjRetention

6 years agorgw_file: introduce fast S3 Unix stats (immutable) 28664/head
Matt Benjamin [Wed, 19 Jun 2019 18:43:38 +0000 (14:43 -0400)]
rgw_file: introduce fast S3 Unix stats (immutable)

For objects originating in S3/Swift, it is frequently acceptable
to synthesize c/mtime and size stats from meta attributes in the RGW
bucket index entry.

Synthetic stat behavior is not compatible with mutation of file
ownership and permissions via SETATTR.  In future, current xattr-based,
mutable, Unix stats may be moved to the bucket index.  For now, use
synthetic stats only when a new option rgw_nfs_s3_fast_attrs is present.

Fixes: http://tracker.ceph.com/issues/40456
Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
6 years agoMerge pull request #27964 from Kriechi/fix-rgw-ldap-username
Matt Benjamin [Fri, 28 Jun 2019 20:17:34 +0000 (16:17 -0400)]
Merge pull request #27964 from Kriechi/fix-rgw-ldap-username

docs: fix rgw_ldap_dnattr username token

6 years agoMerge pull request #28724 from ivancich/wip-abort-multipart-fix
Casey Bodley [Fri, 28 Jun 2019 19:25:12 +0000 (15:25 -0400)]
Merge pull request #28724 from ivancich/wip-abort-multipart-fix

rgw: multipart upload abort is best-effort

Reviewed-by: Casey Bodley <cbodley@redhat.com>
6 years agoMerge pull request #28102 from albIN7/liv2
Ali Maredia [Fri, 28 Jun 2019 18:58:54 +0000 (14:58 -0400)]
Merge pull request #28102 from albIN7/liv2

RGW:Listobjectsv2

6 years agorgw: fix MalformedXML errors in PutBucketObjectLock/PutObjRetention 28783/head
Casey Bodley [Fri, 28 Jun 2019 18:54:54 +0000 (14:54 -0400)]
rgw: fix MalformedXML errors in PutBucketObjectLock/PutObjRetention

RGWPutBucketObjectLock was not calling get_params(), so the 'data' it
was trying to parse was empty

RGWPutObjRetention was calling get_params() a second time, which
overwrote the 'data' from the first call

Signed-off-by: Casey Bodley <cbodley@redhat.com>
6 years agoMerge PR #28491 into master
Sage Weil [Fri, 28 Jun 2019 18:44:18 +0000 (13:44 -0500)]
Merge PR #28491 into master

* refs/pull/28491/head:
doc/rados/operations: add safe-to-destroy check to OSD replacement workflow

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
6 years agoMerge pull request #28781 from ivancich/wip-fix-source-permissions
J. Eric Ivancich [Fri, 28 Jun 2019 17:00:00 +0000 (13:00 -0400)]
Merge pull request #28781 from ivancich/wip-fix-source-permissions

src/: remove execute permissions on nine source files

Reviewed-by: Kefu Chai <kchai@redhat.com>
6 years agoMerge pull request #28775 from neha-ojha/wip-doc-delete-sleep
Neha Ojha [Fri, 28 Jun 2019 16:11:00 +0000 (09:11 -0700)]
Merge pull request #28775 from neha-ojha/wip-doc-delete-sleep

doc/rados/configuration/osd-config-ref.rst: document osd_delete_sleep

Reviewed-by: Sage Weil <sage@redhat.com>
6 years agomisc: remove execute permissions on nine source files 28781/head
J. Eric Ivancich [Wed, 26 Jun 2019 18:48:28 +0000 (14:48 -0400)]
misc: remove execute permissions on nine source files

Signed-off-by: J. Eric Ivancich <ivancich@redhat.com>
6 years agoMerge pull request #28565 from linuxbox2/wip-rgwfile-eof
Matt Benjamin [Fri, 28 Jun 2019 15:05:42 +0000 (11:05 -0400)]
Merge pull request #28565 from linuxbox2/wip-rgwfile-eof

rgw_file: fix readdir eof() calc--caller stop implies !eof

6 years agodoc: Updates link to Sepia lab 28780/head
Varsha Rao [Fri, 28 Jun 2019 14:17:50 +0000 (19:47 +0530)]
doc: Updates link to Sepia lab

Signed-off-by: Varsha Rao <varao@redhat.com>
6 years agoMerge pull request #28761 from lixiaoy1/pmem_osd
Jason Dillaman [Fri, 28 Jun 2019 11:42:43 +0000 (07:42 -0400)]
Merge pull request #28761 from lixiaoy1/pmem_osd

os/bluestore: fix pmem osd build problem

Reviewed-by: Jason Dillaman <dllaman@redhat.com>
6 years agoMerge pull request #28776 from badone/wip-minimimal-config-no-longer-valid
Kefu Chai [Fri, 28 Jun 2019 09:38:40 +0000 (17:38 +0800)]
Merge pull request #28776 from badone/wip-minimimal-config-no-longer-valid

do_cmake.sh: Add a heading to the minimal config

Reviewed-by: Kefu Chai <kchai@redhat.com>
6 years agoos/bluestore: fix pmem osd build problem 28761/head
lixiaoy1 [Thu, 27 Jun 2019 14:12:34 +0000 (10:12 -0400)]
os/bluestore: fix pmem osd build problem

Signed-off-by: Peterson, Scott <scott.d.peterson@intel.com>
Signed-off-by: Li, Xiaoyan <xiaoyan.li@intel.com>
6 years agodo_cmake.sh: Add a heading to the minimal config 28776/head
Brad Hubbard [Fri, 28 Jun 2019 05:46:30 +0000 (15:46 +1000)]
do_cmake.sh: Add a heading to the minimal config

Post #28634 the minimal ceph config is invalid without a header.

Signed-off-by: Brad Hubbard <bhubbard@redhat.com>
6 years agoMerge pull request #28771 from athanatos/sjust/wip-schedule-event-on-commit
Kefu Chai [Fri, 28 Jun 2019 04:14:19 +0000 (12:14 +0800)]
Merge pull request #28771 from athanatos/sjust/wip-schedule-event-on-commit

crimson/osd/pg: start_operation for read_state, schedule_event_on_commit

Reviewed-by: Yingxin Cheng <yingxincheng@gmail.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
6 years agodoc/rados/configuration/osd-config-ref.rst: document osd_delete_sleep 28775/head
Neha Ojha [Fri, 28 Jun 2019 00:21:58 +0000 (17:21 -0700)]
doc/rados/configuration/osd-config-ref.rst: document osd_delete_sleep

Signed-off-by: Neha Ojha <nojha@redhat.com>
6 years agocrimson/osd/pg: start_operation for read_state, schedule_event_on_commit 28771/head
Samuel Just [Thu, 27 Jun 2019 18:57:22 +0000 (11:57 -0700)]
crimson/osd/pg: start_operation for read_state, schedule_event_on_commit

This way they'll be holding the appropriate pipeline stage.

Signed-off-by: Samuel Just <sjust@redhat.com>
6 years agoMerge pull request #28351 from trociny/wip-39968
Jason Dillaman [Thu, 27 Jun 2019 17:41:02 +0000 (13:41 -0400)]
Merge pull request #28351 from trociny/wip-39968

 journal: add support for aligned appends

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
6 years agoMerge pull request #28730 from trociny/wip-40519
Jason Dillaman [Thu, 27 Jun 2019 17:37:56 +0000 (13:37 -0400)]
Merge pull request #28730 from trociny/wip-40519

rbd-mirror: handle duplicates in image sync throttler queue

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
6 years agoMerge pull request #28748 from trociny/wip-journal-player-handle_cache_rebalanced
Jason Dillaman [Thu, 27 Jun 2019 17:37:34 +0000 (13:37 -0400)]
Merge pull request #28748 from trociny/wip-journal-player-handle_cache_rebalanced

journal: fix race between player shut down and cache rebalance

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
6 years agodoc/rados/operations: add safe-to-destroy check to OSD replacement workflow 28491/head
Sage Weil [Tue, 11 Jun 2019 13:39:29 +0000 (08:39 -0500)]
doc/rados/operations: add safe-to-destroy check to OSD replacement workflow

Signed-off-by: Sage Weil <sage@redhat.com>
6 years agoMerge pull request #28706 from ajarr/wip-fs-subvolumes-enhancements
Venky Shankar [Thu, 27 Jun 2019 14:08:49 +0000 (19:38 +0530)]
Merge pull request #28706 from ajarr/wip-fs-subvolumes-enhancements

mgr/volumes: minor enhancements and fixes

6 years agoMerge pull request #28653 from zhangsw/cleanup-doc-sample.conf
Kefu Chai [Thu, 27 Jun 2019 11:24:36 +0000 (19:24 +0800)]
Merge pull request #28653 from zhangsw/cleanup-doc-sample.conf

sample.ceph.conf: correct the default value of filestore merge threshold

Reviewed-by: Kefu Chai <kchai@redhat.com>
6 years agoMerge pull request #28749 from hydro-b/patch-1
Kefu Chai [Thu, 27 Jun 2019 11:09:30 +0000 (19:09 +0800)]
Merge pull request #28749 from hydro-b/patch-1

doc/radosgw/compression.rst: fix typo

Reviewed-by: Casey Bodley <cbodley@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
6 years agomgr/volumes: fix incorrect VolumeException arguments 28706/head
Ramana Raja [Sun, 23 Jun 2019 16:23:16 +0000 (21:53 +0530)]
mgr/volumes: fix incorrect VolumeException arguments

Fixes: http://tracker.ceph.com/issues/40429
Signed-off-by: Ramana Raja <rraja@redhat.com>
6 years agomgr/volumes: allow setting mode
Ramana Raja [Sun, 23 Jun 2019 12:09:36 +0000 (17:39 +0530)]
mgr/volumes: allow setting mode

... of fs subvolumes and subvolume groups during their creation.

Fixes: https://tracker.ceph.com/issues/40299
Signed-off-by: Ramana Raja <rraja@redhat.com>
6 years agomgr/volumes: allow setting data pool layout
Ramana Raja [Thu, 20 Jun 2019 12:15:14 +0000 (17:45 +0530)]
mgr/volumes: allow setting data pool layout

... of fs subvolumes and subvolume groups during their creation.

Fixes: https://tracker.ceph.com/issues/40431
Signed-off-by: Ramana Raja <rraja@redhat.com>
6 years agoMerge pull request #28593 from smithfarm/wip-40398
Kefu Chai [Wed, 26 Jun 2019 15:33:45 +0000 (23:33 +0800)]
Merge pull request #28593 from smithfarm/wip-40398

cmake: set empty INSTALL_RPATH on crypto shared libs

Reviewed-by: Ricardo Dias <rdias@suse.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
6 years agoMerge pull request #28623 from cyx1231st/wip-seastar-msgr-socket
Kefu Chai [Wed, 26 Jun 2019 05:55:45 +0000 (13:55 +0800)]
Merge pull request #28623 from cyx1231st/wip-seastar-msgr-socket

test/crimson: add unit-test for ceph::net::Socket

Reviewed-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
6 years agocrimson/net: added support for new errors 28623/head
Yingxin Cheng [Tue, 18 Jun 2019 13:50:16 +0000 (21:50 +0800)]
crimson/net: added support for new errors

connection_aborted and invalid_argument.

Signed-off-by: Yingxin Cheng <yingxincheng@gmail.com>
6 years agotest/crimson: add unit-test for ceph::net::Socket
Yingxin Cheng [Tue, 18 Jun 2019 13:09:26 +0000 (21:09 +0800)]
test/crimson: add unit-test for ceph::net::Socket

Added unittest_seastar_socket to make sure that seastar network layer
works as expected.

Added missing error code invalid_argument and address_in_use.

Signed-off-by: Yingxin Cheng <yingxincheng@gmail.com>
6 years agodoc/radosgw/compression.rst: fix typo 28749/head
hydro-b [Tue, 25 Jun 2019 19:54:47 +0000 (21:54 +0200)]
doc/radosgw/compression.rst: fix typo

Signed-off-by: hydro-b <stefan@kooman.org>
6 years agoMerge pull request #28747 from tchaikov/wip-more-than-activate
Kefu Chai [Wed, 26 Jun 2019 00:53:20 +0000 (08:53 +0800)]
Merge pull request #28747 from tchaikov/wip-more-than-activate

crimson/osd: update peering_state in PG::on_activate_complete()

Reviewed-by: Samuel Just <sjust@redhat.com>
6 years agorgw: minor code clean-up 28724/head
J. Eric Ivancich [Tue, 25 Jun 2019 19:21:44 +0000 (15:21 -0400)]
rgw: minor code clean-up

Adding some const correctness and reformatting.

Signed-off-by: J. Eric Ivancich <ivancich@redhat.com>
6 years agorgw: allow multipart upload abort to proceed
J. Eric Ivancich [Tue, 25 Jun 2019 20:07:35 +0000 (16:07 -0400)]
rgw: allow multipart upload abort to proceed

Cleaning up after aborting unfinished multipart uploads is a
best-effort process. Due to the history of the multipart upload, not
all components may be found and the process needs to be robust to
that.

Presently, if a component is not found after the final call to
list_bucket_multiparts, the error propogates to the caller, but not if
the component is not found in an earlier call. This change does not
propogate that error up ever.

Additional logging is also added to multipart-related functions.

Signed-off-by: J. Eric Ivancich <ivancich@redhat.com>
6 years agojournal: fix race between player shut down and cache rebalance 28748/head
Mykola Golub [Tue, 25 Jun 2019 16:55:40 +0000 (17:55 +0100)]
journal: fix race between player shut down and cache rebalance

Signed-off-by: Mykola Golub <mgolub@suse.com>
6 years agocrimson/osd: update peering_state in PG::on_activate_complete() 28747/head
Kefu Chai [Sun, 23 Jun 2019 11:37:51 +0000 (19:37 +0800)]
crimson/osd: update peering_state in PG::on_activate_complete()

so that the PG can mark itself clean when it is activated and does not
need recovery.

Signed-off-by: Kefu Chai <kchai@redhat.com>
6 years agocrimson/osd: use get_osdmap_epoch()
Kefu Chai [Tue, 25 Jun 2019 16:15:53 +0000 (00:15 +0800)]
crimson/osd: use get_osdmap_epoch()

would be better to use the interfaces of the PG class, instead of
relying on its implementation.

Signed-off-by: Kefu Chai <kchai@redhat.com>
6 years agoMerge pull request #28634 from tchaikov/wip-22227
Kefu Chai [Tue, 25 Jun 2019 11:28:54 +0000 (19:28 +0800)]
Merge pull request #28634 from tchaikov/wip-22227

common, auth: use boost::spirit to parse ceph.conf, escape quotes in exported auths

Reviewed-by: Brad Hubbard <bhubbard@redhat.com>
Reviewed-by: Neha Ojha <nojha@redhat.com>
6 years agocommon/ConfUtils: implement trim helpers using boost 28634/head
Kefu Chai [Wed, 19 Jun 2019 10:07:07 +0000 (18:07 +0800)]
common/ConfUtils: implement trim helpers using boost

remove unused trim_whitespace() and its tests. as it is not used anymore

Signed-off-by: Kefu Chai <kchai@redhat.com>
6 years agoqa/workunits: add auth caps allow command case
Gu Zhongyan [Tue, 6 Mar 2018 07:40:21 +0000 (15:40 +0800)]
qa/workunits: add auth caps allow command case

this case introduces multiple quotes in caps line
it will trigger the bug like http://tracker.ceph.com/issues/22227

Signed-off-by: Gu Zhongyan <guzhongyan@360.cn>
6 years agoauth/KeyRing: escape quotes around commands
Kefu Chai [Tue, 18 Jun 2019 14:02:57 +0000 (22:02 +0800)]
auth/KeyRing: escape quotes around commands

so the exported auth can be re-imported.

Fixes: http://tracker.ceph.com/issues/22227
Signed-off-by: Kefu Chai <kchai@redhat.com>
6 years agosrc/: parser returns up to one error
Kefu Chai [Tue, 18 Jun 2019 12:59:17 +0000 (20:59 +0800)]
src/: parser returns up to one error

since config parser bails out at seeing the first error, there is no
need to offer the interfaces to report multiple errors.

Signed-off-by: Kefu Chai <kchai@redhat.com>
6 years agosrc: use spirit based ceph.conf parser
Kefu Chai [Sun, 16 Jun 2019 10:08:50 +0000 (18:08 +0800)]
src: use spirit based ceph.conf parser

before this change, the ceph.conf parser was implemented using a
hand-written state machine. which works fine. but it's hard to
understand and hence difficult to maintain.

in this change, it's rewritten using boost::spirit. which well, is also
a state machine under the hood, but the declarative pattern matching
rules help the human readers to understand the machinary.

before this change, the state machine is able to skip the lines with
invalid syntax and spit a warning message for each of them. after this
change, the parser will just bail out when it fails to match the rules.

and the line continuation marker, i.e., "\" is simply skipped, so it's
allowed to have nothing after the backslash in the value of key-value
pair.

changes are listed as following:

* invalid UTF-8 key/value is now treated as an error
* backslash at the very end is now allowed
* repeated settings are tolerated, and no warnings will be printed.
  the last one wins. before this change, we will print out warning
  messages at seeing lines with duplicated keys.
* malformed section header is now an error
* a setting line which does not parse is now an error
* unmatched quotes in setting value is now an error
* "\" following an empty line is allowed now.
* the format of error message is changed, so the cli test is updated
  accordingly.
* [global] section is not added by default. unless there is a single
  line in the conf file. this is only for the convenience of testing.

Signed-off-by: Kefu Chai <kchai@redhat.com>
6 years agoMerge pull request #28695 from kamoltat/wip-mgr-progress-fix-bug-osd-in-out
Kefu Chai [Tue, 25 Jun 2019 05:19:41 +0000 (13:19 +0800)]
Merge pull request #28695 from kamoltat/wip-mgr-progress-fix-bug-osd-in-out

mgr/progress: Bug fix complete event when OSD marked in

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
6 years agoMerge pull request #28689 from tchaikov/wip-crimson-add-me-to-crush
Kefu Chai [Tue, 25 Jun 2019 05:18:56 +0000 (13:18 +0800)]
Merge pull request #28689 from tchaikov/wip-crimson-add-me-to-crush

crimson/osd: add osd to crush when it boots

Reviewed-by: Samuel Just <sjust@redhat.com>
6 years agoMerge pull request #28688 from ifed01/wip-ifed-fix-no-compress
Kefu Chai [Tue, 25 Jun 2019 05:16:47 +0000 (13:16 +0800)]
Merge pull request #28688 from ifed01/wip-ifed-fix-no-compress

os/bluestore: load OSD all compression settings unconditionally.

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
6 years agoMerge pull request #28660 from liewegas/wip-40451
Kefu Chai [Tue, 25 Jun 2019 05:15:33 +0000 (13:15 +0800)]
Merge pull request #28660 from liewegas/wip-40451

osd/PG: do not queue scrub if PG is not active when unblock

Reviewed-by: Neha Ojha <nojha@redhat.com>
Reviewed-by: Samuel Just <sjust@redhat.com>
Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
6 years agoMerge pull request #28601 from rzarzynski/wip-crimson-os-omit-block-write
Kefu Chai [Tue, 25 Jun 2019 05:13:43 +0000 (13:13 +0800)]
Merge pull request #28601 from rzarzynski/wip-crimson-os-omit-block-write

os/memstore, crimson/os: introduce memstore_debug_omit_block_device_write

Reviewed-by: Kefu Chai <kchai@redhat.com>
6 years agoMerge pull request #28510 from liuchang0812/fix-arg-parser
Kefu Chai [Tue, 25 Jun 2019 05:12:51 +0000 (13:12 +0800)]
Merge pull request #28510 from liuchang0812/fix-arg-parser

common: sort best-matched commond by req argument count

Reviewed-by: Kefu Chai <kchai@redhat.com>
6 years agoMerge pull request #28018 from hjwsm1989/wip-39625
Kefu Chai [Tue, 25 Jun 2019 05:11:51 +0000 (13:11 +0800)]
Merge pull request #28018 from hjwsm1989/wip-39625

mon: take the mon lock in handle_conf_change

Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
Reviewed-by: Sage Weil <sage@redhat.com>
6 years agoMerge pull request #27627 from cxytt/fix-add-omap-tail
Kefu Chai [Tue, 25 Jun 2019 05:10:01 +0000 (13:10 +0800)]
Merge pull request #27627 from cxytt/fix-add-omap-tail

os/bluestore: create the tail when first set FLAG_OMAP

Reviewed-by: Igor Fedotov <ifedotov@suse.com>
6 years agoMerge pull request #28718 from varshar16/wip-cephfs-shell-typo-mounting
Jos Collin [Tue, 25 Jun 2019 04:40:45 +0000 (10:10 +0530)]
Merge pull request #28718 from varshar16/wip-cephfs-shell-typo-mounting

cephfs-shell: Fix typo for mounting

Reviewed-by: Jos Collin <jcollin@redhat.com>
6 years agorbd-mirror: handle duplicates in image sync throttler queue 28730/head
Mykola Golub [Tue, 25 Jun 2019 04:38:37 +0000 (05:38 +0100)]
rbd-mirror: handle duplicates in image sync throttler queue

Fixes: http://tracker.ceph.com/issues/40519
Signed-off-by: Mykola Golub <mgolub@suse.com>
6 years agoMerge pull request #28703 from tchaikov/wip-ceph.in-asan
Kefu Chai [Tue, 25 Jun 2019 03:19:35 +0000 (11:19 +0800)]
Merge pull request #28703 from tchaikov/wip-ceph.in-asan

ceph.in: do not preload asan even if not needed

Reviewed-by: Casey Bodley <cbodley@redhat.com>
6 years agoMerge pull request #28725 from cbodley/wip-cmake-ubsan
Kefu Chai [Tue, 25 Jun 2019 03:19:02 +0000 (11:19 +0800)]
Merge pull request #28725 from cbodley/wip-cmake-ubsan

cmake: fix WITH_UBSAN

Reviewed-by: Kefu Chai <kchai@redhat.com>
6 years agoMerge pull request #28395 from athanatos/sjust/wip-crimson-op
Kefu Chai [Tue, 25 Jun 2019 02:46:20 +0000 (10:46 +0800)]
Merge pull request #28395 from athanatos/sjust/wip-crimson-op

Add structures for tracking in progress operations

Reviewed-by: Kefu Chai <kchai@redhat.com>
6 years agocrimson: fix state machine operations in advance_pg_to and pg creation 28395/head
Samuel Just [Sat, 22 Jun 2019 00:46:01 +0000 (17:46 -0700)]
crimson: fix state machine operations in advance_pg_to and pg creation

Both pg creation and advance_pg_to process statemachine events and
therefore need to be under the pg process pipeline stage.

Signed-off-by: Samuel Just <sjust@redhat.com>
6 years agoMerge pull request #27285 from shangdehao1/wip-librbd-shared-read-only-cache-hook
Jason Dillaman [Mon, 24 Jun 2019 22:46:04 +0000 (18:46 -0400)]
Merge pull request #27285 from shangdehao1/wip-librbd-shared-read-only-cache-hook

librbd: shared read-only cache hook

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
6 years agolibrbd: refine re-connect implement and init method 27285/head
shangdehao1 [Fri, 14 Jun 2019 01:15:46 +0000 (09:15 +0800)]
librbd: refine re-connect implement and init method

- add new status to OpenImageRequest, including
  send_parent_cache and handle_parent_cache.
- refine re-connect to remove race condition.
- fixed read error bug

Signed-off-by: Dehao Shang <dehao.shang@intel.com>
6 years agodoc: fix example command on creating ceph user
Yuan Zhou [Fri, 14 Jun 2019 01:55:02 +0000 (09:55 +0800)]
doc: fix example command on creating ceph user

Signed-off-by: Yuan Zhou <yuan.zhou@intel.com>
6 years agolibrbd: change init method of Parent cache to asynchronous
shangdehao1 [Thu, 13 Jun 2019 01:08:18 +0000 (09:08 +0800)]
librbd: change init method of Parent cache to asynchronous

Signed-off-by: Dehao Shang <dehao.shang@intel.com>
6 years agolibrbd: add read_object method to ParentCache
shangdehao1 [Wed, 12 Jun 2019 22:32:33 +0000 (06:32 +0800)]
librbd: add read_object method to ParentCache

Also remove SharedPersistentObjectCacher class

Signed-off-by: Dehao Shang <dehao.shang@intel.com>
6 years agolibrbd: refine hard code and remove dead code
shangdehao1 [Wed, 12 Jun 2019 22:04:30 +0000 (06:04 +0800)]
librbd: refine hard code and remove dead code

Signed-off-by: Dehao Shang <dehao.shang@intel.com>
6 years agolibrbd: add lock to resovle race condition
shangdehao1 [Wed, 12 Jun 2019 21:36:35 +0000 (05:36 +0800)]
librbd: add lock to resovle race condition

possible race condition w/ multiple concurrent attempts to
re-create the cache session

Signed-off-by: Dehao Shang <dehao.shang@intel.com>
6 years agodoc: better format for rbd persistent cache
Yuan Zhou [Wed, 12 Jun 2019 04:14:47 +0000 (12:14 +0800)]
doc: better format for rbd persistent cache

Signed-off-by: Yuan Zhou <yuan.zhou@intel.com>
6 years agolibrbd: remove parent cache config from ImageCtx
shangdehao1 [Mon, 10 Jun 2019 01:19:36 +0000 (09:19 +0800)]
librbd: remove parent cache config from ImageCtx

Signed-off-by: Dehao Shang <dehao.shang@intel.com>
6 years agolibrbd: cleanup parent cache
shangdehao1 [Sun, 9 Jun 2019 23:30:43 +0000 (07:30 +0800)]
librbd: cleanup parent cache

- remove compiler warning.
- add error log level.
- modify tool/immutable_obj_cache unit testing.

Signed-off-by: Dehao Shang <dehao.shang@intel.com>
6 years agolibrbd: modify Parent cache interface
shangdehao1 [Sun, 9 Jun 2019 19:47:24 +0000 (03:47 +0800)]
librbd: modify Parent cache interface

follow the recent ObjectDispatchInterface to adjust parent cache hook

Signed-off-by: Dehao Shang <dehao.shang@intel.com>
6 years agodoc: updating doc for rbd shared parent cache
Yuan Zhou [Thu, 6 Jun 2019 09:36:39 +0000 (17:36 +0800)]
doc: updating doc for rbd shared parent cache

Signed-off-by: Yuan Zhou <yuan.zhou@intel.com>
6 years agolibrbd: move SharedPersistentObjectCacher to ParentCacheObjectDispatch
shangdehao1 [Wed, 5 Jun 2019 00:30:04 +0000 (08:30 +0800)]
librbd: move SharedPersistentObjectCacher to ParentCacheObjectDispatch

Signed-off-by: Dehao Shang <dehao.shang@intel.com>
6 years agolibrbd: add re-connect and infligh enable feature
shangdehao1 [Fri, 31 May 2019 01:47:31 +0000 (09:47 +0800)]
librbd: add re-connect and infligh enable feature

- reconnect : when session don't work or RO daemon crash,
  parent cache will try to re-connect daemon.
- in-fligh enable RO daemon.

Signed-off-by: Dehao Shang <dehao.shang@intel.com>
6 years agotools: modify connect implement of RO cache
shangdehao1 [Sun, 26 May 2019 22:22:21 +0000 (06:22 +0800)]
tools: modify connect implement of RO cache

- In order to support re-connect, add async connect at CacheClient.
- sync connect is based on C_SaferCond + async_connect.

Signed-off-by: Dehao Shang <dehao.shang@intel.com>