]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
10 years agomon: ceph osd df -- a new command to show OSD utilization
Mykola Golub [Fri, 9 Jan 2015 11:14:12 +0000 (13:14 +0200)]
mon: ceph osd df -- a new command to show OSD utilization

Fixes: #10452
Signed-off-by: Mykola Golub <mgolub@mirantis.com>
10 years agoAdd a type (weightf_t) to output float weights.
Mykola Golub [Thu, 15 Jan 2015 14:59:23 +0000 (16:59 +0200)]
Add a type (weightf_t) to output float weights.

Signed-off-by: Mykola Golub <mgolub@mirantis.com>
10 years agoosd: use CrushTreeDumper for printing osd tree.
Mykola Golub [Tue, 13 Jan 2015 15:09:01 +0000 (17:09 +0200)]
osd: use CrushTreeDumper for printing osd tree.

Signed-off-by: Mykola Golub <mgolub@mirantis.com>
10 years agocrush: use CrushTreeDumper for dumping crush tree.
Mykola Golub [Tue, 13 Jan 2015 15:08:17 +0000 (17:08 +0200)]
crush: use CrushTreeDumper for dumping crush tree.

Signed-off-by: Mykola Golub <mgolub@mirantis.com>
10 years agocrush: introduce a helper class for dumping crush tree.
Mykola Golub [Tue, 13 Jan 2015 15:05:29 +0000 (17:05 +0200)]
crush: introduce a helper class for dumping crush tree.

Signed-off-by: Mykola Golub <mgolub@mirantis.com>
10 years agoMerge remote-tracking branch 'origin/next'
Josh Durgin [Fri, 16 Jan 2015 22:40:27 +0000 (14:40 -0800)]
Merge remote-tracking branch 'origin/next'

10 years agoMerge remote-tracking branch 'origin/wip-10271' into next
Josh Durgin [Fri, 16 Jan 2015 22:33:59 +0000 (14:33 -0800)]
Merge remote-tracking branch 'origin/wip-10271' into next

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
10 years agoMerge pull request #3292 from kylinstorage/rbd-merge-diff-v2
Josh Durgin [Fri, 16 Jan 2015 20:08:02 +0000 (12:08 -0800)]
Merge pull request #3292 from kylinstorage/rbd-merge-diff-v2

rbd: merge diff files

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: Sage Weil <sage@redhat.com>
10 years agoMerge pull request #3318 from XinzeChi/wip-scrub
David Zafman [Fri, 16 Jan 2015 18:36:41 +0000 (10:36 -0800)]
Merge pull request #3318 from XinzeChi/wip-scrub

osd: support schedule scrub between some time defined by users

Reviewed-by David Zafman <dzafman@redhat.com>

10 years agoMerge pull request #3090 from ceph/wip-mon-fixes
João Eduardo Luís [Fri, 16 Jan 2015 18:32:54 +0000 (18:32 +0000)]
Merge pull request #3090 from ceph/wip-mon-fixes

mon: fix issues with mixed-version monitors features

Reviewed-by: Sage Weil <sage@redhat.com>
Signed-off-by: Joao Eduardo Luis <joao@redhat.com>
10 years agoMerge pull request #3390 from ceph/wip-librbd-coverity
Josh Durgin [Fri, 16 Jan 2015 16:51:51 +0000 (08:51 -0800)]
Merge pull request #3390 from ceph/wip-librbd-coverity

librbd: fix coverity false-positives for tests

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
10 years agomon: Monitor: return 'required_features' on get_required_features() 3090/head
Joao Eduardo Luis [Thu, 4 Dec 2014 18:09:40 +0000 (18:09 +0000)]
mon: Monitor: return 'required_features' on get_required_features()

We were returning 'quorum_features' instead.  This would lead to funny
and weird behavior.  I hate funny.

Backport: emperor,firefly,giant

Signed-off-by: Joao Eduardo Luis <joao@redhat.com>
10 years agomon: Elector: output features in handle_propose()
Joao Eduardo Luis [Thu, 4 Dec 2014 18:08:56 +0000 (18:08 +0000)]
mon: Elector: output features in handle_propose()

Signed-off-by: Joao Eduardo Luis <joao@redhat.com>
10 years agomon: Elector: put dangling message reference
Joao Eduardo Luis [Thu, 4 Dec 2014 18:07:23 +0000 (18:07 +0000)]
mon: Elector: put dangling message reference

Backport: emperor,firefly,giant

