]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
9 years agorgw:add --reset-regions for regionmap update 5490/head
dwj192 [Wed, 9 Sep 2015 01:48:16 +0000 (09:48 +0800)]
rgw:add --reset-regions for regionmap update

Fixes: #12964
Signed-off-by: Weijun Duan <duanweijun@h3c.com>
9 years agoMerge pull request #5315 from tchaikov/wip-10930
Kefu Chai [Fri, 21 Aug 2015 03:18:32 +0000 (11:18 +0800)]
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>
9 years agoMerge pull request #5579 from jbweber/s3_encoding_type
Yehuda Sadeh [Thu, 20 Aug 2015 22:45:53 +0000 (15:45 -0700)]
Merge pull request #5579 from jbweber/s3_encoding_type

rgw: implement s3 encoding-type for get bucket

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
9 years agorgw: implement s3 encoding-type for get bucket 5579/head
Jeff Weber [Wed, 5 Aug 2015 23:06:46 +0000 (19:06 -0400)]
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>
9 years agoMerge branch 'dont-cache-recovery' of git://github.com/yuyuyu101/ceph
Sage Weil [Thu, 20 Aug 2015 19:20:44 +0000 (15:20 -0400)]
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

9 years agoMerge pull request #5259 from branch-predictor/bp-tuned-bufferlists
Sage Weil [Thu, 20 Aug 2015 19:09:17 +0000 (15:09 -0400)]
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>
9 years agoMerge pull request #5518 from ceph/wip-12652
Sage Weil [Thu, 20 Aug 2015 18:53:30 +0000 (14:53 -0400)]
Merge pull request #5518 from ceph/wip-12652

osd/PGLog: dirty_to is inclusive

Reviewed-by: Samuel Just <sjust@redhat.com>
9 years agoMerge pull request #5539 from wonzhq/flush-mode-stat
Sage Weil [Thu, 20 Aug 2015 18:47:24 +0000 (14:47 -0400)]
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>
9 years agoMerge pull request #5556 from zaitcev/cleanup-dead-code
Yehuda Sadeh [Thu, 20 Aug 2015 16:15:01 +0000 (09:15 -0700)]
Merge pull request #5556 from zaitcev/cleanup-dead-code

rgw: cleanup dead init_bucket

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
9 years agoMerge pull request #5598 from jasuarez/remove-useless-code
Yehuda Sadeh [Thu, 20 Aug 2015 16:13:55 +0000 (09:13 -0700)]
Merge pull request #5598 from jasuarez/remove-useless-code

rgw: Remove useless code in calc_hmac_sha1()

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
9 years agoMerge pull request #5620 from dachary/wip-12734-uuid
Loic Dachary [Thu, 20 Aug 2015 15:49:08 +0000 (17:49 +0200)]
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>
9 years agobuild/ops: add uuid-runtime to debian/control 5620/head
Loic Dachary [Thu, 20 Aug 2015 13:50:30 +0000 (15:50 +0200)]
build/ops: add uuid-runtime to debian/control

uuid-runtime was incorrectly removed by
62bfc7a1ab1587e81ed3bff0ddfbb1aa69d1c299, restore it.

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

Signed-off-by: Loic Dachary <ldachary@redhat.com>
9 years agoMerge pull request #5621 from ceph/revert-5613-wip-12729
Loic Dachary [Thu, 20 Aug 2015 14:18:01 +0000 (16:18 +0200)]
Merge pull request #5621 from ceph/revert-5613-wip-12729

Revert "Fix compile warning unused-result"

Reviewed-by: Loic Dachary <ldachary@redhat.com>
9 years agoRevert "Fix compile warning unused-result" 5621/head
Loic Dachary [Thu, 20 Aug 2015 14:17:13 +0000 (16:17 +0200)]
Revert "Fix compile warning unused-result"

