Commit Graph

79269 Commits

Author SHA1 Message Date
Yuri Weinstein
8ef4760825 Merge pull request #18175 from yaozongyou/fix-radosgw-admin-command-arg-bug
rgw: fix command argument error for radosgw-admin

Reviewed-by: Orit Wasserman <owasserm@redhat.com>
Reviewed-by: Jos Collin <jcollin@redhat.com>
2017-10-11 09:30:02 -07:00
Yuri Weinstein
d3055cd777 Merge pull request #18193 from cbodley/wip-rgw-pool-application-jewel
qa/rgw: ignore errors from 'pool application enable'

Reviewed-by: Yuri Weinstein <yweins@redhat.com>
2017-10-11 08:48:09 -07:00
Yuri Weinstein
6f9c008b7a Merge pull request #18225 from adamemerson/wip-retract-assertions
rgw: Remove assertions in IAM Policy

Reviewed-by: Matt Benjamin <mbenjami@redhat.com>
2017-10-11 08:44:30 -07:00
Kefu Chai
f136dbd460 Merge pull request #17420 from tchaikov/wip-19705
arch/arm: set ceph_arch_aarch64_crc32 only if the build host supports crc32cx

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2017-10-11 22:48:00 +08:00
Sage Weil
2b67a95316 Merge pull request #18242 from tchaikov/wip-21758
crushtool: print error message to stderr not dout(1)

Reviewed-by: Sage Weil <sage@redhat.com>
2017-10-11 08:44:45 -05:00
Matt Benjamin
e6c3ba5cc0 Merge pull request #18137 from cbodley/wip-21685
rgw: RGWUser::init no longer overwrites user_id
2017-10-11 08:32:49 -04:00
John Spray
e498041607 Merge pull request #18233 from gmayyyha/ceph-fs-status-21752
mgr/status: fix ceph fs status returns error

Reviewed-by: John Spray <john.spray@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
2017-10-11 11:21:11 +01:00
Kefu Chai
dc78d40af7 crushtool: print error message to stderr not dout(1)
in hope to fix the mysterious test failure where cli/crushtool/build.t
prints nothing when error message is expected.

Fixes: http://tracker.ceph.com/issues/21758
Signed-off-by: Kefu Chai <kchai@redhat.com>
2017-10-11 17:45:22 +08:00
Kefu Chai
3245fd90ec Merge pull request #18230 from ceph/liewegas-patch-1
.githubmap: Update

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Reviewed-by: Jos Collin <jcollin@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
2017-10-11 12:08:12 +08:00
Xie Xingguo
f9e8ba7f4d Merge pull request #18203 from majianpeng/bluestore-wake-kvfinathread
os/bluestore/BlueStore: ASAP wake up _kv_finalize_thread.

Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
Reviewed-by: Varada Kari <varada.kari@sandisk.com>
2017-10-11 11:35:40 +08:00
Kefu Chai
d2f290f243 Merge pull request #18201 from gregsfortytwo/wip-21737-shutdown-assert
common: by default, do not assert on leaks in the shared_cache code

Reviewed-by: Sage Weil <sage@redhat.com>
2017-10-11 11:20:00 +08:00
Kefu Chai
95072822e1 Merge pull request #18218 from tchaikov/wip-21609
mon/PGMap: let pg_string_state() return boost::optional<>

Reviewed-by: Yan Jun <yan.jun8@zte.com.cn>
Reviewed-by: Sage Weil <sage@redhat.com>
2017-10-11 11:05:08 +08:00
Kefu Chai
246e497d22 Merge pull request #18213 from tchaikov/wip-log-on-osx
log: fix build on osx

Reviewed-by: Adam C. Emerson <aemerson@redhat.com>
2017-10-11 11:03:29 +08:00
Kefu Chai
d35730e64d Merge pull request #18216 from tchaikov/wip-cmake-cleanup
cmake: set supported language the right way

Reviewed-by: Orit Wasserman <owasserm@redhat.com>
2017-10-11 11:02:29 +08:00
Yanhu Cao
4a90daa700 mgr/status: fix ceph fs status returns error
Fixes: http://tracker.ceph.com/issues/21752

Signed-off-by: Yanhu Cao <gmayyyha@gmail.com>
2017-10-11 09:31:14 +08:00
Xie Xingguo
0ffa676250 Merge pull request #18228 from ktdreyer/doc-mds-blacklist-interval-manual
doc: rm stray ")" character from mds config ref

Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
2017-10-11 08:37:08 +08:00
Josh Durgin
a0c921c835 Merge pull request #17900 from markhpc/wip-filestore-rocksdb-compaction-readahead-master
common/options.cc: Set Filestore rocksdb compaction readahead option.

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2017-10-10 16:52:18 -07:00
Sage Weil
e0a183566c Update .githubmap
Signed-off-by: Sage Weil <sage@redhat.com>
2017-10-10 17:25:21 -05:00
Patrick Donnelly
7feb6b28f0
Merge PR #18223 into master
* refs/pull/18223/head:
	githubmap: define merge conflict resolution

