Commit Graph

103644 Commits

Author SHA1 Message Date
wonderpow
c0924402df cls/rbd: add snapshot_add raise -ESTALE test case
Signed-off-by: wonderpow <wangbozhao@cmss.chinamobile.com>
2019-10-28 15:06:10 +08:00
Kefu Chai
70d27ce352
Merge pull request #31156 from cyx1231st/wip-seastar-msgr-testpeer
test/crimson: implement a remote async TestPeer for crimson msgr tests

Reviewed-by: Kefu Chai <kchai@redhat.com>
2019-10-28 12:27:11 +08:00
Yingxin Cheng
9888a4f8f4 test/crimson: add nonstop option in async TestPeer
If set, TestPeer won't shutdown if all tests are done, and will wait for
another round of tests.

Signed-off-by: Yingxin Cheng <yingxin.cheng@intel.com>
2019-10-28 10:44:42 +08:00
Yingxin Cheng
43f05b7c1c test/crimson: add delay to markdown_peer()
Let test sleep awhile for peer markdown propagated.

Signed-off-by: Yingxin Cheng <yingxin.cheng@intel.com>
2019-10-28 10:43:08 +08:00
Yingxin Cheng
41bfffc8b8 test/crimson: async msgr TestPeer for v2 failover tests
Signed-off-by: Yingxin Cheng <yingxin.cheng@intel.com>
2019-10-28 10:42:18 +08:00
Yingxin Cheng
24bfdc08f7 test/crimson: allow v2 failover tests to connect to remote TestPeer
Signed-off-by: Yingxin Cheng <yingxin.cheng@intel.com>
2019-10-28 10:30:18 +08:00
Yingxin Cheng
f7c37dfa6b test/crimson: extract msgr test commands to header
Signed-off-by: Yingxin Cheng <yingxin.cheng@intel.com>
2019-10-28 10:30:18 +08:00
J. Eric Ivancich
10253251e2
Merge pull request #30610 from ivancich/wip-no-schedule-reshard-during-reshard
rgw: prevent bucket reshard scheduling if bucket is resharding

Reviewed-by: Matt Benjamin <mbenjamin@redhat.com>
Reviewed-by: Casey Bodley <cbodley@redhat.com>
Reviewed-by: Abhishek Lekshmanan <abhishek@suse.com>
2019-10-27 14:47:39 -04:00
J. Eric Ivancich
1d61b25dbf
Merge pull request #30795 from ivancich/wip-dynamic-reshard-adjustments
rgw: adjust allowable bucket index shard counts for dynamic resharding

Reviewed-by: Casey Bodley <cbodley@redhat.com>
2019-10-27 14:46:01 -04:00
J. Eric Ivancich
2a1720d5c2
Merge pull request #30845 from croit/rgw-bucket-stats-add-num-shards
rgw: add num_shards to radosgw-admin bucket stats

Reviewed-by: Casey Bodley <cbodley@redhat.com>
Reviewed-by: Abhishek Lekshmanan <abhishek@suse.com>
Reviewed-by: J. Eric Ivancich <ivancich@redhat.com>
2019-10-27 14:44:47 -04:00
J. Eric Ivancich
a2745ce1a4
Merge pull request #30956 from joke-lee/rgw-storage-class-post-obj
rgw: set correct storage class for post object upload

Reviewed-by: Abhishek Lekshmanan <abhishek@suse.com>
2019-10-27 14:42:27 -04:00
J. Eric Ivancich
2d5bac020e
Merge pull request #30970 from theanalyst/rgw/list-common-prefix
rgw: url encode common prefixes for List Objects response 

Reviewed-by: Casey Bodley <cbodley@redhat.com>
2019-10-27 14:39:46 -04:00
Kefu Chai
20ea3df0a0
Merge pull request #31179 from liewegas/cleanup-exec-bit
os/bluestore,comon,erasure-code: chmod -x source files

Reviewed-by: Kefu Chai <kchai@redhat.com>
2019-10-27 23:58:59 +08:00
Kefu Chai
5047b3222c
Merge pull request #31171 from liewegas/bug-42496
qa/tasks/cbt: run stop-all.sh while shutting down

