John Spray
e1b4327d67
Merge pull request #14087 from jcsp/wip-doc-fscid
...
doc: how to specify filesystem for cephfs clients
Reviewed-by: Yan, Zheng <zyan@redhat.com>
2017-04-13 17:42:13 +01:00
Kefu Chai
8442cbb521
Merge pull request #14468 from tchaikov/wip-show-me-fake-plugin
...
qa/workunits/ceph-helpers: display rejected string
Reviewed-by: Loic Dachary <ldachary@redhat.com>
Reviewed-by: Brad Hubbard <bhubbard@redhat.com>
2017-04-13 22:24:03 +08:00
John Spray
b81e4b70a4
Merge pull request #14234 from jcsp/wip-19406-dirhash
...
tools/cephfs: set dir_layout when injecting inodes
Reviewed-by: Yan, Zheng <zyan@redhat.com>
2017-04-13 12:01:28 +01:00
Kefu Chai
051f9138df
Merge pull request #14472 from joscollin/wip-warning-test
...
test: add explicit braces to avoid ambiguous ‘else’ and to silence warnings
Reviewed-by: Adam C. Emerson <aemerson@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
2017-04-13 16:28:12 +08:00
Kefu Chai
097d00cb81
Merge pull request #14495 from tchaikov/wip-cmake-ctags-without-repo
...
cmake: do not try to add submodule to exclude list if .git is not around
Reviewed-by: Brad Hubbard <bhubbard@redhat.com>
2017-04-13 15:35:09 +08:00
Kefu Chai
9acd868857
Merge pull request #14404 from tchaikov/wip-another-mgr-command
...
mon,mgr: move reweight-by-* to mgr
Reviewed-by: Sage Weil <sage@redhat.com>
2017-04-13 13:57:42 +08:00
Kefu Chai
4847a88556
cmake: do not try to add submodule to exclude list if .git is not around
...
Signed-off-by: Kefu Chai <kchai@redhat.com>
2017-04-13 13:49:54 +08:00
Mykola Golub
b9522ef915
Merge pull request #14445 from dillaman/wip-rbd-import-diff
...
rbd: import-diff should discard any zeroed extents
Reviewed-by: Mykola Golub <mgolub@mirantis.com>
2017-04-13 08:00:05 +03:00
Matt Benjamin
335cf9a23e
Merge pull request #14474 from Wilhelmshaven/fix_non-exist_string
...
rgw: avoid using null pointer in rgw_file.cc
2017-04-12 21:00:59 -04:00
Jason Dillaman
25eb40bd4b
Merge pull request #14482 from trociny/wip-qa-diff
...
qa/workunits/rbd: diff.sh failed removing nonexistent file
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
2017-04-12 16:43:21 -04:00
John Spray
7d6d542885
tools/cephfs: set dir_layout when injecting inodes
...
When we left this as zero, the MDS would interpret it was HASH_LINUX
rather than the default HASH_RJENKINS. Potentially that
could cause problems if there perhaps were already dirfrags in
the metadata pool that were set up using rjenkins. Mainly
it just seems more appropriate to explicitly set this field
rather than hit the fallback behaviour.
Related: http://tracker.ceph.com/issues/19406
Signed-off-by: John Spray <john.spray@redhat.com>
2017-04-12 16:30:51 -04:00
Jason Dillaman
7d12a7e184
Merge pull request #14463 from trociny/wip-19451
...
pybind/rbd: add image metadata methods
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
2017-04-12 15:02:16 -04:00
Jason Dillaman
0d2f856464
Merge pull request #14471 from trociny/wip-19588
...
librbd: fix rbd_metadata_list and rbd_metadata_get
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
2017-04-12 15:01:56 -04:00
Mykola Golub
bf21bae415
Merge pull request #14484 from dillaman/wip-librados-test-stub
...
test/librados_test_stub: fixed cls_cxx_map_get_keys/vals return value
Reviewed-by: Mykola Golub <mgolub@mirantis.com>
2017-04-12 21:04:42 +03:00
Yehuda Sadeh
41f0dd1d27
Merge pull request #14375 from cbodley/wip-rgw-fetch-versioned-obj
2017-04-12 09:02:44 -07:00
Kefu Chai
ef7583d717
qa/suites: add mon-reweight-min-pgs-per-osd = 4
...
so we can run reweight commands in a small cluster with 3 OSD and 27
PGs.
Signed-off-by: Kefu Chai <kchai@redhat.com>
2017-04-12 23:29:10 +08:00
Loic Dachary
f55b2a3fe1
Merge pull request #14476 from wjwithagen/wip-wjw-freebsd-ceph-disk-call-rc.d
...
ceph-disk/ceph_disk/main.py: fix calling of the bsdrc init scripts
Reviewed-by: Loic Dachary <ldachary@redhat.com>
2017-04-12 17:04:35 +02:00
Jason Dillaman
9ffd464dac
test/librados_test_stub: fixed cls_cxx_map_get_keys/vals return value
...
Fixes: http://tracker.ceph.com/issues/19597
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2017-04-12 10:49:05 -04:00
Sage Weil
92006f6d39
Merge pull request #14399 from ifed01/wip-bluestore-better-better-reuse
...
os/bluestore: refactor small write handling to reuse blob more effect…
Reviewed-by: Sage Weil <sage@redhat.com>
2017-04-12 09:31:45 -05:00
Sage Weil
048722605f
Merge pull request #14422 from tchaikov/wip-19427
...
mon/MonClient: make get_mon_log_message() atomic
Reviewed-by: Sage Weil <sage@redhat.com>
2017-04-12 09:28:38 -05:00
Sage Weil
4f210cd13d
Merge pull request #14439 from adamemerson/wip-warning-sign
...
misc: Warning Elimination
Reviewed-by: Kefu Chai <kchai@redhat.com>
2017-04-12 09:28:10 -05:00
Mykola Golub
bf52a2a53b
qa/workunits/rbd: diff.sh failed removing nonexistent file
...
Signed-off-by: Mykola Golub <mgolub@mirantis.com>
2017-04-12 16:22:43 +02:00
John Spray
015daa2686
Merge pull request #14347 from ukernel/wip-19501
...
mds: make C_MDSInternalNoop::complete() delete 'this'
Reviewed-by: John Spray <john.spray@redhat.com>
2017-04-12 14:28:11 +01:00
Jason Dillaman
f682d26e6d
rbd: import-diff should discard any zeroed extents
...
Sparse (zeroed) extents cannot be safely skipped. Instead, the
zeroed extent should be discarded from the image to ensure
the import remains consistent with the export.
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2017-04-12 09:00:54 -04:00
Mykola Golub
9a80faa546
Merge pull request #14460 from dillaman/wip-qa-rbd-cli
...
qa/workunits: corrected issues with RBD cli test
Reviewed-by: Mykola Golub <mgolub@mirantis.com>
2017-04-12 15:44:25 +03:00
Willem Jan Withagen
fc01473e55
ceph-disk/ceph_disk/main.py: fix calling of the bsdrc init scripts
...
- rc.d/ceph does not really like the extra stop/start as las cmd.
- And make Start and Stop look similar.
Signed-off-by: Willem Jan Withagen <wjw@digiware.nl>
2017-04-12 14:02:26 +02:00
Jos Collin
12df9a3a18
test: add explicit braces to avoid ambiguous ‘else’ and to silence warnings
...
The following warning appears during make for several files in the test submodule:
warning: suggest explicit braces to avoid ambiguous ‘else’ [-Wdangling-else]
Fixed the review comment too.
Signed-off-by: Jos Collin <jcollin@redhat.com>
2017-04-12 17:27:27 +05:30
Brad Hubbard
b2faddfca0
Merge pull request #14467 from badone/wip-debug-mon-features-api-removal-cleanup
...
mon: Tidy up removal of debug mon features
Reviewed-by: Kefu Chai <kchai@redhat.com>
2017-04-12 20:10:29 +10:00
Kefu Chai
6cb4503a40
qa/workunits/ceph-helpers: do not error out if is_clean
...
it would be a race otherwise, because we cannot be sure that the cluster
pgs are not all clean or not when run_osd() returns, but we can be sure
that they are expected to active+clean after a while. that's what
wait_for_clean() does.
Signed-off-by: Kefu Chai <kchai@redhat.com>
2017-04-12 17:32:44 +08:00
lihongjie
4be4054d8f
rgw: avoid using null pointer in rgw_file.cc
...
When rgw_fh doesn't exist, we should not use rgw_fh->full_object_name().
Signed-off-by: lihongjie <lihongjie@cmss.chinamobile.com>
2017-04-12 17:18:01 +08:00
Mykola Golub
780194199a
pybind/rbd: add image metadata methods
...
Fixes: http://tracker.ceph.com/issues/19451
Signed-off-by: Mykola Golub <mgolub@mirantis.com>
2017-04-12 10:47:09 +02:00
Mykola Golub
75afc74ea6
librbd: fix rbd_metadata_list and rbd_metadata_get
...
- properly check for val_len in rbd_metadata_list
- don't expect output buffers are zero pre-filled
Fixes: http://tracker.ceph.com/issues/19588
Signed-off-by: Mykola Golub <mgolub@mirantis.com>
2017-04-12 10:42:45 +02:00
Kefu Chai
0196e154ed
qa/workunits/ceph-helpers: display rejected string
...
Signed-off-by: Kefu Chai <kchai@redhat.com>
2017-04-12 16:34:51 +08:00
Haomai Wang
b43c180189
Merge pull request #14361 from ShiqiCooperation/master
...
mailmap: shiqi affiliation
Reviewed-by: Brad Hubbard <bhubbard@redhat.com>
2017-04-12 15:41:29 +08:00
Brad Hubbard
6650e3e3d9
Merge pull request #14446 from badone/wip-cppcheck-errors
...
Wip cppcheck errors
Reviewed-by: Kefu Chai <kchai@redhat.com>
2017-04-12 16:25:18 +10:00
Brad Hubbard
d105ec319a
test: Suppress cppcheck error
...
Signed-off-by: Brad Hubbard <bhubbard@redhat.com>
2017-04-12 15:24:21 +10:00
Sage Weil
b841ab2592
Merge pull request #14419 from badone/wip-doc-pg-states-min_size
...
docs: Clarify the relationship of min_size to EC pool recovery
Reviewed-by: Sage Weil <sage@redhat.com>
2017-04-11 21:10:35 -05:00
Brad Hubbard
b0fef6f50f
mon: Tidy up removal of debug mon features
...
545bc83
removed most of the plumbing for the debug mon features admin
socket commands but failed to remove the register/unregister command
pairs. This means the monitor asserts if an attempt is made to use any
of these commands.
Signed-off-by: Brad Hubbard <bhubbard@redhat.com>
2017-04-12 10:49:16 +10:00
Yuri Weinstein
612f806c9d
Merge pull request #14290 from wjwithagen/wip-wjw-freebsd-procprefix
...
core: Prefix /proc/ with FreeBSD emulation
Reviewed-by: Kefu Chai <kchai@redhat.com>
2017-04-11 15:07:45 -07:00
Yuri Weinstein
aa8b3e73ea
Merge pull request #14362 from majianpeng/fs-remove-redundant-code
...
os/fs/FS.cc: remove the redundant code.
Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Sage Weil <sage@redhat.com>
2017-04-11 15:06:44 -07:00
Sage Weil
4b40cf98ea
Merge pull request #14462 from pdinnen/patch-2
...
doc: correct arguments for ceph tell osd.N bench
Reviewed-by: Sage Weil <sage@redhat.com>
2017-04-11 17:00:39 -05:00
Patrick Dinnen
c5931484c9
doc: correct arguments for ceph tell osd.N bench
...
Signed-off-by: Patrick Dinnen pdinnen@gmail.com
2017-04-11 15:57:11 -04:00
Josh Durgin
000629f743
Merge pull request #14461 from dmick/master
...
stop.sh: boilerplate error (don't stop mon when stopping mgr)
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2017-04-11 12:35:48 -07:00
Dan Mick
54e6680c8b
stop.sh: boilerplate error (don't stop mon when stopping mgr)
...
Signed-off-by: Dan Mick <dan.mick@redhat.com>
2017-04-11 10:42:56 -07:00
Orit Wasserman
8c25738f4b
Merge pull request #14376 from cbodley/wip-rgw-forward-canned-acl
...
rgw: fix for EINVAL errors on forwarded bucket put_acl requests
Reviewed-by: Orit Wasserman <owasserm@redhat.com>
2017-04-11 20:30:33 +03:00
Jason Dillaman
d084f68b1c
Merge pull request #13105 from rjfd/wip-18481
...
librbd: deferred image deletion
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
2017-04-11 11:24:21 -04:00
Jason Dillaman
15e5b8e3dc
qa/workunits: corrected issues with RBD cli test
...
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2017-04-11 11:18:29 -04:00
Casey Bodley
179cb5262c
Merge pull request #14355 from cbodley/wip-19505
...
rgw: allow larger payload for period commit
Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
2017-04-11 11:13:04 -04:00
Casey Bodley
2dc5789019
Merge pull request #14319 from cbodley/wip-19488
...
rgw: multisite: fixes for zonegroup redirect
Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
2017-04-11 11:12:44 -04:00
Casey Bodley
cde6359659
Merge pull request #14343 from Liuchang0812/wip-rgw-read-user-buckets
...
rgw: update is_truncated in function rgw_read_user_buckets
Reviewed-by: Casey Bodley <cbodley@redhat.com>
2017-04-11 11:11:41 -04:00