]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
7 years agoclient: clamp I/O sizes to INT_MAX when we can't return larger values 20373/head
Jeff Layton [Fri, 9 Feb 2018 12:39:56 +0000 (07:39 -0500)]
client: clamp I/O sizes to INT_MAX when we can't return larger values

We have several API functions that allow the caller to request I/Os
larger than INT_MAX bytes, but that return an int. Ensure that we don't
try to do more I/O than we can represent in the return value.

Tracker: http://tracker.ceph.com/issues/22948
Signed-off-by: Jeff Layton <jlayton@redhat.com>
7 years agotest: new testcase for ceph_ll_readv and ceph_ll_writev
Jeff Layton [Wed, 7 Feb 2018 20:59:47 +0000 (15:59 -0500)]
test: new testcase for ceph_ll_readv and ceph_ll_writev

Just copy the PreadvPwritev test and alter accordingly.

Tracker: http://tracker.ceph.com/issues/22948
Signed-off-by: Jeff Layton <jlayton@redhat.com>
7 years agoclient: hook up ceph_ll_readv and ceph_ll_writev
Jeff Layton [Wed, 7 Feb 2018 14:57:47 +0000 (09:57 -0500)]
client: hook up ceph_ll_readv and ceph_ll_writev

Break the core of _preadv_pwritev out into a function that takes a Fh.
Make _preadv_pwritev into a wrapper around that.

Then add in plumbing for ceph_ll_readv and ceph_ll_writev.

Tracker: http://tracker.ceph.com/issues/22948
Signed-off-by: Jeff Layton <jlayton@redhat.com>
7 years agoclient: type safety cleanup for _read and _write codepaths
Jeff Layton [Mon, 12 Feb 2018 12:17:51 +0000 (07:17 -0500)]
client: type safety cleanup for _read and _write codepaths

In the read codepath, bl->length() returns an unsigned value, and that
could end up looking negative when cast to int. On the write side,
totalwritten is a uint64_t, which could look negative when cast to int.

Have the underlying layers pass back an int64_t and convert them to
int at a higher level. This prepares the underlying infrastructure for
ceph_ll_readv and ceph_ll_writev support.

Tracker: http://tracker.ceph.com/issues/22948
Signed-off-by: Jeff Layton <jlayton@redhat.com>
7 years agoMerge pull request #20264 from ceph/wip-rm22620
Andrew Schoen [Wed, 7 Feb 2018 14:21:04 +0000 (15:21 +0100)]
Merge pull request #20264 from ceph/wip-rm22620

ceph-volume dmcrypt support for simple

Reviewed-by: Andrew Schoen <aschoen@redhat.com>
7 years agoMerge pull request #20307 from tchaikov/wip-std-filesystem
Kefu Chai [Wed, 7 Feb 2018 13:56:28 +0000 (21:56 +0800)]
Merge pull request #20307 from tchaikov/wip-std-filesystem

test/admin_socket_output: switch to std::experimental::filesystem

Reviewed-by: Brad Hubbard <bhubbard@redhat.com>
7 years agoMerge pull request #20324 from tchaikov/wip-cmake-build-boost
Kefu Chai [Wed, 7 Feb 2018 13:53:30 +0000 (21:53 +0800)]
Merge pull request #20324 from tchaikov/wip-cmake-build-boost

cmake: fix the include dir for building boost::python

Reviewed-by: Piotr Dałek <piotr.dalek@corp.ovh.com>
7 years agoMerge pull request #20347 from Songweibin/wip-osd-cleanup
Xie Xingguo [Wed, 7 Feb 2018 07:34:04 +0000 (15:34 +0800)]
Merge pull request #20347 from Songweibin/wip-osd-cleanup

osd: drop redundant comment

Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
7 years agoosd: drop redundant comment 20347/head
songweibin [Wed, 7 Feb 2018 05:53:21 +0000 (13:53 +0800)]
osd: drop redundant comment

Signed-off-by: songweibin <song.weibin@zte.com.cn>
7 years agoMerge PR #20288 into master
Patrick Donnelly [Wed, 7 Feb 2018 04:38:14 +0000 (20:38 -0800)]
Merge PR #20288 into master

* refs/pull/20288/head:
ptl-tool: open githubmap with utf-8 code

Reviewed-by: Jos Collin <jcollin@redhat.com>
7 years agoMerge pull request #20313 from guzhongyan/fix-22350
Sage Weil [Tue, 6 Feb 2018 20:01:41 +0000 (14:01 -0600)]
Merge pull request #20313 from guzhongyan/fix-22350

osd/OSDMap: misleading message in print_oneline_summary()