Signed-off-by: Joao Eduardo Luis <joao@redhat.com>
10 years agomon: mkfs compatset may be different from runtime compatset
Joao Eduardo Luis [Thu, 4 Dec 2014 18:34:23 +0000 (18:34 +0000)]
mon: mkfs compatset may be different from runtime compatset

When we create a monitor we set a given number of compat features on
disk to clearly state the features a given monitor supports -- mostly to
break backward compatibility when such compatibility cannot be
guaranteed.

However, we may wish to toggle some features during runtime; e.g., wait
for all the monitors in the quorum to support a given feature before
flipping a switch and state that all monitors now require feature X.

We are already flipping those switches during runtime, but we weren't
allowing the monitor to set a subset of those features during mkfs.
While the initial approach worked fine with clusters being upgraded and
fresh clusters, it could become weird in a mixed-version environment.

Backport: emperor,firefly,giant

Signed-off-by: Joao Eduardo Luis <joao@redhat.com>
10 years agoMerge pull request #3384 from liewegas/wip-crush-tests
Loic Dachary [Fri, 16 Jan 2015 10:49:02 +0000 (11:49 +0100)]
Merge pull request #3384 from liewegas/wip-crush-tests

crush: minor reorg of crush unit tests

Reviewed-by: Loic Dachary <ldachary@redhat.com>
10 years agotest: add test for osd scrub 3318/head
Xinze Chi [Fri, 16 Jan 2015 08:31:16 +0000 (08:31 +0000)]
test: add test for osd scrub

Signed-off-by: Xinze Chi <xmdxcxz@gmail.com>
10 years agoosd: support schedule scrub between some time defined by users
Xinze Chi [Fri, 16 Jan 2015 08:30:55 +0000 (08:30 +0000)]
osd: support schedule scrub between some time defined by users

Signed-off-by: Xinze Chi <xmdxcxz@gmail.com>
10 years agoMerge pull request #3335 from ceph/wip-cephfs-tabletool
Gregory Farnum [Fri, 16 Jan 2015 05:58:17 +0000 (21:58 -0800)]
Merge pull request #3335 from ceph/wip-cephfs-tabletool

Create cephfs-table-tool

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
10 years agoMerge pull request #3383 from ceph/wip-10552
Gregory Farnum [Fri, 16 Jan 2015 05:54:56 +0000 (21:54 -0800)]
Merge pull request #3383 from ceph/wip-10552

client: fix getting zero-length xattr

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
10 years agoMerge pull request #3358 from ceph/wip-mon-propose
Sage Weil [Fri, 16 Jan 2015 05:47:42 +0000 (21:47 -0800)]
Merge pull request #3358 from ceph/wip-mon-propose

mon: improve paxos proposals

Reviewed-by: Joao Eduardo Luis <joao@redhat.com>
10 years agoMerge pull request #3342 from ceph/wip-10311
Sage Weil [Fri, 16 Jan 2015 05:45:56 +0000 (21:45 -0800)]
Merge pull request #3342 from ceph/wip-10311

rgw: only keep track for cleanup of rados objects that were written

Reviewed-by: Ray Lv <xiangyulv@gmail.com>
10 years agoMerge pull request #3362 from FrankYu/master
Sage Weil [Fri, 16 Jan 2015 05:24:02 +0000 (21:24 -0800)]
Merge pull request #3362 from FrankYu/master

Doc: Fix the indentation in doc/rbd/rbd-snapshot.rst

10 years agoMerge pull request #3346 from timfreund/update-radosgw-python-swift-example
Sage Weil [Fri, 16 Jan 2015 05:15:06 +0000 (21:15 -0800)]
Merge pull request #3346 from timfreund/update-radosgw-python-swift-example

doc: Replace cloudfiles with swiftclient in Python Swift example

10 years agoMerge pull request #3359 from ceph/wip-mon-converter
Sage Weil [Fri, 16 Jan 2015 05:13:34 +0000 (21:13 -0800)]
Merge pull request #3359 from ceph/wip-mon-converter

drop ceph_mon_store_converter

Reviewed-by: Joao Eduardo Luis <joao@redhat.com>
10 years agoMerge pull request #3373 from jdurgin/wip-rados-ls-dups
Sage Weil [Fri, 16 Jan 2015 05:13:06 +0000 (21:13 -0800)]
Merge pull request #3373 from jdurgin/wip-rados-ls-dups

qa: ignore duplicates in rados ls

Reviewed-by: Sage Weil <sage@redhat.com>
10 years agocrush: move two crush tests over 3384/head
Sage Weil [Fri, 16 Jan 2015 05:10:31 +0000 (21:10 -0800)]
crush: move two crush tests over