9 years agoMerge pull request #5613 from ceph/wip-12729
Sage Weil [Thu, 20 Aug 2015 13:08:14 +0000 (09:08 -0400)]
Merge pull request #5613 from ceph/wip-12729

Fix compile warning unused-result

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #5523 from ceph/wip-scan-use-layout
Yan, Zheng [Thu, 20 Aug 2015 10:13:02 +0000 (18:13 +0800)]
Merge pull request #5523 from ceph/wip-scan-use-layout

Striped layouts in cephfs-data-scan

9 years agoMerge pull request #5272 from chenji-kael/work-branch
Kefu Chai [Thu, 20 Aug 2015 10:10:03 +0000 (18:10 +0800)]
Merge pull request #5272 from chenji-kael/work-branch

rados.py: wrap omap operation for librados

Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agoMerge pull request #5614 from liewegas/wip-logtomonitors
Yan, Zheng [Thu, 20 Aug 2015 09:47:38 +0000 (17:47 +0800)]
Merge pull request #5614 from liewegas/wip-logtomonitors

mds/MDSRank: less noisy about log_to_monitors

9 years agorados.py: This module now supports omap operations 5272/head
chenji [Fri, 17 Jul 2015 03:17:47 +0000 (11:17 +0800)]
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>
9 years agoMerge pull request #5601 from wonzhq/doc-peering
Kefu Chai [Thu, 20 Aug 2015 03:01:29 +0000 (11:01 +0800)]
Merge pull request #5601 from wonzhq/doc-peering

doc: fix the format of peering.rst

Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agomds/MDSRank: less noisy about log_to_monitors 5614/head
Sage Weil [Thu, 20 Aug 2015 02:16:28 +0000 (22:16 -0400)]
mds/MDSRank: less noisy about log_to_monitors

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agoFix compile warning unused-result 5613/head
Haomai Wang [Thu, 20 Aug 2015 02:10:21 +0000 (10:10 +0800)]
Fix compile warning unused-result

Fix #12729
Signed-off-by: Haomai Wang <haomaiwang@gmail.com>
9 years agodoc: fix the format of peering.rst 5601/head
Zhiqiang Wang [Thu, 20 Aug 2015 01:48:07 +0000 (09:48 +0800)]
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>
9 years agoMerge remote-tracking branch 'origin/wip-sam-proxy-write'
Samuel Just [Wed, 19 Aug 2015 22:49:40 +0000 (15:49 -0700)]
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

9 years agoosd/PGLog: dirty_to is inclusive 5518/head
Sage Weil [Sun, 9 Aug 2015 14:46:10 +0000 (10:46 -0400)]
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>
9 years agoMerge pull request #5470 from ceph/wip-newstore-sort
Sage Weil [Wed, 19 Aug 2015 15:07:14 +0000 (11:07 -0400)]
Merge pull request #5470 from ceph/wip-newstore-sort

osd: change sort order for hobject_t

Reviewed-by: Samuel Just <sjust@redhat.com>
9 years agoMerge pull request #5424 from lebauce/fix_swift_user_command_line
Sage Weil [Wed, 19 Aug 2015 13:21:42 +0000 (09:21 -0400)]
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>
9 years agoMerge pull request #5048 from SUSE/wip-objecter-comment-cleanup
Sage Weil [Wed, 19 Aug 2015 13:21:15 +0000 (09:21 -0400)]
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>
9 years agoMerge pull request #5606 from liewegas/wip-scrub-errormsg
Kefu Chai [Wed, 19 Aug 2015 11:55:53 +0000 (19:55 +0800)]
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>
9 years agoMerge pull request #5604 from oritwas/wip-cmake-fix-rbd
Kefu Chai [Wed, 19 Aug 2015 10:48:32 +0000 (18:48 +0800)]
Merge pull request #5604 from oritwas/wip-cmake-fix-rbd