Reviewed-by: Sage Weil <sage@redhat.com>
7 years agoMerge pull request #20317 from liewegas/wip-pg-scrub-priority
Sage Weil [Tue, 6 Feb 2018 20:01:19 +0000 (14:01 -0600)]
Merge pull request #20317 from liewegas/wip-pg-scrub-priority

osd/PG: pass scrub priority to replica

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
7 years agoMerge pull request #20319 from tchaikov/wip-ops_blocked_by_scrub-cleanup
Sage Weil [Tue, 6 Feb 2018 20:00:53 +0000 (14:00 -0600)]
Merge pull request #20319 from tchaikov/wip-ops_blocked_by_scrub-cleanup

osd: pass ops_blocked_by_scrub() to requeue_scrub()

Reviewed-by: Sage Weil <sage@redhat.com>
7 years agoceph-volume: do not test custom cluster names with simple 20264/head
Andrew Schoen [Tue, 6 Feb 2018 17:36:03 +0000 (11:36 -0600)]
ceph-volume: do not test custom cluster names with simple

Signed-off-by: Andrew Schoen <aschoen@redhat.com>
7 years agoMerge pull request #20279 from liewegas/wip-idempotent-sequence
Sage Weil [Tue, 6 Feb 2018 16:53:35 +0000 (10:53 -0600)]
Merge pull request #20279 from liewegas/wip-idempotent-sequence

ceph_test_filestore_idempotent_sequence: many fixes

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
7 years agoceph-volume: sleep 2 minutes after reboot in simple tests
Andrew Schoen [Tue, 6 Feb 2018 16:46:44 +0000 (10:46 -0600)]
ceph-volume: sleep 2 minutes after reboot in simple tests

This will allow for some time for OSD services to start back up after
reboot. If not we see race conditions where tests fail because they
were run before the OSD finished startup.

Signed-off-by: Andrew Schoen <aschoen@redhat.com>
7 years agoMerge pull request #20267 from liewegas/wip-22847
Kefu Chai [Tue, 6 Feb 2018 06:49:35 +0000 (14:49 +0800)]
Merge pull request #20267 from liewegas/wip-22847

mon/OSDMonitor: filter out pgs that shouldn't exist from force-create-pg

Reviewed-by: Kefu Chai <kchai@redhat.com>
7 years agoMerge pull request #20259 from guzhongyan/rados-cleanup
Kefu Chai [Tue, 6 Feb 2018 06:48:42 +0000 (14:48 +0800)]
Merge pull request #20259 from guzhongyan/rados-cleanup

rados: clean up rados_getxattrs() and rados_striper_getxattrs()

Reviewed-by: Sage Weil <sage@redhat.com>
7 years agoMerge pull request #20260 from guzhongyan/fix-22042
Kefu Chai [Tue, 6 Feb 2018 06:45:03 +0000 (14:45 +0800)]
Merge pull request #20260 from guzhongyan/fix-22042

librados: invalid free() in rados_getxattrs_next()

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
7 years agoMerge pull request #20255 from david-z/wip-fix-kv-max-option
Kefu Chai [Tue, 6 Feb 2018 06:41:11 +0000 (14:41 +0800)]
Merge pull request #20255 from david-z/wip-fix-kv-max-option

config: Change bluestore_cache_kv_max to type INT64

Reviewed-by: Kefu Chai <kchai@redhat.com>
7 years agoMerge pull request #20301 from bigclouds/wip-fix-declaration-of-rados-striper-trunc
Kefu Chai [Tue, 6 Feb 2018 06:40:28 +0000 (14:40 +0800)]
Merge pull request #20301 from bigclouds/wip-fix-declaration-of-rados-striper-trunc

libradosstriper: fix the function declaration of rados_striper_trunc

Reviewed-by: Kefu Chai <kchai@redhat.com>
7 years agoMerge pull request #20233 from cbodley/wip-test-log-nullptr
Kefu Chai [Tue, 6 Feb 2018 06:35:18 +0000 (14:35 +0800)]
Merge pull request #20233 from cbodley/wip-test-log-nullptr

test/log: fix for crash with libc++

Reviewed-by: Willem Jan Withagen <wjw@digiware.nl>
Reviewed-by: Kefu Chai <kchai@redhat.com>
7 years agoMerge pull request #20223 from Yan-waller/wip-walle-180124cephosd
Kefu Chai [Tue, 6 Feb 2018 06:31:52 +0000 (14:31 +0800)]
Merge pull request #20223 from Yan-waller/wip-walle-180124cephosd

osd: use existing osd_required variable for messenger policy

Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
Reviewed-by: Kefu Chai <kchai@redhat.com>
7 years agoMerge pull request #20201 from majianpeng/mosdrepop-encode-log
Kefu Chai [Tue, 6 Feb 2018 06:29:34 +0000 (14:29 +0800)]
Merge pull request #20201 from majianpeng/mosdrepop-encode-log

