Commit Graph

43701 Commits

Author SHA1 Message Date
Zhiqiang Wang
5fedc8414b osd: consolidate encoding snaps into pg log code in finish_ctx
'MODIFY', 'PROMOTE' and 'CLEAN' are sharing the same encoding snaps
code.

Signed-off-by: Zhiqiang Wang <zhiqiang.wang@intel.com>
2015-08-21 16:08:46 +08:00
Kefu Chai
b33209b469 Merge pull request #5315 from tchaikov/wip-10930
mon: remove osd_epoch to avoid out-dated osdmap_cache

Reviewed-by: Sage Weil <sage@redhat.com>
2015-08-21 11:18:32 +08:00
Yehuda Sadeh
8314384a3c Merge pull request #5579 from jbweber/s3_encoding_type
rgw: implement s3 encoding-type for get bucket

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
2015-08-20 15:45:53 -07:00
Jeff Weber
180ca7b56b rgw: implement s3 encoding-type for get bucket
This change introduces handling for the encoding-type request
parameter on the get bucket operation. An object key may contain
characters which are not supported in XML. Passing the value "url" for
the encoding-type parameter will cause the key to be urlencoded in the
response.

Fixes: #12735
Signed-off-by: Jeff Weber <jweber@cofront.net>
2015-08-20 22:33:35 +00:00
Sage Weil
5686d9badb Merge branch 'dont-cache-recovery' of git://github.com/yuyuyu101/ceph
Reviewed-by: Samuel Just <sjust@redhat.com>
Reviewed-by: Sage Weil <sage@redhat.com>

# Conflicts:
#	src/osd/ReplicatedBackend.cc
#	src/osd/ReplicatedBackend.h
#	src/osd/ReplicatedPG.cc
2015-08-20 15:20:44 -04:00
Sage Weil
779466e34d Merge pull request #5259 from branch-predictor/bp-tuned-bufferlists
Bufferlist tuning

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Haomai Wang <haomaiwang@gmail.com>
Reviewed-by: Samuel Just <sjust@redhat.com>
2015-08-20 15:09:17 -04:00
Sage Weil
181dc28845 Merge pull request #5518 from ceph/wip-12652
osd/PGLog: dirty_to is inclusive

Reviewed-by: Samuel Just <sjust@redhat.com>
2015-08-20 14:53:30 -04:00
Sage Weil
6468ffb67b Merge pull request #5539 from wonzhq/flush-mode-stat
mon: show # of PGs at high flush mode in the command output

Reviewed-by: Sage Weil <sage@redhat.com>
2015-08-20 14:47:24 -04:00
Yehuda Sadeh
aeb80d03e1 Merge pull request #5556 from zaitcev/cleanup-dead-code
rgw: cleanup dead init_bucket

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
2015-08-20 09:15:01 -07:00
Yehuda Sadeh
f04322a848 Merge pull request #5598 from jasuarez/remove-useless-code
rgw: Remove useless code in calc_hmac_sha1()

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
2015-08-20 09:13:55 -07:00
Loic Dachary
bf108a3471 Merge pull request #5620 from dachary/wip-12734-uuid
build/ops: add uuid-runtime to debian/control

Reviewed-by: Casey Bodley <cbodley@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Sage Weil <sage@redhat.com>
2015-08-20 17:49:08 +02:00
Loic Dachary
d2d540c165 build/ops: add uuid-runtime to debian/control
uuid-runtime was incorrectly removed by
62bfc7a1ab, restore it.

http://tracker.ceph.com/issues/12734 Fixes: #12734

Signed-off-by: Loic Dachary <ldachary@redhat.com>
2015-08-20 16:19:00 +02:00
Loic Dachary
4e88268d93 Merge pull request #5621 from ceph/revert-5613-wip-12729
Revert "Fix compile warning unused-result"

Reviewed-by: Loic Dachary <ldachary@redhat.com>
2015-08-20 16:18:01 +02:00
Loic Dachary
951a3d6dcd Revert "Fix compile warning unused-result" 2015-08-20 16:17:13 +02:00
Sage Weil
910cc17b63 Merge pull request #5613 from ceph/wip-12729
Fix compile warning unused-result

Reviewed-by: Sage Weil <sage@redhat.com>
2015-08-20 09:08:14 -04:00
Yan, Zheng
bb70ac8e23 Merge pull request #5523 from ceph/wip-scan-use-layout
Striped layouts in cephfs-data-scan
2015-08-20 18:13:02 +08:00
Kefu Chai
aef8491319 Merge pull request #5272 from chenji-kael/work-branch
rados.py: wrap omap operation for librados

Reviewed-by: Kefu Chai <kchai@redhat.com>
2015-08-20 18:10:03 +08:00
Yan, Zheng
ea103798f3 Merge pull request #5614 from liewegas/wip-logtomonitors
mds/MDSRank: less noisy about log_to_monitors
2015-08-20 17:47:38 +08:00
chenji
d353dbc53a rados.py: This module now supports omap operations
you can operate omap in python
test_rados.py: add unit-test cases

