1
0
mirror of https://github.com/ceph/ceph synced 2025-03-19 17:06:24 +00:00
Commit Graph

51919 Commits

Author SHA1 Message Date
Greg Farnum
4bc4e74932 MDSMap: lock out multimds clusters and directory fragmentation by default
Add new flags operating the way the snapshot lockout does. Then, actually
block out the directory fragmentation in the MDS; and block out setting
max_mds > 1 in the MDSMonitor.

Signed-off-by: Greg Farnum <gfarnum@redhat.com>
2016-04-07 16:40:23 -07:00
Greg Farnum
15d1fd48ba MDSMap: switch from booleans to flags for feature enablement logging
Signed-off-by: Greg Farnum <gfarnum@redhat.com>
2016-04-07 16:40:23 -07:00
Greg Farnum
cda1c1a984 FSMap: add output for enabled_multiple flags
Signed-off-by: Greg Farnum <gfarnum@redhat.com>
2016-04-07 16:40:22 -07:00
Greg Farnum
313013209b MDSMonitor: make enabling multiple FSes a lot scarier
Output a more explicit warning when the user tries to enable multiple FSes, and
mark the FSMap when the user does so anyway.

Signed-off-by: Greg Farnum <gfarnum@redhat.com>
2016-04-07 16:40:22 -07:00
Greg Farnum
3b9371aa2f FSMap: print out compat instead of erroneously repeating enable_multiple
Signed-off-by: Greg Farnum <gfarnum@redhat.com>
2016-04-07 16:40:22 -07:00
Greg Farnum
2429463ea5 ceph-dencoder: add FSMap
Signed-off-by: Greg Farnum <gfarnum@redhat.com>
2016-04-07 16:40:22 -07:00
Josh Durgin
cf5d2777b8 Merge pull request from dillaman/wip-15370
test: TestMirroringWatcher test cases were not closing images

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2016-04-04 18:11:48 -07:00
Jason Dillaman
b7a5f8bba7 test: TestMirroringWatcher test cases were not closing images
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2016-04-04 18:03:59 -04:00
Sage Weil
0f81ac5d87 Merge pull request from liewegas/wip-pgls-pgid
osdc/Objecter: use full pgid hash in PGNLS ops

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2016-04-04 16:53:51 -04:00
Samuel Just
72f18a26de Merge pull request from somnathr/wip-dyn-throttle-doc
Adding documentation on how to use new dynamic throttle scheme

Reviewed-by: Samuel Just <sjust@redhat.com>
2016-04-04 12:54:32 -07:00
Sage Weil
ec8318df70 Merge pull request from ErwanAliasr1/evelu-broken-cephtool-test-mon
tests: Fixing broken test/cephtool-test-mon.sh test

Reviewed-by: Loic Dachary <ldachary@redhat.com>
2016-04-04 15:48:10 -04:00
Orit Wasserman
9eca65f328 Merge pull request from theanalyst/rgw/unused-var
rgw_admin: remove unused parent_period arg
Reviewed-by: Orit Wasserman <owasserm@redhat.com>
2016-04-04 20:22:43 +02:00
Josh Durgin
cce88dfdc5 Merge pull request from dillaman/wip-striper-logs
Striper: reduce assemble_result log level

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2016-04-04 10:01:52 -07:00
Kefu Chai
24b9762355 Merge pull request from tchaikov/wip-noexcept
os/ObjectStore: add noexcept to ensure move ctor is used

Reviewed-by: Casey Bodley <cbodley@redhat.com>
2016-04-04 23:44:43 +08:00
Erwan Velu
f47e06b907 tests: Fixing broken test/cephtool-test-mon.sh test
Since the merge of pr , 'ceph command' to get the help is invalid.
As a result, 'test/cephtool-test-mon.sh' test was broken

This patch simply change the 'ceph command' by a 'ceph --help command'

Since this change the test is passing again.