osd: avoid encoding the same log entries repeatedly for different peers

Reviewed-by: Kefu Chai <kchai@redhat.com>
7 years agoos/filestore: add replay guards for omap operations 20279/head
Sage Weil [Mon, 5 Feb 2018 15:08:44 +0000 (09:08 -0600)]
os/filestore: add replay guards for omap operations

These were not guarded, meaning they could get replayed onto an object
that was cloned or renamed.  Eek!

Fixes: http://tracker.ceph.com/issues/22920
Signed-off-by: Sage Weil <sage@redhat.com>
7 years agotest/objectstore/run_seed_to_range: stop on first error
Sage Weil [Mon, 5 Feb 2018 15:09:04 +0000 (09:09 -0600)]
test/objectstore/run_seed_to_range: stop on first error

Signed-off-by: Sage Weil <sage@redhat.com>
7 years agoceph_test_idempotent_sequence: use coll_entry_t
Sage Weil [Sun, 4 Feb 2018 16:51:37 +0000 (10:51 -0600)]
ceph_test_idempotent_sequence: use coll_entry_t

Signed-off-by: Sage Weil <sage@redhat.com>
7 years agoceph_filestore_idempotent_sequence: fix up clone, move ops; cleanup
Sage Weil [Sun, 4 Feb 2018 16:34:25 +0000 (10:34 -0600)]
ceph_filestore_idempotent_sequence: fix up clone, move ops; cleanup

Signed-off-by: Sage Weil <sage@redhat.com>
7 years agoqa/tasks/filestore_idempotent: run failure tests later in sequence
Sage Weil [Sat, 3 Feb 2018 15:29:44 +0000 (09:29 -0600)]
qa/tasks/filestore_idempotent: run failure tests later in sequence

We want to get past the initial colleciton and object creation steps,
which don't include interesting ops.

Signed-off-by: Sage Weil <sage@redhat.com>
7 years agoMerge pull request #20016 from cbodley/wip-18885
Casey Bodley [Mon, 5 Feb 2018 21:44:37 +0000 (16:44 -0500)]
Merge pull request #20016 from cbodley/wip-18885

rgw: log unlink_instance mtime as object's mtime

Reviewed-by: Orit Wasserman <owasserm@redhat.com>
7 years agoceph-volume: adds the simple dmcrypt_plain and dmcrypt_luks tests
Andrew Schoen [Mon, 5 Feb 2018 20:18:28 +0000 (14:18 -0600)]
ceph-volume: adds the simple dmcrypt_plain and dmcrypt_luks tests

Signed-off-by: Andrew Schoen <aschoen@redhat.com>
7 years agoceph-volume: fix ceph-volume simple scan help menu test
Andrew Schoen [Mon, 5 Feb 2018 19:53:13 +0000 (13:53 -0600)]
ceph-volume: fix ceph-volume simple scan help menu test

Signed-off-by: Andrew Schoen <aschoen@redhat.com>
7 years agoMerge pull request #20145 from linuxbox2/rgwf-deref-readdir-off
Matt Benjamin [Mon, 5 Feb 2018 19:22:48 +0000 (14:22 -0500)]
Merge pull request #20145 from linuxbox2/rgwf-deref-readdir-off

rgw_file: avoid evaluating nullptr for readdir offset

7 years agoMerge pull request #20188 from cbodley/wip-rgw-frontend-multimap
Casey Bodley [Mon, 5 Feb 2018 18:52:04 +0000 (13:52 -0500)]
Merge pull request #20188 from cbodley/wip-rgw-frontend-multimap

rgw: beast frontend can listen on multiple endpoints

Reviewed-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
7 years agoMerge pull request #20013 from cbodley/wip-rgw-auth-skew
Casey Bodley [Mon, 5 Feb 2018 18:51:43 +0000 (13:51 -0500)]
Merge pull request #20013 from cbodley/wip-rgw-auth-skew

rgw: share time skew check between v2 and v4 auth

Reviewed-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
7 years agoMerge pull request #20017 from cbodley/wip-22248
Casey Bodley [Mon, 5 Feb 2018 18:50:48 +0000 (13:50 -0500)]
Merge pull request #20017 from cbodley/wip-22248

rgw: unlink deleted bucket from bucket's owner

Reviewed-by: Orit Wasserman <owasserm@redhat.com>
7 years agoMerge pull request #20120 from cbodley/wip-22797
Casey Bodley [Mon, 5 Feb 2018 18:49:13 +0000 (13:49 -0500)]
Merge pull request #20120 from cbodley/wip-22797