CrushWrapper handles map manipulation, crush.cc tests the placement.

Signed-off-by: Sage Weil <sage@redhat.com>
10 years agocrush: rename unit tests
Sage Weil [Fri, 16 Jan 2015 05:06:57 +0000 (21:06 -0800)]
crush: rename unit tests

Signed-off-by: Sage Weil <sage@redhat.com>
10 years agoclient: fix getting zero-length xattr 3383/head
Yan, Zheng [Fri, 16 Jan 2015 02:16:44 +0000 (10:16 +0800)]
client: fix getting zero-length xattr

Fixes: #10552
Signed-off-by: Yan, Zheng <zyan@redhat.com>
10 years agoMerge pull request #3378 from xinxinsh/wip-cleanup
Sage Weil [Fri, 16 Jan 2015 01:26:01 +0000 (17:26 -0800)]
Merge pull request #3378 from xinxinsh/wip-cleanup

cleanup unused varibles

Reviewed-by: Sage Weil <sage@redhat.com>
10 years agotools: create cephfs-table-tool 3335/head
John Spray [Fri, 2 Jan 2015 17:48:25 +0000 (17:48 +0000)]
tools: create cephfs-table-tool

It was unnatural to shoehorn resetting tables
into the journaltool.  This new tool initially
can simply dump or reset the session/snap/ino
tables, and would also be a place for any
more complex operations in future.

Signed-off-by: John Spray <john.spray@redhat.com>
10 years agomds: give MDSTables a `rank` attribute
John Spray [Fri, 16 Jan 2015 00:02:00 +0000 (00:02 +0000)]
mds: give MDSTables a `rank` attribute

...so that they (like the new SessionMapStore)
can be used outside of a live MDS in tool code.

Signed-off-by: John Spray <john.spray@redhat.com>
10 years agomds: abstract SessionMapStore from SessionMap
John Spray [Fri, 16 Jan 2015 00:00:56 +0000 (00:00 +0000)]
mds: abstract SessionMapStore from SessionMap

This is similar to what I did for InodeStore a while back:
introduce a logical separation between the persisted attributers
(and their encoding) and the live/runtime behavioural code.  This
results in a handy SessionMapStore class that can be used for
encode/decode from tools.

Also give it a reset_state method so that it matches the
prototype of the MDSTable subclasses for the benefit of
cephfs-table-tool.

Signed-off-by: John Spray <john.spray@redhat.com>
10 years agoMerge pull request #3380 from trhoden/doc_cephextras
Alfredo Deza [Thu, 15 Jan 2015 19:46:50 +0000 (14:46 -0500)]
Merge pull request #3380 from trhoden/doc_cephextras

doc: add cases where ceph-extras is not needed

Reviewed-by: Alfredo Deza <adeza@redhat.com>
10 years agodoc: add cases where ceph-extras is not needed 3380/head
Travis Rhoden [Thu, 15 Jan 2015 19:39:01 +0000 (14:39 -0500)]
doc: add cases where ceph-extras is not needed

The Ceph Extras repo is not needed on EL7 distributions or
Fedora

http://tracker.ceph.com/issues/9793 Refs: #9793

Signed-off-by: Travis Rhoden <trhoden@redhat.com>
10 years agoMerge pull request #3379 from ceph/wip-mon-drop-conversion
Sage Weil [Thu, 15 Jan 2015 19:22:16 +0000 (11:22 -0800)]
Merge pull request #3379 from ceph/wip-mon-drop-conversion

mon: drop store conversion code

Reviewed-by: Sage Weil <sage@redhat.com>
10 years agoMerge pull request #3377 from ceph/wip-fail-idempotent
Gregory Farnum [Thu, 15 Jan 2015 19:21:18 +0000 (11:21 -0800)]
Merge pull request #3377 from ceph/wip-fail-idempotent

mon/MDSMonitor: make 'mds fail' idempotent for IDs

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
10 years agoos/FileJournal: Fix journal write fail, align for direct io
Sage Weil [Thu, 15 Jan 2015 19:20:18 +0000 (11:20 -0800)]
os/FileJournal: Fix journal write fail, align for direct io

when config journal_zero_on_create true, osd mkfs will fail when zeroing journal.
journal open with O_DIRECT, buf should align with blocksize.

Backport: giant, firefly, dumpling
Signed-off-by: Xie Rui <875016668@qq.com>
Reviewed-by: Sage Weil <sage@redhat.com>
10 years agomon: encode stashed monmap with all features
Jerry7X [Wed, 7 Jan 2015 06:29:02 +0000 (14:29 +0800)]
mon: encode stashed monmap with all features

