Commit Graph

79414 Commits

Author SHA1 Message Date
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
Sage Weil
0a886bc9f3 qa/suites/rados/singleton/all/mon-seesaw: whitelist MON_DOWN
Mgr can get marked down when mon weirdness is happening.

Signed-off-by: Sage Weil <sage@redhat.com>
2017-10-11 08:24:50 -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
b4c662c2cf mds: additional damage handling case in EImportStart
Fixes: http://tracker.ceph.com/issues/21759
Signed-off-by: John Spray <john.spray@redhat.com>
2017-10-11 11:37:26 +01: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
Ning Yao
87f33376d9 test: fix misc fiemap testing
1) Different filesystem will have different behavior to
allocate extents. Therefore, even if write 4000 extents,
the filesystem may not really allocate 4000 extents.

2) kstore always return [0, xxx] even if offset ~= 0. Therefore,
the whole non-zero offset FiemapHoles test should be skipped

3) enable fiemap test for filestore, bluestore, memstore again

Fixes: http://tracker.ceph.com/issues/21716
Signed-off-by: Ning Yao <yaoning@unitedstack.com>
Signed-off-by: Kefu Chai <kchai@redhat.com>
2017-10-11 16:11:15 +08:00
shangfufei
38990a61c9 msg/async: fix bug of data type conversion in do_request()
Signed-off-by: shangfufei <shangfufei@inspur.com>
2017-10-11 14:46:26 +08:00
ownedu
322f87f8a9 msg/async/rdma: fix a coredump bug which is introduced by PR #18053,
where the iterator is not working properly after erase().

Signed-off-by: Yan Lei <yongyou.yl@alibaba-inc.com>
2017-10-11 14:31:30 +08:00
Kefu Chai
31e1651647 test/unittest_bufferlist: check retvals of syscalls
so we can have better understanding of failures like

[ RUN      ] BufferList.write_fd_offset
/home/jenkins-build/build/workspace/ceph-pull-requests-arm64/src/test/bufferlist.cc:2609:
Failure
      Expected: 1024 * 2 + offset
      Which is: 2248
To be equal to: (unsigned)st.st_size
      Which is: 0
[  FAILED  ] BufferList.write_fd_offset (4 ms)

Signed-off-by: Kefu Chai <kchai@redhat.com>
2017-10-11 14:01:23 +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
Kefu Chai
e21114274f qa: s/backfill/backfilling/
it's renamed "backfilling" in 4015343f .

Signed-off-by: Kefu Chai <kchai@redhat.com>
2017-10-11 11:52:43 +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
Sage Weil
6a91d20936 ceph-objectstore-tool: fix import of post-split pg from pre-split ancestor
If we export a PG, it later splits, and then we try to import a
post-split portion of it, we need to generate the PastIntervals
properly (instead of crashing).

Fixes: http://tracker.ceph.com/issues/21753
Signed-off-by: Sage Weil <sage@redhat.com>
2017-10-10 17:02:56 -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
4fb89a63172d2dc6ce8f4702fe90904f9a8fd7bd

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
Adam C. Emerson
bbefcc2f0b config: Remove _get_val
I added this originally to prevent a deadlock when reading a new-style
configuration variable from a called observer. I didn't realize at the
time that the config mutex was recursive, so this change was
superfluous.

Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
2017-10-10 14:43:17 -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
Kefu Chai
8dc100d3f3 ceph-kvstore-tool: use unique_ptr<> manage the lifecycle of bluestore and db
Signed-off-by: Kefu Chai <kchai@redhat.com>
2017-10-10 22:28:42 +08:00
myoungwon oh
07d460c17c osd: generalize PGSrub, PGRecovery, PGSnapTrim
This commit will allow PGScrub, PGRecovery, PGSnapTrim
to be created anywhere (e.g. TestMClockClientQueue.cc)

Signed-off-by: Myoungwon Oh <omwmw@sk.com>
2017-10-10 23:18:22 +09:00
myoungwon oh
e9416d524f osd: use get_pgid() instead of info.pgid
Signed-off-by: Myoungwon Oh <omwmw@sk.com>
2017-10-10 23:18:03 +09:00
myoungwon oh
3d608c1857 osd: use global id instead of entity_inst_t
Signed-off-by: Myoungwon Oh <omwmw@sk.com>
2017-10-10 23:01:07 +09:00
Kefu Chai
b679abcfc5 osd: move pgid into OpQueueItem
this pave the road to generalize OpWQ

We're going to want to be able to queue things that are not ordered by
the PG lock.  To that end, this patch genearlizes OSD::ShardedOpWQ to
use a type which can specify an ordering token and locking structure
other than a PG.

There is a lot of collateral damage which I didn't feel was worth
separating out into other commits.  The code in ShardedOpWQ itself got
some superficial cleanup.  Also, the item being queued has been switched
to not use a boost::variant.  It was a cute way before to make the type
easily copyable, but adding more visitors for the locking support would
have been annoying.  Instead, the variant is a unique_ptr to an
interface.  This makes the queue item type no longer copyable, which is
just as well since we don't really want to be copying queue items anyway
(duplicates would be most likely a bug)

Signed-off-by: Samuel Just <sjust@redhat.com>
Signed-off-by: Kefu Chai <kchai@redhat.com>
Signed-off-by: Myoungwon Oh <omwmw@sk.com>
2017-10-10 23:00:45 +09:00
Sage Weil
47a5fcc404 osd/PG: fix clang build vs private state events
Signed-off-by: Sage Weil <sage@redhat.com>
2017-10-10 08:29:54 -05: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
myoungwon oh
9e12935240 src/test: fix move semantics
Signed-off-by: Myoungwon Oh <omwmw@sk.com>
2017-10-10 21:37:10 +09:00
Kefu Chai
90e71c5ff8 common,osd: enforce move semantics in WorkQueue
enable the WorkQueue to support move-only template types.

Signed-off-by: Samuel Just <sjust@redhat.com>
Signed-off-by: Kefu Chai <kchai@redhat.com>
Signed-off-by: Myoungwon Oh <omwmw@sk.com>
2017-10-10 21:32:42 +09: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
Yan, Zheng
9d5c92a336 mds: update client metadata for already open session
session opened by Server::prepare_force_open_sessions() has no
client metadata.

Fixes: http://tracker.ceph.com/issues/21746
Signed-off-by: "Yan, Zheng" <zyan@redhat.com>
2017-10-10 17:54:30 +08:00
lu.shasha
66e0d56a12 rgw: clean up "realm remove" in radosgw-admin
Signed-off-by: Shasha Lu <lu.shasha@eisoo.com>
2017-10-10 17:02:44 +08:00
lu.shasha
3189edc28e rgw: don't change rados object's mtime when update olh
null instance and olh share rados object. Null instance using the rados object mtime as its mtime. When olh updated, the rados object mtime will change.
Thus the null instance will be incorrect. When list objects in bucket, the mtime is correct, down the null instance the last modified time is incorrect.
So when update olh, using the previous mtime, thus the null instance mtime will be correct.

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

Signed-off-by: Shasha Lu <lu.shasha@eisoo.com>
2017-10-10 16:54:00 +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