rgw: fix for empty query string in beast frontend

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
7 years agoMerge pull request #20038 from oritwas/wip-rgw-22742
Orit Wasserman [Mon, 5 Feb 2018 18:02:06 +0000 (20:02 +0200)]
Merge pull request #20038 from oritwas/wip-rgw-22742

rgw: bucket resharding should not update bucket ACL or user stats
Reviewed-by: Casey Bodley <cbodley@redhat.com>
7 years agoMerge pull request #20295 from trociny/wip-test_deep_copy_clone
Jason Dillaman [Mon, 5 Feb 2018 17:26:44 +0000 (12:26 -0500)]
Merge pull request #20295 from trociny/wip-test_deep_copy_clone

test/pybind/rbd: skip test_deep_copy_clone if layering not enabled

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
7 years agocmake: fix the include dir for building boost::python 20324/head
Kefu Chai [Mon, 5 Feb 2018 16:36:20 +0000 (00:36 +0800)]
cmake: fix the include dir for building boost::python

the "includes" directories are separated by spaces not semicolons.

Signed-off-by: Kefu Chai <kchai@redhat.com>
7 years agoMerge pull request #20309 from pritha-srivastava/wip-rgw-roles-error-codes
Casey Bodley [Mon, 5 Feb 2018 15:03:54 +0000 (10:03 -0500)]
Merge pull request #20309 from pritha-srivastava/wip-rgw-roles-error-codes

rgw: Reinstating error codes mapping for Roles.

Reviewed-by: Casey Bodley <cbodley@redhat.com>
7 years agoMerge pull request #20316 from smithfarm/wip-doc-log
Kefu Chai [Mon, 5 Feb 2018 14:53:34 +0000 (22:53 +0800)]
Merge pull request #20316 from smithfarm/wip-doc-log

doc: log-and-debug: fix default value of "log max recent"

Reviewed-by: Kefu Chai <kchai@redhat.com>
7 years agoosd: pass ops_blocked_by_scrub() to requeue_scrub() 20319/head
Kefu Chai [Mon, 5 Feb 2018 14:14:37 +0000 (22:14 +0800)]
osd: pass ops_blocked_by_scrub() to requeue_scrub()

less nesting levels, and less repeatings.

Signed-off-by: Kefu Chai <kchai@redhat.com>
7 years agoosd/PG: pass scrub priority to replica 20317/head
Sage Weil [Mon, 5 Feb 2018 13:10:54 +0000 (07:10 -0600)]
osd/PG: pass scrub priority to replica

If we are scrubbing with high priority on the primary, pass that along
to the replica so that it can schedule its scrub work accordingly.

Signed-off-by: Sage Weil <sage@redhat.com>
7 years agodoc: log-and-debug: fix default value of "log max recent" 20316/head
Nathan Cutler [Mon, 5 Feb 2018 12:53:05 +0000 (13:53 +0100)]
doc: log-and-debug: fix default value of "log max recent"

Doc says 1000000, but the real figure is two orders of magnitude less:

    Option("log_max_recent", Option::TYPE_INT, Option::LEVEL_ADVANCED)
      .set_default(500)
      .set_daemon_default(10000)

Signed-off-by: Nathan Cutler <ncutler@suse.com>
7 years agoMerge pull request #20229 from zhsj/fix-dashboard-prefix
John Spray [Mon, 5 Feb 2018 12:07:33 +0000 (13:07 +0100)]
Merge pull request #20229 from zhsj/fix-dashboard-prefix

pybind/mgr/dashboard: fix duplicated slash in html href

Reviewed-by: John Spray <john.spray@redhat.com>
7 years agoosd/OSDMap: misleading message in print_oneline_summary() 20313/head
Gu Zhongyan [Mon, 5 Feb 2018 10:45:54 +0000 (18:45 +0800)]
osd/OSDMap: misleading message in print_oneline_summary()
The output scared people as showing so many osds were full/nearfull

Improve the output to make the message clearer

Fixes: http://tracker.ceph.com/issues/22350
Signed-off-by: Gu Zhongyan <guzhongyan@360.cn>
7 years agorgw: Reinstating error codes mapping for Roles. 20309/head
Pritha Srivastava [Mon, 5 Feb 2018 09:50:10 +0000 (15:20 +0530)]
rgw: Reinstating error codes mapping for Roles.

Signed-off-by: Pritha Srivastava <prsrivas@redhat.com>
7 years agotest/admin_socket_output: switch to std::experimental::filesystem 20307/head
Kefu Chai [Mon, 5 Feb 2018 09:12:14 +0000 (17:12 +0800)]
test/admin_socket_output: switch to std::experimental::filesystem

so we don't need to compile boost::filesystem anymore.