latest_monmap that we stash is only used locally--the encoded bl is never shared. Which means we should just use CEPH_FEATURES_ALL all of the time.

Fixes: #5203
Backport: giant, firefly
Signed-off-by: Xie Rui <875016668@qq.com>
Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Joao Eduardo Luis <joao@redhat.com>
10 years agomon: Monitor: drop StoreConverter code 3379/head
Joao Eduardo Luis [Thu, 15 Jan 2015 16:06:21 +0000 (16:06 +0000)]
mon: Monitor: drop StoreConverter code

We no longer convert stores on upgrade.  Users coming from bobtail or
before sould go through an interim version such as cuttlefish, dumpling,
firefly or giant.

Signed-off-by: Joao Eduardo Luis <joao@redhat.com>
10 years agoceph_mon: no longer attempt store conversion on start
Joao Eduardo Luis [Thu, 15 Jan 2015 16:02:28 +0000 (16:02 +0000)]
ceph_mon: no longer attempt store conversion on start

People upgrading from bobtail or previous clusters should first go
through an interim version (quite a few to pick from: cuttlefish,
dumpling, firefly, giant).

Signed-off-by: Joao Eduardo Luis <joao@redhat.com>
10 years agoMerge pull request #3376 from dachary/wip-10547-formatter
Gregory Farnum [Thu, 15 Jan 2015 15:11:17 +0000 (07:11 -0800)]
Merge pull request #3376 from dachary/wip-10547-formatter

common: restore format fallback semantic

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
10 years agomon/MDSMonitor: make 'mds fail' idempotent for IDs 3377/head
John Spray [Thu, 15 Jan 2015 14:21:51 +0000 (14:21 +0000)]
mon/MDSMonitor: make 'mds fail' idempotent for IDs

Was returning ENOENT, should succeed for 'fail' on
a non-existent name, as the fail operation makes
it cease to exist.

Signed-off-by: John Spray <john.spray@redhat.com>
10 years agotests: adapt to new json-pretty format 3376/head
Loic Dachary [Thu, 15 Jan 2015 12:23:47 +0000 (13:23 +0100)]
tests: adapt to new json-pretty format

The json-pretty format was modified for readability and now includes
additional newlines / spaces. Either switch to json to avoid dealing
with space changes or modify the expected output to include them.

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

Signed-off-by: Loic Dachary <ldachary@redhat.com>
10 years agotest: rename test_activate_osd
Loic Dachary [Thu, 15 Jan 2015 12:22:44 +0000 (13:22 +0100)]
test: rename test_activate_osd

It was incorrectly shadowing test_run_osd.

Signed-off-by: Loic Dachary <ldachary@redhat.com>
10 years agocommon: restore format fallback semantic
Loic Dachary [Thu, 15 Jan 2015 11:28:12 +0000 (12:28 +0100)]
common: restore format fallback semantic

When Formatter::create replaced new_formatter, the handling of an
invalid format was also incorrectly changed. When an invalid format (for
instance "plain") was specified, new_formatter returned a NULL pointer
which was sometime handled by creating a json-pretty formatter and
sometimes differently.

A new Formatter::create prototype with a fallback argument is added and
is used if it is not the empty string and that the format is not
known. This prototype is used where new_formatter returning NULL was
replaced by a json-pretty formatter.

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

Signed-off-by: Loic Dachary <ldachary@redhat.com>
10 years agoMerge pull request #3370 from ceph/wip-10382
Yan, Zheng [Thu, 15 Jan 2015 11:54:55 +0000 (19:54 +0800)]
Merge pull request #3370 from ceph/wip-10382

mds: handle heartbeat_reset during shutdown

10 years agoremove unused hold_map_lock in _open_lock_pg 3378/head
xinxin shu [Thu, 15 Jan 2015 04:47:07 +0000 (12:47 +0800)]
remove unused hold_map_lock in _open_lock_pg

Signed-off-by: xinxin shu <xinxin.shu@intel.com>
10 years agoman: add help for rbd merge-diff command 3292/head
Yunchuan Wen [Thu, 15 Jan 2015 02:31:41 +0000 (02:31 +0000)]
man: add help for rbd merge-diff command

Signed-off-by: Yunchuan Wen <yunchuanwen@ubuntukylin.com>
Signed-off-by: Li Wang <liwang@ubuntukylin.com>
10 years agoMerge pull request #3366 from ceph/wip-formatter
Dan Mick [Wed, 14 Jan 2015 23:25:25 +0000 (15:25 -0800)]
Merge pull request #3366 from ceph/wip-formatter

