RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2024-12-18 09:25:49 +00:00
Code Issues Packages Projects Releases Wiki Activity
66,824 Commits 211 Branches 394 Tags 2.1 GiB
ae40602c14
Commit Graph

66824 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Samuel Just
ae40602c14 Merge remote-tracking branch 'ceph-qa-suite/master' into wip-18113-qa 2016-12-14 16:05:35 -08:00
Samuel Just
36481ff23f Merge pull request #1310 from ceph/wip-18113 
test: Update for new error message when doing scrub with deep-scrub e…

Reviewed-by: Samuel Just <sjust@redhat.com>
 2016-12-14 15:57:24 -08:00
Yuri Weinstein
940b96a75b Merge pull request #12438 from songbaisen/s6 
mon: make it more clearly to debug for paxos state

Reviewed-by: Kefu Chai <kchai@redhat.com>
 2016-12-14 13:49:24 -08:00
Yuri Weinstein
167b3e1dc5 Merge pull request #12461 from liupan1111/wip-replace-atomic 
osd: remove the lock heartbeat_update_lock, and change heatbeat_need_…

Reviewed-by: Kefu Chai <kchai@redhat.com>
 2016-12-14 13:48:28 -08:00
Yehuda Sadeh
a5bc1f4888 Merge pull request #12452 from ceph/wip-rgw-fix-cr-deadlock 
rgw: use explicit flag to cancel RGWCoroutinesManager::run()

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
 2016-12-14 13:42:51 -08:00
Samuel Just
dff7077c67 Merge pull request #12487 from athanatos/wip-rpg-rename 
src: rename ReplicatedPG to PrimaryLogPG

Reviewed-by: Samuel Just <sjust@redhat.com>
 2016-12-14 13:27:54 -08:00
Yehuda Sadeh
9b331f948d Merge pull request #7639 from linuxbox2/wip-rgw-header 
rgw: add option to log custom HTTP headers (rgw_log_http_headers)

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
 2016-12-14 11:35:24 -08:00
Samuel Just
c2c5dace33 Merge pull request #12268 from dzafman/wip-18113 
osd: When deep-scrub errors present upgrade regular scrubs

Reviewed-by: Samuel Just <sjust@redhat.com>
 2016-12-14 11:34:24 -08:00
Samuel Just
6f8e4b3810 src: rename ReplicatedPG to PrimaryLogPG 
It's been confusing for a long time that EC pools are implemented by
ReplicatedPG.  What PG/ReplicatedPG really implement is the concept
of a PG where consistency is managed by the primary via a log.

Signed-off-by: Samuel Just <sjust@redhat.com>
 2016-12-14 10:18:27 -08:00
Sage Weil
025f777dbb Merge pull request #12453 from liewegas/qa-suite-master 
master: merge ceph-qa-suite
 2016-12-14 11:39:42 -06:00
Sage Weil
a1eaa3f00f merge ceph-qa-suite 2016-12-14 11:29:58 -06:00
Sage Weil
c01f2ee0e2 move ceph-qa-suite dirs into qa/ 2016-12-14 11:29:55 -06:00
Sage Weil
0c061c14a6 Revert "tasks/workunit.py: depth 1 clone" 
This reverts commit 4faf77a649.
 2016-12-14 12:28:23 -05:00
Mykola Golub
4828ab63fa Merge pull request #12420 from dillaman/wip-16176 
librbd: properly order concurrent updates to the object map

Reviewed-by: Mykola Golub <mgolub@mirantis.com>
Reviewed-by: Venky Shankar <vshankar@redhat.com>
 2016-12-14 19:23:12 +02:00
Zack Cerza
124712a4d5 Merge pull request #1307 from ceph/wip-workunit-repo 
tasks/workunit: use correct git mirror url
 2016-12-14 10:21:05 -07:00
Sage Weil
4faf77a649 tasks/workunit.py: depth 1 clone 
Signed-off-by: Sage Weil <sage@redhat.com>
 2016-12-14 12:19:44 -05:00
Sage Weil
159c455a03 tasks/workunit: remove kludge to use git.ceph.com 
This was hard-coded to ceph.git (almost) and breaks when
you specify --ceph-repo.  Remove it entirely.  We'll see if
github.com is better at handling our load than it used to
be!

