Commit Graph

79376 Commits

Author SHA1 Message Date
Kefu Chai
ebf39a2235 Merge pull request #16843 from amitkumar50/cov-radosstriper
rados: Intializing members class StriperTest

Reviewed-by: Sage Weil <sage@redhat.com>
2017-10-02 11:33:52 +08:00
Sage Weil
f7782427ab Merge pull request #17912 from ceph/docs-min-size
docs: Do not use "min size = 1" as an example

Reviewed-by: Brad Hubbard <bhubbard@redhat.com>
2017-10-01 21:35:10 -05:00
Sage Weil
e10b527dae Merge pull request #17931 from jcsp/wip-21518
mgr/zabbix: fix div by zero

Reviewed-by: Wido den Hollander <wido@42on.com>
2017-10-01 21:34:09 -05:00
Sage Weil
6467fcaff2 Merge pull request #18040 from joscollin/wip-guide-submitting-patches-typo
doc: Fix typo and URL

Reviewed-by: Sage Weil <sage@redhat.com>
2017-10-01 21:29:07 -05:00
Sage Weil
0885e9a9d7 Merge pull request #18060 from dragonylffly/wip-revise-organization
doc: update Li Wang Affiliation

Reviewed-by: Sage Weil <sage@redhat.com>
2017-10-01 21:24:19 -05:00
Sage Weil
6e829a3a7c osd: make note about when we get MBackfillReserve REJECT messages
Signed-off-by: Sage Weil <sage@redhat.com>
2017-10-01 15:07:57 -05:00
Sage Weil
ab8f1d2912 osd/PG: handle RecoveryReservationRejected in RepWaitRecoveryReserved
This state is analogous to RepWaitBackfillReserved; just like we do there
we want to handle the REJECT from the primary by canceling our local
remote_reservation.

Signed-off-by: Sage Weil <sage@redhat.com>
2017-10-01 15:06:22 -05:00
Sage Weil
1ce235c5dd osd/PG: ignore RemoteReservationRejected if we are RepNotRecoverying
The primary may send us a REJECT (meaning cancel) if recovery/backfill is
preempted there.  That can happen even if the recovery isn't reserved or
requested here (e.g., because the primary is still waiting for the local
reservation).  Just ignore it and remain in RepNotRecovering.

Fixes: http://tracker.ceph.com/issues/21613
Signed-off-by: Sage Weil <sage@redhat.com>
2017-10-01 15:06:22 -05:00
Sage Weil
f5809afb0f osd/PG: cancel local reservation in RemoteReservationRejected handler
We can get a RemoteReservationRejected event either because *we* decide
to reject, or because we get a REJECT from the primary that means "cancel"
(e.g., because recovery/backfill was preempted there).  In both cases we
want to cancel our remote_reservation.

Signed-off-by: Sage Weil <sage@redhat.com>
2017-10-01 15:06:22 -05:00
Sage Weil
57d18f0e8d osd/PG: move reject_reservation out of RemoteReservationRejected reaction
The RemoteReservationRejected event is also submitted when we are a
replica or backfill target and get a MBackfillReserve REJECT message
because the primary canceled or was preempted.  In that case, we don't
want to send a REJECT back to the primary; we only need to send it in the
cases where *we*, locally, decide to reject.  Move the call to those call
sites.

Signed-off-by: Sage Weil <sage@redhat.com>
2017-10-01 15:06:19 -05:00
Mykola Golub
fcaffe7e01 qa/workunits/rbd: pool create may fail for small cluster
ceph osd pool create test 100
Error ERANGE:  pg_num 100 size 3 would mean 648 total pgs, which exceeds max 600 (mon_max_pg_per_osd 200 * num_in_osds 3)

Signed-off-by: Mykola Golub <to.my.trociny@gmail.com>
2017-10-01 16:36:17 +02:00
ownedu
e3237714e4 Addressing CR comments from alex-mikheev (Alex Mikheev), to use a single
atomic counter for inflight Tx CQEs.

Signed-off-by: Yan Lei <yongyou.yl@alibaba-inc.com>
2017-10-01 18:27:52 +08:00
Mykola Golub
af33467301 Merge pull request #18043 from dillaman/wip-21567
librbd: snapshots should be created/removed against data pool

Reviewed-by: Mykola Golub <to.my.trociny@gmail.com>
2017-10-01 12:32:58 +03:00
Mykola Golub
3e3a69a54b Merge pull request #18042 from dillaman/wip-21529
librbd: image-meta config overrides should be dynamically refreshed

Reviewed-by: Mykola Golub <to.my.trociny@gmail.com>
2017-10-01 12:28:05 +03:00
Mykola Golub
0c9c894acf Merge pull request #18026 from dillaman/wip-21535
rbd-mirror: sync image metadata when transfering remote image

Reviewed-by: Mykola Golub <to.my.trociny@gmail.com>
2017-10-01 12:27:26 +03:00
Mykola Golub
2665d4448e Merge pull request #17992 from dillaman/wip-21558
librbd: hold cache_lock while clearing cache nonexistence flags