Reviewed-by: Sage Weil <sage@redhat.com>
2017-10-10 14:33:59 -07:00
Ken Dreyer
0fcdba5339 doc: rm stray ")" character from mds config ref
I accidentally introduced this in
4fb89a6317

Signed-off-by: Ken Dreyer <kdreyer@redhat.com>
2017-10-10 15:11:46 -06:00
Adam C. Emerson
b3118cabb8 rgw: Remove assertions in IAM Policy
A couple of them could be triggered by user input.

Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
2017-10-10 16:21:48 -04:00
Patrick Donnelly
e0e348eedf
githubmap: define merge conflict resolution
Use "union" merge to automatically resolve trivial append merge conflicts from
using ptl-tool.py.

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
2017-10-10 12:06:34 -07:00
Matt Benjamin
65b7543390 Merge pull request #17882 from ZVampirEM77/wip-rgw-encryption
rgw: clean up and fix some bugs for encryption
2017-10-10 14:56:08 -04:00
Sage Weil
85055e81d7 Merge pull request #17759 from liewegas/wip-21407
osd: fix waiting_for_peered vs flushing

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2017-10-10 13:17:01 -05:00
Dan Mick
6309b81804 Merge pull request #18208 from jan--f/mgr-prometheus-fix-undef-metrics
pybind/mgr/prometheus: fix metric type undef -> untyped

Reviewed-by: Dan Mick <dmick@redhat.com>
Reviewed-by: John Spray <jspray@redhat.com>
2017-10-10 10:38:49 -07:00
Mykola Golub
069c8dc2f4 Merge pull request #18136 from dillaman/wip-21561
rbd-mirror: primary image should register in remote, non-primary image's journal

Reviewed-by: Mykola Golub <to.my.trociny@gmail.com>
2017-10-10 18:01:44 +03:00
Mykola Golub
1dbf7f37fe Merge pull request #18158 from dillaman/wip-21711
librbd: refresh image after applying new metadata

Reviewed-by: Mykola Golub <to.my.trociny@gmail.com>
2017-10-10 18:00:52 +03:00
Jason Dillaman
ad01a883c5 librbd: refresh image after applying new/removing old metadata
Fixes: http://tracker.ceph.com/issues/21711
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2017-10-10 09:10:26 -04:00
Kefu Chai
260f87a9f1 mon/PGMap: let pg_string_state() return boost::optional<>
better to be specific, so we don't run into the same problem even we
are using the MSB of uint64_t for a pg state bit in future. we could,
however use uint64_t(-1) to indicate the pg_string_state()'s failure to
parse the state string, because pg_string_state() only translate a
single state a time. but it's always better to be explicit than
implicit.

Fixes: http://tracker.ceph.com/issues/21609
Signed-off-by: Kefu Chai <kchai@redhat.com>
2017-10-10 20:41:48 +08:00
Kefu Chai
90b9591c7d mon/PGMap: use uint64_t for pg state
Signed-off-by: Kefu Chai <kchai@redhat.com>
2017-10-10 20:41:48 +08:00
Kefu Chai
0c9c5ffe0f cmake: set supported language the right way
the second param of enable_launage() is not used, we should call it
multiple times to enable more than one language. switch to project()
command for simplicity.

Signed-off-by: Kefu Chai <kchai@redhat.com>
2017-10-10 19:54:31 +08:00
Kefu Chai
f29d304af4 log: fix build on osx
we can not assume that the the `rep` type is identical to `time_t` and
`susecond_t`, on osx they are `int`, not `int64_t`. so cast they as
necessary.

this fixes the error and warning of