Signed-off-by: Erwan Velu <erwan@redhat.com>
2016-04-04 16:58:58 +02:00
Casey Bodley
77ccd20d90 Merge pull request from ceph/wip-fix-cmake
CMake: For CMake version <= 2.8.11, use LINK_PRIVATE
2016-04-04 10:35:20 -04:00
Casey Bodley
969d62827c Merge pull request from theanalyst/rgw/help-args
rgw: add a few more help options in admin interface
2016-04-04 10:28:38 -04:00
Sage Weil
77aee99835 Merge pull request from jcsp/wip-15309-2
qa: update rest test cephfs calls (part 2)

Reviewed-by: Sage Weil <sage@redhat.com>
2016-04-04 09:42:57 -04:00
Sage Weil
5aedc215e7 Merge pull request from ilc/master
configure: Add -D_LARGEFILE64_SOURCE to Linux build.
2016-04-04 09:32:12 -04:00
Sage Weil
6d5855814b Merge pull request from dzafman/wip-15347
test: Fix test to run with btrfs which has snap_### dirs

Reviewed-by: Sage Weil <sage@redhat.com>
2016-04-04 08:56:23 -04:00
Sage Weil
79582b04f6 Merge pull request from wjin/fix
osdmap: rm nonused variable

Reviewed-by: Sage Weil <sage@redhat.com>
2016-04-04 08:55:53 -04:00
Sage Weil
f203d56cd1 qa/workunits/rbd: qemu tests need to wait for image to be createdReviewe
qa/workunits/rbd: qemu tests need to wait for image to be created

Reviewed-by: Sage Weil <sage@redhat.com>
2016-04-04 08:55:14 -04:00
Sage Weil
01a56dc81c Merge pull request from ghxandsky/master
set 128MB tcmalloc cache size by bytes
2016-04-04 08:54:11 -04:00
Star Guo
9565a50c58 set 128MB tcmalloc cache size by bytes
Signed-off-by: Star Guo <star.guo@mevoco.com>
2016-04-04 13:41:52 +08:00
Sage Weil
548fb8b2d4 Merge pull request from dx9/wip-unittest-erasure-code-plugin
unittest_erasure_code_plugin: fix deadlock (Alpine)
2016-04-03 18:13:28 -04:00
Sage Weil
dac9ad338d Merge pull request from aclamk/auto_complete_python
ceph: bash auto complete for CLI based on mon command descriptions

Reviewed-by: Kefu Chai <kchai@redhat.com>
2016-04-03 18:12:03 -04:00
Sage Weil
773d5ec167 Merge pull request from yangdongsheng/trival
build: fix compiling warnings

Reviewed-by: Kefu Chai <kchai@redhat.com>
2016-04-03 18:11:18 -04:00
Sage Weil
370e4f773a Merge remote-tracking branch 'gh/jewel' 2016-04-03 14:28:23 -04:00
Jason Dillaman
ff9843bb34 Striper: reduce assemble_result log level
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2016-04-03 10:52:10 -04:00
Jason Dillaman
f812199f72 qa/workunits/rbd: qemu tests need to wait for image to be created
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2016-04-03 10:29:38 -04:00
Sage Weil
f7137661a2 ceph_test_rados_api_tier: parse env
Signed-off-by: Sage Weil <sage@redhat.com>
2016-04-03 09:49:07 -04:00
Sage Weil
769c0affc4 ceph_test_rados_api_list: parse env
Signed-off-by: Sage Weil <sage@redhat.com>
2016-04-03 09:45:56 -04:00
Sage Weil
b9b07c13e4 osd/ReplicatedPG: tolerate pgls commands with full hash
Signed-off-by: Sage Weil <sage@redhat.com>
2016-04-03 09:45:56 -04:00
Sage Weil
5c612e82bb osd/ReplicatedPG: discard pgnls op that is outside pg bounds
This should only happen with a buggy client, but we should avoid crashing,
and send a polite error message back.

Signed-off-by: Sage Weil <sage@redhat.com>
2016-04-03 09:45:56 -04:00
Sage Weil
f16187f68d osdc/Objecter: use full hash value for pg[n]ls ops
Normal ops do this so they can behave when racing with split; pgnls ops
are no different.