Reviewed-by: Mykola Golub <to.my.trociny@gmail.com>
2017-10-01 12:26:28 +03:00
ownedu
303e640c74 Addressing CR comments from tchaikov (Kefu Chai).
Signed-off-by: Yan Lei <yongyou.yl@alibaba-inc.com>
2017-10-01 17:07:53 +08:00
Song Shun
341b13c467 tool: change default objectstore from filestore to bluestore
as Luminous gets released, it's better to switch default objectstore from filestore to bluestore.

Signed-off-by: Song Shun <song.shun3@zte.com.cn>
2017-10-01 17:04:19 +08:00
Orit Wasserman
8ef45de6af Merge pull request #17989 from mkogan1/wip-rgw-21151
rgw: update vstart.sh to support rgw ssl port notation : '--rgw_port 443s'
Reviewed-by: Orit Wasserman <owasserm@redhat.com>
2017-10-01 11:39:33 +03:00
Kefu Chai
d221aba2d7 osd,mon: switch from vectors_equal() to operator==()
std::equal() in c++11 is able to compare elements of different container
types. but would be easier to read if we can just use the operator==().

Signed-off-by: Kefu Chai <kchai@redhat.com>
2017-10-01 15:09:03 +08:00
Kefu Chai
36f9607c63 mempool: add operator== for std::vector/mempool::vector comparison
Signed-off-by: Kefu Chai <kchai@redhat.com>
2017-10-01 15:09:03 +08:00
Orit Wasserman
8a1034bccd doc: replace region with zonegroup in configure bucket sharding section
Fixes: http://tracker.ceph.com/issues/21610
Signed-off-by: Orit Wasserman <owasserm@redhat.com>
2017-10-01 08:46:22 +03:00
Patrick Donnelly
534c30aca4
Merge PR #18041 into master
* refs/remotes/upstream/pull/18041/head:
	qa: relax cap expected value check
2017-09-30 17:43:56 -07:00
Patrick Donnelly
08384c0ad5
Merge PR #17990 into master
* refs/remotes/upstream/pull/17990/head:
	mds: open purge queue when transitioning out of standby replay
	mds: always re-probe mds log when standby replay done

Reviewed-by: John Spray <john.spray@redhat.com>
2017-09-30 17:43:54 -07:00
Patrick Donnelly
e48683e35d
Merge PR #17935 into master
* refs/remotes/upstream/pull/17935/head:
	ceph_volume_client: fix setting caps for IDs

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
2017-09-30 17:43:52 -07:00
Marcus Watts
61f292ec3c Merge pull request #17958 from gaosibei/branch1
RGW: fix a bug about inconsistent unit of comparison
2017-09-30 18:30:02 -04:00
xie xingguo
be078c8b7b osd/PrimaryLogPG: do not set data/omap digest blindly
As bluestore has bulitin csum, we generally no longer generate
object data digest for now. The consequence is that we should
handle data/omap digest more carefully to make certain ops,
such as copy_from/promote, to work properly since they heavily
relies on data digest for data transfer correctness.

Example of failure:
http://pulpito.ceph.com/xxg-2017-09-30_11:46:34-rbd-master-distro-basic-mira/1690609/

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
2017-09-30 22:50:52 +08:00
Li Wang
c5c8fb5ea5 doc: revise organization
Signed-off-by: Li Wang <laurence.liwang@gmail.com>
2017-09-30 10:39:36 +00:00
Chang Liu
6597e048af osd: remove duplicated function ec_pool in pg_pool_t
Signed-off-by: Chang Liu <liuchang0812@gmail.com>
2017-09-30 16:03:25 +08:00
Xie Xingguo
cd6b9830d1 Merge pull request #15199 from xiexingguo/wip-object-logic-size
osd: fine-grained statistics of logical object space usage

Reviewed-by: Sage Weil <sage@redhat.com>
2017-09-30 14:50:32 +08:00
Kefu Chai
259b3c1ead Merge pull request #16884 from liewegas/wip-20919
osd/PrimaryLogPG: send requests to primary on cache miss

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
2017-09-30 12:14:14 +08:00
Kefu Chai
3dfe209499 Merge pull request #17955 from asomers/bin_bash2
test: fix bash path in shebangs (part 2)

Reviewed-by: Kefu Chai <kchai@redhat.com>
2017-09-30 12:13:35 +08:00
Kefu Chai
709c77b2b5 Merge pull request #17985 from dzafman/wip-21327
ceph-objectstore-tool: "$OBJ get-omaphdr" and "$OBJ list-omap" scan all pgs instead of using specific pg

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
2017-09-30 12:12:25 +08:00
Kefu Chai
d877b0b07d Merge pull request #18005 from jcsp/wip-21577
tools: update monstore tool for fsmap, mgrmap

Reviewed-by: Kefu Chai <kchai@redhat.com>
2017-09-30 12:11:21 +08:00
Kefu Chai
583f62bd98 Merge pull request #18015 from tchaikov/wip-kill-warnings
osd,os/bluestore: kill clang analyzer warnings

Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
Reviewed-by: Sage Weil <sage@redhat.com>
2017-09-30 12:10:49 +08:00
Kefu Chai
c76742b748 Merge pull request #18018 from tchaikov/wip-ceph-disk-cleanup
ceph-disk: more precise error message when a disk is specified

