]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
7 years agorgw: reuse CURL* for keystone. 20635/head
Marcus Watts [Tue, 27 Feb 2018 07:53:37 +0000 (02:53 -0500)]
rgw: reuse CURL* for keystone.

When using keystone with https (the recommended setting),
it is inefficient to start up a new SSL connection for
each and every operation.  Keeping a CURL* structure around
should reduce the cost of doing this.  This logic tries
to do so, but it also tries to free them fairly aggressively
(5-10 seconds).  This should still greatly reduce load on
keystone at peak times while not tying up excess resources.

Fixes: https://tracker.ceph.com/issues/23162
Signed-off-by: Marcus Watts <mwatts@redhat.com>
7 years agobuild/link against curl w/ openssl not nss or gnutls. (debian)
Marcus Watts [Mon, 26 Feb 2018 00:33:34 +0000 (19:33 -0500)]
build/link against curl w/ openssl not nss or gnutls. (debian)

curl + gnutls has some big significant performance hits at least
when doing keystone validation.  nss has long-term memory growth
issues.

Signed-off-by: Marcus Watts <mwatts@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 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 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 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 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 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 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 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 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 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 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 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 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>
7 years agodoc: Fix path in ceph-fuse.rst 20261/head
Jos Collin [Fri, 2 Feb 2018 10:48:26 +0000 (16:18 +0530)]
doc: Fix path in ceph-fuse.rst

This mistake was introduced in https://github.com/ceph/ceph/commit/9b6f9da3ce935ba1dcc28dfd6723ca46883ccb5e.

Signed-off-by: Jos Collin <jcollin@redhat.com>
7 years agoMerge pull request #20178 from xiexingguo/wip-map-version
Xie Xingguo [Fri, 2 Feb 2018 08:37:00 +0000 (16:37 +0800)]
Merge pull request #20178 from xiexingguo/wip-map-version

crush, mon: bump up map version only if we truly created a weight-set

Reviewed-by: Kefu Chai <kchai@redhat.com>
7 years agoMerge pull request #20197 from xiexingguo/wip-load-ws-from-ms
Kefu Chai [Fri, 2 Feb 2018 07:57:14 +0000 (15:57 +0800)]
Merge pull request #20197 from xiexingguo/wip-load-ws-from-ms

pybind/mgr/balancer: load weight-set from ms

Reviewed-by: Sage Weil <sage@redhat.com>
7 years agoMerge pull request #20196 from yaozongyou/improve-straw2-readability
Kefu Chai [Fri, 2 Feb 2018 07:56:13 +0000 (15:56 +0800)]
Merge pull request #20196 from yaozongyou/improve-straw2-readability

crush: improve straw2 algorithm's readability

Reviewed-by: Sage Weil <sage@redhat.com>
7 years agoMerge pull request #20194 from xiexingguo/wip-badsteps
Kefu Chai [Fri, 2 Feb 2018 07:55:41 +0000 (15:55 +0800)]
Merge pull request #20194 from xiexingguo/wip-badsteps

pybind/mgr/balancer: increase bad_steps properly

Reviewed-by: Sage Weil <sage@redhat.com>
7 years agoMerge pull request #20189 from neha-ojha/wip-fix-update_calc_stats
Kefu Chai [Fri, 2 Feb 2018 07:55:02 +0000 (15:55 +0800)]
Merge pull request #20189 from neha-ojha/wip-fix-update_calc_stats

PG: primary should not be in the peer_info, skip if it is

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: David Zafman <dzafman@redhat.com>
7 years agoMerge pull request #20151 from badone/wip-run-tox-ceph-disk-deps-failure
Kefu Chai [Fri, 2 Feb 2018 07:35:59 +0000 (15:35 +0800)]
Merge pull request #20151 from badone/wip-run-tox-ceph-disk-deps-failure

tests: ceph-disk: Remove sitepackages=True

Reviewed-by: Alfredo Deza <adeza@redhat.com>
7 years agoMerge pull request #20140 from smithfarm/wip-python3-mopup
Kefu Chai [Fri, 2 Feb 2018 07:35:05 +0000 (15:35 +0800)]
Merge pull request #20140 from smithfarm/wip-python3-mopup

build/ops: rpm: Python 3-only ceph-disk and ceph-volume

Reviewed-by: Kefu Chai <kchai@redhat.com>
7 years agoMerge pull request #19953 from badone/wip-c_read_operations-tautological-compare...
Kefu Chai [Fri, 2 Feb 2018 07:29:33 +0000 (15:29 +0800)]
Merge pull request #19953 from badone/wip-c_read_operations-tautological-compare-warning

