Commit Graph

90435 Commits

Author SHA1 Message Date
Sage Weil
4591f134c8 Merge PR #24025 into master
* refs/pull/24025/head:
	mon/OSDMonitor: reject pg_num -> 0

Reviewed-by: huangjun <huangjun@xsky.com>
Reviewed-by: Sage Weil <sage@redhat.com>
2018-09-12 11:51:58 -05:00
Sage Weil
1266d5ceb8 Merge PR #21611 into master
* refs/pull/21611/head:
	osd/ECBackend: don't get result code of subchunk-read overwritten

Reviewed-by: David Zafman <dzafman@redhat.com>
2018-09-12 11:47:13 -05:00
Sage Weil
bd084f8ac1 Merge PR #23273 into master
* refs/pull/23273/head:
	os/bluestore: handle spurious read errors

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Igor Fedotov <ifedotov@suse.com>
2018-09-12 11:46:56 -05:00
Sage Weil
a497276c33 Merge PR #23694 into master
* refs/pull/23694/head:
	mon: remove pre-luminous health output compatibility

Reviewed-by: Sage Weil <sage@redhat.com>
2018-09-12 11:46:42 -05:00
Adam C. Emerson
05dd8866a8 test: Remove unused variable
Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
2018-09-12 12:41:40 -04:00
Adam C. Emerson
169e8ee22b mds: Remove pessimizing move
Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
2018-09-12 12:41:40 -04:00
Adam C. Emerson
4f6efd5917 test: Silence unused capture warnings
Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
2018-09-12 12:41:40 -04:00
Adam C. Emerson
ee32a4c905 test: Fix sprintf overflow warning
Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
2018-09-12 12:41:40 -04:00
Adam C. Emerson
d1aa821f2f test: Quell unused variable warnings
Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
2018-09-12 12:41:40 -04:00
Adam C. Emerson
55b011a3c7 test: Fix sign comparison warnings
Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
2018-09-12 12:41:40 -04:00
Sage Weil
9e7f2707b0 Merge PR #24035 into master
* refs/pull/24035/head:
	osd/PG: avoid choose_acting picking want with > pool size items

Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
Reviewed-by: Neha Ojha <nojha@redhat.com>
2018-09-12 11:40:20 -05:00
Patrick Donnelly
29f159fdec
Merge PR #24052 into master
* refs/pull/24052/head:
	doc: update mds stat output

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Reviewed-by: Zheng Yan <zyan@redhat.com>
2018-09-12 09:14:28 -07:00
Kefu Chai
cb29186e94
Merge pull request #24032 from liewegas/wip-pg-ls
mon/PGMap: include unknown PGs in 'pg ls'

Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
Reviewed-by: David Zafman <dzafman@redhat.com>
2018-09-12 23:43:50 +08:00
Kefu Chai
a2d3049bbb
Merge pull request #24040 from rzarzynski/wip-common-bl-drop-raw_mmap_pages
common: drop the unused buffer::raw_mmap_pages.

Reviewed-by: Matt Benjamin <mbenjami@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
2018-09-12 23:42:52 +08:00
songweibin
1c03ee1c1d rbd: sort to display group image by name
Signed-off-by: songweibin <song.weibin@zte.com.cn>
2018-09-12 23:42:16 +08:00
songweibin
02f106fb91 pybind/rbd: new group snap rollback Python API
Signed-off-by: songweibin <song.weibin@zte.com.cn>
2018-09-12 23:42:15 +08:00
songweibin
dec2ea83cf tools/rbd: support group snap rollback CLI
Signed-off-by: songweibin <song.weibin@zte.com.cn>
2018-09-12 23:42:15 +08:00
songweibin
908fcd39b1 librbd: minor cleanup in api/Group.cc
Signed-off-by: songweibin <song.weibin@zte.com.cn>
2018-09-12 23:42:15 +08:00
songweibin
680e86e6fb librbd: add group snap rollback method
Fixes: http://tracker.ceph.com/issues/23550

Signed-off-by: songweibin <song.weibin@zte.com.cn>
2018-09-12 23:42:14 +08:00
Adam C. Emerson
9e90c01310 cephfs: Do not catch polymorphic exception by value
Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
2018-09-12 11:37:28 -04:00
Adam C. Emerson
c29e7898a9 crush: Quell unused variable warnings
Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
2018-09-12 11:37:28 -04:00
Alfredo Deza
04a40eda0a ceph-volume lvm.batch.validators account for osds per device, include collocation
Signed-off-by: Alfredo Deza <adeza@redhat.com>
2018-09-12 11:35:41 -04:00
Alfredo Deza
028ef60df7 ceph-volume lvm.batch.bluestore allow osds-per-device with MixedType
Signed-off-by: Alfredo Deza <adeza@redhat.com>
2018-09-12 11:35:41 -04:00
Kefu Chai
cdfcb0f107
Merge pull request #24042 from liewegas/wip-merge-derr
osd: remove stray derr

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: Casey Bodley <cbodley@redhat.com>
2018-09-12 23:34:48 +08:00
Kefu Chai
748b7edd47
Merge pull request #23996 from mogeb/fmt-cmake
cmake: fix version matching for Findfmt

Reviewed-by: Kefu Chai <kchai@redhat.com>
2018-09-12 23:32:53 +08:00
Kefu Chai
1578875194
Merge pull request #24013 from dzafman/wip-35845
test: Use a grep pattern that works across releases

Reviewed-by: Kefu Chai <kchai@redhat.com>
2018-09-12 23:00:39 +08:00
Mykola Golub
e1508c0de8
Merge pull request #24045 from dillaman/wip-35702
librbd: fixed assert when flattening clone with zero overlap

