]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
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 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 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 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 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 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'

9 years agoMerge pull request #5537 from s09816/master
Josh Durgin [Fri, 14 Aug 2015 21:03:56 +0000 (14:03 -0700)]
Merge pull request #5537 from s09816/master

rbd:modify the log of purging snaps so that it is more appropriate

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
9 years agoMerge pull request #5560 from solesoul1127/master
Josh Durgin [Fri, 14 Aug 2015 21:03:15 +0000 (14:03 -0700)]
Merge pull request #5560 from solesoul1127/master

rbd:Check the dest image name, if it is empty string, return error and give a message

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
9 years agofix print error of rados bench 5572/head
xinxin shu [Thu, 13 Aug 2015 03:57:58 +0000 (11:57 +0800)]
fix print error of rados bench

Total time run:         12.279167
Total writes made:      92
Write size:             4194304
Bandwidth (MB/sec):     30
Stddev Bandwidth:       23.4
Max bandwidth (MB/sec): 64
Min bandwidth (MB/sec): 2
Average IOPS:           7
Stddev IOPS:            6
Max IOPS:               32767
Min IOPS:               -1537890352
Average Latency:        2.12
Stddev Latency:         1.35
Max latency:            6.05
Min latency:            0.501

Signed-off-by: xinxin shu <xinxin.shu@intel.com>
9 years agoMerge pull request #5569 from ceph/wip-unused-var
Yan, Zheng [Fri, 14 Aug 2015 07:45:47 +0000 (15:45 +0800)]
Merge pull request #5569 from ceph/wip-unused-var

client: fix unused var warning

9 years agorbd:modify the log of purging snaps so that it is more appropriate. 5537/head
s09816 [Fri, 14 Aug 2015 03:24:41 +0000 (23:24 -0400)]
rbd:modify the log of purging snaps so that it is more appropriate.

Signed-off-by: s09816 <shi.lu@h3c.com>
9 years agoMerge pull request #4744 from ceph/wip-11625
Josh Durgin [Thu, 13 Aug 2015 20:04:19 +0000 (13:04 -0700)]
Merge pull request #4744 from ceph/wip-11625

librbd: diff_iterate should issue concurrent ops

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
9 years agoMerge pull request #5555 from dachary/wip-mon-test-timeouts
Loic Dachary [Thu, 13 Aug 2015 19:11:03 +0000 (21:11 +0200)]
Merge pull request #5555 from dachary/wip-mon-test-timeouts

tests: be more generous with mon tests timeouts

Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agoMerge pull request #5576 from liewegas/wip-dencoder
Sage Weil [Thu, 13 Aug 2015 19:03:34 +0000 (15:03 -0400)]
Merge pull request #5576 from liewegas/wip-dencoder

simplify handling for objects w/ nondeterministic encoding

Reviewed-by: John Spray <john.spray@redhat.com>
9 years agorgw: we should not overide Swift sent content type 5577/head
Orit Wasserman [Thu, 13 Aug 2015 13:02:03 +0000 (15:02 +0200)]
rgw: we should not overide Swift sent content type

Fixes: #12363
backport: hammer

Signed-off-by: Orit Wasserman <owasserm@redhat.com>
9 years agotest/encoding/check-generated: test sorted json dumps for nondeterministic objects 5576/head
Sage Weil [Thu, 13 Aug 2015 18:49:40 +0000 (14:49 -0400)]
test/encoding/check-generated: test sorted json dumps for nondeterministic objects

Nondeterministic objects dump nondeterministically (usually due
to unordered_map or _set).  Compare their sorted output.  This
is a weaker test but is better than nothing.

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agoRevert "osd/HitSet: make subclasses dump deterministically"
Sage Weil [Thu, 13 Aug 2015 18:37:32 +0000 (14:37 -0400)]
Revert "osd/HitSet: make subclasses dump deterministically"

This reverts commit 34c048b3cb2b16658e692ac5110115612031510d.

9 years agoRevert "mon/PGMap: dump osd_epochs in deterministic order"
Sage Weil [Thu, 13 Aug 2015 18:37:16 +0000 (14:37 -0400)]
Revert "mon/PGMap: dump osd_epochs in deterministic order"

This reverts commit 3df6438cd2c9a77a06b7a8d011bafbed00f1fc5e.

9 years agoMerge pull request #4864 from stevecapperlinaro/for-ceph/journal-page-size-fix
Sage Weil [Thu, 13 Aug 2015 15:35:12 +0000 (11:35 -0400)]
Merge pull request #4864 from stevecapperlinaro/for-ceph/journal-page-size-fix