c_read_operations.cc: Silence tautological-compare compiler warning

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
7 years agoMerge pull request #20071 from joscollin/wip-ceph-fuse-doc
Jos Collin [Fri, 2 Feb 2018 06:30:18 +0000 (12:00 +0530)]
Merge pull request #20071 from joscollin/wip-ceph-fuse-doc

doc: Specify mount details in ceph-fuse

Reviewed-by: Zheng Yan <zyan@redhat.com>
7 years agodoc: Specify mount details in ceph-fuse 20071/head
Jos Collin [Tue, 23 Jan 2018 10:14:49 +0000 (15:44 +0530)]
doc: Specify mount details in ceph-fuse

Signed-off-by: Jos Collin <jcollin@redhat.com>
7 years agoOSDMap: add osdmap epoch info when printing info summary 20184/head
shun-s [Tue, 30 Jan 2018 13:32:59 +0000 (21:32 +0800)]
OSDMap: add osdmap epoch info when printing info summary

  add osdmap epoch info when printing info summary

Signed-off-by: shun-s <song.shun3@zte.com.cn>
7 years agoMerge PR #19856 into master
Patrick Donnelly [Thu, 1 Feb 2018 22:50:12 +0000 (14:50 -0800)]
Merge PR #19856 into master

* refs/pull/19856/head:
qa: synchronize kcephfs suites with fs/multimds

Reviewed-by: Zheng Yan <zyan@redhat.com>
7 years agorgw: beast frontend can listen on multiple endpoints 20188/head
Casey Bodley [Tue, 23 Jan 2018 21:03:13 +0000 (16:03 -0500)]
rgw: beast frontend can listen on multiple endpoints

rgw_frontends options port= and endpoint= can be given multiple times,
and the beast frontend will listen on each endpoint

Fixes: http://tracker.ceph.com/issues/22779
Signed-off-by: Casey Bodley <cbodley@redhat.com>
7 years agoMerge pull request #20203 from ceph/wip-rm22642
Alfredo Deza [Thu, 1 Feb 2018 16:13:21 +0000 (11:13 -0500)]
Merge pull request #20203 from ceph/wip-rm22642

ceph-volume: fix usage of the --osd-id flag

Reviewed-by: Alfredo Deza <adeza@redhat.com>
7 years agoqa/workunits/rbd: remove "trash purge --threshold" test 20170/head
Mykola Golub [Mon, 29 Jan 2018 14:52:10 +0000 (16:52 +0200)]
qa/workunits/rbd: remove "trash purge --threshold" test

It is difficult to make it work reliably in different environments.

Fixes: http://tracker.ceph.com/issues/22803
Signed-off-by: Mykola Golub <mgolub@suse.com>
7 years agoMerge pull request #20090 from liewegas/wip-bluestore-label
Sage Weil [Thu, 1 Feb 2018 14:51:01 +0000 (08:51 -0600)]
Merge pull request #20090 from liewegas/wip-bluestore-label

os/bluestore: make bdev label parsing error more meaningful and less noisy

Reviewed-by: Varada Kari <varada.kari@gmail.com>
7 years agotest/store_test: update Many4KWritesTest* test cases to finalize with fsck 20230/head
Igor Fedotov [Thu, 1 Feb 2018 11:54:29 +0000 (14:54 +0300)]
test/store_test: update Many4KWritesTest* test cases to finalize with fsck

Doing that when statfs report doesn't match our expectations will
provide more insight on the mismatch and helps to avoid races if any.
Maybe Fixes: https://tracker.ceph.com/issues/21312

Signed-off-by: Igor Fedotov <ifedotov@suse.com>
7 years agoMerge pull request #20214 from dillaman/wip-22819
Mykola Golub [Thu, 1 Feb 2018 10:01:00 +0000 (12:01 +0200)]
Merge pull request #20214 from dillaman/wip-22819

librbd: potential crash if object map check encounters error

Reviewed-by: Mykola Golub <mgolub@suse.com>
7 years agoosd: avoid the config's get_val() overhead on the read path. 20217/head
Radoslaw Zarzynski [Wed, 31 Jan 2018 23:51:14 +0000 (00:51 +0100)]
osd: avoid the config's get_val() overhead on the read path.

Profiling shows the overhead of the md_config_t::get_val<T>
can be significant. Unfortunately, it is being used in two
critical places across the read path.