formatter: improve pretty output, rename factory method

Reviewed-by: Dan Mick <dan.mick@redhat.com>
10 years agodoc/release-notes: v0.91
Sage Weil [Wed, 14 Jan 2015 23:11:07 +0000 (15:11 -0800)]
doc/release-notes: v0.91

Signed-off-by: Sage Weil <sage@redhat.com>
10 years agodoc/release-notes: typo
Sage Weil [Wed, 14 Jan 2015 21:54:26 +0000 (13:54 -0800)]
doc/release-notes: typo

Signed-off-by: Sage Weil <sage@redhat.com>
10 years agoqa: ignore duplicates in rados ls 3373/head
Josh Durgin [Wed, 14 Jan 2015 23:01:38 +0000 (15:01 -0800)]
qa: ignore duplicates in rados ls

These can happen with split or with state changes due to reordering
results within the hash range requested. It's easy enough to filter
them out at this stage.

Backport: giant, firefly
Signed-off-by: Josh Durgin <jdurgin@redhat.com>
10 years agoMerge pull request #3372 from ceph/wip-10539
Gregory Farnum [Wed, 14 Jan 2015 22:50:46 +0000 (14:50 -0800)]
Merge pull request #3372 from ceph/wip-10539

qa: fail_all_mds between fs reset and fs rm

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
10 years agoqa: fail_all_mds between fs reset and fs rm 3372/head
John Spray [Wed, 14 Jan 2015 22:08:09 +0000 (22:08 +0000)]
qa: fail_all_mds between fs reset and fs rm

Because fs reset opens a brief window for the previously
failed MDSs to spring back into life.

Fixes: #10539
Signed-off-by: John Spray <john.spray@redhat.com>
10 years agodoc/release-notes: v0.80.8
Sage Weil [Wed, 14 Jan 2015 21:48:32 +0000 (13:48 -0800)]
doc/release-notes: v0.80.8

Signed-off-by: Sage Weil <sage@redhat.com>
10 years agolibrbd: fix coverity false-positives for tests 3390/head
Jason Dillaman [Wed, 14 Jan 2015 20:39:28 +0000 (15:39 -0500)]
librbd: fix coverity false-positives for tests

Coverity flagged two variables as uninitialized prior to use.
Explicitly initialize the variables in the constructors to remove
the false-positives.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
10 years agoMerge remote-tracking branch 'gh/next'
Sage Weil [Wed, 14 Jan 2015 16:57:33 +0000 (08:57 -0800)]
Merge remote-tracking branch 'gh/next'

10 years agomds: handle heartbeat_reset during shutdown 3370/head
John Spray [Wed, 14 Jan 2015 10:35:53 +0000 (10:35 +0000)]
mds: handle heartbeat_reset during shutdown

Because any thread might grab mds_lock and call heartbeat_reset
immediately after a call to suicide() completes, this needs
to be handled as a special case where we tolerate MDS::hb having
already been destroyed.

Fixes: #10382
Signed-off-by: John Spray <john.spray@redhat.com>
10 years agomon/Paxos: consolidate finish_round() 3358/head
Sage Weil [Tue, 13 Jan 2015 13:38:19 +0000 (05:38 -0800)]
mon/Paxos: consolidate finish_round()

Signed-off-by: Sage Weil <sage@redhat.com>
10 years agomon: accumulate a single pending transaction and propose it all at once
Sage Weil [Tue, 13 Jan 2015 22:51:04 +0000 (14:51 -0800)]
mon: accumulate a single pending transaction and propose it all at once

Previous we would queue lots of distinct encoded Transactions from various
callers, usually one per PaxosService.  These would be sent through paxos
one at a time.

If there is a completed transaction there is no reason to delay; it is
more efficient to push it through immediately.  Since we will propose
anything pending right when we finish, there is minimal opportunity for
other work to get done.

Instead, accumulate everything in a single MonitorDBStore::Transaction and
propose all pending changes all at once.  Encode at propose time and
expose the Transaction to the callers so they can add their changes.

Signed-off-by: Sage Weil <sage@redhat.com>
10 years agoPendingReleaseNotes: make a note about librados flag changes
Sage Weil [Tue, 13 Jan 2015 20:23:37 +0000 (12:23 -0800)]
PendingReleaseNotes: make a note about librados flag changes

