Commit Graph

38502 Commits

Author SHA1 Message Date
Sage Weil
dd99b7d989 Merge pull request #3320 from wonzhq/lfn_open
FileStore: return error if get_index fails in lfn_open

Reviewed-by: Haomai Wang <haomaiwang@gmail.com>
2015-01-19 12:38:28 -08:00
Sage Weil
01af73bc45 Merge pull request #3211 from yuyuyu101/wip-10172
AsyncMessenger: Bind thread to core, use buffer read and fix some bugs
2015-01-19 12:38:01 -08:00
Sage Weil
075012bd18 Merge pull request #3221 from ceph/wip-9440
mon: log health changes to clog

Reviewed-by: Sage Weil <sage@redhat.com>
2015-01-19 12:36:26 -08:00
Sage Weil
8318a2e5e2 Merge pull request #3382 from xinxinsh/wip-fix
fix command 'ceph pg dump_stuck degraded'

Reviewed-by: Sage Weil <sage@redhat.com>
2015-01-19 12:35:58 -08:00
Sage Weil
d53275c6de ceph_test_objectstore: fix keyvaluestore name
Signed-off-by: Sage Weil <sage@redhat.com>
2015-01-19 12:33:20 -08:00
Gregory Farnum
c15f2d5056 Merge pull request #3338 from ceph/wip-recover-dentries
#9883 tools/cephfs: add recover_dentries to journaltool

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
2015-01-19 10:50:56 -08:00
Josh Durgin
f9f695c017 Merge pull request #3400 from kylinstorage/fix-rbd-watch
fix rbd watch command for v2 image

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2015-01-19 09:39:51 -08:00
Yehuda Sadeh
0dca07379b Merge remote-tracking branch 'origin/wip-bi-sharding-3' 2015-01-19 09:33:46 -08:00
Josh Durgin
ac93c28522 Merge pull request #3396 from leseb/doc-openstack-fix-glance
doc: Fix OpenStack Glance configuration

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2015-01-19 08:38:37 -08:00
Sage Weil
ce1e1fe4b2 Merge pull request #3401 from FrankYu/master
Doc: rbd-snapshot: Fix the typo
2015-01-19 08:34:32 -08:00
Loic Dachary
b5e79a8842 Merge pull request #3374 from dachary/wip-mailmap
mailmap updates

Reviewed-by: Loic Dachary <ldachary@redhat.com>
2015-01-19 17:06:46 +01:00
John Spray
66f3bd6278 tools: output per-event errors from recover dentries 2015-01-19 15:16:46 +00:00
John Spray
3e15fd5f06 tools: handle hardlinks in recover_dentries
Signed-off-by: Johh Spray <john.spray@redhat.com>
2015-01-19 14:09:34 +00:00
John Spray
9d91757559 tools: recover_dentries efficiency
Avoid a redundant stat, and gather updates to a frag
into a single OMAP get/set.

Still could be heaps more efficient in the case of
many updates to the same dirs by adding in a little
cache and batching the updates.

Signed-off-by: John Spray <john.spray@redhat.com>
2015-01-19 14:09:34 +00:00
John Spray
e2ae91fc70 tweak comment wording in recover_dentries 2015-01-19 14:09:34 +00:00
John Spray
5f348313a5 fixup some oversized lines 2015-01-19 14:09:34 +00:00
John Spray
1dc023b36a fix handling of io.read retval
(it returns length read, which was falling through as
a spurious nonzero "error")
2015-01-19 14:09:34 +00:00
John Spray
d94a7a8fdd tools: remove duplicated InoTable encoding
...and add a method to InoTable so that we can
artifically acquire inodes.

Signed-off-by: John Spray <john.spray@redhat.com>
2015-01-19 14:09:34 +00:00
John Spray
478659f34a JournalTool: handle corrupt fnodes 2015-01-19 14:09:34 +00:00
John Spray
36830ebc3e tools/cephfs: add recover_dentries to journaltool
This is intended as a comparatively safe recovery
operation, where we compare the versions
of journalled dentries with backing store dentries,
and write into the backing store only when the
existing contents are older than the journal
or invalid.

Fixes: #9883

Signed-off-by: John Spray <john.spray@redhat.com>
2015-01-19 14:09:34 +00:00
Frank Yu
4bd0894cc7 Doc: rbd-snapshot: Fix the typo
Signed-off-by: Frank Yu <flyxiaoyu@gmail.com>
2015-01-19 20:19:25 +08:00
Yunchuan Wen
07e1d18f4b rbd: fix bug about rbd watch command
the header oid should be prefix+image_id, rather than prefix+image_name

