Commit Graph

99317 Commits

Author SHA1 Message Date
Sage Weil
e1600b1452 auth/cephx/CephxKeyServer: make clear_secrets() clear rotating secrets too
Clear the rotating secrets.  And also reset the versions.

Signed-off-by: Sage Weil <sage@redhat.com>
2019-07-02 18:04:14 -05:00
Kefu Chai
f4733364ae
Merge pull request #28752 from xiexingguo/wip-reset-hb-session
osd/OSD: auto mark heartbeat sessions as stale and tear them down

Reviewed-by: yanjun <yan.jun8@zte.com.cn>
Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
2019-07-02 17:54:42 +08:00
Kefu Chai
009bd79be2
Merge pull request #28731 from tchaikov/wip-40533
qa/tasks/ceph_manager.py: ignore errors in test_pool_min_size

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
Reviewed-by: Neha Ojha <nojha@redhat.com>
2019-07-02 17:45:06 +08:00
Kefu Chai
b0e948c97b
Merge pull request #28744 from tchaikov/wip-monitor-cleanup
mon/Monitor: no need to create a local variable for capturing it

Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
2019-07-02 17:38:35 +08:00
Kefu Chai
890c343da5
Merge pull request #28581 from Aran85/fix-mtime
osd: copyfrom omitted to set mtime

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
2019-07-02 17:37:27 +08:00
Volker Theile
90f643bcf9
mgr/dashboard: Separate file for icons for refering and reusing (#27376)
mgr/dashboard: Separate file for icons for refering and reusing

Reviewed-by: Tiago Melo <tmelo@suse.com>
Reviewed-by: Volker Theile <vtheile@suse.com>
Reviewed-by: Alfonso Martínez <almartin@redhat.com>
2019-07-02 10:50:09 +02:00
Kefu Chai
402bb5b175
Merge pull request #28827 from Rjerk/fix-mgr-ansible-doc
doc/mgr/ansible.rst: fix typo

Reviewed-by: Juan Miguel Olmo Martínez <jolmomar@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
2019-07-02 16:31:38 +08:00
Kefu Chai
b53985da05
Merge pull request #28798 from tchaikov/wip-crimson-net
crimson/net: print tx/rx messages using logger().info()

Reviewed-by: Samuel Just <sjust@redhat.com>
Reviewed-by: Yingxin Cheng <yingxincheng@gmail.com>
2019-07-02 15:41:09 +08:00
Lan Liu
8898bf5370 doc/mgr/ansible.rst: fix typo
Signed-off-by: Lan Liu <liulan@umcloud.com>
2019-07-02 13:59:19 +08:00
Kefu Chai
d8eb2bb73e
Merge pull request #28828 from iotcg/crimson
crimson/common: remove unused file .#log.cc

Reviewed-by: Kefu Chai <kchai@redhat.com>
2019-07-02 12:49:13 +08:00
Kefu Chai
88ce727253
Merge pull request #28818 from tchaikov/wip-ceph-conf-cli-test
test/cli/ceph-conf: fix test

Reviewed-by: Brad Hubbard <bhubbard@redhat.com>
Reviewed-by: Neha Ojha <nojha@redhat.com>
2019-07-02 12:46:41 +08:00
Xie Xingguo
873db7c2ef
Merge pull request #28805 from Rjerk/fix-doc
doc/rados/configuration: fix typos in osd-config-ref.rst

Reviewed-by: Kefu Chai <kchai@redhat.com>
2019-07-02 11:55:55 +08:00
Changcheng Liu
969d1c20a3 crimson/common: remove unused file .#log.cc
Signed-off-by: Changcheng Liu <changcheng.liu@aliyun.com>
2019-07-02 11:34:50 +08:00
Kefu Chai
f047fb99ff crimson/net: print tx/rx messages using logger().debug()
so we can find them with less efforts.

Signed-off-by: Kefu Chai <kchai@redhat.com>
2019-07-02 11:10:33 +08:00
Kefu Chai
dc900fd653 crimson/net: print trivial logging using "trace"
Signed-off-by: Kefu Chai <kchai@redhat.com>
2019-07-02 11:05:54 +08:00
Kefu Chai
4935a49d53 crimson/net: note down server's peer_id as client
the peer_id is not used at this moment. this change is made just for
the sake of completeness.

Signed-off-by: Kefu Chai <kchai@redhat.com>
2019-07-02 11:05:54 +08:00
Kefu Chai
da0069a67f crimson/net: use Connection::peer_is_mon()
always prefer using interface over its implementation

Signed-off-by: Kefu Chai <kchai@redhat.com>
2019-07-02 11:05:54 +08:00
Kefu Chai
23dca20747 crimson: store ticket.peer_global_id in connection
peer_global_id is used by `ProtocolV2::_handle_auth_request()` when
encoding an `AuthDoneFrame`.

Signed-off-by: Kefu Chai <kchai@redhat.com>
2019-07-02 11:05:54 +08:00
Lan Liu
2d71227e43 doc/rados/configuration: fix typos in osd-config-ref.rst
Signed-off-by: Lan Liu <liulan@umcloud.com>
2019-07-02 10:22:03 +08:00
Kefu Chai
4bea063567
Merge pull request #28795 from tchaikov/wip-cmake-rbd
CMakeLists.txt: fix typo in error message

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
Reviewed-by: Milind Changire <mchangir@redhat.com>
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
2019-07-02 10:04:07 +08:00
Kefu Chai
60403c0a21
Merge pull request #28750 from neha-ojha/wip-40488
doc/rados/operations/erasure-code.rst: allow recovery below min_size

Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
Reviewed-by: Kefu Chai <kchai@redhat.com>
2019-07-02 10:00:03 +08:00
Patrick Donnelly
0e25e4bb4e
Merge PR #27073 into master
* refs/pull/27073/head:
	qa/tasks: Check MDS failover during mon_thrash
	qa/tasks: Compare two FSStatuses
	qa/suites/fs: renamed default.yaml to mds.yaml
	qa/suites/fs: mon_thrash test for fs
	qa/tasks: Fix typo in the comment

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
2019-07-01 15:31:55 -07:00
Patrick Donnelly
0ee0798e8a
Merge PR #28459 into master
* refs/pull/28459/head:
	mds: wake up lock waiters after forcibly changing lock state

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
2019-07-01 15:28:30 -07:00
Patrick Donnelly
fcd0c82e30
Merge PR #28642 into master
* refs/pull/28642/head:
	mds: check last laggy before marking unresponsive client stale
	mds: remove the code that skip evicting the only client

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
2019-07-01 14:56:54 -07:00
Matt Benjamin
f470839091
Merge pull request #28632 from linuxbox2/wip-rgwfile-advexp
rgw_file: advance_mtime() should consider namespace expiration
2019-07-01 14:15:28 -04:00
Casey Bodley
24ccb2f857
Merge pull request #27794 from cbodley/wip-39487
rgw: data/bilogs are trimmed when no peers are reading them

Reviewed-by: J. Eric Ivancich <ivancich@redhat.com>
2019-07-01 09:59:02 -04:00
Mykola Golub
a94cef818d
Merge pull request #28743 from dillaman/wip-40417
librbd: prevent concurrent AIO callbacks to external clients

Reviewed-by: Mykola Golub <mgolub@suse.com>
2019-07-01 16:47:57 +03:00
Kefu Chai
bbf1b90932 test/cli/ceph-conf: fix test
turns out the libstdc++ on fc30 does not include error_code.message() in
filesystem_error.what(). let's make it optional

Signed-off-by: Kefu Chai <kchai@redhat.com>
2019-07-01 20:39:04 +08:00
Kefu Chai
beb0c343b3
Merge pull request #28800 from tchaikov/wip-crimson-mkfs
crimson: use given osd_fsid when mkfs

Reviewed-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
2019-07-01 10:04:12 +08:00
Kefu Chai
3e96ad19e9
Merge pull request #28774 from falcon78921/wip-doc-40575
doc: fixed broken link in Swift Settings section

Reviewed-by: Kefu Chai <kchai@redhat.com>
2019-07-01 09:41:52 +08:00
James McClune
2a59842991 doc: fixed broken link in Swift Settings section
Fixes: https://tracker.ceph.com/issues/40575

Signed-off-by: James McClune <jmcclune@mcclunetechnologies.net>
2019-06-30 14:34:23 -04:00
Kefu Chai
42a21a435e
Merge pull request #28786 from tchaikov/wip-const-head
osd/PrimaryLogPG: more constness

Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
2019-06-30 23:44:51 +08:00
Kefu Chai
7b17f983f3 crimson: use given osd_fsid when mkfs
MemStore does not have this feature, but CyanStore needs it. because
`qa/tasks/ceph.py` uses following steps when creating/starting an OSD

1. ceph-osd --mkfs --mkkey -i <osd_id> --monmap <monmap>
2. read the osd_fsid of osd.<osd_id>
3. ceph osd new <osd_fsid> <osd_id>

when we mkfs for the OSD, the osd_fsid is still unknown. so we cannot
use the configured one, as it is always empty. in that case, we need to
use a random uuid, and persist it to both ${osd_data}/fsid and
superblock.osd_fsid

Signed-off-by: Kefu Chai <kchai@redhat.com>
2019-06-30 23:42:55 +08:00
Kefu Chai
5f0f83589f
Merge pull request #28719 from majianpeng/remove-unused-code-XioMessenger
msg/Message: Remove used code about XioMessenger.

Reviewed-by: Kefu Chai <kchai@redhat.com>
2019-06-30 15:55:08 +08:00
Kefu Chai
db09ea8531
Merge pull request #28794 from tchaikov/wip-crimson-option-help-seastar
crimson/osd: add "--help-seastar" command line option

Reviewed-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
2019-06-30 15:52:32 +08:00
Kefu Chai
d0d8932506 CMakeLists.txt: s/Remote block storage/RADOS Block Device/
RBD is short for RADOS Block Device, not Remote Block Storage.

Signed-off-by: Kefu Chai <kchai@redhat.com>
2019-06-29 23:47:48 +08:00
Kefu Chai
1400867d92 CMakeLists.txt: fix typo in error message
krbd depends on rbd, so we cannot build krbd without rbd.

Signed-off-by: Kefu Chai <kchai@redhat.com>
2019-06-29 23:35:48 +08:00
Kefu Chai
9e3e5d435e doc/dev/crimson.rst: update with stuff related to seastar options
Signed-off-by: Kefu Chai <kchai@redhat.com>
2019-06-29 23:16:42 +08:00
Kefu Chai
b8b205a3ae
Merge pull request #28792 from tchaikov/wip-crimson-logging
common/config_values: set seastar logging level per that of ceph

Reviewed-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
2019-06-29 23:02:39 +08:00
Kefu Chai
c8dac70afd
Merge pull request #28790 from tchaikov/wip-crimson-unknown-objectstore
crimson/osd: abort on unsupported objectstore type

Reviewed-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
2019-06-29 22:54:15 +08:00
Kefu Chai
67bc3e0a03 crimson/osd: add "--help-seastar" command line option
so we can

* have access to the available command line options offered by Seastar.
* tell if the executable we are playing around is ceph-osd or crimson-osd.

Signed-off-by: Kefu Chai <kchai@redhat.com>
2019-06-29 22:48:05 +08:00
Kefu Chai
a66c27ad26 doc/dev/crimson.rst: update logging related doc
as crimson's logging levels are now connected those of ceph, there is no
need to note down the difference between them anymore.

Signed-off-by: Kefu Chai <kchai@redhat.com>
2019-06-29 21:41:00 +08:00
Kefu Chai
253d05306c common/config_values: set seastar logging level as well
when the logging level of a subsys changes, update seastar accordingly

before this change, seastar logging levels of different logger are not
connected to ceph's logging levels of different subsystem.

after this change, they are connected. whenever a subsys's logging level
changes, the corresponding seastar logger is updated as well.

Signed-off-by: Kefu Chai <kchai@redhat.com>
2019-06-29 21:38:22 +08:00
Kefu Chai
513e49b396 common/dout.h: extract log level mapping out
so we can reuse it.

Signed-off-by: Kefu Chai <kchai@redhat.com>
2019-06-29 21:38:22 +08:00
Kefu Chai
dc4d8082d0 crimson/osd: revert 9813f7d6
since we have a proper PeeringState implementation, there is no need to
fake an active+clean PG anymore.

Signed-off-by: Kefu Chai <kchai@redhat.com>
2019-06-29 21:38:22 +08:00
Kefu Chai
d5dbee1ff6 crimson/osd: abort on unsupported objectstore type
Signed-off-by: Kefu Chai <kchai@redhat.com>
2019-06-29 20:03:20 +08:00
Kefu Chai
cf64928412 crimson/osd: add editor variables/options
Signed-off-by: Kefu Chai <kchai@redhat.com>
2019-06-29 20:03:20 +08:00
Kefu Chai
02388911ae crimson/common: implement "__ceph_abortf()"
the macro of `ceph_abort_msgf()` is implemented using it.

Signed-off-by: Kefu Chai <kchai@redhat.com>
2019-06-29 20:03:20 +08:00
Kefu Chai
8b4c62f520 crimson/osd: add a space before function name
for better readability

Signed-off-by: Kefu Chai <kchai@redhat.com>
2019-06-29 20:03:20 +08:00
Kefu Chai
713a9a09e4 crimson/osd: use get_osdmap_epoch()
always prefer using the interface.

Signed-off-by: Kefu Chai <kchai@redhat.com>
2019-06-29 20:03:20 +08:00