Casey Bodley
b2fe116d97
Merge pull request #23402 from cbodley/wip-23659
...
qa/rgw: patch keystone requirements.txt
Reviewed-by: Orit Wasserman <owasserm@redhat.com>
2018-08-14 16:53:30 -04:00
Patrick Donnelly
fbfbe8f3df
Merge PR #23426 into master
...
* refs/pull/23426/head:
client: privatize some class members
client: reorganize Client header
Reviewed-by: Venky Shankar <vshankar@redhat.com>
2018-08-14 11:50:09 -07:00
Patrick Donnelly
a807a7ebf0
Merge PR #23470 into master
...
* refs/pull/23470/head:
tools/cephfs-shell: unable to copy files to a sub-directory from local file system
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
2018-08-14 09:41:01 -07:00
Pavani Rajula
b726ac2513
tools/cephfs-shell: unable to copy files to a sub-directory from local file system
...
Fixes:http://tracker.ceph.com/issues/26874
Signed-off-by: Pavani Rajula <rpavani1998@gmail.com>
2018-08-14 21:48:04 +05:30
Patrick Donnelly
038b95da83
Merge PR #23561 into master
...
* refs/pull/23561/head:
tools/cephfs: do not split args if it's already a list
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
2018-08-14 08:59:29 -07:00
Alfredo Deza
9066792764
ceph-volume lvm.zap loop over all vgs from a pv to destroy them
...
Signed-off-by: Alfredo Deza <adeza@redhat.com>
2018-08-14 11:59:25 -04:00
Sage Weil
1ee7b8c6c2
Merge PR #23552 into master
...
* refs/pull/23552/head:
ceph_test_objectstore: queue split on parent pg sequencer
os/bluestore: fix split vs finish_write race
Reviewed-by: Igor Fedotov <ifedotov@suse.com>
Reviewed-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
2018-08-14 10:34:29 -05:00
Alfredo Deza
7a5ee22437
ceph-volume tests.util ensure dmcrypt_close will skip non-existent paths
...
Signed-off-by: Alfredo Deza <adeza@redhat.com>
2018-08-14 10:47:14 -04:00
Alfredo Deza
635f8e9e2e
ceph-volume util.encryption if crypt path does not exist, skip it
...
Signed-off-by: Alfredo Deza <adeza@redhat.com>
2018-08-14 10:47:14 -04:00
Alfredo Deza
549109c1de
ceph-volume lvm.zap unmount lvs and close dmcrypt on partitions
...
Signed-off-by: Alfredo Deza <adeza@redhat.com>
2018-08-14 10:47:13 -04:00
Sage Weil
de747b0dc1
ceph_test_objectstore: queue split on parent pg sequencer
...
This matches the OSD.
It also ensure that we drain transactions that precede the split, which
will include any finish_write calls that might otherwise attach the
Buffer to the wrong cache shard: _txc_finish() calls finish_write and
passes the cache shard without the cache shard lock held, but may block
waiting for split_cache() which then changes the destination collection's
shard. Once it gets the lock and proceeds it would operate on the wrong
cache shard, leading to a failed assert later when the sharedblob is
trimmed.
Fixes: http://tracker.ceph.com/issues/24439
Signed-off-by: Sage Weil <sage@redhat.com>
2018-08-14 09:08:12 -05:00
Kefu Chai
aec096558e
Merge pull request #23539 from cyx1231st/wip-seastar-msgr-cyx
...
crimson/net: fix unittest_seastar_messenger errors
Reviewed-by: Casey Bodley <cbodley@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
2018-08-14 20:47:44 +08:00
Ricardo Marques
2a6ce09691
Merge pull request #22457 from p-na/dash-settings
...
mgr/dashboard: Add backend support for changing dashboard configuration settings via the REST API
Reviewed-by: Ricardo Marques <rimarques@suse.com>
Reviewed-by: Tatjana Dehler <tdehler@suse.com>
Reviewed-by: Volker Theile <vtheile@suse.com>
2018-08-14 09:27:09 +01:00
Yingxin
d5d7c698c3
crimson/net: fix unittest_seastar_messenger errors
...
fix several bugs that may fail unittest_seastar_messenger:
1. keep holding the connection reference until closed.
2. zero h.reply before start to use it.
3. set server-side features correctly.
4. add missing return to link write with flush.
5. remove an empty lambda operation.
Signed-off-by: Yingxin <yingxin.cheng@intel.com>
2018-08-14 16:15:53 +08:00
James McClune
bba0bcdc6f
doc: updated reference link for osdmaptool utility
...
Reference link for osdmaptool utility was broken (404 error).
Signed-off-by: James McClune <jmcclune@mcclunetechnologies.net>
2018-08-13 23:39:46 -04:00
James McClune
f8a0e874b5
doc: updated link for submitting patches
...
Updated link for Submitting Patches (404 error).
Signed-off-by: James McClune <jmcclune@mcclunetechnologies.net>
2018-08-13 23:29:41 -04:00
Kefu Chai
130ab077f9
tools/cephfs: do not split args if it's already a list
...
Signed-off-by: Kefu Chai <kchai@redhat.com>
2018-08-14 09:59:00 +08:00
Patrick Donnelly
c1a43ca22e
Merge PR #23537 into master
...
* refs/pull/23537/head:
tools/cephfs-shell:fixing the issue in using with_argparse.
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
2018-08-13 16:39:32 -07:00
Gregory Farnum
2b0ceced42
Merge pull request #23519 from falcon78921/wip-doc-troubleshoot-osds
...
doc: cleaned up troubleshooting OSDs documentation
Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Greg Farnum <gfarnum@redhat.com>
2018-08-13 13:57:58 -07:00
Dan Mick
298a1d92d2
qa/suites/rados, qa/workunits/rados: Add suite/workunit for ceph-crash
...
Signed-off-by: Dan Mick <dan.mick@redhat.com>
2018-08-13 13:53:26 -07:00
Casey Bodley
909f74d6c5
Merge pull request #23401 from cbodley/wip-rgw-getomapkeys2-more
...
rgw: RGWRadosGetOmapKeysCR uses 'more' flag from omap_get_keys2()
Reviewed-by: Casey Bodley <cbodley@redhat.com>
2018-08-13 15:44:45 -04:00
Sage Weil
a3d64ea9db
Merge PR #23406 into master
...
* refs/pull/23406/head:
TestOSDMap: Test with negative upmap values
osd/OSDMap: Disallow negative values in _apply_upmap
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2018-08-13 13:00:51 -05:00
Sage Weil
211cd6388b
Merge PR #23512 into master
...
* refs/pull/23512/head:
osd: vary tick interval +/- 5% to avoid scrub livelocks
osd: tick at OSD_TICK_INTERVAL, not heartbeat interval
Reviewed-by: Brad Hubbard <bhubbard@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
2018-08-13 13:00:46 -05:00
Sage Weil
88ec550112
Merge PR #23515 into master
...
* refs/pull/23515/head:
os/bluestore_tool: print actual usage in BlueFS::dump_block_extents.
Reviewed-by: Sage Weil <sage@redhat.com>
2018-08-13 13:00:41 -05:00
Sage Weil
4c2591b5d3
Merge PR #23516 into master
...
* refs/pull/23516/head:
os/bluestore: check bluefs_extents consistency (DB vs. BlueFS)
Reviewed-by: Sage Weil <sage@redhat.com>
2018-08-13 13:00:36 -05:00
Sage Weil
58a45f13a4
Merge PR #23517 into master
...
* refs/pull/23517/head:
os/bluestore: uniform loging format for bluefs_extent_t.
os/bluestore_tool: handle fsck's returned status properly.
os/bluestore_tool: fix multiple extents handling in BlueFS::log_dump
Reviewed-by: Sage Weil <sage@redhat.com>
2018-08-13 13:00:32 -05:00
Patrick Donnelly
9ce675d0ca
Merge PR #23536 into master
...
* refs/pull/23536/head:
mds: report lagginess at lower debug
MDSMonitor: note beacons and cluster changes at low dbg level
Reviewed-by: Sage Weil <sage@redhat.com>
2018-08-13 10:16:32 -07:00
Sage Weil
f21f1f14f2
os/bluestore: fix split vs finish_write race
...
In _tcx_finish(), we were looking at the right Cache for the collection,
and then calling finish_write with that Cache and taking the lock. This
could race with a split_cache() such that after we got the lock the
collection was not on a different cache. This would in turn lead to a
failed assertion later on in _rm_buffer when the sharedblob was trimmed.
Fixes: http://tracker.ceph.com/issues/24439
Signed-off-by: Sage Weil <sage@redhat.com>
2018-08-13 12:10:59 -05:00
Sage Weil
3d774d6a91
Merge PR #23291 into master
...
* refs/pull/23291/head:
tests: add Cephx-resembling scenarios to crypto tests.
tests: differentiate AES testing regarding text size.
Reviewed-by: Sage Weil <sage@redhat.com>
2018-08-13 10:49:41 -05:00
Sage Weil
8f3560d4ed
Merge PR #22879 into master
...
* refs/pull/22879/head:
doc/rados/operations/user-management: document 'network' clause of moncap and osdcap
mds/SessionMap: make Session::connection private
mds/MDSAuthCaps: parse and enforce network restriction
mds/MDSAuthCaps: pass addr to is_capable
mds/SessionMap: track socket_addr for each Session
osd/OSDCap: enforce network restriction
osd/OSDCap: take addr arg to is_capable
osd/OSDCap: parse 'network' clause in grant
mon: adapt MonCap network checks to addrvecs
mon/MonCap: enforce network constraint (if present)
mon/MonCap: take addr for MonCap::is_capable
mon/MonCap: parse 'network ...' suffix
osd: add peer_socket_addr to Session
mon: use addrvec for RoutedRequest and MForward
msg/Connection: add get_peer_socket_addr()
common/ipaddr: add network_contains() helper
common/ipaddr: add parse_network helper
common/ipaddr: expose netmask_ipv[46]
Reviewed-by: Gregory Farnum <gfarnum@redhat.com>
Reviewed-by: Greg Farnum <gfarnum@redhat.com>
2018-08-13 08:48:14 -05:00
Kefu Chai
e2e6a77b38
Merge pull request #23510 from tchaikov/wip-cmake-boost-build
...
cmake: fix build WITH_SYSTEM_BOOST=ON
Reviewed-by: Willem Jan Withagen <wjw@digiware.nl>
Reviewed-by: Casey Bodley <cbodley@redhat.com>
2018-08-13 21:42:10 +08:00
Alfredo Deza
ac00e72255
ceph-volume tests.functional batch add filestore sceanrios to tox.ini
...
Signed-off-by: Alfredo Deza <adeza@redhat.com>
2018-08-13 08:38:08 -04:00
Willem Jan Withagen
57f7a9f005
osd: make random shuffle comply with C++17
...
random_shuffle is depriacted in C++14 and removed in C++17 on FreeBSD
(As per the standard)
So this code does not compile on FreeBSD with Clang 6
Signed-off-by: Willem Jan Withagen <wjw@digiware.nl>
2018-08-13 11:57:33 +02:00
Yao Zongyou
a4ff39a588
mon/MonMap: remove duplicate code in get_rank
...
Signed-off-by: Yao Zongyou <yaozongyou@vip.qq.com>
2018-08-13 17:35:34 +08:00
Patrick Donnelly
418db4617b
Merge PR #23542 into master
...
* refs/pull/23542/head:
qa: fix mon config section
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
2018-08-12 19:15:20 -07:00
Patrick Donnelly
47e60908a3
qa: fix mon config section
...
Fixes: fc6e683832
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
2018-08-12 19:13:06 -07:00
Patrick Donnelly
0b879f4401
Merge PR #23444 into master
...
* refs/pull/23444/head:
cephfs-shell: avoid sys.argv modification
tools/cephfs-shell: added support for batch file processing and to execute commands from arguments.
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
2018-08-12 18:29:34 -07:00
Sage Weil
d7596a74e1
doc/rados/operations/user-management: document 'network' clause of moncap and osdcap
...
Signed-off-by: Sage Weil <sage@redhat.com>
2018-08-12 17:03:20 -05:00
Sage Weil
d3af166d6e
mds/SessionMap: make Session::connection private
...
Ensure all setters go through set_connection()
Signed-off-by: Sage Weil <sage@redhat.com>
2018-08-12 17:03:20 -05:00
Patrick Donnelly
e6c33aa09b
cephfs-shell: avoid sys.argv modification
...
In multiple locations in the code.
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
2018-08-12 15:01:34 -07:00
Sage Weil
6651b49863
mds/MDSAuthCaps: parse and enforce network restriction
...
Signed-off-by: Sage Weil <sage@redhat.com>
2018-08-12 17:01:05 -05:00
Sage Weil
09bf0cd9a4
mds/MDSAuthCaps: pass addr to is_capable
...
Signed-off-by: Sage Weil <sage@redhat.com>
2018-08-12 17:01:05 -05:00
Sage Weil
37568982e3
mds/SessionMap: track socket_addr for each Session
...
Make sure socket_addr is populated when connection is set.
Signed-off-by: Sage Weil <sage@redhat.com>
2018-08-12 17:01:05 -05:00
Sage Weil
43f812d15d
osd/OSDCap: enforce network restriction
...
Signed-off-by: Sage Weil <sage@redhat.com>
2018-08-12 17:01:05 -05:00
Sage Weil
7ae14b5688
osd/OSDCap: take addr arg to is_capable
...
Not enforced yet; just plumbing!
Signed-off-by: Sage Weil <sage@redhat.com>
2018-08-12 17:01:05 -05:00
Sage Weil
b1418387df
osd/OSDCap: parse 'network' clause in grant
...
This mirrors what we do in the MonCap (but, naturally, is a slightly
different since we're using a the spirit parse in a totally different way).
Signed-off-by: Sage Weil <sage@redhat.com>
2018-08-12 17:01:05 -05:00
Sage Weil
759a902ace
mon: adapt MonCap network checks to addrvecs
...
Breaking this out in a separate commit to make the backport a bit easier.
Signed-off-by: Sage Weil <sage@redhat.com>
2018-08-12 17:01:05 -05:00
Sage Weil
556426e66a
mon/MonCap: enforce network constraint (if present)
...
Signed-off-by: Sage Weil <sage@redhat.com>
2018-08-12 17:01:05 -05:00
Sage Weil
1081e5f691
mon/MonCap: take addr for MonCap::is_capable
...
Signed-off-by: Sage Weil <sage@redhat.com>
2018-08-12 17:01:05 -05:00
Sage Weil
5038627c9a
mon/MonCap: parse 'network ...' suffix
...
Allow an optional network constraint to any grant.
Signed-off-by: Sage Weil <sage@redhat.com>
2018-08-12 17:01:05 -05:00