FileJournal: Remove CEPH_PAGE_SIZE assumptions

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #5100 from stevecapperlinaro/for-ceph/tweak-buffer-append-size
Sage Weil [Thu, 13 Aug 2015 15:34:56 +0000 (11:34 -0400)]
Merge pull request #5100 from stevecapperlinaro/for-ceph/tweak-buffer-append-size

Common: Do not use CEPH_PAGE_SIZE when appending buffers in Ceph

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #5339 from xinxinsh/wip-use-throttle
Sage Weil [Thu, 13 Aug 2015 15:34:13 +0000 (11:34 -0400)]
Merge pull request #5339 from xinxinsh/wip-use-throttle

use throttle framework to throttle objectstore ops/bytes

Reviewed-by: Li Wang <liwang@ubuntukylin.com>
Reviewed-by: Sage Weil <sage@redhat.com>
9 years agocrypto: fix unbalanced ceph::crypto::init/ceph::crypto:shutdown
Yan, Zheng [Wed, 5 Aug 2015 07:19:13 +0000 (15:19 +0800)]
crypto: fix unbalanced ceph::crypto::init/ceph::crypto:shutdown

we may create a CephContext without calling common_init_finish(), then
delete the CephContext. In this case, ceph::crypto:init() is not called,
so CephContext::~CephContext() should not call ceph::crypto::shutdown().

Fixes: #12598
Signed-off-by: Yan, Zheng <zyan@redhat.com>
Reviewed-by: John Spray <john.spray@redhat.com>
9 years agoMerge pull request #5573 from SUSE/wip-restart-on-rpm-removal-only
Sage Weil [Thu, 13 Aug 2015 14:21:37 +0000 (10:21 -0400)]
Merge pull request #5573 from SUSE/wip-restart-on-rpm-removal-only

ceph.spec.in: test %preun argument is zero for removal-only operations

9 years agoceph.spec.in: test %preun argument is zero for removal-only operations 5573/head
Nathan Cutler [Thu, 13 Aug 2015 13:36:02 +0000 (15:36 +0200)]
ceph.spec.in: test %preun argument is zero for removal-only operations

The %preun section now contains logic for disabling and stopping all the
Ceph systemd units when the ceph package is removed. However, there is no
conditional around it, so the units are disabled and stopped on RPM upgrade
as well as removal.

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

Signed-off-by: Nathan Cutler <ncutler@suse.com>
Signed-off-by: Tim Serong <tserong@suse.com>
9 years agoMerge pull request #5562 from varadakari/wip-kvstore-statfs
Sage Weil [Thu, 13 Aug 2015 12:51:01 +0000 (08:51 -0400)]
Merge pull request #5562 from varadakari/wip-kvstore-statfs

Adding statfs api to KeyValueDB

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #5565 from varadakari/wip-kvstore-makefile
Sage Weil [Thu, 13 Aug 2015 12:44:42 +0000 (08:44 -0400)]
Merge pull request #5565 from varadakari/wip-kvstore-makefile

Remove redundant line from Makefile

Reviewed-by: Loic Dachary <ldachary@redhat.com>
9 years agotests: do not test timeout mon add 5555/head
Loic Dachary [Wed, 12 Aug 2015 14:59:47 +0000 (16:59 +0200)]
tests: do not test timeout mon add

Strictly speaking it's not a feature, but an expected hahaviour. After
discussion it does not seem useful to have that test.

Signed-off-by: Kefu Chai <kchai@redhat.com>
Signed-off-by: Loic Dachary <ldachary@redhat.com>
9 years agoclient: fix unused var warning 5569/head
John Spray [Thu, 13 Aug 2015 10:18:20 +0000 (11:18 +0100)]
client: fix unused var warning

Signed-off-by: John Spray <john.spray@redhat.com>
9 years agoMerge remote-tracking branch 'origin/next'
John Spray [Thu, 13 Aug 2015 10:00:50 +0000 (11:00 +0100)]
Merge remote-tracking branch 'origin/next'

9 years agoMerge pull request #5564 from wonzhq/test-inode
John Spray [Thu, 13 Aug 2015 09:43:53 +0000 (10:43 +0100)]
Merge pull request #5564 from wonzhq/test-inode

mds: initialize 'divergent' to false when comparing inode_t

Reviewed-by: John Spray <john.spray@redhat.com>
9 years agoMerge pull request #5553 from majianpeng/mds
John Spray [Thu, 13 Aug 2015 09:36:40 +0000 (10:36 +0100)]
Merge pull request #5553 from majianpeng/mds

mds (fix to flags_to_mode and cleanup in handle_client_open)