Signed-off-by: Yunchuan Wen <yunchuanwen@ubuntukylin.com>
2015-01-19 09:04:47 +00:00
Sage Weil
751e504275 Merge pull request #3397 from liewegas/wip-prealloc
mon: fix globalid when prealloc value is larger than max
2015-01-18 20:46:31 -08:00
Sage Weil
bbaf582e5b mon: handle case where mon_globalid_prealloc > max_global_id
This triggers with the new larger mon_globalid_prealloc value.  It didn't
trigger on the existing cluster I tested on because it already had a very
large max.

Signed-off-by: Sage Weil <sage@redhat.com>
2015-01-18 16:49:20 -08:00
Sébastien Han
d29aef5eb9 doc: Fix OpenStack Glance configuration
Glance has not completely moved to 'store' yet so we need to configure
the store in the DEFAULT section as well.

Fixes: #10478

Signed-off-by: Sébastien Han <sebastien.han@enovance.com>
2015-01-18 22:55:57 +01:00
Sage Weil
8379b454b9 Merge pull request #3361 from wonzhq/watch-notify
osd/ReplicatedPG: force promotion for watch/notify ops

Reviewed-by: Sage Weil <sage@redhat.com>
2015-01-18 10:44:35 -08:00
Sage Weil
f078a429fd Merge pull request #3395 from liewegas/wip-cache-none
osd: skip all of maybe_handle_cache if cachemode is none
2015-01-18 10:43:58 -08:00
Sage Weil
e7f9bffa50 Merge pull request #3315 from majianpeng/fix6
bug fix 

Reviewed-by: Sage Weil <sage@redhat.com>
2015-01-18 10:42:31 -08:00
Sage Weil
ba73ef9378 Merge pull request #3385 from majianpeng/misc
Misc

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2015-01-18 10:41:55 -08:00
Sage Weil
31eb4c615a Merge pull request #3194 from dachary/wip-10350-erasure-code-choose-tries
resolve and document most common erasure coded pool pain points

Documentation-Reviewed-by: Italo Santos <okdokk@gmail.com>
2015-01-18 10:41:31 -08:00
Sage Weil
1d1215fe5f mon: change mon_globalid_prealloc to 10000 (from 100)
100 ids (session 100 authentications) can be consumed quite quickly if
the monitor is being queried by the CLI via scripts or on a large cluster,
especially if the propose interval is long (many seconds).  These live in
a 64-bit value and are only "lost" if we have a mon election before they
are consumed, so there's no real risk here.

Backport: giant, firefly
Reviewed-by: Joao Eduardo Luis <joao@redhat.com>
Signed-off-by: Sage Weil <sage@redhat.com>
2015-01-18 10:39:25 -08:00
Sage Weil
be1416a044 mon: silently ignore mark_down, mark_disposable on AnonConnection
This mirrors 0a49db8e6f but was not captured
by 9fff0c53bd.

Signed-off-by: Sage Weil <sage@redhat.com>
2015-01-18 10:37:51 -08:00
Sage Weil
87b3e9600a Merge remote-tracking branch 'gh/wip-xio'
Reviewed-by: Sage Weil <sage@redhat.com>
2015-01-18 10:37:19 -08:00
Sage Weil
78fd69f1aa Merge pull request #3391 from liewegas/wip-pool-delete
mon: global option to prevent pool deletion

Reviewed-by: John Spray <john.spray@redhat.com>
2015-01-18 10:34:59 -08:00
Sage Weil
4698882382 osd/ReplicatedPG: skip all of maybe_handle_cache if caching is off
Return quickly and avoid all of the checks.

Signed-off-by: Sage Weil <sage@redhat.com>
2015-01-17 10:31:10 -08:00
Haomai Wang
4d0e0ae3b5 AsyncConnection: Fix memory leak for AsyncConnection
*_handler will store a reference to AsyncConnection, it need to explicit reset
it.

Signed-off-by: Haomai Wang <haomaiwang@gmail.com>
2015-01-17 19:52:19 +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
Yehuda Sadeh
dbaa1420c4 rgw: bilog marker related fixes
Fix the way we parse the marker. Instead of specifying whether it's a
sharded or not sharded bucket, we pass a shard_id. If string itself
points to a singe shard, we'll use the passed shard_id, otherwise we'll
parse the string and determine the shard id by that. In this way when
referencing a single shard we can get the marker with either shard id
specified or not. This works with the non-shard case too.
Adjust the bilog listing function, set it to work with the new
interface. It was broken before, and there are multiple fixes to it.

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
2015-01-16 09:12:54 -08: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
Sage Weil
6b982e4cc0 mon/OSDMonitor: require mon_allow_pool_delete = true to remove pools
This is a simple safety check.  Since we default to true it is currently
opt-in.

Backport: giant, firefly
Signed-off-by: Sage Weil <sage@redhat.com>
2015-01-16 07:54:22 -08: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