Signed-off-by: Kefu Chai <kchai@redhat.com>
7 years agoMerge pull request #20114 from cethikdata/ceph-disk-lock
Kefu Chai [Mon, 5 Feb 2018 06:10:49 +0000 (14:10 +0800)]
Merge pull request #20114 from cethikdata/ceph-disk-lock

ceph-disk: reduce the scope of activate_lock.

Reviewed-by: Kefu Chai <kchai@redhat.com>
7 years agotest/pybind/test_rados.py: expand test_xattrs/test_obj_xattrs 20260/head
Gu Zhongyan [Mon, 5 Feb 2018 04:14:42 +0000 (12:14 +0800)]
test/pybind/test_rados.py: expand test_xattrs/test_obj_xattrs
to cover attribute with empty value case.

Signed-off-by: Gu Zhongyan <guzhongyan@360.cn>
7 years agolibrados: invalid free() in rados_getxattrs_next()
Gu Zhongyan [Fri, 2 Feb 2018 10:01:05 +0000 (18:01 +0800)]
librados: invalid free() in rados_getxattrs_next()

Invalid free() can cause corruption when getting an object
attribute with empty value.

Check the validity of the pointer before free(). Also move
the free() call at the start of rados_getxattrs_next() to
avoid memory leak.

Fixes: http://tracker.ceph.com/issues/22042
Signed-off-by: Gu Zhongyan <guzhongyan@360.cn>
7 years agolibradosstriper: fix the function declaration of rados_striper_trunc 20301/head
yuelongguang [Mon, 5 Feb 2018 02:29:26 +0000 (10:29 +0800)]
libradosstriper: fix the function declaration of rados_striper_trunc
change the type of first parameter from rados_ioctx_t to rados_striper_t

Signed-off-by: yuelongguang <yuelongguang@gmail.com>
7 years agoMerge pull request #20270 from ivancich/wip-fix-bad-dmclock-sim-change
Kefu Chai [Mon, 5 Feb 2018 03:05:35 +0000 (11:05 +0800)]
Merge pull request #20270 from ivancich/wip-fix-bad-dmclock-sim-change

osd,dmclock: fix dmclock test simulator change

Reviewed-by: Kefu Chai <kchai@redhat.com>
7 years agoMerge pull request #20258 from tchaikov/wip-balancer-cleanup
Kefu Chai [Mon, 5 Feb 2018 02:01:11 +0000 (10:01 +0800)]
Merge pull request #20258 from tchaikov/wip-balancer-cleanup

 mgr/balancer: replace magic value of -1 for DEFAULT_CHOOSE_ARGS

Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
Reviewed-by: Sage Weil <sage@redhat.com>
7 years agoMerge pull request #20230 from ifed01/wip-ifed-store-test-improve
Kefu Chai [Mon, 5 Feb 2018 01:59:39 +0000 (09:59 +0800)]
Merge pull request #20230 from ifed01/wip-ifed-store-test-improve

test/store_test: update Many4KWritesTest* test cases to finalize with…

Reviewed-by: Sage Weil <sage@redhat.com>
7 years agoMerge pull request #20221 from fangyuxiangGL/max
Kefu Chai [Mon, 5 Feb 2018 01:57:59 +0000 (09:57 +0800)]
Merge pull request #20221 from fangyuxiangGL/max

osd/ReplicatedBackend: 'osd_deep_scrub_keys' doesn't work

Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
7 years agoMerge pull request #20217 from rzarzynski/wip-osd-legacy-conf-for-perf
Kefu Chai [Mon, 5 Feb 2018 01:54:55 +0000 (09:54 +0800)]
Merge pull request #20217 from rzarzynski/wip-osd-legacy-conf-for-perf

osd: avoid the config's get_val() overhead on the read path.

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
7 years agoMerge pull request #20169 from liewegas/wip-22668-revert
Kefu Chai [Mon, 5 Feb 2018 01:41:00 +0000 (09:41 +0800)]
Merge pull request #20169 from liewegas/wip-22668-revert

os/bluestore: disable on_applied sync_complete

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
7 years agoosd: use defined osd_required features for messenger policy 20223/head
Yan Jun [Sun, 4 Feb 2018 15:10:07 +0000 (23:10 +0800)]
osd: use defined osd_required features for messenger policy

Signed-off-by: Yan Jun <yan.jun8@zte.com.cn>
7 years agorgw: bucket resharding should not update bucket ACL or user stats 20038/head
Orit Wasserman [Sun, 21 Jan 2018 08:12:43 +0000 (10:12 +0200)]
rgw: bucket resharding should not update bucket ACL or user stats

bucket link op resets bucket ACL using rgw_link_bucket instead