Reviewed-by: Kefu Chai <kchai@redhat.com>
2019-10-27 23:57:57 +08:00
Sage Weil
f03395e5a6 Revert "Merge pull request #30964 from markhpc/wip-bs-cache-trim-pinned"
This reverts commit 304c37f521, reversing
changes made to 7b4f9a083f.

This causes some bluestore test failures due to an ENOENT right after a
new object is created.  The simplest reproducer is the
ObjectStore/StoreTest.FiemapEmpty/2 test.

Fixes: https://tracker.ceph.com/issues/42495
Signed-off-by: Sage Weil <sage@redhat.com>
2019-10-27 09:59:10 -05:00
Sage Weil
032c880240 os/bluestore,comon,erasure-code: chmod -x source files
Fixes

*** WARNING: ./usr/src/debug/ceph-15.0.0-6512.g62bd825.el8.x86_64/src/common/obj_bencher.cc is executable but has empty or no shebang, removing executable bit
*** WARNING: ./usr/src/debug/ceph-15.0.0-6512.g62bd825.el8.x86_64/src/erasure-code/shec/determinant.c is executable but has empty or no shebang, removing executable bit
*** WARNING: ./usr/src/debug/ceph-15.0.0-6512.g62bd825.el8.x86_64/src/os/bluestore/AvlAllocator.cc is executable but has empty or no shebang, removing executable bit
*** WARNING: ./usr/src/debug/ceph-15.0.0-6512.g62bd825.el8.x86_64/src/os/bluestore/AvlAllocator.h is executable but has empty or no shebang, removing executable bit

in rpm build.

Signed-off-by: Sage Weil <sage@redhat.com>
2019-10-27 09:26:39 -05:00
Sage Weil
6653f73bbd Merge PR #31170 into master
* refs/pull/31170/head:
	src/telemetry: remove, now lives in ceph-telemetry.git

Reviewed-by: Sage Weil <sage@redhat.com>
2019-10-27 09:21:56 -05:00
Sage Weil
44d45ff693 Merge PR #31131 into master
* refs/pull/31131/head:
	crush: remove invalid upmap items

Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
2019-10-27 09:20:51 -05:00
Sage Weil
b4974b42ff Merge PR #31154 into master
* refs/pull/31154/head:
	auth/cephx: always initialize local variables

Reviewed-by: Neha Ojha <nojha@redhat.com>
2019-10-27 09:19:56 -05:00
Sage Weil
e771ece974 Merge PR #31167 into master
* refs/pull/31167/head:
	os/bluestore: do not mark per_pool_omap updated unless we fixed it

Reviewed-by: Igor Fedotov <ifedotov@suse.com>
2019-10-27 09:19:40 -05:00
Kefu Chai
482561bd55 mgr/dashboard: accept socket error 0
see
9d73226ab2

Fixes: https://tracker.ceph.com/issues/38378
Signed-off-by: Kefu Chai <kchai@redhat.com>
2019-10-27 14:34:48 +08:00
Kefu Chai
8a743a8a4e mgr/dashboard: accept exceptions from builtin SSL
see also https://github.com/cherrypy/cheroot/pull/4

so we don't panic when client is trying to talk with us with an
unsupported protocol, the exception should be accepted, and the
client can fallback to supported protocol.

Fixes: https://tracker.ceph.com/issues/38378
Signed-off-by: Kefu Chai <kchai@redhat.com>
2019-10-27 14:34:48 +08:00
Kefu Chai
01cb398019 mgr/dashboard: extract monkey patches for cherrypy out
so they are less distracting to the dashboard developers. and probably
less scaring.

Signed-off-by: Kefu Chai <kchai@redhat.com>
2019-10-27 14:34:48 +08:00
Kefu Chai
8adbb86fb8 ceph.spec.in: add missing python-yaml dependency for mgr-k8sevents
otherwise we might have:

```
ceph/src/pybind/mgr/k8sevents/__init__.py", line 1, in <module>
    from .module import Module
  File "/home/kchai/ceph/src/pybind/mgr/k8sevents/module.py", line 28, in <module>
    import yaml
ImportError: No module named yaml
```