Reviewed-by: Loic Dachary <ldachary@redhat.com>
Reviewed-by: Sage Weil <sage@redhat.com>
2017-09-30 12:10:06 +08:00
Kefu Chai
48582cb00e Merge pull request #18034 from tchaikov/wip-options
common/options: pass by reference and use user-literals for size

Reviewed-by: Adam C. Emerson <aemerson@redhat.com>
2017-09-30 12:07:15 +08:00
Li Wang
73e70a553f client: assert(false)->ceph_abort()
Signed-off-by: Li Wang <laurence.liwang@gmail.com>
2017-09-30 02:30:51 +00:00
ownedu
92c3499f7b msg/async/rdma: fix Tx buffer leakage which can introduce "heartbeat no
reply" due to out of Tx buffers, this can be reproduced by marking some
OSDs down in a big Ceph cluster, say 300+ OSDs.

rootcause: when RDMAStack wants to delete faulty connections there are
chances that those QPs still have inflight CQEs, thus inflight Tx
buffers; without waiting for them to complete, Tx buffer pool will run
out of buffers finally.

fix: ideally the best way to fix this bug is to destroy QPs gracefully
such as to_dead(), we now just reply on the number of Tx WQE and CQE to
avoid buffer leakage; RDMAStack polling is always running so we are safe
to simply bypass some QPs that are not in 'complete' state.

Signed-off-by: Yan Lei <yongyou.yl@alibaba-inc.com>
2017-09-30 10:14:39 +08:00
Jos Collin
ded96388da doc: Fix URL in Licensing
Fixed the unnecessary URL format in the text. Modify the URL formatting to highlight only the file name seems better.

Signed-off-by: Jos Collin <jcollin@redhat.com>
2017-09-30 07:40:01 +05:30
xie xingguo
6a990115c2 osd/PrimaryLogPG: clear pin_stats_invalid bit properly on scrub-repair completion
We have done audit of stats and the numbers should be all ok by then.
Actually the pin_stats_invalid bit is never set true, so forgetting
to clear pin_stats_invalid here generally does harm. Also we could simply
kill the pin_stats_invalid bit instead but let's not bother with that
complexity either.

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
2017-09-30 09:59:53 +08:00
Marcus Watts
c11485e1b3 radosgw: fix awsv4 header line sort order.
The awsv4 signature calculation includes a list of header lines, which
are supposed to be sorted.  The existing code sorts by header name, but
it appears that in fact it is necessary to sort the whole header *line*,
not just the field name.  Sorting by just the field name usually works,
but not always.  The s3-tests teuthology suite includes
s3tests.functional.test_s3.test_object_header_acl_grants
s3tests.functional.test_s3.test_bucket_header_acl_grants
which include the following header lines,

x-amz-grant-read-acp:id=56789abcdef0123456789abcdef0123456789abcdef0123456789abcdef01234
x-amz-grant-read:id=56789abcdef0123456789abcdef0123456789abcdef0123456789abcdef01234
x-amz-grant-write-acp:id=56789abcdef0123456789abcdef0123456789abcdef0123456789abcdef01234
x-amz-grant-write:id=56789abcdef0123456789abcdef0123456789abcdef0123456789abcdef01234

in this case, note that ':' needs to sort after '-'.

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

Signed-off-by: Marcus Watts <mwatts@redhat.com>
2017-09-29 17:04:08 -04:00
Jason Dillaman
ae1530bbfb Merge pull request #17971 from idryomov/wip-krbd-exclude-shared-298
qa/suites/krbd: exclude shared/298

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
2017-09-29 16:07:59 -04:00
Jason Dillaman
5a3baf1bd8 librbd: snapshots should be created/removed against data pool
Fixes: http://tracker.ceph.com/issues/21567
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2017-09-29 15:11:38 -04:00
Radoslaw Zarzynski
90bbcd7cbb os/bluestore: drop support for non-bulky extent release.
Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
2017-09-29 20:30:53 +02:00
Radoslaw Zarzynski
5e1e6f9393 os/bluestore: release txc's extents in bulky manner.
Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
2017-09-29 20:30:53 +02:00
Radoslaw Zarzynski
16906c0190 os/bluestore: BlueFS releases disk extents in bulky manner.
Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
2017-09-29 20:30:53 +02:00
Jason Dillaman
ede691323d librbd: avoid dynamically refreshing non-atomic configuration settings
Fixes: http://tracker.ceph.com/issues/21529
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2017-09-29 12:22:57 -04:00
David Zafman
2f466f8b26 Merge pull request #17920 from dzafman/wip-21382
Erasure code recovery should send additional reads if necessary

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

Reviewed-by: Kefu Chai <kchai@redhat.com>
2017-09-29 09:04:43 -07:00
Patrick Donnelly
b37c7f7db7
qa: relax cap expected value check
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
2017-09-29 08:48:14 -07:00