Fixes: http://tracker.ceph.com/issues/22124
Fixes: http://tracker.ceph.com/issues/22742
Signed-off-by: Orit Wasserman <owasserm@redhat.com>
7 years agopybind/mgr/dashboard: fix duplicated slash in html href 20229/head
Shengjing Zhu [Thu, 1 Feb 2018 08:47:26 +0000 (16:47 +0800)]
pybind/mgr/dashboard: fix duplicated slash in html href

The url_prefix val in html templates is expected not containing '/'
in the end. Otherwise the href will be rendered as '//static/', which
causes browser treating it as http://static/.

Fixes: http://tracker.ceph.com/issues/22851
Signed-off-by: Shengjing Zhu <zhsj@umcloud.com>
7 years agotest/pybind/rbd: skip test_deep_copy_clone if layering not enabled 20295/head
Mykola Golub [Sun, 4 Feb 2018 08:13:18 +0000 (10:13 +0200)]
test/pybind/rbd: skip test_deep_copy_clone if layering not enabled

(otherwise it will fail on protect snap)

Signed-off-by: Mykola Golub <mgolub@suse.com>
7 years agoMerge pull request #20184 from shun-s/wip-add-osdmap-epoch-show
Xie Xingguo [Sun, 4 Feb 2018 02:08:06 +0000 (10:08 +0800)]
Merge pull request #20184 from shun-s/wip-add-osdmap-epoch-show

osd/OSDMap: add osdmap epoch info when printing info summary

Reviewed-by: John Spray <john.spray@redhat.com>
7 years agoMerge pull request #20225 from xiexingguo/wip-balancer-pool-options
Xie Xingguo [Sun, 4 Feb 2018 02:06:16 +0000 (10:06 +0800)]
Merge pull request #20225 from xiexingguo/wip-balancer-pool-options

mgr/balancer: more pool-specific enhancements

Reviewed-by: Sage Weil <sage@redhat.com>
7 years agoMerge pull request #20224 from xiexingguo/wip-still-mgr-fixes
Xie Xingguo [Sun, 4 Feb 2018 02:05:34 +0000 (10:05 +0800)]
Merge pull request #20224 from xiexingguo/wip-still-mgr-fixes

pybind/mgr/balancer: remove optimization plan properly

Reviewed-by: Sage Weil <sage@redhat.com>
7 years agoMerge pull request #20278 from xiexingguo/wip-null-ws-check
Xie Xingguo [Sun, 4 Feb 2018 02:03:19 +0000 (10:03 +0800)]
Merge pull request #20278 from xiexingguo/wip-null-ws-check

pybind/mgr/balancer: fix sanity check against empty weight-set

Reviewed-by: Sage Weil <sage@redhat.com>
7 years agoptl-tool: open githubmap with utf-8 code 20288/head
Patrick Donnelly [Sat, 3 Feb 2018 21:35:22 +0000 (13:35 -0800)]
ptl-tool: open githubmap with utf-8 code

This resolves a decode error:

    UnicodeDecodeError: 'ascii' codec can't decode byte 0xc5 in position 8: ordinal not in range(128)

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
7 years agoMerge PR #20261 into master
Patrick Donnelly [Sat, 3 Feb 2018 20:23:30 +0000 (12:23 -0800)]
Merge PR #20261 into master

* refs/pull/20261/head:
doc: Fix path in ceph-fuse.rst

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
7 years agomgr/mgr_module: do not offer empty default value for choose_args 20258/head
Kefu Chai [Fri, 2 Feb 2018 08:25:26 +0000 (16:25 +0800)]
mgr/mgr_module: do not offer empty default value for choose_args

as it should be always available. this also silence a pep8 warning.

Signed-off-by: Kefu Chai <kchai@redhat.com>
7 years agomgr/balancer: introduce CRUSHMap.DEFAULT_CHOOSE_ARGS and use it
Kefu Chai [Fri, 2 Feb 2018 08:23:31 +0000 (16:23 +0800)]
mgr/balancer: introduce CRUSHMap.DEFAULT_CHOOSE_ARGS and use it

avoid using '-1' as a magic variable.

Signed-off-by: Kefu Chai <kchai@redhat.com>
7 years agotest/objectstore/run_seed_to_range.sh: objects
Sage Weil [Sat, 3 Feb 2018 15:22:51 +0000 (09:22 -0600)]
test/objectstore/run_seed_to_range.sh: objects

We need some initial objects for this to work.

Signed-off-by: Sage Weil <sage@redhat.com>
7 years agotest/objectstore/run_seed_to.sh: make output readable
Sage Weil [Sat, 3 Feb 2018 15:21:53 +0000 (09:21 -0600)]
test/objectstore/run_seed_to.sh: make output readable

Signed-off-by: Sage Weil <sage@redhat.com>
7 years agoceph_test_filestore_idempotent_sequence: fix clone check
Sage Weil [Sat, 3 Feb 2018 15:21:28 +0000 (09:21 -0600)]
ceph_test_filestore_idempotent_sequence: fix clone check