In particular, this fixes a bug where we have an old OSDMap that doesn't
reflect a split, and the OSD replies with a 'next' value of the PG's new
max.  If we resend the same value to that PG, it'll be out of bounds,
and BlueStore will notice.

Signed-off-by: Sage Weil <sage@redhat.com>
2016-04-03 09:45:56 -04:00
Sage Weil
9196a75459 osd/ReplicatedPG: fix typo
Signed-off-by: Sage Weil <sage@redhat.com>
2016-04-03 09:45:56 -04:00
Sage Weil
bf38318070 Merge pull request from dillaman/wip-cls-fadvise
cls_rbd: pass WILLNEED fadvise flags during object map update

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: Sage Weil <sage@redhat.com>
2016-04-03 09:13:31 -04:00
Wei Jin
a92fa830bd osdmap: rm nonused variable
Signed-off-by: Wei Jin <wjin.cn@gmail.com>
2016-04-03 14:20:16 +08:00
Haomai Wang
4eb8f7753c CMake: For CMake version <= 2.8.11, use LINK_PRIVATE
Signed-off-by: Haomai Wang <haomai@xsky.com>
2016-04-03 13:31:07 +08:00
Kefu Chai
c432691a3b os/ObjectStore: add noexcept to ensure move ctor is used
otherwise vector::push_back() will use the copy ctor if it resizes,
to enforce its strong exception guarantee.

Signed-off-by: Kefu Chai <kchai@redhat.com>
2016-04-03 03:37:13 +08:00
Josh Durgin
fdef226cc9 Merge branch 'wip-cycles'
common/Cycles: Do not initialize Cycles globally

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: Haomai Wang <haomai@xsky.com>
2016-04-02 12:35:43 -07:00
Richard W.M. Jones
1c2831a2c1 common/Cycles: Do not initialize Cycles globally.
Move initialization to the few tests that actually use it.

Fixes: http://tracker.ceph.com/issues/15225
Signed-off-by: Richard W.M. Jones <rjones@redhat.com>
2016-04-02 12:34:10 -07:00
John Coyle
ec79b64f85 unittest_erasure_code_plugin: fix deadlock caused by locked mutex in cancelled thread
Added unlock when thread is cancelled.

Signed-off-by: John Coyle <dx9err@gmail.com>
2016-04-02 00:10:12 -04:00
Sage Weil
9470969da1 Merge pull request from liewegas/wip-bluestore
os/bluestore: a few fixes
2016-04-01 17:52:47 -04:00
David Zafman
aedc529b4c test: Fix test to run with btrfs which has snap_### dirs
Fixes: http://tracker.ceph.com/issues/15347

Signed-off-by: David Zafman <dzafman@redhat.com>
2016-04-01 14:35:50 -07:00
Orit Wasserman
f53cb1289a Merge pull request from cbodley/wip-rgw-realm-pull-fix
radosgw-admin: fix for 'realm pull'
Reviewed-by: Orit Wasserman <owasserm@redhat.com>
2016-04-01 20:22:51 +02:00
Josh Durgin
b71cc17f1c Merge pull request from dillaman/wip-librbd-mirroring-unsupported
librbd: avoid throwing error if mirroring is unsupported

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2016-04-01 10:54:02 -07:00
Josh Durgin
c9ca7692e4 Merge pull request from trociny/wip-rbd-mirror-test-misc
test: rbd-mirror: script improvements for manual testing

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2016-04-01 09:55:20 -07:00
Jason Dillaman
d21646ade6 Merge pull request from runsisi/wip-fix-eexist
cls_journal: fix -EEXIST checking

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
2016-04-01 11:16:12 -05:00
Jason Dillaman
3dd5249b6a librbd: avoid throwing error if mirroring is unsupported
Attempting to remove an image will remove the image from the mirroring
directory.  However, if the OSD is older and doesn't support this
new feature, avoid throwing an error.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2016-04-01 12:08:12 -04:00