Signed-off-by: Sage Weil <sage@redhat.com>
10 years agoMerge pull request #3360 from mattrichards/bump_rados_version
Sage Weil [Tue, 13 Jan 2015 20:18:04 +0000 (12:18 -0800)]
Merge pull request #3360 from mattrichards/bump_rados_version

librados: bump rados version number

Reviewed-by: Sage Weil <sage@redhat.com>
10 years ago0.91 v0.91
Jenkins [Tue, 13 Jan 2015 20:10:22 +0000 (12:10 -0800)]
0.91

10 years agoMerge pull request #2697 from ceph/wip-8900
Josh Durgin [Tue, 13 Jan 2015 19:17:29 +0000 (11:17 -0800)]
Merge pull request #2697 from ceph/wip-8900

RBD image watcher and new exclusive lock handling

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
10 years agoMerge pull request #3254 from trociny/feature-10036
Samuel Just [Tue, 13 Jan 2015 18:56:29 +0000 (10:56 -0800)]
Merge pull request #3254 from trociny/feature-10036

osd: osd tree to show primary-affinity value

Reviewed-by: Loic Dachary <ldachary@redhat.com>
10 years agoMerge pull request #3281 from ceph/wip-10441-b
Samuel Just [Tue, 13 Jan 2015 18:55:29 +0000 (10:55 -0800)]
Merge pull request #3281 from ceph/wip-10441-b

osd: fix watch ordering bug 10441 option b

Reviewed-by: Samuel Just <sjust@redhat.com>
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
10 years agoMerge pull request #3290 from ceph/wip-da-SCA-20150102
Samuel Just [Tue, 13 Jan 2015 18:54:45 +0000 (10:54 -0800)]
Merge pull request #3290 from ceph/wip-da-SCA-20150102

Coverity and SCA fixes

Reviewed-by: Sage Weil <sage@redhat.com>
10 years agoMerge pull request #3302 from ceph/wip-9956
Samuel Just [Tue, 13 Jan 2015 18:54:21 +0000 (10:54 -0800)]
Merge pull request #3302 from ceph/wip-9956

os/FileStore: verify kernel is new enough before using extsize ioctl

Reviewed-by: Samuel Just <sjust@redhat.com>
10 years agoMerge pull request #3305 from majianpeng/fix5
Samuel Just [Tue, 13 Jan 2015 18:53:34 +0000 (10:53 -0800)]
Merge pull request #3305 from majianpeng/fix5

fix bugs about sync_filesystem

Reviewed-by: Samuel Just <sjust@redhat.com>
Reviewed-by: Sage Weil <sage@redhat.com>
10 years agocommon/Formatter: new_formatter -> Formatter::create 3366/head
Sage Weil [Tue, 13 Jan 2015 16:32:45 +0000 (08:32 -0800)]
common/Formatter: new_formatter -> Formatter::create

Also make the default formatter selection more explicit.

Signed-off-by: Sage Weil <sage@redhat.com>
10 years agocommon/Formatter: improve json-pretty whitespace
Sage Weil [Tue, 13 Jan 2015 16:20:08 +0000 (08:20 -0800)]
common/Formatter: improve json-pretty whitespace

The whitespace for the current pretty mode is awkward and weird.  Move
to a more standard approach.  It's more newlines, but *much* more
readable.

Signed-off-by: Sage Weil <sage@redhat.com>
10 years agocommon/Formatter: add newline to flushed output if m_pretty
Sage Weil [Mon, 14 Oct 2013 23:02:30 +0000 (16:02 -0700)]
common/Formatter: add newline to flushed output if m_pretty

This applies to json-pretty and xml-pretty modes.

Signed-off-by: Sage Weil <sage@inktank.com>
10 years agoMerge pull request #3364 from ceph/wip-quota-test
Gregory Farnum [Tue, 13 Jan 2015 15:08:30 +0000 (07:08 -0800)]
Merge pull request #3364 from ceph/wip-quota-test

qa: set -e explicitly in quota test

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
10 years agoqa: set -e explicitly in quota test 3364/head
John Spray [Tue, 13 Jan 2015 14:58:57 +0000 (14:58 +0000)]
qa: set -e explicitly in quota test

Previously was set in hashbang, which meant
that "./quota.sh" was OK, but "sh ./quota.sh" would
just run through ignoring errors.

Signed-off-by: John Spray <john.spray@redhat.com>
10 years agoMerge pull request #3336 from ceph/wip-fs-reset
Gregory Farnum [Tue, 13 Jan 2015 14:47:04 +0000 (06:47 -0800)]
Merge pull request #3336 from ceph/wip-fs-reset