Signed-off-by: Kefu Chai <kchai@redhat.com>
2019-10-27 12:46:15 +08:00
Kefu Chai
3f56b1f3ef mgr/diskprediction_cloud: refactor timeout() decorator
* timeout() is never passed any parameter when being called, so let's
  remove the parameters list of "seconds" and "error_message"
* use `getattr()` instead of `hasattr()` for retrieving the
  member variable of `self`
* pass `self` to wrapper function explicitly.
* return `func()` right away.
* hardwire the error message of `TimeoutError` to "Timer expired",
  because
  - as neither errno.ETIME nor errno.ETIMEOUT is portable
  - the only caller of `TimeoutError` is `timeout()`, so there is
    no need to have the flexibility to pass a different error message
* use `wraps()` as a decorator, simpler this way.

Signed-off-by: Kefu Chai <kchai@redhat.com>
2019-10-27 10:15:09 +08:00
Kefu Chai
48bf1c9bf3 mon/OSDMonitor: use initializer_list<> for {si,iec}_options
* use initializer_list<> for {si,iec}_options, no need to uset set<>
* remove the comments, the variable names are self-documented.

Signed-off-by: Kefu Chai <kchai@redhat.com>
2019-10-27 09:43:43 +08:00
Kefu Chai
3e2f997061
Merge pull request #31010 from pdvian/wip-fix-target-max
mon/OSDMonitor.cc: Allow pool set target_max_(objects/bytes) with SI/IEC units

Reviewed-by: Kefu Chai <kchai@redhat.com>
2019-10-27 09:38:23 +08:00
Kefu Chai
674bd8a9e6
Merge pull request #30434 from smithfarm/wip-41820
qa: enable dashboard tests to be run with "--suite rados/dashboard"

Reviewed-by: Laura Paduano <lpaduano@suse.com>
Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
2019-10-27 09:18:16 +08:00
Kefu Chai
c121234b79
Merge pull request #31005 from tchaikov/wip/qa/tasks/ceph/cleanup
qa/tasks/ceph.py: remove unused variables

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Reviewed-by: Neha Ojha <nojha@redhat.com>
2019-10-27 09:16:37 +08:00
Sage Weil
56e99ba5f0 qa/tasks/cbt: run stop-all.sh when finishing up
stop-all.sh will work if the right deps are there (currently we lack 'nc')

also killall -9 java to be sure.

Fixes: https://tracker.ceph.com/issues/42496
Signed-off-by: Sage Weil <sage@redhat.com>
2019-10-26 13:25:39 -05:00
Sage Weil
fa414c7667 Merge PR #31086 into master
* refs/pull/31086/head:
	doc/bootstrap.rst: fix github's url

Reviewed-by: Sage Weil <sage@redhat.com>
2019-10-26 11:42:31 -05:00
Sage Weil
7fc78b6342 Merge PR #31169 into master
* refs/pull/31169/head:
	mgr/ssh: implement (synchronous) describe_service
	ceph-daemon: ls: replace 'active' bool with 'state' enum
	ceph-daemon: include container_id and version in 'ls' output
	ceph-daemon: tolerate systemctl is-* exit codes
	mgr/ssh: modernize timeout config option

Reviewed-by: Sebastian Wagner <swagner@suse.com>
2019-10-26 10:55:19 -05:00
Alexandre Bruyelles
333895a2ca
doc/bootstrap.rst: fix github's url
Signed-off-by: Alexandre Bruyelles <jack@jack.fr.eu.org>
2019-10-26 17:20:27 +02:00
Kefu Chai
23e39ed9e5
Merge pull request #31126 from wjwithagen/wjw-fix-std-bitset
rgw: Select the std::bitset to resolv ambiguity

Reviewed-by: Adam C. Emerson <aemerson@redhat.com>
Reviewed-by: Casey Bodley <cbodley@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
2019-10-26 09:30:54 +08:00
Dan Mick
baec02e6b2 src/telemetry: remove, now lives in ceph-telemetry.git
Signed-off-by: Dan Mick <dan.mick@redhat.com>
2019-10-25 16:44:05 -07:00
Sage Weil
8bbb13f0eb mgr/ssh: implement (synchronous) describe_service
Signed-off-by: Sage Weil <sage@redhat.com>
2019-10-25 18:43:44 -05:00
Sage Weil
eca63205cc ceph-daemon: ls: replace 'active' bool with 'state' enum
('running', 'inactive', 'error', 'unknown')