Signed-off-by: Ji Chen <insomnia@139.com>
2015-08-20 17:19:45 +08:00
Kefu Chai
050e1c5c74 Merge pull request #5601 from wonzhq/doc-peering
doc: fix the format of peering.rst

Reviewed-by: Kefu Chai <kchai@redhat.com>
2015-08-20 11:01:29 +08:00
Sage Weil
4b75baa4dd mds/MDSRank: less noisy about log_to_monitors
Signed-off-by: Sage Weil <sage@redhat.com>
2015-08-19 22:16:28 -04:00
Haomai Wang
5ae3e36b29 Fix compile warning unused-result
Fix #12729
Signed-off-by: Haomai Wang <haomaiwang@gmail.com>
2015-08-20 10:10:21 +08:00
Zhiqiang Wang
73d4b7dbf2 doc: fix the format of peering.rst
Fix an incorrent number in the ordered list and some indention issue.
Make the ordered list to use '1' or 'a' for the first item, and '#' for
the remaining items.

Signed-off-by: Zhiqiang Wang <zhiqiang.wang@intel.com>
2015-08-20 09:48:07 +08:00
Samuel Just
afb4db73cc Merge remote-tracking branch 'origin/wip-sam-proxy-write'
Reviewed-by: Samuel Just <sjust@redhat.com>
Reviewed-by: Sage Weil <sage@redhat.com>

Conflicts:
	src/include/ceph_features.h
	src/osd/ReplicatedPG.cc
	src/osd/ReplicatedPG.h
2015-08-19 16:07:30 -07:00
Sage Weil
f0ca14df06 osd/PGLog: dirty_to is inclusive
There are only two callers of mark_dirty_to who do not pass max,
and they are both in the merge_log extending tail path.  In that
case, we want to include the last version specified in the log
writeout.  Fix the tail extending code to always specify the
last entry added, inclusive.

Fixes: #12652
Signed-off-by: Sage Weil <sage@redhat.com>
2015-08-19 17:13:28 -04:00
Sage Weil
b4a4bc140e Merge pull request #5470 from ceph/wip-newstore-sort
osd: change sort order for hobject_t

Reviewed-by: Samuel Just <sjust@redhat.com>
2015-08-19 11:07:14 -04:00
Sage Weil
c9ec2c0865 Merge pull request #5424 from lebauce/fix_swift_user_command_line
doc: fix command line for swift user creation

Reviewed-by: Sage Weil <sage@redhat.com>
2015-08-19 09:21:42 -04:00
Sage Weil
4a850b57ad Merge pull request #5048 from SUSE/wip-objecter-comment-cleanup
Objecter.cc: fix name of _take_op_budget() function in comment

Reviewed-by: Sage Weil <sage@redhat.com>
2015-08-19 09:21:15 -04:00
Kefu Chai
d2407f297c Merge pull request #5606 from liewegas/wip-scrub-errormsg
osd/ReplicatedPG: fix missing whitespace in scrub error message

Reviewed-by: Kefu Chai <kchai@redhat.com>
2015-08-19 19:55:53 +08:00
Kefu Chai
1abf1d6529 Merge pull request #5604 from oritwas/wip-cmake-fix-rbd
cmake: add DiffIterate.cc to librbd

Reviewed-by: Kefu Chai <kchai@redhat.com>
2015-08-19 18:48:32 +08:00
Rohan Mars
62bfc7a1ab moved to use boost uuid implementation, based on commit 4fe89a7b14
Signed-off-by: Rohan Mars <code@rohanmars.com>
Reviewed-by: Casey Bodley <cbodley@redhat.com>
2015-08-19 06:46:17 -04:00
Sage Weil
49c3119a84 Merge pull request #5433 from zqkkqz/master
common/Thread: pthread_attr_destroy(thread_attr) when done with it

Reviewed-by: Kefu Chai <kchai@redhat.com>
2015-08-19 06:44:20 -04:00
Sage Weil
041642e8c0 osd/ReplicatedPG: fix missing whitespace in scrub error message
Signed-off-by: Sage Weil <sage@redhat.com>
2015-08-19 06:40:17 -04:00
Sage Weil
a0ae5bcfd1 Merge pull request #5538 from ceph/wip-selinux-improve-update
selinux: Relabel files if and only if the policy version changed

Reviewed-by: Milan Broz <mbroz@redhat.com>
2015-08-19 06:29:40 -04:00
Boris Ranto
e4cff034e3 ceph.spec.in: Require awk for selinux post script
Signed-off-by: Boris Ranto <branto@redhat.com>
2015-08-19 11:26:06 +02:00
Boris Ranto
9038488bc2 selinux: Relabel files if and only if the policy version changed
Currently, the ceph files are being relabelled every time the package is
rebuilt. Fix this by checking the policy versions and relabel the files
only if the policy actually changed (different policy version was
detected).

