Commit Graph

38350 Commits

Author SHA1 Message Date
Sage Weil
86729e7970 osd, crush: caps for headers
Signed-off-by: Sage Weil <sage@redhat.com>
2015-01-17 08:57:26 -08:00
Sage Weil
022950ecbf crush/CrushTreeDumper: add missing close_section
Signed-off-by: Sage Weil <sage@redhat.com>
2015-01-17 08:57:26 -08:00
Sage Weil
7a04518498 crush, osdmap: use weightf_t helper for all weights
Signed-off-by: Sage Weil <sage@redhat.com>
2015-01-17 08:57:26 -08:00
Mykola Golub
9e22f6179b osd: use TextTable for osd tree command output
Signed-off-by: Mykola Golub <mgolub@mirantis.com>
2015-01-17 08:57:26 -08:00
Mykola Golub
1d984a5239 osd: use weightf_t type when outputing weights by osd tree command
Signed-off-by: Mykola Golub <mgolub@mirantis.com>
2015-01-17 08:57:26 -08:00
Mykola Golub
4bae3a8db3 mon: ceph osd df -- a new command to show OSD utilization
Fixes: #10452
Signed-off-by: Mykola Golub <mgolub@mirantis.com>
2015-01-17 08:57:26 -08:00
Mykola Golub
b42c7e28f0 Add a type (weightf_t) to output float weights.
Signed-off-by: Mykola Golub <mgolub@mirantis.com>
2015-01-17 08:57:26 -08:00
Mykola Golub
3e2eaa4ba0 osd: use CrushTreeDumper for printing osd tree.
Signed-off-by: Mykola Golub <mgolub@mirantis.com>
2015-01-17 08:57:26 -08:00
Mykola Golub
3f9b4d1f33 crush: use CrushTreeDumper for dumping crush tree.
Signed-off-by: Mykola Golub <mgolub@mirantis.com>
2015-01-17 08:57:26 -08:00
Mykola Golub
26921f43cb crush: introduce a helper class for dumping crush tree.
Signed-off-by: Mykola Golub <mgolub@mirantis.com>
2015-01-17 08:57:26 -08:00
Josh Durgin
a76e537630 Merge remote-tracking branch 'origin/next' 2015-01-16 14:40:27 -08:00
Josh Durgin
896c8899ac Merge remote-tracking branch 'origin/wip-10271' into next
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2015-01-16 14:33:59 -08:00
Josh Durgin
a845139d1f 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>
2015-01-16 12:08:02 -08:00
David Zafman
9231931607 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>
2015-01-16 10:36:41 -08:00
João Eduardo Luís
a1f3fdc8f3 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>
2015-01-16 18:32:54 +00:00
Josh Durgin
eee9da430b Merge pull request #3390 from ceph/wip-librbd-coverity
librbd: fix coverity false-positives for tests

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2015-01-16 08:51:51 -08:00
Joao Eduardo Luis
80a9d99860 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>
2015-01-16 16:34:30 +00:00
Joao Eduardo Luis
ab996c141b mon: Elector: output features in handle_propose()
Signed-off-by: Joao Eduardo Luis <joao@redhat.com>
2015-01-16 16:34:30 +00:00
Joao Eduardo Luis
bb48ebe1f0 mon: Elector: put dangling message reference
Backport: emperor,firefly,giant

Signed-off-by: Joao Eduardo Luis <joao@redhat.com>
2015-01-16 16:34:21 +00:00
Joao Eduardo Luis
0a369b9bb2 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>
2015-01-16 16:33:51 +00:00
Loic Dachary
28f8b1328c Merge pull request #3384 from liewegas/wip-crush-tests
crush: minor reorg of crush unit tests

Reviewed-by: Loic Dachary <ldachary@redhat.com>
2015-01-16 11:49:02 +01:00
Xinze Chi
e85197c630 test: add test for osd scrub
Signed-off-by: Xinze Chi <xmdxcxz@gmail.com>
2015-01-16 08:31:16 +00:00
Xinze Chi
f4b94e05cb osd: support schedule scrub between some time defined by users
Signed-off-by: Xinze Chi <xmdxcxz@gmail.com>
2015-01-16 08:30:55 +00:00
Gregory Farnum
2a4cbfcca6 Merge pull request #3335 from ceph/wip-cephfs-tabletool
Create cephfs-table-tool

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
2015-01-15 21:58:17 -08:00
Gregory Farnum
a60b815c85 Merge pull request #3383 from ceph/wip-10552
client: fix getting zero-length xattr

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
2015-01-15 21:54:56 -08:00
Sage Weil
87d10d3962 Merge pull request #3358 from ceph/wip-mon-propose
mon: improve paxos proposals