LogClock.h:112:7: error: non-constant-expression cannot be narrowed from type 'rep' (aka 'long long') to '__darwin_suseconds_t' (aka 'int') in initializer list [-Wc++11-narrowing]
             std::chrono::duration_cast<std::chrono::microseconds>(
             ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
/Users/kefu/dev/ceph/src/log/LogClock.h:112:7: note: insert an explicit cast to silence this issue
             std::chrono::duration_cast<std::chrono::microseconds>(
             ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
LogClock.h:139:46: warning: format specifies type 'long' but the argument has type 'int' [-Wformat]
                      bdt.tm_hour, bdt.tm_min, bdt.tm_sec, tv.tv_usec / 1000);
                                                           ^~~~~~~~~~~~~~~~~

Signed-off-by: Kefu Chai <kchai@redhat.com>
2017-10-10 15:41:56 +08:00
Jan Fajerski
6306392492 pybind/mgr/prometheus: fix metric type undef -> untyped
Signed-off-by: Jan Fajerski <jfajerski@suse.com>
2017-10-10 08:40:31 +02:00
Kefu Chai
6cd9c71de6 Merge pull request #18205 from yaozongyou/fix-bluestore-cache-kv-max-type
doc: correct wrong bluestore config types

Reviewed-by: Kefu Chai <kchai@redhat.com>
2017-10-10 12:49:19 +08:00
Yao Zongyou
7966d3cd1d doc: fix bluestore config type error.
Signed-off-by: Yao Zongyou <yaozongyou@vip.qq.com>
2017-10-10 11:34:26 +08:00
Kefu Chai
526246db3e Merge pull request #18161 from Liuchang0812/wip-bluestore-ebusy
os/bluestore: do not core dump when we try to open kvstore twice

Reviewed-by: Sage Weil <sage@redhat.com>
2017-10-10 10:55:07 +08:00
Kefu Chai
7d155c4cd0 Merge pull request #18149 from tchaikov/wip-cleanups
common, osd: various cleanups

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Adam C. Emerson <aemerson@redhat.com>
2017-10-10 10:53:52 +08:00
Kefu Chai
a753282796 Merge pull request #18177 from tchaikov/wip-kv-kill-warning
kv: unify {create_and_,}open() methods

Reviewed-by: Sage Weil <sage@redhat.com>
2017-10-10 10:52:53 +08:00
Jason Dillaman
d774d4702f rbd-mirror: removed duplicate client registration logic
The client will now be registered before the bootstrap state machine
is invoked.

Fixes: http://tracker.ceph.com/issues/21561
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2017-10-09 20:53:51 -04:00
Jason Dillaman
d74b95dc10 rbd-mirror: local primary images should still register to remote images
Fixes: http://tracker.ceph.com/issues/21561
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2017-10-09 20:53:50 -04:00
John Spray
980f18d319 Merge pull request #18195 from ktdreyer/doc-mds-blacklist-interval-manual
doc: "mds blacklist interval" vs manually blacklisting
2017-10-09 23:31:09 +01:00
Greg Farnum
165b61a7df common: by default, do not assert on leaks in the shared_cache code
Update the standard qa suite cluster configs so that we continue
asserting in our nightlies, but users don't hit this.

Fixes: http://tracker.ceph.com/issues/21737

Signed-off-by: Greg Farnum <gfarnum@redhat.com>
2017-10-09 14:16:05 -07:00
Sage Weil
8f7dc8b0d8 osd: fix waiting_for_peered vs flushing
on_flush() requeues waiting_for_peered, but we flush twice on the
primary during peering, and we don't want to requeue the first one
(when we have the master pg log merged).

Fix by moving waiting_for_peered to waiting_for_flush if we aren't
already flush on _activate_committed.  If we get an op and are
peered but not flushed, queue ops there.  (We can simplify this
check a bit since pgbackend inactive message handling doesn't care
about flushed or not flushed.)  When flushed, we requeue
waiting_for_flush.

The waiting_for_flush, waiting_for_peered, and waiting_for_active
lists are all mutually exclusive, so this mostly serves to
clarify what we are waiting for (not to keep items separate). And
it means that on_flushed() will only requeue things that were
waiting for it specifically.

Fixes: http://tracker.ceph.com/issues/21407
Signed-off-by: Sage Weil <sage@redhat.com>
2017-10-09 15:27:51 -05:00
Kefu Chai
d28506d7ff Merge pull request #18188 from jschmid1/wip-man-osd-config-ref-syntax
doc: fixes syntax in osd-config-ref

Reviewed-by: Kefu Chai <kchai@redhat.com>
2017-10-10 01:01:00 +08:00
Joshua Schmid
a657717449
doc: fix syntax in rst
* Fix syntax in osd max object size section.

Fixes: http://tracker.ceph.com/issues/21733
Signed-off-by: Joshua Schmid <jschmid@suse.de>
2017-10-09 17:31:45 +02:00
Ken Dreyer
4fb89a6317 doc: "mds blacklist interval" vs manually blacklisting
The "mds blacklist interval" setting has no effect on the time that
the "ceph osd blacklist" command will use by default. Clarify this in
the docs.

Signed-off-by: Ken Dreyer <kdreyer@redhat.com>
2017-10-09 09:28:38 -06:00
Jianpeng Ma
2303c73261 os/bluestore/BlueStore: ASAP wake up _kv_finalize_thread.
Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
2017-10-09 22:38:33 +08:00
Casey Bodley
160240e0c1 qa/rgw: ignore errors from 'pool application enable'
Fixes: http://tracker.ceph.com/issues/21715

Signed-off-by: Casey Bodley <cbodley@redhat.com>
2017-10-09 10:25:26 -04:00
Kefu Chai
385786b362 kv: unify {create_and_,}open() methods
this silences the warning of "-Woverloaded-virtual" where create() and
create_and_open() from KeyValueDB are hidden from the ones defined in
derived classes.

Signed-off-by: Kefu Chai <kchai@redhat.com>
2017-10-09 21:50:26 +08:00
Haomai Wang
765259a082 Merge pull request #18190 from JustL/master
msg/async/rdma: unnecessary reinitiliazation of an iterator

Reviewed-by: Haomai Wang <haomai@xsky.com>
2017-10-09 08:48:19 -05:00