RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-02-06 02:14:01 +00:00
Code Issues Packages Projects Releases Wiki Activity
99,343 Commits 215 Branches 394 Tags 1.6 GiB
fa7655351c
Commit Graph

99343 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sage Weil
fa7655351c mon/OSDMonitor: make snap removal handle dups safely 
Signed-off-by: Sage Weil <sage@redhat.com>
 2019-07-02 08:37:49 -05:00
Sage Weil
b945de141f mon/OSDMonitor: only update removed_snaps when pre-octopus 
Signed-off-by: Sage Weil <sage@redhat.com>
 2019-07-02 08:37:49 -05:00
Sage Weil
7fe43cc4e4 ceph_test_rados: stop doing long object names 
This was there to test filestore's long file name handling, which (1)
works, and (2) we don't care that much about anymore.  Meanwhile, the
long names make the OSD log files *really* painful to read.

Signed-off-by: Sage Weil <sage@redhat.com>
 2019-07-02 08:37:49 -05:00
Sage Weil
419251a401 ceph_test_rados_api_tier_pp: fix osd version checks 
These need to exclude old releases but run the test for newer, unnamed
releases.

Signed-off-by: Sage Weil <sage@redhat.com>
 2019-07-02 08:37:49 -05:00
Sage Weil
f58f5cfc51 osd/PrimaryLogPG: use get_ssc_as_of for snapc for flushing clones 
We will stop maintaining SnapSet::snaps shortly.  Instead, generate this
snapc using the existing SnapSet::get_ssc_as_of() method, which will now
derive the snap list from the clone_snaps member.

Signed-off-by: Sage Weil <sage@redhat.com>
 2019-07-02 08:37:49 -05:00
Sage Weil
d7c343eebf osd/PrimaryLogPG: only maintain SnapSet::snaps for pre-octopus compat 
Once we have all octopus or newer OSDs, we can stop maintaining
SnapSet::snaps.

Signed-off-by: Sage Weil <sage@redhat.com>
 2019-07-02 08:37:49 -05:00
Sage Weil
de5d3f6a0a mon/OSDMonitor: only maintain pg_pool_t::removed_snaps for pre-octopus 
- do not examine removed_snaps
- do not add new items to removed_snaps unless we need pre-octopus compat
- clear removed_snaps in first octopus epoch

Signed-off-by: Sage Weil <sage@redhat.com>
 2019-07-02 08:37:49 -05:00
Sage Weil
8f714e2ba6 osd/osd_types: mark SnapSet::snaps as legacy 
Signed-off-by: Sage Weil <sage@redhat.com>
 2019-07-02 08:37:48 -05:00
Sage Weil
f43d214789 osd/osd_types: SnapSet::get_ssc_as_of: use clone_snaps 
Fabricate a SnapContext from the clone_snaps instead of snaps (which we
are trying to kill).

Signed-off-by: Sage Weil <sage@redhat.com>
 2019-07-02 08:37:48 -05:00
Sage Weil
a362fedc81 osd/PrimaryLogPG: change fabrication of promoted clone snaps 
Instead of using SnapSet::snaps (which we are trying to kill), use the
clone_snaps[] snaps.

Signed-off-by: Sage Weil <sage@redhat.com>
 2019-07-02 08:37:48 -05:00
Sage Weil
0964498132 osd/PrimaryLogPG: only filter SnapSet::snaps for flush for pre-octopus compat 
Signed-off-by: Sage Weil <sage@redhat.com>
 2019-07-02 08:37:48 -05:00
Sage Weil
c88d860dce osd/PrimaryLogPG: trim_objects: only filter SnapSet::snaps for pre-octopus 
For octopus and later, we don't need SnapSet::snaps.

Signed-off-by: Sage Weil <sage@redhat.com>
 2019-07-02 08:37:48 -05:00
Sage Weil
b1a5bff4a8 osd/PrimaryLogPG: make best effort to sanitize clones on copy-from 
Signed-off-by: Sage Weil <sage@redhat.com>
 2019-07-02 08:37:48 -05:00
Sage Weil
8c0c63c7e1 mds/SnapServer: int -> int32_t for encoded type 
Signed-off-by: Sage Weil <sage@redhat.com>
 2019-07-02 08:37:48 -05:00
Sage Weil
25b690fe06 messages/MRemoveSnaps: int -> int32_t on encoded type 
Signed-off-by: Sage Weil <sage@redhat.com>
 2019-07-02 08:37:48 -05:00
Sage Weil
a6f85089c0 osd/PrimaryLogPG: find_object_context: trust SnapSet's clone_snaps 
Instead of checking the OSDMap pg_pool_t whether a snap exists, instead

1- Look at the clone_snaps more carefully.  If the snap didn't exist when
the clone was last touched (created or partially-trimmed) then it still
doesn't exist now (snaps aren't resurrected).

2- Check in the OSDMap's removed snaps queue.  This will catch anything
that is still being removed but hasn't been reflected by the clone_snaps
yet.

Signed-off-by: Sage Weil <sage@redhat.com>
 2019-07-02 08:37:48 -05:00
Sage Weil
cabc48c403 osd/PrimaryLogPG: use osdmap removed_snaps_queue for snap trimming 
No need to use the pg_pool_t member now--the osdmap has a queue
specifically for the snaps we are in the process of trimming.

Signed-off-by: Sage Weil <sage@redhat.com>
 2019-07-02 08:37:48 -05:00
Sage Weil
3f9c28823a mon/OSDMonitor: avoid is_removed_snap() 
Instead, consult the OSDMap's removed_snap_queue and the mon's record of
purged snaps.

Signed-off-by: Sage Weil <sage@redhat.com>
 2019-07-02 08:37:48 -05:00
Sage Weil
9b6acc2cad osd/PeeringState: drop some mimic conditionals 
Signed-off-by: Sage Weil <sage@redhat.com>
 2019-07-02 08:37:48 -05:00
Sage Weil
b59a25d9c9 osd/PG: drop pre-mimic snap_trimq code 
This is no longer needed for octopus.

Signed-off-by: Sage Weil <sage@redhat.com>
 2019-07-02 08:37:48 -05:00
Sage Weil
e963ee6039 osd/PeeringState: removed pre-mimic removed snap tracking 
Signed-off-by: Sage Weil <sage@redhat.com>
 2019-07-02 08:37:48 -05:00
Sage Weil
58c4c8fc8e osd: move snap_interval_set_t to osd_types 
Signed-off-by: Sage Weil <sage@redhat.com>
 2019-07-02 08:37:48 -05:00
Sage Weil
99970bb795 mon: drop mon_debug_no_require_mimic 
Signed-off-by: Sage Weil <sage@redhat.com>
 2019-07-02 08:37:48 -05:00
Sage Weil
04b946d913 mon/OSDMonitor: remove pre-mimic snap behavior support 
Signed-off-by: Sage Weil <sage@redhat.com>
 2019-07-02 08:37:47 -05:00
Sage Weil
248fe11dd2 mon/OSDMonitor: remove support for pre-mimic conversion 
Cluster must already be mimic to run octopus.

Signed-off-by: Sage Weil <sage@redhat.com>
 2019-07-02 08:37:47 -05:00
Sage Weil
713d48eff0 osd/osd_types: remove build_removed_snaps(), maybe_update_removed_snaps() 
Signed-off-by: Sage Weil <sage@redhat.com>
 2019-07-02 08:37:47 -05:00
Sage Weil
41c24a1326 osd: remove luminous compat code for removed_snaps 
This is no longer necessary with peers >= mimic.

Signed-off-by: Sage Weil <sage@redhat.com>
 2019-07-02 08:37:47 -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