Reviewed-by: John Spray <john.spray@redhat.com>
9 years agomds/Server: clean up code for handle_client_open. 5553/head
Jianpeng Ma [Tue, 11 Aug 2015 08:27:26 +0000 (16:27 +0800)]
mds/Server: clean up code for handle_client_open.

Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
9 years agocommon/ceph_fs: set mode default is -1 for func ceph_flags_to_mode.
Jianpeng Ma [Thu, 13 Aug 2015 09:03:52 +0000 (17:03 +0800)]
common/ceph_fs: set mode default is -1 for func ceph_flags_to_mode.

Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
9 years agoRemove redundant line from Makefile 5565/head
Varada Kari [Thu, 13 Aug 2015 06:53:45 +0000 (12:23 +0530)]
Remove redundant line from Makefile

Signed-off-by: Varada Kari <varada.kari@sandisk.com>
9 years agomds: initialize 'divergent' to false when comparing inode_t 5564/head
Zhiqiang Wang [Thu, 13 Aug 2015 06:28:50 +0000 (14:28 +0800)]
mds: initialize 'divergent' to false when comparing inode_t

'divergent' is not set in the case when all the fields of 'inode_t' are
equal.

Signed-off-by: Zhiqiang Wang <zhiqiang.wang@intel.com>
9 years agoAdding statfs api to KeyValueDB 5562/head
Varada Kari [Thu, 13 Aug 2015 05:31:40 +0000 (11:01 +0530)]
Adding statfs api to KeyValueDB

If any backend supports and implements statfs will extract the
stats from backend to show correct utilization in the status.

Signed-off-by: Varada Kari <varada.kari@sandisk.com>
9 years agorbd:Check the dest image name, if it is empty string, refuse to execute and give... 5560/head
root [Thu, 13 Aug 2015 03:16:49 +0000 (23:16 -0400)]
rbd:Check the dest image name, if it is empty string, refuse to execute and give a message

Signed-off-by: solesoul1127 <chen.yehua@h3c.com>
9 years agoMerge pull request #5544 from ceph/wip-12664-next
Josh Durgin [Wed, 12 Aug 2015 23:22:46 +0000 (16:22 -0700)]
Merge pull request #5544 from ceph/wip-12664-next

librbd: prevent race condition between resize requests

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
9 years agotests: be more generous with mon tests timeouts
Loic Dachary [Wed, 12 Aug 2015 12:59:01 +0000 (14:59 +0200)]
tests: be more generous with mon tests timeouts

Change the timeouts of the TEST_mon_add_to_single_mon tests to be 120
seconds. They have value to guard against blocking forever. The exact
timing does not matter as long as the operation completes.

When a timeout is too short, it will create false negatives when running
on slow machines. It could be argued that being too generous with
timeout in general may hide problems. But not in this specific case.

Signed-off-by: Loic Dachary <ldachary@redhat.com>
9 years agoMerge pull request #5550 from schuzhoy/schuzhoy-patch-1
Kefu Chai [Wed, 12 Aug 2015 09:25:18 +0000 (17:25 +0800)]
Merge pull request #5550 from schuzhoy/schuzhoy-patch-1

doc: Correcting the default number of copies.

Reviewed-by: Travis Rhoden <trhoden@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agoMerge pull request #5072 from zhouyuan/doc_rgw_rados_handlers
Kefu Chai [Wed, 12 Aug 2015 09:21:38 +0000 (17:21 +0800)]
Merge pull request #5072 from zhouyuan/doc_rgw_rados_handlers

doc: update rgw configuration on multiple rgw rados handlers feature

Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agoMerge pull request #5495 from tchaikov/wip-12620
Loic Dachary [Wed, 12 Aug 2015 07:49:18 +0000 (09:49 +0200)]
Merge pull request #5495 from tchaikov/wip-12620

doc/rados/operations/add-or-rm-mons: simplify the steps to add a mon

Reviewed-by: Joao Eduardo Luis <joao@suse.de>
Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Loic Dachary <ldachary@redhat.com>
9 years agoMerge pull request #5528 from Be-El/master
Yan, Zheng [Wed, 12 Aug 2015 03:30:00 +0000 (11:30 +0800)]
Merge pull request #5528 from Be-El/master

Correct handling of supplementary groups in ceph-fuse (Bug 12617)

9 years agodoc: update rgw configuration on multiple rgw rados handlers feature 5072/head
Yuan Zhou [Thu, 25 Jun 2015 03:42:01 +0000 (11:42 +0800)]
doc: update rgw configuration on multiple rgw rados handlers feature

Signed-off-by: Yuan Zhou <yuan.zhou@intel.com>
9 years agoDoc: Correcting the default number of copies. 5550/head
Alexander Chuzhoy [Tue, 11 Aug 2015 22:40:00 +0000 (18:40 -0400)]
Doc: Correcting the default number of copies.

According to the "quick ceph deploy" page, the default number of replicas in the Ceph configuration file is 3