The patch resorts to the legacy config infrastructure to
mitigate the performance penalty. It is expected it will
be superseded with a solution that allows to use the new,
intended routines without hurting performance.
`
Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
7 years agopybind/mgr/balancer: make 'eval' command can evaluate specific pool 20225/head
xie xingguo [Tue, 30 Jan 2018 12:00:33 +0000 (20:00 +0800)]
pybind/mgr/balancer: make 'eval' command can evaluate specific pool

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
7 years agomgr/balancer: pool-specific optimization for crush-compat
xie xingguo [Tue, 30 Jan 2018 03:31:39 +0000 (11:31 +0800)]
mgr/balancer: pool-specific optimization for crush-compat

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
7 years agopybind/mgr/balancer: remove optimization plan properly 20224/head
xie xingguo [Thu, 1 Feb 2018 07:48:53 +0000 (15:48 +0800)]
pybind/mgr/balancer: remove optimization plan properly

Should pass in plan name instead of the plan itself.

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
7 years agolibrbd: by default use new format for deep copy destination 20222/head
Mykola Golub [Thu, 1 Feb 2018 07:21:35 +0000 (09:21 +0200)]
librbd: by default use new format for deep copy destination

Signed-off-by: Mykola Golub <mgolub@suse.com>
7 years agoosd/ReplicatedBackend: 'osd_deep_scrub_keys' doesn't work 20221/head
fang yuxiang [Thu, 1 Feb 2018 06:17:17 +0000 (14:17 +0800)]
osd/ReplicatedBackend: 'osd_deep_scrub_keys' doesn't work

Signed-off-by: fang yuxiang <fang.yuxiang@eisoo.com>
7 years agoMerge pull request #20175 from tone-zhang/wip-fix-bug22828
Kefu Chai [Thu, 1 Feb 2018 04:46:35 +0000 (12:46 +0800)]
Merge pull request #20175 from tone-zhang/wip-fix-bug22828

cmake: fix libcephfs-test.jar build failure

Reviewed-by: Kefu Chai <kchai@redhat.com>
7 years agoMerge pull request #20174 from cbodley/wip-log-stream-clear
Kefu Chai [Thu, 1 Feb 2018 04:45:54 +0000 (12:45 +0800)]
Merge pull request #20174 from cbodley/wip-log-stream-clear

 log: clear thread-local stream's ios flags on reuse

Reviewed-by: Matt Benjamin <mbenjami@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
7 years agoMerge pull request #20166 from smithfarm/wip-fix-python2-global
Kefu Chai [Thu, 1 Feb 2018 04:43:35 +0000 (12:43 +0800)]
Merge pull request #20166 from smithfarm/wip-fix-python2-global

build/ops: rpm: fix _defined_if_python2_absent conditional

Reviewed-by: Boris Ranto <branto@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
7 years agoMerge pull request #20183 from tchaikov/wip-crushtool
Kefu Chai [Thu, 1 Feb 2018 04:37:55 +0000 (12:37 +0800)]
Merge pull request #20183 from tchaikov/wip-crushtool

crushtool: add --add-bucket and --move options

Reviewed-by: Sage Weil <sage@redhat.com>
7 years agoMerge pull request #20180 from xiexingguo/wip-more-balancer-fixes
Kefu Chai [Thu, 1 Feb 2018 04:34:50 +0000 (12:34 +0800)]
Merge pull request #20180 from xiexingguo/wip-more-balancer-fixes

mgr/balancer: two more fixes

Reviewed-by: Sage Weil <sage@redhat.com>
7 years agoMerge pull request #20154 from xiexingguo/wip-mgr-balancer-fixes
Kefu Chai [Thu, 1 Feb 2018 04:33:31 +0000 (12:33 +0800)]
Merge pull request #20154 from xiexingguo/wip-mgr-balancer-fixes

mgr/balancer: pool-specific optimization support and bug fixes

Reviewed-by: Sage Weil <sage@redhat.com>
7 years agoMerge pull request #20128 from guzhongyan/master
Kefu Chai [Thu, 1 Feb 2018 04:29:19 +0000 (12:29 +0800)]
Merge pull request #20128 from guzhongyan/master

common/pick_address: wrong prefix_len in pick_iface()

Reviewed-by: Kefu Chai <kchai@redhat.com>
7 years agoMerge pull request #20080 from dillaman/wip-librados-client-compat
Kefu Chai [Thu, 1 Feb 2018 04:24:54 +0000 (12:24 +0800)]
Merge pull request #20080 from dillaman/wip-librados-client-compat

librados: getter for min compatible client versions

Reviewed-by: Brad Hubbard <bhubbard@redhat.com>
7 years agocrush: improve straw2 algorithm's readability 20196/head
Yao Zongyou [Thu, 1 Feb 2018 02:20:33 +0000 (10:20 +0800)]
crush: improve straw2 algorithm's readability

Signed-off-by: Yao Zongyou <yaozongyou@vip.qq.com>
7 years agolibrbd: group misc cleanup 20199/head
songweibin [Wed, 31 Jan 2018 08:56:35 +0000 (16:56 +0800)]
librbd: group misc cleanup

* Add some error message when returning a negative error code.
* Validate dest name when renaming a group snap.

Signed-off-by: songweibin <song.weibin@zte.com.cn>
7 years agolibrbd: fix deep copy a child-image 20099/head
songweibin [Fri, 26 Jan 2018 03:22:27 +0000 (11:22 +0800)]
librbd: fix deep copy a child-image

* tweak create a cloned image when the source image is
  a clone (or at least one of its snapshots is a clone).

Signed-off-by: songweibin <song.weibin@zte.com.cn>
7 years agoceph-volume: adds tests for zap --destroy and --osd-id 20203/head
Andrew Schoen [Wed, 31 Jan 2018 21:45:44 +0000 (15:45 -0600)]
ceph-volume: adds tests for zap --destroy and --osd-id

These are not added for dmcrypt right now because there is a bug related
to zapping encrypted disks that needs fixed first.

Signed-off-by: Andrew Schoen <aschoen@redhat.com>
7 years agolibrbd: potential crash if object map check encounters error 20214/head
Jason Dillaman [Wed, 31 Jan 2018 21:52:52 +0000 (16:52 -0500)]
librbd: potential crash if object map check encounters error

Fixes: http://tracker.ceph.com/issues/22819
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
7 years agoMerge pull request #20195 from luomuyao/bugfix
Casey Bodley [Wed, 31 Jan 2018 15:54:15 +0000 (10:54 -0500)]
Merge pull request #20195 from luomuyao/bugfix

rgw: drop a repeated statement for encode_xml()

Reviewed-by: Casey Bodley <cbodley@redhat.com>
7 years agoceph-volume: no need to return osd_id from util.prepare.check_id
Andrew Schoen [Wed, 31 Jan 2018 15:04:09 +0000 (09:04 -0600)]
ceph-volume: no need to return osd_id from util.prepare.check_id

Now that osd_id is passed to util.prepare.create_id it doesn't
make any sense to return osd_id from check_id anymore as it's
not being used.

Signed-off-by: Andrew Schoen <aschoen@redhat.com>
7 years agopybind/mgr/balancer: load weight-set from ms 20197/head
xie xingguo [Wed, 31 Jan 2018 09:30:59 +0000 (17:30 +0800)]
pybind/mgr/balancer: load weight-set from ms

See https://github.com/ceph/ceph/pull/20178, so we won't
try to call 'ceph osd crush weight-set create-compat' multiple times.

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
7 years agorbd: add open/close section when listing group images
songweibin [Wed, 31 Jan 2018 05:46:06 +0000 (13:46 +0800)]
rbd: add open/close section when listing group images

Signed-off-by: songweibin <song.weibin@zte.com.cn>
7 years agorbd: translate pool id into pool name in error msg
songweibin [Wed, 31 Jan 2018 05:44:28 +0000 (13:44 +0800)]
rbd: translate pool id into pool name in error msg

Signed-off-by: songweibin <song.weibin@zte.com.cn>
7 years agopybind/rbd: fix some typo
songweibin [Wed, 31 Jan 2018 03:25:05 +0000 (11:25 +0800)]
pybind/rbd: fix some typo

Signed-off-by: songweibin <song.weibin@zte.com.cn>
7 years agorgw: If use 'copy part' without 'x-amz-copy-source-range', 20002/head
Malcolm Lee [Wed, 31 Jan 2018 02:45:19 +0000 (10:45 +0800)]
rgw: If use 'copy part' without 'x-amz-copy-source-range',
it will copy an entire source object

Signed-off-by: Malcolm Lee <fengxueyu35@126.com>
7 years agodoc/rbd: update rbd man page
songweibin [Wed, 31 Jan 2018 03:11:02 +0000 (11:11 +0800)]
doc/rbd: update rbd man page

Signed-off-by: songweibin <song.weibin@zte.com.cn>
7 years agorbd: add missing period at the end of mesg
songweibin [Wed, 31 Jan 2018 02:17:12 +0000 (10:17 +0800)]
rbd: add missing period at the end of mesg

Signed-off-by: songweibin <song.weibin@zte.com.cn>
7 years agorbd: s/group-spec/group-snap-spec for group snapshot
songweibin [Wed, 31 Jan 2018 02:13:34 +0000 (10:13 +0800)]
rbd: s/group-spec/group-snap-spec for group snapshot

Signed-off-by: songweibin <song.weibin@zte.com.cn>
7 years agorgw: drop a repeated statement for encode_xml() 20195/head
luomuyao [Wed, 31 Jan 2018 02:33:27 +0000 (10:33 +0800)]
rgw: drop a repeated statement for encode_xml()

Signed-off-by: luomuyao <luo.muyao@zte.com.cn>
7 years agopybind/mgr/balancer: increase bad_steps properly 20194/head
xie xingguo [Wed, 31 Jan 2018 02:15:53 +0000 (10:15 +0800)]
pybind/mgr/balancer: increase bad_steps properly

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
7 years agocrush, mon: bump up map version only if we truly created a weight-set 20178/head
xie xingguo [Tue, 30 Jan 2018 05:38:44 +0000 (13:38 +0800)]
crush, mon: bump up map version only if we truly created a weight-set

In crush-compat mode mgr/balancer will do 'ceph osd crush weight-set create-compat'
on each call to 'ceph balancer optimize <plan>', which turns out to be
bumping up osdmap version without modifying anything (we haven't executed the
plan yet).

E.g.:
./bin/ceph balancer reset && ./bin/ceph balancer optimize crush test && ./bin/ceph balancer show crush
// starting osdmap epoch 993
// starting crush version 962
// mode crush-compat

./bin/ceph balancer reset && ./bin/ceph balancer optimize crush test && ./bin/ceph balancer show crush
// starting osdmap epoch 994
// starting crush version 963
// mode crush-compat

Fix the above problem by checking whether a new weight-set is truly created or not
on the OSDMonitor-side.

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
7 years agoPG: primary should not be in the peer_info, skip if it is 20189/head
Neha Ojha [Tue, 30 Jan 2018 21:34:11 +0000 (13:34 -0800)]
PG: primary should not be in the peer_info, skip if it is

Signed-off-by: Neha Ojha <nojha@redhat.com>
7 years agoMerge PR #19760 into master
Patrick Donnelly [Tue, 30 Jan 2018 23:18:10 +0000 (15:18 -0800)]
Merge PR #19760 into master

* refs/pull/19760/head:
mds: add dump flag for CInode
mds: add command "openfiles ls"

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
7 years agoMerge PR #19825 into master
Patrick Donnelly [Tue, 30 Jan 2018 23:18:01 +0000 (15:18 -0800)]
Merge PR #19825 into master

* refs/pull/19825/head:
client: properly choose target mds for rmsnap/renamesnap
mds: properly setup need_snapflush for snapped inode
mds: ignore MClientCaps::FLAG_NO_CAPSNAP

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
7 years agoMerge PR #19833 into master
Patrick Donnelly [Tue, 30 Jan 2018 23:17:54 +0000 (15:17 -0800)]
Merge PR #19833 into master

* refs/pull/19833/head:
common: add C_SaferCond ctor with name argument
Client: use C_SaferCond for "_flush_range"
client: use C_SaferCond for _fallocate and ll_write_block
client: use C_SaferCond for _sync_fs and _fsync
client: use C_SaferCond in Client::_write
client: use C_SaferCond for _read_sync
client: use C_SaferCond in _read_async
client: use C_SaferCond for "Client::_read"

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
7 years agoMerge PR #19836 into master
Patrick Donnelly [Tue, 30 Jan 2018 23:17:48 +0000 (15:17 -0800)]
Merge PR #19836 into master

* refs/pull/19836/head:
Avoid the assert failure when the inode for the cap_export from other MDS happened not in MDCache

Reviewed-by: Zheng Yan <zyan@redhat.com>
7 years agoMerge PR #19842 into master
Patrick Donnelly [Tue, 30 Jan 2018 23:17:42 +0000 (15:17 -0800)]
Merge PR #19842 into master

* refs/pull/19842/head:
client: unify function name in debug log for Client.cc

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
7 years agoMerge PR #19991 into master
Patrick Donnelly [Tue, 30 Jan 2018 23:17:35 +0000 (15:17 -0800)]
Merge PR #19991 into master

* refs/pull/19991/head:
cephfs-journal-tool: move shutdown to the deconstructor of MDSUtility

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
7 years agoMerge PR #20001 into master
Patrick Donnelly [Tue, 30 Jan 2018 23:17:29 +0000 (15:17 -0800)]
Merge PR #20001 into master

* refs/pull/20001/head:
mds: use the steady clock on tick

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>