Reviewed-by: Mykola Golub <mgolub@suse.com>
2018-09-12 17:48:15 +03:00
Lenz Grimmer
e03d228ab0
Merge pull request #24030 from LenzGr/mgr-dashboard-documentation
doc: Updated Mgr Dashboard documentation

Reviewed-by: Sebastian Wagner <swagner@suse.com>
Reviewed-by: Volker Theile <vtheile@suse.com>
2018-09-12 16:01:29 +02:00
Sage Weil
05a7443f22 osd/PG: write pg epoch when resurrecting pg after delete vs merge race
Fixes: http://tracker.ceph.com/issues/35923
Signed-off-by: Sage Weil <sage@redhat.com>
2018-09-12 09:01:26 -05:00
Patrick Donnelly
6537a8fe7c
mds: use common send message mechanisms
Fixes: http://tracker.ceph.com/issues/26961

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
2018-09-12 06:40:29 -07:00
Yan, Zheng
60f73cde4e client: update ctime when modifying file content
Fixes: http://tracker.ceph.com/issues/35945
Signed-off-by: "Yan, Zheng" <zyan@redhat.com>
2018-09-12 21:27:33 +08:00
myoungwon oh
f3d21c8177 src/common/buffer.cc: remove unnecessary copy in sha1()
Signed-off-by: Myoungwon Oh <omwmw@sk.com>
2018-09-12 21:01:05 +09:00
John Spray
f9d57a0b55
Merge pull request #24055 from sebastian-philipp/kubejacker-opensuse-mimic
script/kubejacker: Add openSUSE based images

Reviewed-by: John Spray <john.spray@redhat.com>
2018-09-12 11:25:44 +01:00
Sebastian Wagner
143b8a7370 script/kubejacker: Add openSUSE based images
* Added executable bit of `kubejacker.sh`.
* Reduced the number of `RUN` commands
* Added zypper commands for SUSE.

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
2018-09-12 10:32:53 +02:00
Patrick Nawracay
079cfeae4d mgr/dashboard: Cleanup
Signed-off-by: Patrick Nawracay <pnawracay@suse.com>
2018-09-12 10:16:54 +02:00
Patrick Nawracay
49ab1315a3 mgr/dashboard: Fix flaky QA tests
Signed-off-by: Patrick Nawracay <pnawracay@suse.com>
2018-09-12 10:16:54 +02:00
Nathan Cutler
af89b66715 cmake: no libradosstriper headers if WITH_LIBRADOSSTRIPER=OFF
This commit conditionalizes inclusion of the libradosstriper header files and
moves the "option(WITH_LIBRADOSSTRIPER..)" directive to before
"add_subdirectory(include)", as we check for this variable in src/include.

Fixes: http://tracker.ceph.com/issues/35922
Signed-off-by: Kefu Chai <kchai@redhat.com>
Signed-off-by: Nathan Cutler <ncutler@suse.com>
2018-09-12 09:51:36 +02:00
Zhi Zhang
b3b57dec5a mds: translate CEPH_MDS_STATE_NULL state name as null
Signed-off-by: Zhi Zhang <zhangz.david@outlook.com>
2018-09-12 15:36:57 +08:00
Jos Collin
1485e86a2c
doc: update mds stat output
Signed-off-by: Jos Collin <jcollin@redhat.com>
2018-09-12 10:27:22 +05:30
Patrick Donnelly
66165eac67
mds: remove dead code
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
2018-09-11 20:17:27 -07:00
Jason Dillaman
8e90354433 librbd: fixed assert when flattening clone with zero overlap
Fixes: http://tracker.ceph.com/issues/35702
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2018-09-11 21:52:05 -04:00
Jason Dillaman
5463e1a1e1 rbd-mirror: extract optional peer mon_host/key values from MON
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2018-09-11 21:07:58 -04:00
Jason Dillaman
1cbcaaab24 rbd-mirror: cluster watcher doesn't need to resolve pool names
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2018-09-11 21:07:24 -04:00
Jason Dillaman
672bb2c6b8 rbd-mirror: renamed 'peer_t' type to 'PeerSpec'
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2018-09-11 21:07:24 -04:00
Jason Dillaman
c72b56be38 rbd-mirror: renamed 'types' files to 'Types'
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2018-09-11 21:07:24 -04:00
xie xingguo
6d8d20a55b mon/OSDMonitor: reject pg_num -> 0
Otherwise it will finally crash the mgr process:
```
-2> 2018-09-11 16:23:31.272 7ff521d59700 -1 /clove/xxG/ceph/src/osd/osd_types.cc: In function 'pg_t pg_t::get_parent() const'
 thread 7ff521d59700 time 2018-09-11 16:23:31.272096
/clove/xxG/ceph/src/osd/osd_types.cc: 587: FAILED ceph_assert(bits)
```

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
2018-09-12 08:58:10 +08:00
Jason Dillaman
d43ff1caf3
Merge pull request #23941 from trociny/wip-23445
librbd: flatten operation should use object map

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
2018-09-11 20:49:28 -04:00
Jason Dillaman
722724e829
Merge pull request #22675 from nuyhah/fix_block_name_prefix
librbd: block_name_prefix is not created randomly

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
2018-09-11 20:48:23 -04:00
Jason Dillaman
72b9179dea
Merge pull request #23790 from iridescent-rsy/myfix
librbd: remove template declaration of a non-template function

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
2018-09-11 20:48:08 -04:00
Jason Dillaman
c74432d031
Merge pull request #23853 from zy751713126/add_protect_snapshot_list
rbd: add protected in snap list

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
2018-09-11 20:47:52 -04:00