mon: implement `fs reset`

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
10 years agoDoc: Fix the indentation in doc/rbd/rbd-snapshot.rst 3362/head
Frank Yu [Tue, 13 Jan 2015 10:27:08 +0000 (18:27 +0800)]
Doc: Fix the indentation in doc/rbd/rbd-snapshot.rst

10 years agoMerge pull request #3343 from dachary/wip-10505-centos-parted
Loic Dachary [Tue, 13 Jan 2015 10:07:55 +0000 (11:07 +0100)]
Merge pull request #3343 from dachary/wip-10505-centos-parted

tests: install parted in centos Dockerfile

Reviewed-by: Joao Eduardo Luis <joao@redhat.com>
10 years agolibrbd: flush pending AIO requests under all existing flush scenarios 2697/head
Jason Dillaman [Tue, 13 Jan 2015 04:17:50 +0000 (23:17 -0500)]
librbd: flush pending AIO requests under all existing flush scenarios

AIO requests that are waiting on the image lock should be flushed
during all existing RBD flush scenarios.  A few flush cases were
missed in the original implementation.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
10 years agolibrbd: AIO requests should retry lock requests
Jason Dillaman [Tue, 13 Jan 2015 04:14:11 +0000 (23:14 -0500)]
librbd: AIO requests should retry lock requests

Added a timer to support retrying AIO lock requests until
they are successful.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
10 years agolibrbd: differentiate between R/O vs R/W RBD features
Jason Dillaman [Mon, 3 Nov 2014 21:51:06 +0000 (16:51 -0500)]
librbd: differentiate between R/O vs R/W RBD features

The new RBD exclusive lock feature should be treated as a
feature that is only applied when the image is opened in
R/W mode.

Older clients will need to handle the updated
cls_rbd::get_features method in order to properly determine
the incompatible features for an image depending on the
current mode.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
10 years agolibrbd: Add internal unit test cases
Jason Dillaman [Tue, 21 Oct 2014 02:09:29 +0000 (22:09 -0400)]
librbd: Add internal unit test cases

The new unit tests cover the modifications made to integrate
the internal librbd functionality with the new ImageWatcher.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
10 years agolibrbd: Add ImageWatcher unit test cases
Jason Dillaman [Fri, 17 Oct 2014 13:05:22 +0000 (09:05 -0400)]
librbd: Add ImageWatcher unit test cases

Directly unit test the new ImageWatcher class to complement
the existing librbd integration tests of exclusive lock
handling.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
10 years agolibrbd: Add convenience library to support unit tests
Jason Dillaman [Sun, 16 Nov 2014 19:20:42 +0000 (14:20 -0500)]
librbd: Add convenience library to support unit tests

Unit tests need access to the private symbols of librbd no
longer exported from librbd.so.  A new librbd_internal
convenience library was created to allow access.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
10 years agorbd: Allow CLI to optionally create shared images
Jason Dillaman [Wed, 1 Oct 2014 20:12:21 +0000 (16:12 -0400)]
rbd: Allow CLI to optionally create shared images

Images that are flagged as shared cannot use the RBD
object map nor RBD mirroring features.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
10 years agolibrbd: Integrate librbd with new exclusive lock feature
Jason Dillaman [Wed, 8 Oct 2014 12:41:53 +0000 (08:41 -0400)]
librbd: Integrate librbd with new exclusive lock feature

Operations that update the image now require the exclusive lock
if the feature is enabled.  AIO write and discard operations will
automatically request the exclusive lock from the current leader
to support live-migration.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
10 years agolibrados: bump rados version number 3360/head
Matt Richards [Tue, 13 Jan 2015 00:59:42 +0000 (16:59 -0800)]
librados: bump rados version number

As a follow-on to 49d114f1fff90e5c0f206725a5eb82c0ba329376,
increment the "extra" version field so clients can easily
determine if they have a version of librados that properly
translates C API operation flags.

Signed-off-by: Matthew Richards <mattjrichards@gmail.com>
10 years agoMerge pull request #3316 from ceph/wip-10471
Josh Durgin [Tue, 13 Jan 2015 00:20:28 +0000 (16:20 -0800)]
Merge pull request #3316 from ceph/wip-10471

rgw: index swift keys appropriately

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
10 years agolibrbd: Create image exclusive lock watch/notify handler
Jason Dillaman [Wed, 8 Oct 2014 12:20:47 +0000 (08:20 -0400)]
librbd: Create image exclusive lock watch/notify handler