cmake: add DiffIterate.cc to librbd

Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agomoved to use boost uuid implementation, based on commit 4fe89a7b14c97b2ed7f357132901b...
Rohan Mars [Thu, 13 Aug 2015 04:19:31 +0000 (21:19 -0700)]
moved to use boost uuid implementation, based on commit 4fe89a7b14c97b2ed7f357132901beb2bdcec551

Signed-off-by: Rohan Mars <code@rohanmars.com>
Reviewed-by: Casey Bodley <cbodley@redhat.com>
9 years agoMerge pull request #5433 from zqkkqz/master
Sage Weil [Wed, 19 Aug 2015 10:44:20 +0000 (06:44 -0400)]
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>
9 years agoosd/ReplicatedPG: fix missing whitespace in scrub error message 5606/head
Sage Weil [Wed, 19 Aug 2015 10:40:17 +0000 (06:40 -0400)]
osd/ReplicatedPG: fix missing whitespace in scrub error message

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #5538 from ceph/wip-selinux-improve-update
Sage Weil [Wed, 19 Aug 2015 10:29:40 +0000 (06:29 -0400)]
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>
9 years agoceph.spec.in: Require awk for selinux post script 5538/head
Boris Ranto [Wed, 19 Aug 2015 09:25:52 +0000 (11:25 +0200)]
ceph.spec.in: Require awk for selinux post script

Signed-off-by: Boris Ranto <branto@redhat.com>
9 years agoselinux: Relabel files if and only if the policy version changed
Boris Ranto [Tue, 11 Aug 2015 07:13:01 +0000 (09:13 +0200)]
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>
9 years agoMerge pull request #5596 from mbroz/wip-selinux-systemd
branto1 [Wed, 19 Aug 2015 09:00:40 +0000 (11:00 +0200)]
Merge pull request #5596 from mbroz/wip-selinux-systemd

Update ceph-selinux rpm spec

Reviewed-by: Boris Ranto <branto@redhat.com>
9 years agocmake: add DiffIterate.cc to librbd 5604/head
Orit Wasserman [Wed, 19 Aug 2015 08:56:27 +0000 (10:56 +0200)]
cmake: add DiffIterate.cc to librbd

Signed-off-by: Orit Wasserman <owasserm@redhat.com>
9 years agoMerge pull request #5600 from liewegas/wip-osd-bind
Loic Dachary [Tue, 18 Aug 2015 19:19:37 +0000 (21:19 +0200)]
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>
9 years agoReplicatedPG::cancel_pull: also finish_degraded_object 5599/head
Samuel Just [Mon, 17 Aug 2015 18:21:49 +0000 (11:21 -0700)]
ReplicatedPG::cancel_pull: also finish_degraded_object

We might have degraded object waiters on a pull.

Signed-off-by: Samuel Just <sjust@redhat.com>
9 years agoReplicatedPG: treat object as degraded until on_global_recover
Samuel Just [Mon, 17 Aug 2015 18:21:27 +0000 (11:21 -0700)]
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>
9 years agoReplicatedPG: block writes on promote of rollback snap promotion
Samuel Just [Mon, 27 Jul 2015 20:19:18 +0000 (13:19 -0700)]
ReplicatedPG: block writes on promote of rollback snap promotion

Signed-off-by: Samuel Just <sjust@redhat.com>
9 years agoReplicatedPG: enforce write ordering on rollback
Samuel Just [Mon, 27 Jul 2015 20:12:25 +0000 (13:12 -0700)]
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>
9 years agoRadosModel: send writes before and after rollback to verify ordering
Samuel Just [Thu, 23 Jul 2015 23:49:01 +0000 (16:49 -0700)]
RadosModel: send writes before and after rollback to verify ordering

Signed-off-by: Samuel Just <sjust@redhat.com>
9 years agoRevert "osd: set the blocked_by relationship when rolling back to a degraded"
Samuel Just [Thu, 23 Jul 2015 22:31:23 +0000 (15:31 -0700)]
Revert "osd: set the blocked_by relationship when rolling back to a degraded"