Signed-off-by: Boris Ranto <branto@redhat.com>
2015-08-19 11:17:13 +02:00
branto1
a4d5ae2861 Merge pull request #5596 from mbroz/wip-selinux-systemd
Update ceph-selinux rpm spec

Reviewed-by: Boris Ranto <branto@redhat.com>
2015-08-19 11:00:40 +02:00
Orit Wasserman
aa50321aeb cmake: add DiffIterate.cc to librbd
Signed-off-by: Orit Wasserman <owasserm@redhat.com>
2015-08-19 10:56:27 +02:00
Loic Dachary
cf8a360cd1 Merge pull request #5600 from liewegas/wip-osd-bind
doc: ceph-osd binds to up to 4 ports, not 3

Reviewed-by: Loic Dachary <ldachary@redhat.com>
2015-08-18 21:19:37 +02:00
Samuel Just
9b2339297a ReplicatedPG::cancel_pull: also finish_degraded_object
We might have degraded object waiters on a pull.

Signed-off-by: Samuel Just <sjust@redhat.com>
2015-08-18 11:25:25 -07:00
Samuel Just
79f310ac4d ReplicatedPG: treat object as degraded until on_global_recover
Otherwise, an op might slip by between on_local_recover and
on_global_recover.

Signed-off-by: Samuel Just <sjust@redhat.com>
2015-08-18 11:25:25 -07:00
Samuel Just
5390072c8c ReplicatedPG: block writes on promote of rollback snap promotion
Signed-off-by: Samuel Just <sjust@redhat.com>
2015-08-18 11:25:25 -07:00
Samuel Just
35af63b982 ReplicatedPG: enforce write ordering on rollback
Previously, rollback ops could reorder w.r.t other writes due to waiting
on degraded snaps other than head.  To fix that, we'll introduce a new
map tracking objects blocked on degraded snaps.  A particular object can
only be blocked on one snap at a time (subsequent writes won't get far
enough to add another entry).

It might have been possible use the blocked_by machinery for this, but
it requires that the object have an extant obc, which we may not
have for a missing object.  Also, that machinery exists primarily to
support clone_range, which I hope to remove soon.

Signed-off-by: Samuel Just <sjust@redhat.com>
2015-08-18 11:25:24 -07:00
Samuel Just
7d4f695b3b RadosModel: send writes before and after rollback to verify ordering
Signed-off-by: Samuel Just <sjust@redhat.com>
2015-08-18 11:25:24 -07:00
Samuel Just
e7107ce07f Revert "osd: set the blocked_by relationship when rolling back to a degraded"
This reverts commit 48dacd7556.
2015-08-18 11:25:24 -07:00
Zhiqiang Wang
61c86a1281 test: change the test_tiering test case accordingly for proxy write
When an object is first created, it's proxied to base tier, need to
change the behavior of the test_tiering test case accordingly.

Signed-off-by: Zhiqiang Wang <zhiqiang.wang@intel.com>
2015-08-18 11:25:24 -07:00
Zhiqiang Wang
b7225a4834 osd: copy the reqids even if the object is deleted during promotion
If the object is deleted on the base tier, and the reqids are not copied
during promotion, this again leads to the 'ops not idempotent' problem.
For the copy-get op, this fix copies the reqids even if the object doesn't
exist.

Signed-off-by: Zhiqiang Wang <zhiqiang.wang@intel.com>
2015-08-18 11:25:24 -07:00
Zhiqiang Wang
da68bb371f osd: purge the object from the cache when proxying and not promoting the op
When proxying the write/cache op, if it is decided to not promote the
object, need to purge it from the object_contexts cache. Otherwise, it
causes problems for the later ops on this object.

Signed-off-by: Zhiqiang Wang <zhiqiang.wang@intel.com>
2015-08-18 11:25:24 -07:00
Zhiqiang Wang
aff8aa1a7b osd: set the blocked_by relationship when rolling back to a degraded
object

In a scenario like below:
- A rollback op comes in, and is enqueued.
- Several other ops on the same object come in, and are enqueued.
- The rollback op dispatches, and finds the object which it rollbacks to is
degraded, then this op is pushbacked into a list to wait for the degraded
object to recover.
- The later ops are handled and responded back to client.
- The degraded object recovers. The rollback op is enqueued again and finally
responded to client.
This breaks the op order. Need to set the blocked_by relationship to enqueue
the later ops until the degraded object recovers.

Signed-off-by: Zhiqiang Wang <zhiqiang.wang@intel.com>
2015-08-18 11:25:23 -07:00
Zhiqiang Wang
fa5b6e6d5e osd: skip promotion when proxying a delete op
When the object is deleted, there is no need to promote it.

Signed-off-by: Zhiqiang Wang <zhiqiang.wang@intel.com>
2015-08-18 11:25:23 -07:00