Signed-off-by: Sage Weil <sage@redhat.com>
7 years agoceph_test_filestore_idempotent_sequence: fix do_coll_create
Sage Weil [Sat, 3 Feb 2018 15:21:09 +0000 (09:21 -0600)]
ceph_test_filestore_idempotent_sequence: fix do_coll_create

The old code made no sense whatsoever!

- create one colletion, not a zillion
- inform the model in the parent class

Signed-off-by: Sage Weil <sage@redhat.com>
7 years agoceph_test_filestore_idempotent_sequence: fix gap in ops
Sage Weil [Sat, 3 Feb 2018 15:20:21 +0000 (09:20 -0600)]
ceph_test_filestore_idempotent_sequence: fix gap in ops

Signed-off-by: Sage Weil <sage@redhat.com>
7 years agoceph_test_filestore_idempotent_sequence: start poolid at 2
Sage Weil [Sat, 3 Feb 2018 15:19:58 +0000 (09:19 -0600)]
ceph_test_filestore_idempotent_sequence: start poolid at 2

Signed-off-by: Sage Weil <sage@redhat.com>
7 years agotest/objectstore/FilestoreDiff: write to stdout
Sage Weil [Sat, 3 Feb 2018 14:42:11 +0000 (08:42 -0600)]
test/objectstore/FilestoreDiff: write to stdout

This keeps our output separate from the filestore log, which we send to
a file so that the terminal output is readable.

Signed-off-by: Sage Weil <sage@redhat.com>
7 years agopybind/mgr/balancer: fix sanity check against empty weight-set 20278/head
xie xingguo [Sat, 3 Feb 2018 14:05:02 +0000 (22:05 +0800)]
pybind/mgr/balancer: fix sanity check against empty weight-set

There are paths get_compat_weight_set_weights() will return a
empty dict, not None.

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
7 years agoRevert change from commit 8c5fea68cb9e0c2e6cc2352e64c4f3f46e29c58f 20270/head
J. Eric Ivancich [Fri, 2 Feb 2018 19:56:36 +0000 (14:56 -0500)]
Revert change from commit 8c5fea68cb9e0c2e6cc2352e64c4f3f46e29c58f
that introduced a compilation error that was not noticed since the
dmclock support/testing simulators are not built by ceph.

Also, changes below the src/dmclock tree should be made in the dmclock
library and then pulled into ceph.

Signed-off-by: J. Eric Ivancich <ivancich@redhat.com>
7 years agoMerge pull request #19711 from trociny/wip-20762
Jason Dillaman [Fri, 2 Feb 2018 18:56:13 +0000 (13:56 -0500)]
Merge pull request #19711 from trociny/wip-20762

rbd: unified way to map images using different drivers

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
Reviewed-by: Ilya Dryomov <idryomov@redhat.com>
Reviewed-by: Willem Jan Withagen <wjw@digiware.nl>
7 years agomon/OSDMonitor: ignore and/or remove pgs that shouldn't exist 20267/head
Sage Weil [Fri, 2 Feb 2018 18:07:58 +0000 (12:07 -0600)]
mon/OSDMonitor: ignore and/or remove pgs that shouldn't exist

The update_creating_pgs() change is there mainly for clusters that already
have an invalid pg in the map; going forward they hopefully shouldn't
appear!

Fixes: https://tracker.ceph.com/issues/22847
Signed-off-by: Sage Weil <sage@redhat.com>
7 years agomon/OSDMonitor: reject force-create-pg on pgids that shouldn't exist
Sage Weil [Fri, 2 Feb 2018 17:59:29 +0000 (11:59 -0600)]
mon/OSDMonitor: reject force-create-pg on pgids that shouldn't exist

Signed-off-by: Sage Weil <sage@redhat.com>
7 years agoMerge pull request #19902 from linuxbox2/wip-rgw-mploc
Matt Benjamin [Fri, 2 Feb 2018 16:37:01 +0000 (11:37 -0500)]
Merge pull request #19902 from linuxbox2/wip-rgw-mploc

rgw: return valid Location element, CompleteMultipartUpload

7 years agoosd/ReplicatedBackend: only do once encode log_entries for multi MOSDRepOp 20201/head
Jianpeng Ma [Fri, 2 Feb 2018 16:35:15 +0000 (00:35 +0800)]
osd/ReplicatedBackend: only do once encode log_entries  for multi MOSDRepOp

Encode log_entries is the same work for multi MOSDRepOp and encode is
heavy load.

Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
7 years agoMerge pull request #20199 from Songweibin/wip-group-cleanup
Jason Dillaman [Fri, 2 Feb 2018 15:25:50 +0000 (10:25 -0500)]
Merge pull request #20199 from Songweibin/wip-group-cleanup