This reverts commit 48dacd75566f64cb89f991ac4d05e2e50c4e73e0.

9 years agotest: change the test_tiering test case accordingly for proxy write
Zhiqiang Wang [Wed, 17 Jun 2015 04:26:36 +0000 (12:26 +0800)]
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>
9 years agoosd: copy the reqids even if the object is deleted during promotion
Zhiqiang Wang [Wed, 10 Jun 2015 06:21:36 +0000 (14:21 +0800)]
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>
9 years agoosd: purge the object from the cache when proxying and not promoting the op
Zhiqiang Wang [Tue, 2 Jun 2015 08:36:56 +0000 (16:36 +0800)]
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>
9 years agoosd: set the blocked_by relationship when rolling back to a degraded
Zhiqiang Wang [Tue, 2 Jun 2015 08:20:35 +0000 (16:20 +0800)]
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>
9 years agoosd: skip promotion when proxying a delete op
Zhiqiang Wang [Wed, 27 May 2015 13:54:35 +0000 (21:54 +0800)]
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>
9 years agoosd: rename SKIP_PROMOTE to SKIP_HANDLE_CACHE
Zhiqiang Wang [Wed, 27 May 2015 12:50:02 +0000 (20:50 +0800)]
osd: rename SKIP_PROMOTE to SKIP_HANDLE_CACHE

To comply with what it really means.

Signed-off-by: Zhiqiang Wang <zhiqiang.wang@intel.com>
9 years agoosd: force promote for object overwrites on a ec base pool
Zhiqiang Wang [Wed, 27 May 2015 08:20:36 +0000 (16:20 +0800)]
osd: force promote for object overwrites on a ec base pool

When doing object overwrites on the ec base pool, the write op can't be
proxied. Always force promotion in this case.

Signed-off-by: Zhiqiang Wang <zhiqiang.wang@intel.com>
9 years agoosd: explicitly set the reqid when proxying the write op
Zhiqiang Wang [Wed, 27 May 2015 06:02:33 +0000 (14:02 +0800)]
osd: explicitly set the reqid when proxying the write op

This is needed as in the following scenario:
- Client sends 3 writes and a read on the same object to base tier
- Set up cache tiering
- Client retries ops and sends the 3 writes and 1 read to the cache tier
- The 3 writes finished on the base tier, say with versions v1, v2 and v3
- Cache tier proxies the 1st write, and start to promote the object for the 2nd
write, the 2nd and 3rd writes and the read are blocked
- The proxied 1st write finishes on the base tier with version v4, and returns
to cache tier. But somehow the cache tier fails to send the reply due to socket
failure injecting
- Client retries the writes and the read again, the writes are identified as
dup ops
- The promotion finishes, it copies the pg_log entries from the base tier and
put it in the cache tier's pg_log. This includes the 3 writes on the base tier
and the proxied write
- The writes dispatches after the promotion, they are identified as completed
dup ops. Cache tier replies these write ops with the version from the base tier
(v1, v2 and v3)
- In the last, the read dispatches, it reads the version of the proxied write
(v4) and replies to client
- Client complains that 'racing read got wrong version'

Signed-off-by: Zhiqiang Wang <zhiqiang.wang@intel.com>
9 years agoObjecter: optionally setting the reqid in the mutate interface
Zhiqiang Wang [Wed, 27 May 2015 03:57:29 +0000 (11:57 +0800)]
Objecter: optionally setting the reqid in the mutate interface

The cache tier needs to set the reqid to the original reqid from client
when proxying the write op.

Signed-off-by: Zhiqiang Wang <zhiqiang.wang@intel.com>
9 years agoosd: add reqid in MOSDOp
Zhiqiang Wang [Wed, 27 May 2015 03:14:02 +0000 (11:14 +0800)]
osd: add reqid in MOSDOp

The cache tier needs to set the reqid explicitly to the original reqid
from the client when proxying the write op to the base tier.