Signed-off-by: Sage Weil <sage@redhat.com>
 2016-12-14 12:18:29 -05:00
Jason Dillaman
52e46fdf21 Merge pull request #12483 from trociny/wip-18242 
rbd-nbd: invalid error code for "failed to read nbd request" messages

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
 2016-12-14 11:40:09 -05:00
Sage Weil
bd83719e6e Merge pull request #1309 from ceph/wip-16800-kefu 
tasks/ceph: restore context of osd mount path before mkfs
 2016-12-14 09:56:25 -06:00
Sage Weil
49698d6e2b Merge pull request #12476 from liewegas/wip-vstart-rados 
CMakeLists: add vstart-base target

Reviewed-by: Kefu Chai <kchai@redhat.com>
 2016-12-14 09:23:52 -06:00
Matt Benjamin
04bf0f8ca1 rgw: add 'rgw log http headers' gloss to config-ref.rst 
Explain the option for upstream doc.

Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
 2016-12-14 09:59:20 -05:00
Sage Weil
2b94702139 Merge pull request #12393 from dachary/wip-18036-throttle 
tests: unittest_throttle avoid ASSERT_DEATH

Reviewed-by: Sage Weil <sage@redhat.com>
 2016-12-14 08:54:34 -06:00
Mykola Golub
a1a2f3a0ce Merge pull request #12473 from dillaman/wip-18243 
journal: avoid logging an error when a watch is blacklisted

Reviewed-by: Mykola Golub <mgolub@mirantis.com>
 2016-12-14 16:51:04 +02:00
John Spray
2871374c38 Merge pull request #1156 from ceph/wip-kclient-python 
Enable cephfs python tests on kclient
 2016-12-14 14:09:13 +00:00
John Spray
63ae8579bf Merge pull request #11542 from batrick/systemd-ceph-fuse 
systemd: add ceph-fuse service file

Reviewed-by: John Spray <john.spray@redhat.com>
 2016-12-14 13:55:33 +00:00
John Spray
3c7c65c669 Merge pull request #12337 from vishalkanaujia/wip_12132 
tools: cleanup phase of cephfs-data-scan

Reviewed-by: John Spray <john.spray@redhat.com>
 2016-12-14 13:52:35 +00:00
John Spray
69e03da184 Merge pull request #12358 from tchaikov/wip-18157 
ceph-fuse: start up log on parent process before shutdown

Reviewed-by: Sage Weil <sage@redhat.com>
 2016-12-14 13:49:33 +00:00
John Spray
f0f552ca13 Merge pull request #12384 from renhwztetecs/renhw-wip-libcephfs-addreadlink 
libcephfs: add readlink function in cephfs.pyx

Reviewed-by: John Spray <john.spray@redhat.com>
 2016-12-14 12:57:21 +00:00
John Spray
cdbad50eca Merge pull request #12395 from jcsp/wip-18166 
mon/MDSMonitor: fix iterating over mutated map

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
 2016-12-14 12:56:35 +00:00
John Spray
e25f060a73 Merge pull request #12401 from kylinstorage/wip-typos 
client: fix mutex name typos

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
 2016-12-14 12:56:11 +00:00
John Spray
8d4a95d50b Merge pull request #12443 from jcsp/wip-18225 
mds: release pool allocator memory after exceeding size limit

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
 2016-12-14 12:52:23 +00:00
Kefu Chai
53225d5272 tasks/ceph: restore context of osd mount path before mkfs 
all newly created files and directories under the mount dir inherit the
SELinux type of their parent directory. so we need to set it before
mkfs.

Fixes: http://tracker.ceph.com/issues/16800
Signed-off-by: Kefu Chai <kchai@redhat.com>
 2016-12-14 19:15:16 +08:00
Mykola Golub
42c2514fe2 rbd-nbd: invalid error code for "failed to read nbd request" messages 
Fixes: http://tracker.ceph.com/issues/18242
Signed-off-by: Mykola Golub <mgolub@mirantis.com>
 2016-12-14 09:53:05 +02:00
Sage Weil
4e23550bb2 Merge pull request #12333 from xiexingguo/xxg-wip-bluestore-1206 
os/bluestore: fix potential csum_order overflow