Signed-off-by: Sage Weil <sage@redhat.com>
2019-10-25 18:43:44 -05:00
Sage Weil
2039d3aa4a ceph-daemon: include container_id and version in 'ls' output
Signed-off-by: Sage Weil <sage@redhat.com>
2019-10-25 17:58:27 -05:00
Sage Weil
24f55ba832 ceph-daemon: tolerate systemctl is-* exit codes
Signed-off-by: Sage Weil <sage@redhat.com>
2019-10-25 17:58:19 -05:00
Sage Weil
776c0b09fe mgr/ssh: modernize timeout config option
(and rename it)

Signed-off-by: Sage Weil <sage@redhat.com>
2019-10-25 16:37:13 -05:00
Ilya Dryomov
b7a0e2adcb qa: add script to stress udev_enumerate_scan_devices()
Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
2019-10-25 22:05:38 +02:00
Ilya Dryomov
bd37a72e0e krbd: retry on an empty list from udev_enumerate_scan_devices()
systemd 219 doesn't have the issue that is worked around in the
previous commit, but has a different one: udev_enumerate_scan_devices()
always succeeds, but sometimes returns an empty list when the device is
actually there.  This happens rarely and at random so I haven't been
able to get to the bottom of it yet, but it looks like another similar
race condition in libudev.

Since an empty list is expected if the device isn't there, retry just
twice with a small sleep in-between.  This appears to be enough: I got
7 occurrences per 600000 "rbd unmap" invocations, all of which needed
a single retry:

  rbd: udev enumerate missed a device, tries = 1

Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
2019-10-25 22:05:32 +02:00
Sage Weil
0bc2ed6191 Merge PR #31141 into master
* refs/pull/31141/head:
	ceph-daemon: fix warning message
	ceph-daemon: fix enable with conflicting ceph.target files
	test_ceph_daemon.sh: use same fsid as qa/standalone/test_ceph_daemon.sh
	test_ceph_daemon.sh: use other latest-master image
	ceph-daemon: fix pathify (fix shell --config/--keyring)
	ceph-daemon: /var/run/ceph -> /var/run/ceph/$fsid

Reviewed-by: Sebastian Wagner <swagner@suse.com>
2019-10-25 14:30:33 -05:00
Sage Weil
3ee7d4154b ceph-daemon: fix warning message
Signed-off-by: Sage Weil <sage@redhat.com>
2019-10-25 12:46:52 -05:00
Josh Durgin
8c7eeab703
Merge pull request #31164 from tchaikov/wip/doc/rados/fix-typo
doc/rados/deployment/ceph-deploy-mon: fix typo

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2019-10-25 10:41:42 -07:00
Sage Weil
efd3497d03 ceph-daemon: fix enable with conflicting ceph.target files
+ make description better

Signed-off-by: Sage Weil <sage@redhat.com>
2019-10-25 11:26:32 -05:00
Sage Weil
4408911ec4 os/bluestore: do not mark per_pool_omap updated unless we fixed it
We only fix the per-pool-omap issues if we do a non-shallow fsck.

Fixes: https://tracker.ceph.com/issues/42490
Signed-off-by: Sage Weil <sage@redhat.com>
2019-10-25 11:02:28 -05:00
Mykola Golub
dea3d1b738 rbd-mirror: mirrored clone should be same format
Fixes: https://tracker.ceph.com/issues/42488
Signed-off-by: Mykola Golub <mgolub@suse.com>
2019-10-25 17:50:54 +03:00
Mykola Golub
06bda36b42 librbd: allow to override format in clone request
Signed-off-by: Mykola Golub <mgolub@suse.com>
2019-10-25 17:50:53 +03:00
Kefu Chai
659456d36a doc/rados/deployment/ceph-deploy-mon: fix typo
s/comingling/commingling/

Signed-off-by: Kefu Chai <kchai@redhat.com>
2019-10-25 22:38:44 +08:00