Signed-off-by: Zhiqiang Wang <zhiqiang.wang@intel.com>
9 years agoosd: turn on proxy write feature bit by default
Zhiqiang Wang [Tue, 19 May 2015 07:54:08 +0000 (15:54 +0800)]
osd: turn on proxy write feature bit by default

Signed-off-by: Zhiqiang Wang <zhiqiang.wang@intel.com>
9 years agoosd: add proxy write perf counter
Zhiqiang Wang [Fri, 24 Apr 2015 08:48:22 +0000 (16:48 +0800)]
osd: add proxy write perf counter

Signed-off-by: Zhiqiang Wang <zhiqiang.wang@intel.com>
9 years agoosd/ReplicatedPG: add the proxy write feature bit support
Zhiqiang Wang [Fri, 24 Apr 2015 08:44:12 +0000 (16:44 +0800)]
osd/ReplicatedPG: add the proxy write feature bit support

For older versions which doesn't support proxy write, doing promote.
Otherwise, we can proxy the write.

Signed-off-by: Zhiqiang Wang <zhiqiang.wang@intel.com>
9 years agoosd/ReplicatedPG: don't check order in finish_proxy_write
Zhiqiang Wang [Fri, 24 Apr 2015 08:35:47 +0000 (16:35 +0800)]
osd/ReplicatedPG: don't check order in finish_proxy_write

When proxy write comes back from base tier, the write op may or may not
sit at the front of the list.

Signed-off-by: Zhiqiang Wang <zhiqiang.wang@intel.com>
9 years agoosd/ReplicatedPG: add helper function check_for_promote
Zhiqiang Wang [Tue, 13 Jan 2015 03:55:31 +0000 (11:55 +0800)]
osd/ReplicatedPG: add helper function check_for_promote

This function is used to check if we need to initiate a promotion in
maybe_handle_cache.

Signed-off-by: Zhiqiang Wang <zhiqiang.wang@intel.com>
Conflicts:
src/osd/ReplicatedPG.cc

9 years agoosd/ReplicatedPG: minor updates on proxy write
Zhiqiang Wang [Tue, 13 Jan 2015 03:09:42 +0000 (11:09 +0800)]
osd/ReplicatedPG: minor updates on proxy write

Signed-off-by: Zhiqiang Wang <zhiqiang.wang@intel.com>
9 years agomon: add osd pool set/get for min_write_recency_for_promote
Zhiqiang Wang [Thu, 18 Dec 2014 08:02:08 +0000 (16:02 +0800)]
mon: add osd pool set/get for min_write_recency_for_promote

Signed-off-by: Zhiqiang Wang <zhiqiang.wang@intel.com>
Conflicts:
src/mon/MonCommands.h
src/mon/OSDMonitor.cc

9 years agoosd/ReplicatedPG: promote on 2nd write
Zhiqiang Wang [Thu, 18 Dec 2014 05:31:04 +0000 (13:31 +0800)]
osd/ReplicatedPG: promote on 2nd write

If min_write_recency_for_promote is
- 0: Promote when there is a write.
- 1: Check if the object is in current hit set. Promote if yes.
- else: Check if the object is in current and other in memory hit sets.
Promote if yes.

Signed-off-by: Zhiqiang Wang <zhiqiang.wang@intel.com>
Conflicts:
src/osd/ReplicatedPG.cc

9 years agoosd/osd_types: add min_write_recency_for_promote in pg_pool_t
Zhiqiang Wang [Thu, 18 Dec 2014 04:55:53 +0000 (12:55 +0800)]
osd/osd_types: add min_write_recency_for_promote in pg_pool_t

This field stands for the minimum number of hit sets to check before
promote on write.

Signed-off-by: Zhiqiang Wang <zhiqiang.wang@intel.com>
9 years agoosd/ReplicatedPG: set the RWORDERED flag for the promote copy-from op
Zhiqiang Wang [Fri, 12 Dec 2014 08:27:41 +0000 (16:27 +0800)]
osd/ReplicatedPG: set the RWORDERED flag for the promote copy-from op