Signed-off-by: Sasha Chuzhoy <sashac88@hotmail.com>
9 years agoMerge pull request #5047 from rzarzynski/wip-12108
Yehuda Sadeh [Tue, 11 Aug 2015 21:01:46 +0000 (14:01 -0700)]
Merge pull request #5047 from rzarzynski/wip-12108

rgw: rework X-Trans-Id header to be conform with Swift API.

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
9 years agoMerge pull request #5449 from yangruifeng/wip-rgw-bugfix1
Yehuda Sadeh [Tue, 11 Aug 2015 18:39:42 +0000 (11:39 -0700)]
Merge pull request #5449 from yangruifeng/wip-rgw-bugfix1

rgw:segmentation fault when rgw_gc_max_objs > HASH_PRIME

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
9 years agoMerge pull request #5447 from yangruifeng/master
Yehuda Sadeh [Tue, 11 Aug 2015 18:32:39 +0000 (11:32 -0700)]
Merge pull request #5447 from yangruifeng/master

rgw:the arguments 'domain' should not be assigned when return false

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
9 years agoMerge pull request #5543 from ceph/wip-cmake-nlist
John Spray [Tue, 11 Aug 2015 18:19:42 +0000 (19:19 +0100)]
Merge pull request #5543 from ceph/wip-cmake-nlist

CMake: add missing librados nlist test

Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agoMerge pull request #5547 from ritz303/wip-doc-11082
John Wilkins [Tue, 11 Aug 2015 17:48:23 +0000 (10:48 -0700)]
Merge pull request #5547 from ritz303/wip-doc-11082

doc: Removed reference to RAID-4

Reviewed-by: John Wilkins <jowilkin@redhat.com>
9 years agodoc: Removed reference to RAID-4 5547/head
ritz303 [Tue, 11 Aug 2015 17:46:10 +0000 (12:46 -0500)]
doc: Removed reference to RAID-4

Fixes: #11082
Signed-off-by: ritz303 <ritz_303@yahoo.com>
9 years agoMerge pull request #5546 from ritz303/wip-doc-11897
John Wilkins [Tue, 11 Aug 2015 17:11:12 +0000 (10:11 -0700)]
Merge pull request #5546 from ritz303/wip-doc-11897

doc: Clarify how 'ceph auth caps' works.

Reviewed-by: John Wilkins <jowilkin@redhat.com>
9 years agoCMake: cut down unnecessary linkage on rados tests 5543/head
John Spray [Tue, 11 Aug 2015 15:35:18 +0000 (16:35 +0100)]
CMake: cut down unnecessary linkage on rados tests

Signed-off-by: John Spray <john.spray@redhat.com>
9 years agoCMake: add missing librados nlist test
John Spray [Tue, 11 Aug 2015 10:14:56 +0000 (11:14 +0100)]
CMake: add missing librados nlist test

Signed-off-by: John Spray <john.spray@redhat.com>
9 years agoMerge pull request #5354 from ceph/wip-pgls-filter-librados
John Spray [Tue, 11 Aug 2015 14:40:58 +0000 (15:40 +0100)]
Merge pull request #5354 from ceph/wip-pgls-filter-librados

librados: partially expose PGLS filter interface

Reviewed-by: David Zafman <dzafman@redhat.com>
9 years agodoc/rados/operations/add-or-rm-mons: simplify the steps to add a mon 5495/head
Kefu Chai [Thu, 6 Aug 2015 14:32:42 +0000 (22:32 +0800)]
doc/rados/operations/add-or-rm-mons: simplify the steps to add a mon

this change removes the step to "ceph mon add" before starting a new
monitor. because the existing leader will start an election at seeing
the MMonJoin message sent by the new joiner, after the quorum is
archieved, the monmap will be updated with the new monitor.
so, "ceph mon add" is not necessary to add a new monitor.
moreover, this command will be blocked until a new quorum is formed,
and the proposed monmap is accepted. but in case of adding a monitor
to a single monitor cluster, the leader will wait until at least two
of the monitors reply to it. apparently, this does not happen unless
the new monitor starts. so from the user's point of view, this
command hangs until timesout, if he/she does not start the mon.b
beforehand. but this is an expected behaviour.

so, to avoid this confusion and simplify the steps to add a new
monitor. we'd better simply remove this "ceph mon add" step.

Fixes: #12620
Signed-off-by: Kefu Chai <kchai@redhat.com>
9 years agolibrbd: prevent race condition between resize requests 5544/head
Jason Dillaman [Tue, 11 Aug 2015 13:26:33 +0000 (09:26 -0400)]
librbd: prevent race condition between resize requests

It was possible that the same resize request could be sent twice
if a completed resize op started a newly created resize op while
it was also being concurrently started by another thread.

Fixes: #12664
Backport: hammer
Signed-off-by: Jason Dillaman <dillaman@redhat.com>