Chenjiong Deng
c65832c1ff
doc: fixed --read-only argument value in multisite doc
...
Fixes: https://tracker.ceph.com/issues/40458
Signed-off-by: Chenjiong Deng <dengchenjiong@umcloud.com>
2019-06-20 10:59:23 +08:00
Kefu Chai
ee11e9b60b
Merge pull request #23312 from sylvia0409/master
...
doc: Fixes OSD node labels which based on the osd_devices name
Reviewed-by: Kefu Chai <kchai@redhat.com>
2019-06-09 21:26:38 +08:00
Kefu Chai
2394f0cc38
Merge pull request #28461 from tchaikov/wip-cmake-pg-meta-set
...
crimson/osd/pg_meta: use initializer list for passing set<>
Reviewed-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
2019-06-09 19:46:41 +08:00
Kefu Chai
5a028137e8
crimson/osd/pg_meta: use initializer list for passing set<>
...
we cannot assume that the data in string views are always nul
terminated.
this change partially reverts 82fedbd008
.
Signed-off-by: Kefu Chai <kchai@redhat.com>
2019-06-09 18:11:27 +08:00
Kefu Chai
b4d67ab978
Merge pull request #28397 from tchaikov/wip-38403
...
osdc/Objecter: use unique_ptr<OSDMap> for Objecter::osdmap
Reviewed-by: Neha Ojha <nojha@redhat.com>
2019-06-09 15:32:22 +08:00
Kefu Chai
bec00b8a01
Merge pull request #28403 from xiexingguo/wip-unify-is-noup
...
osd: unify sources of no{up,down,in,out} flags into singleton helpers
Reviewed-by: Sage Weil <sage@redhat.com>
2019-06-08 23:36:34 +08:00
Kefu Chai
64fa21e726
osdc/Objecter: move Objecter::Objecter() into .cc
...
to speed up compilation.
Signed-off-by: Kefu Chai <kchai@redhat.com>
2019-06-08 23:35:21 +08:00
Kefu Chai
8f30bd868f
osdc/Objecter: use unique_ptr<OSDMap> for Objecter::osdmap
...
Fixes: http://tracker.ceph.com/issues/38403
Signed-off-by: Kefu Chai <kchai@redhat.com>
2019-06-08 23:34:52 +08:00
Kefu Chai
e11c6865f8
Merge pull request #28379 from jtlayton/wip-jlayton-40114
...
msg: fix addr2 encoding for sockaddrs
Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
2019-06-08 23:31:58 +08:00
Kefu Chai
8aa5bf0c8d
Merge pull request #28368 from kamoltat/wip-progress-module-pg-osdmap-comparison
...
mgr/progress: Look at PG state when PG epoch >= OSDMap epoch
Reviewed-by: Sage Weil <sage@redhat.com>
2019-06-08 23:28:35 +08:00
Kefu Chai
177956c9f6
Merge pull request #28352 from smithfarm/wip-rpm-obsolete-python
...
rpm: have pybind RPMs provide/obsolete their python2 predecessors
Reviewed-by: Tim Serong <tserong@suse.com>
Reviewed-by: Boris Ranto <branto@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
2019-06-08 23:27:39 +08:00
Kefu Chai
286cdeb784
Merge pull request #27512 from jmolmo/tls_auth
...
mgr/ansible: TLS Mutual Authentication
Reviewed-by: Sebastian Wagner <swagner@suse.com>
2019-06-08 23:24:53 +08:00
Patrick Donnelly
38fc69d0fa
Merge PR #28171 into master
...
* refs/pull/28171/head:
test_volume_client: simplify test_get_authorized_ids()
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
2019-06-07 21:20:18 -07:00
Patrick Donnelly
a5696cb484
Merge PR #28190 into master
...
* refs/pull/28190/head:
mds: cleanup unneeded client_snap_caps when splitting snap inode
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
2019-06-07 21:18:48 -07:00
Patrick Donnelly
2c2cf856b2
Merge PR #28293 into master
...
* refs/pull/28293/head:
mds: avoid passing null to SessionmMap::hit_session()
qa/cephfs: add test for blacklisted client eviction
mds: fix 'is session in blacklist' check in Server::apply_blacklist()
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
2019-06-07 21:16:14 -07:00
Patrick Donnelly
e60af462f1
Merge PR #28376 into master
...
* refs/pull/28376/head:
mds: count purge queue items left in journal
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
2019-06-07 21:14:40 -07:00
Patrick Donnelly
37c70455b9
Merge PR #28406 into master
...
* refs/pull/28406/head:
mds: reset heartbeat inside big loop
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
2019-06-07 21:13:36 -07:00
Patrick Donnelly
eaaf648ccb
Merge PR #28411 into master
...
* refs/pull/28411/head:
qa/cephfs: fix test_evict_client
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
2019-06-07 21:12:38 -07:00
Patrick Donnelly
df2d0cb8f0
Merge PR #28433 into master
...
* refs/pull/28433/head:
cephfs-shell: Remove unnecessary empty line
cephfs-shell: Fix flake8 bare 'except' warnings
cephfs-shell: Remove unused variable 'e'
cephfs-shell: Fix flake8 use != to compare str literals warning
cephfs-shell: Fixe flake8 line too long error
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
2019-06-07 21:10:52 -07:00
Yuri Weinstein
62a144f730
Merge pull request #28455 from yuriw/wip-yuriw-40208-master
...
qa/tests: removed `1node` and `systemd` tests as ceph-deploy is not actively developed
2019-06-07 16:27:40 -07:00
Yuri Weinstein
103a4299cd
qa/tests: removed 1node
and systemd
tests as ceph-deploy is not actively developed
...
Fixes: http://tracker.ceph.com/issues/40207
Fixes: http://tracker.ceph.com/issues/40208
Signed-off-by: Yuri Weinstein <yweinste@redhat.com>
2019-06-07 14:39:15 -07:00
Matt Benjamin
167ce67828
Merge pull request #28440 from linuxbox2/wip-rgwfile-invbckt
...
rgw_file: permit lookup_handle to lookup root_fh
2019-06-07 14:25:48 -04:00
Neha Ojha
2780813667
Merge pull request #28442 from neha-ojha/wip-40120-port
...
qa/tasks/cbt.py: change port to work with client_endpoints
Reviewed-by: Mark Nelson <mnelson@redhat.com>
2019-06-07 09:36:52 -07:00
Yuri Weinstein
dd1ef1081a
Merge pull request #28435 from yuriw/wip-yuriw-smoke-master
...
qa/tests: reduced distro to run to be random
2019-06-07 09:13:49 -07:00
Kefu Chai
5cc1a62fda
Merge pull request #28428 from tchaikov/wip-package-crimson-osd
...
rpm,debian,install-deps: package crimson-osd
Reviewed-by: Boris Ranto <branto@redhat.com>
Reviewed-by: Tim Serong <tserong@suse.com>
2019-06-08 00:03:22 +08:00
Kefu Chai
f03d8e2548
ceph.spec.in: align "Requires" of ceph-osd
...
Signed-off-by: Kefu Chai <kchai@redhat.com>
2019-06-07 22:17:19 +08:00
Kefu Chai
34b02f00d0
ceph.spec.in: package crimson-osd
...
Signed-off-by: Kefu Chai <kchai@redhat.com>
2019-06-07 22:17:19 +08:00
Kefu Chai
9bdf2dfa0d
debian/: add ceph-crimson-osd package
...
this package is commented out using `# Crimson`. and it will be enabled
only if we are building "crimson" flavor builds.
this package depends on ceph-osd, because it'll basically be a drop-in
replacement of ceph-osd. and it shares all the dependencies of ceph-osd.
so let's just reuse ceph-osd package for now.
Signed-off-by: Kefu Chai <kchai@redhat.com>
2019-06-07 22:17:19 +08:00
Kefu Chai
05899c1b86
cmake: install crimson-osd if WITH_SEASTAR
...
Signed-off-by: Kefu Chai <kchai@redhat.com>
2019-06-07 22:17:19 +08:00
Kefu Chai
7f19bf39d6
install-deps.sh: populate WITH_SEASTAR in the same way as for_make_check
...
because `install-deps.sh` is executed using `source`, we have to pass
these options using env variables. but before this change, `WITH_SEASTAR` is used directly,
while `FOR_MAKE_CHECK` is checked and translated to a local variable
`for_make_check`. which, in my opinion, has better readability.
so, in this change, `WITH_SEASTAR` is translated to `with_seastar`
variable in `install-deps.sh`.
Signed-off-by: Kefu Chai <kchai@redhat.com>
2019-06-07 22:17:19 +08:00
Neha Ojha
ee02416c65
qa/tasks/cbt.py: change port to work with client_endpoints
...
hack to work with https://github.com/ceph/cbt/pull/160/
Signed-off-by: Neha Ojha <nojha@redhat.com>
2019-06-06 17:21:38 -07:00
Yuri Weinstein
4c335b31fe
Merge pull request #28439 from yuriw/wip-yuriw-crontab-master
...
qa/tests: filtered in only "trusty"
2019-06-06 16:24:19 -07:00
Patrick Donnelly
2b7d75a219
Merge PR #27731 into master
...
* refs/pull/27731/head:
qa: use mimic-O upgrade process
Reviewed-by: Sage Weil <sage@redhat.com>
2019-06-06 14:48:44 -07:00
Yuri Weinstein
7939b1a10f
qa/tests: filtered in only "trusty"
...
Fixes: http://tracker.ceph.com/issues/40195
Signed-off-by: Yuri Weinstein <yweinste@redhat.com>
2019-06-06 14:36:57 -07:00
Matt Benjamin
547cb9f87b
rgw_file: permit lookup_handle to lookup root_fh
...
Originally, root_fh was reachable from RGWLibFS::fh_cache, but
this was problematic as it has infinite lifetime and so is not
present in RGWLibFS::fs_lru.
To fix the above, RGWLibFS::root_fh came to live unhooked from the
handle caches which works because nfs-ganesha/the application
always has an instance handle. However, this silently breaks
READDIR event invalidation.
Fixes: https://tracker.ceph.com/issues/40196
Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
2019-06-06 17:03:00 -04:00
Patrick Donnelly
66f18ecd09
qa: use mimic-O upgrade process
...
Fixes: https://tracker.ceph.com/issues/39436
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
2019-06-06 13:06:56 -07:00
Sage Weil
78122147dc
Merge PR #27015 into master
...
* refs/pull/27015/head:
OSD: rollforward may need to mark pglog dirty
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2019-06-06 12:15:50 -05:00
Sage Weil
3d519bd96a
Merge PR #28242 into master
...
* refs/pull/28242/head:
osdc/Objecter: fix OSDMap leak in handle_osd_map
Reviewed-by: Greg Farnum <gfarnum@redhat.com>
2019-06-06 12:15:06 -05:00
Sage Weil
5e569e1cf6
Merge PR #28363 into master
...
* refs/pull/28363/head:
osd/ClassHandler: use std::variant for storing func
osd/ClassHandler: no need to add `struct` before struct type
osd/ClassHandler: use ceph::mutex instead of Mutex
osd/ClassHandler: remove unused function
osd/ClassHandler: s/string/std::string/ in header
Reviewed-by: Samuel Just <sjust@redhat.com>
Reviewed-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
2019-06-06 12:14:49 -05:00
Yuri Weinstein
c6c90663c3
qa/tests: reduced distro to run to be random
...
Signed-off-by: Yuri Weinstein <yweinste@redhat.com>
2019-06-06 10:08:55 -07:00
Varsha Rao
d141adac9a
cephfs-shell: Remove unnecessary empty line
...
This patch fixes flake8 too many blank lines error.
Fixes: https://tracker.ceph.com/issues/40191
Signed-off-by: Varsha Rao <varao@redhat.com>
2019-06-06 21:25:53 +05:30
Varsha Rao
d063e8b1e0
cephfs-shell: Fix flake8 bare 'except' warnings
...
Instead of bare 'except', catch OSError and libcephfs exceptions.
Fixes: https://tracker.ceph.com/issues/40191
Signed-off-by: Varsha Rao <varao@redhat.com>
2019-06-06 21:25:53 +05:30
Varsha Rao
6a0a5ed83d
cephfs-shell: Remove unused variable 'e'
...
Fixes: https://tracker.ceph.com/issues/40191
Signed-off-by: Varsha Rao <varao@redhat.com>
2019-06-06 21:25:53 +05:30
Varsha Rao
db7b9306fb
cephfs-shell: Fix flake8 use != to compare str literals warning
...
Fixes: https://tracker.ceph.com/issues/40191
Signed-off-by: Varsha Rao <varao@redhat.com>
2019-06-06 21:25:53 +05:30
Varsha Rao
e41d467d4f
cephfs-shell: Fixe flake8 line too long error
...
Break the line into multiple lines and add new variable wherever necessary, to
fix the line too long error.
Fixes: https://tracker.ceph.com/issues/40191
Signed-off-by: Varsha Rao <varao@redhat.com>
2019-06-06 21:25:53 +05:30
Jason Dillaman
2964297b9a
Merge pull request #28313 from Songweibin/wip-fix-get-args
...
rbd/action: fix error getting positional argument
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
2019-06-06 11:19:35 -04:00
Jason Dillaman
df691487d5
Merge pull request #28253 from Songweibin/wip-39973-rbd
...
osd/OSDCap: rbd profile permits use of rbd_info
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
2019-06-06 11:18:43 -04:00
Jason Dillaman
6cd6f5e607
Merge pull request #27902 from mikechristie/rbd-nbd-netlink-support
...
rbd-nbd: add netlink map/unmap support
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
2019-06-06 10:36:48 -04:00
Matt Benjamin
7a38429a08
Merge pull request #28370 from linuxbox2/wip-rgw-tntbucket
...
rgw_file: include tenant when hashing bucket names
2019-06-06 08:58:29 -04:00
Kefu Chai
4d363edc59
d/control,install-deps: use d/control for installing seastar deps
...
prepare for building ceph-crimson-osd deb package
Signed-off-by: Kefu Chai <kchai@redhat.com>
2019-06-06 18:06:43 +08:00