Set the RWORDERED flag when doing promote copy-from op. This is in case
there are proxy writes in flight.

Signed-off-by: Zhiqiang Wang <zhiqiang.wang@intel.com>
Conflicts:
src/osd/ReplicatedPG.cc

9 years agoosd: tiering: use proxy write in writeback mode
Zhiqiang Wang [Thu, 11 Dec 2014 08:23:08 +0000 (16:23 +0800)]
osd: tiering: use proxy write in writeback mode

Signed-off-by: Zhiqiang Wang <zhiqiang.wang@intel.com>
Conflicts:
src/osd/ReplicatedPG.cc

9 years agoosd/ReplicatedPG: remove the peer_type assertion in eval_repop
Zhiqiang Wang [Thu, 11 Dec 2014 04:36:56 +0000 (12:36 +0800)]
osd/ReplicatedPG: remove the peer_type assertion in eval_repop

When moving to proxy write, this assertion doesn't hold any more.

Signed-off-by: Zhiqiang Wang <zhiqiang.wang@intel.com>
Conflicts:
src/osd/ReplicatedPG.cc

9 years agoosd: tiering: add proxy write support
Zhiqiang Wang [Fri, 5 Dec 2014 00:57:39 +0000 (08:57 +0800)]
osd: tiering: add proxy write support

Signed-off-by: Zhiqiang Wang <zhiqiang.wang@intel.com>
Conflicts:
src/osd/ReplicatedPG.cc

9 years agodoc: ceph-osd binds to up to 4 ports, not 3 5600/head
Sage Weil [Tue, 18 Aug 2015 17:57:37 +0000 (13:57 -0400)]
doc: ceph-osd binds to up to 4 ports, not 3

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agoMerge remote-tracking branch 'gh/next'
Sage Weil [Tue, 18 Aug 2015 15:52:53 +0000 (11:52 -0400)]
Merge remote-tracking branch 'gh/next'

9 years agorgw: Remove useless code in calc_hmac_sha1() 5598/head
Juan A. Suarez Romero [Tue, 18 Aug 2015 15:08:07 +0000 (15:08 +0000)]
rgw: Remove useless code in calc_hmac_sha1()

Hex conversion from buf is not used at all.

Signed-off-by: Juan A. Suarez Romero <jasuarez@igalia.com>
9 years agoMerge pull request #5597 from dachary/wip-12718-restorecon
branto1 [Tue, 18 Aug 2015 13:05:02 +0000 (15:05 +0200)]
Merge pull request #5597 from dachary/wip-12718-restorecon

ceph-disk: only call restorecon when available

Reviewed-by: Boris Ranto <branto@redhat.com>
9 years agoceph-disk: only call restorecon when available 5597/head
Loic Dachary [Tue, 18 Aug 2015 12:43:15 +0000 (14:43 +0200)]
ceph-disk: only call restorecon when available

9db80da12803d42bb676d67f37442c0c54d83448 added an unconditional call to
restorecon after mounting the filesystem. It fails when restorecon is
not available and must be made conditional.

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

Signed-off-by: Loic Dachary <ldachary@redhat.com>
9 years agoDo not use hardcoded paths in spec post section for selinux commands. 5596/head
Milan Broz [Tue, 18 Aug 2015 12:18:26 +0000 (14:18 +0200)]
Do not use hardcoded paths in spec post section for selinux commands.

Signed-off-by: Milan Broz <mbroz@redhat.com>
9 years agoAdd dependence to selinux-policy-base to fix installation in kickstart.
Milan Broz [Mon, 17 Aug 2015 12:46:31 +0000 (14:46 +0200)]
Add dependence to selinux-policy-base to fix installation in kickstart.