The new watch/notify handler replaces the existing header
update watch/notify handler and adds support for managing
image exclusive lock leadership.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
10 years agoosd: enable filestore_extsize by default 3302/head
Sage Weil [Mon, 12 Jan 2015 22:00:21 +0000 (14:00 -0800)]
osd: enable filestore_extsize by default

Note that this will only get used if the kernel is new enough; if it is
older than 3.5 the option will get disabled and extsize will not be used
even if the option is set to true.

This partially reverts 01cd3cdc726a3e838bce05b355a021778b4e5db1.

Fixes: #9956
Signed-off-by: Sage Weil <sage@redhat.com>
10 years agoos/FileStore: verify kernel is new enough before using extsize ioctl
Sage Weil [Mon, 12 Jan 2015 21:59:39 +0000 (13:59 -0800)]
os/FileStore: verify kernel is new enough before using extsize ioctl

Old kernels have an XFS bug that exposes uninitialized data when the
extsize hint is set and only partially written.  This is fixed by Linux
commit aff3a9edb7080f69f07fe76a8bd089b3dfa4cb5d, documented in XFS bug
http://oss.sgi.com/bugzilla/show_bug.cgi?id=874, and tested by XFS
test xfs/229 to prevent regressions.

Notably the original bug affects kernel 3.2, which is widely deployed with
ubuntu precise 12.04.

Backport: giant, firefly
Signed-off-by: Sage Weil <sage@redhat.com>
10 years agoMerge pull request #3352 from kylinstorage/fix-10503
Gregory Farnum [Mon, 12 Jan 2015 19:33:02 +0000 (11:33 -0800)]
Merge pull request #3352 from kylinstorage/fix-10503

Fix bug 10503: http://tracker.ceph.com/issues/10503

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
10 years agodrop ceph_mon_store_converter 3359/head
Sage Weil [Mon, 12 Jan 2015 17:37:08 +0000 (09:37 -0800)]
drop ceph_mon_store_converter

This was needed for upgrades in the cuttlefish era; no longer useful.

Signed-off-by: Sage Weil <sage@redhat.com>
10 years agoMerge pull request #3203 from majianpeng/fix1
Samuel Just [Mon, 12 Jan 2015 16:39:48 +0000 (08:39 -0800)]
Merge pull request #3203 from majianpeng/fix1

avoid memcopy from librados to caller buffer

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Samuel Just <sjust@redhat.com>
10 years agoMerge pull request #3034 from dachary/wip-10017-erasure-code-repair
Samuel Just [Mon, 12 Jan 2015 16:26:08 +0000 (08:26 -0800)]
Merge pull request #3034 from dachary/wip-10017-erasure-code-repair

erasure code repair when there are two failures

Reviewed-by: Samuel Just <sjust@redhat.com>
10 years agoMerge pull request #3148 from mslovy/optimazation_wbthrottle
Samuel Just [Mon, 12 Jan 2015 16:23:26 +0000 (08:23 -0800)]
Merge pull request #3148 from mslovy/optimazation_wbthrottle

os: WBThrottle: optimize the map to unordered_map

Reviewed-by: Samuel Just <sjust@redhat.com>
10 years agomon/MDSMonitor: add confirm flag to fs reset 3336/head
John Spray [Mon, 12 Jan 2015 14:52:43 +0000 (14:52 +0000)]
mon/MDSMonitor: add confirm flag to fs reset

This was already in the command map but was not
being checked.

Signed-off-by: John Spray <john.spray@redhat.com>
10 years agoqa: add `fs reset` to cephtool tests
John Spray [Mon, 12 Jan 2015 13:54:52 +0000 (13:54 +0000)]
qa: add `fs reset` to cephtool tests

This is just a superficial "I can call it" test,
it's actual behaviour is checked elsewhere.

Signed-off-by: John Spray <john.spray@redhat.com>
10 years agomon: implement `fs reset`
John Spray [Mon, 5 Jan 2015 19:34:57 +0000 (19:34 +0000)]
mon: implement `fs reset`

This is for use in CephFS disaster recovery.  When
the metadata pool has been forcibly reset to a single-MDS
metadata tree, we would like to reset the MDSMap to match.

Signed-off-by: John Spray <john.spray@redhat.com>
10 years agoFix bug 10503: http://tracker.ceph.com/issues/10503 3352/head
Yunchuan Wen [Mon, 12 Jan 2015 05:49:32 +0000 (05:49 +0000)]
Fix bug 10503: http://tracker.ceph.com/issues/10503
ceph-fuse: quota code is not 32-bit safe for vxattr output

Signed-off-by: Yunchuan Wen <yunchuanwen@ubuntukylin.com>