Reviewed-by: Sage Weil <sage@redhat.com>
 2016-12-14 01:07:37 -06:00
Sage Weil
6b6af6cfd4 Merge pull request #12382 from dachary/wip-18092-gf-complete 
erasure-code: synchronize with upstream gf-complete
 2016-12-14 01:06:47 -06:00
Sage Weil
3faf8b8466 CMakeLists: add vstart-base target 
No mds or radosgw.  Add rados CLI.

Signed-off-by: Sage Weil <sage@redhat.com>
 2016-12-14 00:51:25 -06:00
Sage Weil
80ac7b124b Merge pull request #12459 from runsisi/wip-ec-minor-cleanup 
osd/ECBackend: minor cleanup to remove duplicate code

Reviewed-by: Sage Weil <sage@redhat.com>
 2016-12-13 20:08:55 -06:00
Sage Weil
581a8c6310 Merge remote-tracking branch 'gh/kraken' 2016-12-13 17:48:47 -06:00
Matt Benjamin
4092c97ee5 rgw: custom headers: use boost::container::flat_map 
Use this occasion of serialized map to implement encoders
for boost::container::flat_map, which is optimized for
in-order insertion.

After some discussion, I'm proposing to just add the new template
forms, rather than (e.g.) adding either a large amount of
specialization machinery, or alternatively using C-style
macros.

Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
 2016-12-13 18:14:13 -05:00
Matt Benjamin
b82919a152 rgw: add rgw_log_http_headers option 
Tracks headers that should be handled conditionally (currently,
can only log, so using minimal structure to represent the
mapping).

Adds map of custom headers to rgw_log_entry, and populate it with
headers pre-selected for custom logging in RGWREST.  Added to encoder
and Formatter output.

Some additional optimization possible.

Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
 2016-12-13 18:13:42 -05:00
Jason Dillaman
7d743bfce6 librbd: block concurrent in-flight object map updates for the same object 
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
 2016-12-13 16:57:59 -05:00
Jason Dillaman
b1d624b43e librbd: new block guard helper to prevent concurrent IO to blocks 
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
 2016-12-13 16:57:59 -05:00
Jason Dillaman
ea7b30a4fb librbd: convert ObjectMap to template for unit testing 
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
 2016-12-13 16:57:59 -05:00
Jason Dillaman
477ae54a56 librbd: clean up object map update interface 
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
 2016-12-13 16:57:59 -05:00
Jason Dillaman
378b810cba librbd: update in-memory object map after on-disk update committed 
Concurrent IO to the same object would previously result in the first
IO pausing to update the object map while the other IO would proceed
to directly update the object before the object map state was properly
updated.

Fixes: http://tracker.ceph.com/issues/16176
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
 2016-12-13 16:57:59 -05:00
Jason Dillaman
b82a1c1d1f journal: avoid logging an error when a watch is blacklisted 
Fixes: http://tracker.ceph.com/issues/18243
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
 2016-12-13 14:40:23 -05:00
Sage Weil
c6198c3e7e Merge pull request #12447 from ifed01/wip-bluestore-fix-reshard2 
os/bluestore: avoid resharding if the last shard size fall below shar…

Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
Reviewed-by: Somnath Roy <somnath.roy@sandisk.com>
Reviewed-by: Sage Weil <sage@redhat.com>
 2016-12-13 11:47:42 -06:00
Kefu Chai
0be3f5f72e Merge pull request #12289 from liewegas/wip-pg-down 
osd/PG: add "down" pg state (distinct from down+peering)

Reviewed-by: Samuel Just <sjust@redhat.com>
 2016-12-13 22:46:16 +08:00
Kefu Chai
c0e6171c95 Merge pull request #12389 from ovh/wip-rework-recovery-priorities 
osd: Increase priority for inactive PGs backfill

Reviewed-by: Sage Weil <sage@redhat.com>
 2016-12-13 22:44:52 +08:00
Kefu Chai
11733614b8 Merge pull request #12352 from kylinstorage/wip-cleanup-mark-queued 
osd: mark queued flag for op

Reviewed-by: Sage Weil <sage@redhat.com>
 2016-12-13 22:44:22 +08:00