Signed-off-by: Milan Broz <mbroz@redhat.com>
9 years agoUpdate rpm spec to properly restart systemd ceph.target.
Milan Broz [Mon, 17 Aug 2015 10:48:17 +0000 (12:48 +0200)]
Update rpm spec to properly restart systemd ceph.target.

If we are using systemd, ceph target should be used.
Also fail to restart service should not stop policy to load.

Signed-off-by: Milan Broz <mbroz@redhat.com>
9 years agoMerge pull request #5595 from ceph/wip-12710
Gregory Farnum [Tue, 18 Aug 2015 12:07:09 +0000 (13:07 +0100)]
Merge pull request #5595 from ceph/wip-12710

qa/fsstress.sh: fix 'cp not writing through dangling symlink'

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
9 years agoMerge pull request #5594 from ceph/wip-12711
Gregory Farnum [Tue, 18 Aug 2015 12:01:17 +0000 (13:01 +0100)]
Merge pull request #5594 from ceph/wip-12711

mds: properly set client incarnation

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
9 years agotools/cephfs: account for striping in size estimation 5523/head
John Spray [Mon, 10 Aug 2015 12:17:28 +0000 (13:17 +0100)]
tools/cephfs: account for striping in size estimation

Signed-off-by: John Spray <john.spray@redhat.com>
9 years agoqa/fsstress.sh: fix 'cp not writing through dangling symlink' 5595/head
Yan, Zheng [Tue, 18 Aug 2015 07:22:55 +0000 (15:22 +0800)]
qa/fsstress.sh: fix 'cp not writing through dangling symlink'

On some test machines, /usr/lib/ltp/testcases/bin/fsstress is
dangling symlink. 'cp -f' is impotent in this case.

Fixes: #12710
Signed-off-by: Yan, Zheng <zyan@redhat.com>
9 years agomds: properly set client incarnation 5594/head
Yan, Zheng [Tue, 18 Aug 2015 06:56:24 +0000 (14:56 +0800)]
mds: properly set client incarnation

Fixes: #12711
Signed-off-by: Yan, Zheng <zyan@redhat.com>
9 years agoMerge pull request #5593 from ceph/revert-4927-snapset-obc
Samuel Just [Mon, 17 Aug 2015 19:59:18 +0000 (12:59 -0700)]
Merge pull request #5593 from ceph/revert-4927-snapset-obc

Revert "osd/ReplicatedPG: snapset is not persisted"

Reviewed-by: Samuel Just <sjust@redhat.com>
9 years agoRevert "osd/ReplicatedPG: snapset is not persisted" 5593/head
Samuel Just [Mon, 17 Aug 2015 19:58:58 +0000 (12:58 -0700)]
Revert "osd/ReplicatedPG: snapset is not persisted"

9 years agoMerge pull request #5577 from oritwas/wip-next-12363
Yehuda Sadeh [Mon, 17 Aug 2015 18:19:23 +0000 (11:19 -0700)]
Merge pull request #5577 from oritwas/wip-next-12363

rgw: we should not overide Swift sent content type

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
9 years agoMerge pull request #5558 from s09816/rbd-fix
Jason Dillaman [Mon, 17 Aug 2015 15:42:51 +0000 (11:42 -0400)]
Merge pull request #5558 from s09816/rbd-fix

rbd:improve the error handle of rbd,check the return value.

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
9 years agoosd/OSDMap: test_flag returns bool 5470/head
Sage Weil [Mon, 17 Aug 2015 14:29:48 +0000 (10:29 -0400)]
osd/OSDMap: test_flag returns bool

Otherwise comparing the result to a bool will promote the bool to
an int and fail the comparison.

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agoosdc/Objecter: restart listing this PG if sort order changes
Sage Weil [Mon, 10 Aug 2015 14:14:03 +0000 (10:14 -0400)]
osdc/Objecter: restart listing this PG if sort order changes