rbd: group misc cleanup and update rbd man page

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
7 years agoMerge pull request #20002 from malc0lm/fix-copypart
Matt Benjamin [Fri, 2 Feb 2018 14:35:14 +0000 (09:35 -0500)]
Merge pull request #20002 from malc0lm/fix-copypart

rgw: fix 'copy part' without 'x-amz-copy-source-range'

7 years agoceph-volume tests.functional add simple xenial filestore dmcrypt plain support
Alfredo Deza [Fri, 2 Feb 2018 14:11:09 +0000 (09:11 -0500)]
ceph-volume tests.functional add simple xenial filestore dmcrypt plain support

Signed-off-by: Alfredo Deza <adeza@redhat.com>
7 years agoceph-volume tests.functional add simple xenial filestore dmcrypt luks support
Alfredo Deza [Fri, 2 Feb 2018 14:10:56 +0000 (09:10 -0500)]
ceph-volume tests.functional add simple xenial filestore dmcrypt luks support

Signed-off-by: Alfredo Deza <adeza@redhat.com>
7 years agoceph-volume tests.functional add simple xenial bluestore dmcrypt plain support
Alfredo Deza [Fri, 2 Feb 2018 14:10:36 +0000 (09:10 -0500)]
ceph-volume tests.functional add simple xenial bluestore dmcrypt plain support

Signed-off-by: Alfredo Deza <adeza@redhat.com>
7 years agoceph-volume tests.functional add simple centos7 filestore dmcrypt plain support
Alfredo Deza [Fri, 2 Feb 2018 14:10:12 +0000 (09:10 -0500)]
ceph-volume tests.functional add simple centos7 filestore dmcrypt plain support

Signed-off-by: Alfredo Deza <adeza@redhat.com>
7 years agoceph-volume tests.functional add simple centos7 filestore dmcrypt luks support
Alfredo Deza [Fri, 2 Feb 2018 14:09:57 +0000 (09:09 -0500)]
ceph-volume tests.functional add simple centos7 filestore dmcrypt luks support

Signed-off-by: Alfredo Deza <adeza@redhat.com>
7 years agoceph-volume tests.functional add simple centos7 bluestore dmcrypt plain support
Alfredo Deza [Fri, 2 Feb 2018 14:09:41 +0000 (09:09 -0500)]
ceph-volume tests.functional add simple centos7 bluestore dmcrypt plain support

Signed-off-by: Alfredo Deza <adeza@redhat.com>
7 years agoceph-volume tests.functional add simple centos7 bluestore dmcrypt luks support
Alfredo Deza [Fri, 2 Feb 2018 14:09:21 +0000 (09:09 -0500)]
ceph-volume tests.functional add simple centos7 bluestore dmcrypt luks support

Signed-off-by: Alfredo Deza <adeza@redhat.com>
7 years agoceph-volume tests.functional add simple bluestore dmcrypt luks support
Alfredo Deza [Fri, 2 Feb 2018 14:08:23 +0000 (09:08 -0500)]
ceph-volume tests.functional add simple bluestore dmcrypt luks support

Signed-off-by: Alfredo Deza <adeza@redhat.com>
7 years agodoc/ceph-volume lvm prepare fully supports encryption now
Alfredo Deza [Fri, 2 Feb 2018 13:36:45 +0000 (08:36 -0500)]
doc/ceph-volume lvm prepare fully supports encryption now

Signed-off-by: Alfredo Deza <adeza@redhat.com>
7 years agodoc/ceph-volume scan update for encryption support
Alfredo Deza [Fri, 2 Feb 2018 13:36:02 +0000 (08:36 -0500)]
doc/ceph-volume scan update for encryption support

Signed-off-by: Alfredo Deza <adeza@redhat.com>
7 years agoMerge pull request #20222 from trociny/wip-deep-copy-default-format
Jason Dillaman [Fri, 2 Feb 2018 13:32:52 +0000 (08:32 -0500)]
Merge pull request #20222 from trociny/wip-deep-copy-default-format

librbd: by default use new format for deep copy destination

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
7 years agoMerge pull request #20170 from trociny/wip-22803
Jason Dillaman [Fri, 2 Feb 2018 13:32:36 +0000 (08:32 -0500)]
Merge pull request #20170 from trociny/wip-22803

qa/workunits/rbd: remove "trash purge --threshold" test

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
7 years agoMerge pull request #20099 from Songweibin/wip-fix-deep-cp
Jason Dillaman [Fri, 2 Feb 2018 13:32:20 +0000 (08:32 -0500)]
Merge pull request #20099 from Songweibin/wip-fix-deep-cp

librbd: fix deep copy a child-image

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