Reviewed-by: Joao Eduardo Luis <joao@redhat.com>
2015-01-15 21:47:42 -08:00
Sage Weil
bed740bbd0 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>
2015-01-15 21:45:56 -08:00
Sage Weil
2da231160f Merge pull request #3362 from FrankYu/master
Doc: Fix the indentation in doc/rbd/rbd-snapshot.rst
2015-01-15 21:24:02 -08:00
Sage Weil
aed937cac7 Merge pull request #3346 from timfreund/update-radosgw-python-swift-example
doc: Replace cloudfiles with swiftclient in Python Swift example
2015-01-15 21:15:06 -08:00
Sage Weil
15112cc300 Merge pull request #3359 from ceph/wip-mon-converter
drop ceph_mon_store_converter

Reviewed-by: Joao Eduardo Luis <joao@redhat.com>
2015-01-15 21:13:34 -08:00
Sage Weil
441d0aa77d Merge pull request #3373 from jdurgin/wip-rados-ls-dups
qa: ignore duplicates in rados ls

Reviewed-by: Sage Weil <sage@redhat.com>
2015-01-15 21:13:06 -08:00
Sage Weil
7372ac7ae5 crush: move two crush tests over
CrushWrapper handles map manipulation, crush.cc tests the placement.

Signed-off-by: Sage Weil <sage@redhat.com>
2015-01-15 21:10:31 -08:00
Sage Weil
ddb91b2f8f crush: rename unit tests
Signed-off-by: Sage Weil <sage@redhat.com>
2015-01-15 21:06:57 -08:00
Yan, Zheng
e7d5fddc82 client: fix getting zero-length xattr
Fixes: #10552
Signed-off-by: Yan, Zheng <zyan@redhat.com>
2015-01-16 10:26:19 +08:00
Sage Weil
3eceda9f33 Merge pull request #3378 from xinxinsh/wip-cleanup
cleanup unused varibles

Reviewed-by: Sage Weil <sage@redhat.com>
2015-01-15 17:26:01 -08:00
John Spray
2f3160636b 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>
2015-01-16 00:45:25 +00:00
John Spray
b8ffe5c2dc 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>
2015-01-16 00:45:25 +00:00
John Spray
ea153c3f05 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>
2015-01-16 00:45:25 +00:00
Alfredo Deza
c3fb34c1e3 Merge pull request #3380 from trhoden/doc_cephextras
doc: add cases where ceph-extras is not needed

Reviewed-by: Alfredo Deza <adeza@redhat.com>
2015-01-15 14:46:50 -05:00
Travis Rhoden
fc01b010d9 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>
2015-01-15 14:40:03 -05:00
Sage Weil
062d3b0215 Merge pull request #3379 from ceph/wip-mon-drop-conversion
mon: drop store conversion code

Reviewed-by: Sage Weil <sage@redhat.com>
2015-01-15 11:22:16 -08:00
Gregory Farnum
11062d2f45 Merge pull request #3377 from ceph/wip-fail-idempotent
mon/MDSMonitor: make 'mds fail' idempotent for IDs

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
2015-01-15 11:21:18 -08:00
Sage Weil
80473f6385 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>
2015-01-15 11:20:18 -08:00
Jerry7X
cc0dba5261 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>
2015-01-15 11:13:17 -08:00
Joao Eduardo Luis
34081562a8 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>
2015-01-15 16:06:21 +00:00
Joao Eduardo Luis
1d814b76b8 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>
2015-01-15 16:02:28 +00:00
Gregory Farnum
d4a64474e5 Merge pull request #3376 from dachary/wip-10547-formatter
common: restore format fallback semantic

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
2015-01-15 07:11:17 -08:00
John Spray
889969e21d 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>
2015-01-15 14:23:26 +00:00
Loic Dachary
b957fa8ecf 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>
2015-01-15 13:29:32 +01:00
Loic Dachary
97609a3309 test: rename test_activate_osd
It was incorrectly shadowing test_run_osd.

Signed-off-by: Loic Dachary <ldachary@redhat.com>
2015-01-15 13:27:01 +01:00