If the cluster sort order changes mid-way through our listing, our
cursor within this pg is meaningless and we need to restart at the
beginning of the PG.

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agoosd/ReplicatedPG: fix missing set sort order on [N]PGLS
Sage Weil [Fri, 7 Aug 2015 20:47:43 +0000 (16:47 -0400)]
osd/ReplicatedPG: fix missing set sort order on [N]PGLS

This is the only thing that cares about the missing set sort order,
so only adjust it here as needed.

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agoosd/osd_types: add pg_missing_t::resort() method
Sage Weil [Fri, 7 Aug 2015 20:47:08 +0000 (16:47 -0400)]
osd/osd_types: add pg_missing_t::resort() method

Set/change sort order as needed.

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agoosd/osd_types: make pg_missing_t sort order dynamic
Sage Weil [Fri, 7 Aug 2015 20:46:50 +0000 (16:46 -0400)]
osd/osd_types: make pg_missing_t sort order dynamic

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agoosd: refuse to boot if SORTBITWISE not set but backend cannot sort nibblewise
Sage Weil [Fri, 7 Aug 2015 20:27:43 +0000 (16:27 -0400)]
osd: refuse to boot if SORTBITWISE not set but backend cannot sort nibblewise

This prevenents OSDs with new backends from starting if the
cluster is still using the legacy sort order.

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #5586 from ceph/wip-jni-loader
Noah Watkins [Mon, 17 Aug 2015 13:00:39 +0000 (07:00 -0600)]
Merge pull request #5586 from ceph/wip-jni-loader

wip-jni-loader

Signed-off-by: Noah Watkins <noahwatkins@gmail.com>
9 years agoMerge pull request #5588 from zhouyuan/isal_yasm_fix
Kefu Chai [Mon, 17 Aug 2015 05:20:34 +0000 (13:20 +0800)]
Merge pull request #5588 from zhouyuan/isal_yasm_fix

configure: Fix checking for yasm compatibility

Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agoconfigure: Fix checking for yasm compability 5588/head
Yuan Zhou [Mon, 17 Aug 2015 01:52:19 +0000 (09:52 +0800)]
configure: Fix checking for yasm compability

Fix typo when checking yasm

Signed-off-by: Yuan Zhou <yuan.zhou@intel.com>
9 years agojava: add libcommon to deps 5586/head
Noah Watkins [Sun, 9 Aug 2015 20:12:48 +0000 (14:12 -0600)]
java: add libcommon to deps

Why do indirect dependencies seem to work randomly:

  undefined symbol: _ZN4ceph3log3Log12create_entryEii

Signed-off-by: Noah Watkins <noahwatkins@gmail.com>
9 years agojava: search for JNI bits in common dirs
Noah Watkins [Sun, 9 Aug 2015 19:33:22 +0000 (13:33 -0600)]
java: search for JNI bits in common dirs

Signed-off-by: Noah Watkins <noahwatkins@gmail.com>
9 years agoMerge pull request #5572 from xinxinsh/wip-rados-bench-error
Kefu Chai [Sat, 15 Aug 2015 03:56:22 +0000 (11:56 +0800)]
Merge pull request #5572 from xinxinsh/wip-rados-bench-error

fix print error of rados bench

Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agorbd:improve the error handle of rbd,check the return value. 5558/head
s09816 [Sat, 15 Aug 2015 02:31:57 +0000 (22:31 -0400)]
rbd:improve the error handle of rbd,check the return value.

Signed-off-by: s09816 <shi.lu@h3c.com>
9 years agoMerge pull request #5443 from ceph/wip-wrlock
Josh Durgin [Fri, 14 Aug 2015 22:50:53 +0000 (15:50 -0700)]
Merge pull request #5443 from ceph/wip-wrlock

cleanup: remove all traces of rados 'lock' operations

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
9 years agoMerge remote-tracking branch 'origin/next'
Josh Durgin [Fri, 14 Aug 2015 21:18:12 +0000 (14:18 -0700)]
Merge remote-tracking branch 'origin/next'