]>
git.apps.os.sepia.ceph.com Git - ceph.git/log
Patrick Donnelly [Sun, 6 May 2018 02:59:22 +0000 (19:59 -0700)]
mds: refactor MDSMap init
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
(cherry picked from commit
7be74fd004686dc12c3c6b8d2be5f83cb2f3dea8 )
Patrick Donnelly [Sun, 6 May 2018 02:54:27 +0000 (19:54 -0700)]
mds: refactor FSMap init
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
(cherry picked from commit
344be27d696f8f7f9522f75c8aae55a2b62cdd7c )
Patrick Donnelly [Sun, 6 May 2018 02:53:09 +0000 (19:53 -0700)]
mds: refactor Filesystem init
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
(cherry picked from commit
91c01dc958c8bae29ee31a38e63187a341376ecc )
Patrick Donnelly [Sun, 6 May 2018 02:44:56 +0000 (19:44 -0700)]
mds: move compat set methods to MDSMap
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
(cherry picked from commit
db3a24c94924dbe12796307704d3b12278c8c8a3 )
Lenz Grimmer [Tue, 15 May 2018 11:30:02 +0000 (13:30 +0200)]
Merge pull request #21978 from votdev/improve_error_panel_mimic
mimic: mgr/dashboard: Improve error panel
Reviewed-by: Ricardo Marques <rimarques@suse.com>
Reviewed-by: Stephan Müller <smueller@suse.com>
Kefu Chai [Mon, 14 May 2018 15:31:14 +0000 (23:31 +0800)]
Merge pull request #21970 from wido/mgr-brag
mgr/telemetry: Add Ceph Telemetry module to send reports back to project
Reviewed-by: Kefu Chai <kchai@redhat.com>
Sage Weil [Mon, 14 May 2018 13:46:37 +0000 (08:46 -0500)]
Merge pull request #21956 from tchaikov/mimic-pr-21942
mimic: qa/workunits/ceph-disk: --no-mon-config
Volker Theile [Mon, 14 May 2018 12:57:43 +0000 (14:57 +0200)]
mgr/dashboard: Improve error panel
Signed-off-by: Volker Theile <vtheile@suse.com>
(cherry picked from commit
a8dae80dce973c441db3d4b914febd4b48725f1e )
Yan, Zheng [Mon, 14 May 2018 12:00:37 +0000 (20:00 +0800)]
Merge pull request #21976 from ukernel/mimic-revert-23837
Revert "ceph-fuse: Delete inode's bufferhead was in Tx state would le…
Yan, Zheng [Mon, 14 May 2018 11:59:01 +0000 (19:59 +0800)]
Revert "ceph-fuse: Delete inode's bufferhead was in Tx state would lead a assert fail"
This reverts commit
ede7817a36e7b10f01f906000ce3ed621c0fc358 .
Signed-off-by: "Yan, Zheng" <zyan@redhat.com>
Wido den Hollander [Fri, 27 Apr 2018 07:14:05 +0000 (09:14 +0200)]
mgr/telemetry: Add Ceph Telemetry module to send reports back to project
This Manager Module will send statistics and version information from
a Ceph cluster back to telemetry.ceph.com if the user has opted-in on sending
this information.
Additionally a user can tell that the information is allowed to be made
public which then allows other users to see this information.
Signed-off-by: Wido den Hollander <wido@42on.com>
Wido den Hollander [Fri, 27 Apr 2018 07:13:14 +0000 (09:13 +0200)]
brag: Remove ceph-brag
To be replaced by Telemetry module in Ceph Mgr
Signed-off-by: Wido den Hollander <wido@42on.com>
Kefu Chai [Fri, 11 May 2018 13:06:51 +0000 (21:06 +0800)]
qa/workunits/ceph-disk: --no-mon-config
port
a095ec8b to the qa/workunits
Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit
ee33dc8e53fb41b8ee23783a969ac5288d3211eb )
Patrick Donnelly [Fri, 11 May 2018 22:15:23 +0000 (15:15 -0700)]
Merge PR #21954 into mimic
* refs/pull/21954/head:
ceph-fuse: Delete inode's bufferhead was in Tx state would lead a assert fail
YunfeiGuan [Tue, 8 May 2018 11:35:32 +0000 (19:35 +0800)]
ceph-fuse: Delete inode's bufferhead was in Tx state would lead a assert fail
Prematurely delted the bh which was in Tx state may lead the object can't
be closed before its writer of this bh callback. Thus if inode's ref call
put_inode decrease ref to zero and release inode's oset.An assert fail occur
beacuse the oset can't be emptied.
If gather.has_subs() is true, we can't call flush_set_callback() because
this would cause a double drop of FILE_CACHE | FILE_BUFFER.
Fixes:http://tracker.ceph.com/issues/23837
Signed-off-by: Guan yunfei <yunfei.guan@xtaotech.com>
(cherry picked from commit
07e3bceea78dc8ecd76abb1cafca5c9d1fde521e )
Patrick Donnelly [Fri, 11 May 2018 22:12:11 +0000 (15:12 -0700)]
Merge PR #21953 into mimic
* refs/pull/21953/head:
mds: properly reconnect client caps after loading inodes
Yan, Zheng [Wed, 2 May 2018 02:23:33 +0000 (10:23 +0800)]
mds: properly reconnect client caps after loading inodes
Commit
e43c02d6 "mds: filter out blacklisted clients when importing
caps" makes MDCache::process_imported_caps() ignore clients that are
not in MDCache::rejoin_imported_session_map. The map does not contain
clients from which mds has received reconnect messages. This causes
some client caps (corresponding inodes were not in cache when mds was
in reconnect state) to get dropped.
Signed-off-by: "Yan, Zheng" <zyan@redhat.com>
(cherry picked from commit
48f60e7f274de9d76499816a528eff859bb161e3 )
Patrick Donnelly [Fri, 11 May 2018 22:05:46 +0000 (15:05 -0700)]
Merge PR #21952 into mimic
* refs/pull/21952/head:
mds: tighten conditions of calling rejoin_gather_finish()
mds: avoid calling rejoin_gather_finish() two times successively
Yan, Zheng [Tue, 8 May 2018 03:32:01 +0000 (11:32 +0800)]
mds: tighten conditions of calling rejoin_gather_finish()
Handle two cases:
1. mds receives all cache rejoin messages, then receives mdsmap that
says mds cluster enters rejoining state.
2. when opening undef inodes/dirfrags, other mds restarts.
Signed-off-by: "Yan, Zheng" <zyan@redhat.com>
(cherry picked from commit
0a38a499b86c0ee13aa0e783a8359bcce0876088 )
Yan, Zheng [Tue, 8 May 2018 02:42:05 +0000 (10:42 +0800)]
mds: avoid calling rejoin_gather_finish() two times successively
If MDCache::rejoin_gather is empty and MDCache::rejoins_pending is true
when MDCache::process_imported_caps() calls maybe_send_pending_rejoins()
Both MDCache::rejoin_send_rejoins() and MDCache::process_imported_caps()
may call rejoin_gather_finish().
Signed-off-by: "Yan, Zheng" <zyan@redhat.com>
Fixes: http://tracker.ceph.com/issues/24047
(cherry picked from commit
0451dae777a2a9b1e70303d7bbc4398849f45f3e )
Patrick Donnelly [Fri, 11 May 2018 22:01:52 +0000 (15:01 -0700)]
Merge PR #21951 into mimic
* refs/pull/21951/head:
mds: set could_consume to false when no purge queue item actually executed
Xuehan Xu [Thu, 10 May 2018 04:22:24 +0000 (12:22 +0800)]
mds: set could_consume to false when no purge queue item actually executed
Fixes: http://tracker.ceph.com/issues/24073
Signed-off-by: Xuehan Xu <xuxuehan@360.cn>
(cherry picked from commit
46b4e6afa631058fe066bfd58c76d644d5c2181d )
Nathan Cutler [Fri, 11 May 2018 09:02:08 +0000 (11:02 +0200)]
Merge pull request #21916 from smithfarm/wip-24062-mimic
mimic: rgw: policy: modify s3:ListBucketMultiPartUploads to s3:ListBucketMul
Reviewed-by: Adam C. Emerson <aemerson@redhat.com>
Sage Weil [Thu, 10 May 2018 17:16:44 +0000 (12:16 -0500)]
ceph_release: we are an rc now
Signed-off-by: Sage Weil <sage@redhat.com>
Jason Dillaman [Thu, 10 May 2018 15:27:43 +0000 (11:27 -0400)]
Merge pull request #21930 from dillaman/wip-rbd-backports-mimic
rbd: backport of mimic bug fixes
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
Jason Dillaman [Wed, 9 May 2018 19:01:18 +0000 (15:01 -0400)]
Revert "stop.sh: use --no-mon-config when trying to unmap rbd devices"
This reverts commit
6c722cd5f3f829ccf14280e7e36387bafd819c7a .
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit
3c6b01574766ca128818461d6630866cc0c0405b )
Jason Dillaman [Wed, 9 May 2018 16:37:22 +0000 (12:37 -0400)]
rbd: don't load config overrides from monitor initially
The overrides will be loaded when we connect to the cluster via librados
and the current approach prevents running 'rbd help' without a running
cluster.
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit
46eafdabde57736d2a8b63f55cab94461885a957 )
Jason Dillaman [Fri, 4 May 2018 15:14:34 +0000 (11:14 -0400)]
rbd-mirror: ensure remote demotion is replayed locally
The bootstrap process cannot immediately quit if it notices the remote
image is not primary. Instead, it needs to continue if the local image is
still chained to the remote.
Fixes: http://tracker.ceph.com/issues/24009
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit
d35bc94319c6fa267e973e533f4591568289ee96 )
Jason Dillaman [Fri, 4 May 2018 13:24:43 +0000 (09:24 -0400)]
rbd-mirror: fix potential race between image sync and shut down
Fixes: http://tracker.ceph.com/issues/24008
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit
4f2dbcefc5e3547926b8d34135a808266bd059b8 )
Jason Dillaman [Fri, 4 May 2018 13:23:27 +0000 (09:23 -0400)]
rbd-mirror: ensure instance replayer is stoped before destructing
Fixes: http://tracker.ceph.com/issues/24008
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit
9ba94f303072374b5c7c9265c3a493fddce2f8ca )
Nathan Cutler [Thu, 10 May 2018 05:15:34 +0000 (07:15 +0200)]
Merge pull request #21918 from smithfarm/wip-24003-mimic
script: build-integration-branch: avoid Unicode error
Reviewed-by: Kefu Chai <kchai@redhat.com>
Nathan Cutler [Thu, 3 May 2018 20:42:04 +0000 (22:42 +0200)]
script: build-integration-branch: avoid Unicode error
When run on PRs that have non-ASCII characters in their titles, the script
fails like this when run in a non UTF-8 environment:
UnicodeEncodeError: 'latin-1' codec can't encode character u'\u2026' in
position 651: ordinal not in range(256)
Since failing like that is not useful, avoid the error by forcing ASCII
encoding and filtering out any non-ASCII characters.
Fixes: http://tracker.ceph.com/issues/24003
Signed-off-by: Nathan Cutler <ncutler@suse.com>
(cherry picked from commit
6dd31fdbec43e37bece24c0de886d2c4083901c8 )
xiangxiang [Tue, 20 Mar 2018 12:38:07 +0000 (20:38 +0800)]
rgw: policy: modify s3:ListBucketMultiPartUploads to s3:ListBucketMultipartUploads
according to AWS S3, the permission keyword should be s3:ListBucketMultipartUploads
rather than s3:ListBucketMultiPartUploads.
all operation permission list in AWS S3 as follows:
https://docs.aws.amazon.com/AmazonS3/latest/dev/using-with-s3-actions.html?shortFooter=true
Signed-off-by: xiangxiang <xiangxiang@xsky.com>
(cherry picked from commit
41ef62d9047ca7469023181f203e79c63ec30d64 )
Venky Shankar [Wed, 9 May 2018 15:07:19 +0000 (20:37 +0530)]
doc: fix iscsi target name when configuring target
Signed-off-by: Venky Shankar <vshankar@redhat.com>
(cherry picked from commit
3b2d739e4c12120d27fdaf6b0af0e0de5bb972f3 )
Tatjana Dehler [Wed, 9 May 2018 14:59:32 +0000 (16:59 +0200)]
Merge pull request #21855 from votdev/fix_rgw_backend_mimic
mimic: mgr/dashboard: Refactor RGW backend
Reviewed-by: Sebastian Wagner <swagner@suse.com>
Reviewed-by: Tatjana Dehler <tdehler@suse.com>
Kefu Chai [Wed, 9 May 2018 14:08:52 +0000 (22:08 +0800)]
Merge pull request #21835 from tchaikov/mimic-23921
mimic: crush, osd: handle multiple parents properly when applying pg upmaps
Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
Kefu Chai [Wed, 9 May 2018 13:03:50 +0000 (21:03 +0800)]
Merge pull request #21834 from tchaikov/mimic-23966
mimic: osdc: guard op->on_notify_finish with lock
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
Kefu Chai [Wed, 9 May 2018 12:12:13 +0000 (20:12 +0800)]
Merge pull request #21830 from tchaikov/mimic-qa-cephfs-snap
mimic: qa: fix test on "ceph fs set cephfs allow_new_snaps"
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Kefu Chai [Wed, 9 May 2018 12:10:00 +0000 (20:10 +0800)]
Merge pull request #21859 from dillaman/wip-23966-mimic
librados: fix potential race condition if notify immediately fails
Reviewed-by: Kefu Chai <kchai@redhat.com>
Volker Theile [Wed, 9 May 2018 08:29:11 +0000 (10:29 +0200)]
mgr/dashboard: Refactor RGW backend
- Do some polishing in the docs.
- Refactor RgwClient::is_service_online() method. The system is considered as online if the response structure is valid. The response content itself is not validated in this case.
- Relocate NoCredentialsException and derive it from RequestException.
Signed-off-by: Volker Theile <vtheile@suse.com>
(cherry picked from commit
ad997b54c2728b9a72745b69fbe80c94db6eefc8 )
Volker Theile [Wed, 9 May 2018 08:16:01 +0000 (10:16 +0200)]
Merge pull request #21875 from rjfd/wip-dashboard-fix-awsauth-mimic
mimic: mgr/dashboard: awsauth: fix python3 string decode problem
Reviewed-by: Sebastian Wagner <swagner@suse.com>
Reviewed-by: Volker Theile <vtheile@suse.com>
Patrick Donnelly [Tue, 8 May 2018 22:44:30 +0000 (15:44 -0700)]
Merge PR #21896 into mimic
* refs/pull/21896/head:
qa: ignore version in auth metadata comp
ceph_volume_client: allow volumes without namespace isolation
Patrick Donnelly [Mon, 7 May 2018 16:49:00 +0000 (09:49 -0700)]
qa: ignore version in auth metadata comp
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
(cherry picked from commit
3838674f655f50a0e76020d940b747e50158ba78 )
Ramana Raja [Thu, 3 May 2018 22:09:09 +0000 (03:39 +0530)]
ceph_volume_client: allow volumes without namespace isolation
Fixes: https://tracker.ceph.com/issues/23695
Signed-off-by: Ramana Raja <rraja@redhat.com>
(cherry picked from commit
3a7fdb8b052fee2ff1bff24c8de745278314c78c )
Patrick Donnelly [Tue, 8 May 2018 16:07:40 +0000 (09:07 -0700)]
Merge PR #21888 into mimic
* refs/pull/21888/head:
MDSMonitor: promote standby after fs creation
MDSMonitor: always prints standbys even if no fs
Patrick Donnelly [Fri, 4 May 2018 17:11:10 +0000 (10:11 -0700)]
MDSMonitor: promote standby after fs creation
This avoids unnecessary health warnings. However, the original issue in i23885
still exists because the standbys are not available at fs creation time. If you
create a new file system after these standbys are available, then you will
observe that the promotion works to silence the warnings.
Fixes: http://tracker.ceph.com/issues/23885
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
(cherry picked from commit
93bc8c53ef51bf4fbaafad0c2d1ad79dbff8eb8b )
Patrick Donnelly [Fri, 4 May 2018 17:50:38 +0000 (10:50 -0700)]
MDSMonitor: always prints standbys even if no fs
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
(cherry picked from commit
ad75128c8e1011e3f8d17405a11fad97506d74a0 )
Jason Dillaman [Mon, 7 May 2018 17:23:43 +0000 (10:23 -0700)]
librados: fix potential race condition if notify immediately fails
Fixes: http://tracker.ceph.com/issues/23966
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
Ricardo Dias [Fri, 27 Apr 2018 11:38:41 +0000 (12:38 +0100)]
mgr/dashboard: awsauth: fix python3 string decode problem
Signed-off-by: Ricardo Dias <rdias@suse.com>
(cherry picked from commit
7f332a396299825eb078c8935449b816ce613d6d )
Patrick Donnelly [Mon, 7 May 2018 23:00:07 +0000 (16:00 -0700)]
Merge PR #21867 into mimic
* refs/pull/21867/head:
qa/tasks/cephfs: add test for renewing stale session
client: invalidate caps and leases when session becomes stale
client: fix race in concurrent readdir
Yan, Zheng [Tue, 1 May 2018 04:26:51 +0000 (12:26 +0800)]
qa/tasks/cephfs: add test for renewing stale session
Signed-off-by: "Yan, Zheng" <zyan@redhat.com>
(cherry picked from commit
5688476513a78cf9ab2cf3b1f65e6244f05ea73d )
Yan, Zheng [Sat, 28 Apr 2018 04:36:43 +0000 (12:36 +0800)]
client: invalidate caps and leases when session becomes stale
Signed-off-by: "Yan, Zheng" <zyan@redhat.com>
Fixes: https://tracker.ceph.com/issues/23894
(cherry picked from commit
8b2e7d834ccf2a4ff6c7aa3d4aeee07ebe36fb59 )
Yan, Zheng [Fri, 27 Apr 2018 01:13:51 +0000 (09:13 +0800)]
client: fix race in concurrent readdir
For a large directory, program needs to issue multiple readdir
syscalls to get all dentries. When there are multiple programs
read the directory concurrently. Following sequence of events
can happen.
- program calls readdir with pos = 2. ceph sends readdir request
to mds. The reply contains N1 entries. ceph adds these N1 entries
to readdir cache.
- program calls readdir with pos = N1+2. The readdir is satisfied
by the readdir cache, N2 entries are returned. (Other program
calls readdir in the middle, which fills the cache)
- program calls readdir with pos = N1+N2+2. ceph sends readdir
request to mds. The reply contains N3 entries and it reaches
directory end. ceph adds these N3 entries to the readdir cache
and marks directory complete.
The second readdir call does not update dirp->cache_index. ceph adds
the last N3 entries to wrong places.
Signed-off-by: "Yan, Zheng" <zyan@redhat.com>
Fixes: http://tracker.ceph.com/issues/23894
(cherry picked from commit
01e23c178d068a3983c58cf115d57f6e1cc06255 )
Patrick Donnelly [Mon, 7 May 2018 22:47:50 +0000 (15:47 -0700)]
Merge PR #21866 into mimic
* refs/pull/21866/head:
mds: include nfiles/nsubdirs of directory inode in MClientCaps
Yan, Zheng [Thu, 26 Apr 2018 07:12:48 +0000 (15:12 +0800)]
mds: include nfiles/nsubdirs of directory inode in MClientCaps
Directory inode's dirstat gets updated by request reply, but not by
cap message. This causes problem for following case.
1. MDS modifies a directory
2. MDS issues CEPH_CAP_ANY_SHARED to client
3. The client satifies stat(2) by its cached metadata.
Signed-off-by: "Yan, Zheng" <zyan@redhat.com>
Fixes: http://tracker.ceph.com/issues/23855
(cherry picked from commit
ee2c628f6783954e9b25fab8ac9b572a58666a91 )
Patrick Donnelly [Mon, 7 May 2018 14:40:24 +0000 (07:40 -0700)]
Merge PR #21857 into mimic
* refs/pull/21857/head:
qa: move snap-hierarchy out of snaps workunits
qa: try snap format upgrade with multimds cluster
qa: add mds deactivation procedure for upgrades
Patrick Donnelly [Thu, 3 May 2018 22:07:21 +0000 (15:07 -0700)]
qa: move snap-hierarchy out of snaps workunits
The snapshot hierarchy it leaves behind can't be cleaned up by `rm -rf` which
breaks workunit cleanup. So, don't run this as part of normal snaps test.
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
(cherry picked from commit
4d37b0ee8d9594977aeae02c536b5f5fcc187e33 )
Patrick Donnelly [Thu, 3 May 2018 20:15:35 +0000 (13:15 -0700)]
qa: try snap format upgrade with multimds cluster
Fixes: http://tracker.ceph.com/issues/24002
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
(cherry picked from commit
0b466cb2e6ccdeb56199cb889f24cc590aedff04 )
Patrick Donnelly [Thu, 3 May 2018 20:12:54 +0000 (13:12 -0700)]
qa: add mds deactivation procedure for upgrades
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
(cherry picked from commit
6a788bf203dc07d32f299ce488b054addaae4f75 )
xiexingguo [Fri, 4 May 2018 13:20:29 +0000 (21:20 +0800)]
crush, osd: handle multiple parents properly when applying pg upmaps
Fixes: http://tracker.ceph.com/issues/23921
Signed-off-by: xiexingguo <xie.xingguo@gmail.com>
(cherry picked from commit
482ec97c98107be20c9ca1f34636323703ecfa5c )
Kefu Chai [Sun, 6 May 2018 03:23:47 +0000 (11:23 +0800)]
Merge pull request #21832 from tchaikov/mimic-23627
librados: block MgrClient::start_command until mgrmap
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Kefu Chai [Sun, 6 May 2018 03:11:16 +0000 (11:11 +0800)]
osdc: guard op->on_notify_finish with lock
Fixes: http://tracker.ceph.com/issues/23966
Signed-off-by: Kefu Chai <kchai@redhat.com>
Kefu Chai [Fri, 4 May 2018 08:11:53 +0000 (16:11 +0800)]
librados: timeout on mgr_command()
because the mgrclient will be waiting for the mgrmap if the mgrmap
is not available, when the client is about to send a mgr command.
and monitor will drop the subscription requests if the client does not
have enough cap for reading mon, so unlike mon commands, the client
won't get an EACCES return code in this case.
in this change, a timeout machinary is introduced. and the client
will wait for "rados-mon-op-timeout" before it gives up. if this
setting is 0, it will wait forever.
Fixes: https://tracker.ceph.com/issues/23627
Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit
eaa1179965c840c0f935c570e146395583f198b6 )
John Spray [Mon, 30 Apr 2018 15:35:18 +0000 (11:35 -0400)]
librados: fix locking on get_required_monitor_features
This wasn't taking the MonClient lock: should use
with_monmap to protect access to MonClient::monmap.
Signed-off-by: John Spray <john.spray@redhat.com>
(cherry picked from commit
ef517d0ea0dd4754fe725ae8d6f01209b58130be )
John Spray [Mon, 30 Apr 2018 15:31:27 +0000 (11:31 -0400)]
librados: config mgrclient for pre-luminous cluster
Signed-off-by: John Spray <john.spray@redhat.com>
(cherry picked from commit
8fd500d736bc3c868736537d04940c627587ec63 )
John Spray [Mon, 30 Apr 2018 13:32:43 +0000 (09:32 -0400)]
mgr/MgrClient: add mgr_optional mode
This is for use when talking to pre-luminous
clusters, where we should not block waiting
for MgrMap because it might never come.
Fixes: https://tracker.ceph.com/issues/23627
Signed-off-by: John Spray <john.spray@redhat.com>
(cherry picked from commit
bae47183c2621577ba564d29c82a0517ab8a7f54 )
Kefu Chai [Sat, 5 May 2018 10:52:44 +0000 (18:52 +0800)]
Merge pull request #21786 from dillaman/wip-23966
osdc: invoke notify finish context on linger commit failure
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
Kefu Chai [Sat, 5 May 2018 01:38:29 +0000 (09:38 +0800)]
qa: fix test on "ceph fs set cephfs allow_new_snaps"
snapshot is now enabled for new fs in
81d0554e , so this test should be
updated accordingly.
Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit
5910c2902e50cf3c087009ed54ccf878b9ddff8c )
xiexingguo [Fri, 4 May 2018 13:43:51 +0000 (21:43 +0800)]
osd/OSD: drop extra/wrong *unregister_pg*
Signed-off-by: xiexingguo <xie.xingguo@gmail.com>
(cherry picked from commit
6ee6fa79b5fab532dea22399afdcceeb6624019d )
Sage Weil [Fri, 4 May 2018 20:25:10 +0000 (15:25 -0500)]
Merge pull request #21753 from liewegas/wip-upgrade-enospc
qa/suites/upgrade/luminous-x/stress-split: avoid enospc
Alfredo Deza [Fri, 4 May 2018 17:50:45 +0000 (13:50 -0400)]
Merge pull request #21824 from tchaikov/mimic-cmake-jni
mimic: cmake: use javac -h for creating JNI native headers
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: Alfredo Deza <adeza@redhat.com>
Alfredo Deza [Fri, 4 May 2018 17:46:20 +0000 (13:46 -0400)]
Merge branch 'mimic' of github.com:ceph/ceph into mimic
Kefu Chai [Fri, 4 May 2018 14:55:43 +0000 (22:55 +0800)]
cmake: bump up JDK version to 1.8
as JDK 7 is EOL. see
http://www.oracle.com/technetwork/java/eol-135779.html and
https://www.java.com/en/download/faq/java_7.xml
Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit
df27ed3a3806aaba41ca7bb1019e586d0b01a049 )
Kefu Chai [Fri, 4 May 2018 14:32:35 +0000 (22:32 +0800)]
cmake: use javac -h for creating JNI native headers
JDK 1.10 does not offer javah anymore, so we need to use "javac -h" or
add_jar(... GENERATE_NATIVE_HEADERS) instead.
Fixes: http://tracker.ceph.com/issues/24012
Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit
edc504b9d446cc1739f3e8e087914cfe66d6cac3 )
Brad Hubbard [Tue, 1 May 2018 01:15:28 +0000 (11:15 +1000)]
mgr: Include daemon details in SLOW_OPS output
Currently there is no way to see which daemons were involved in a slow
op after the op has cleared. This change allows us to record which
daemons were implicated in the logs.
Partially fixes: http://tracker.ceph.com/issues/23205
Signed-off-by: Brad Hubbard <bhubbard@redhat.com>
(cherry picked from commit
b5263176dea6d204c2caa52043cefc94dd5e475f )
Sage Weil [Tue, 1 May 2018 12:00:10 +0000 (07:00 -0500)]
qa/suites/upgarde/luminous-x/stress-split: 8 osds (not 6)
Signed-off-by: Sage Weil <sage@redhat.com>
Jason Dillaman [Wed, 2 May 2018 16:52:42 +0000 (12:52 -0400)]
osdc: invoke notify finish context on linger commit failure
Fixes: http://tracker.ceph.com/issues/23966
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
John Spray [Fri, 4 May 2018 09:56:24 +0000 (10:56 +0100)]
Merge pull request #21557 from jan--f/mgr-prometheus-fix-metadata-labels
mgr: prometheus fix metadata labels
Reviewed-by: John Spray <john.spray@redhat.com>
Sage Weil [Thu, 3 May 2018 22:34:13 +0000 (17:34 -0500)]
Merge pull request #21553 from dragonylffly/wip-improve-rados-ls
tools/rados: improve the ls command usage
Reviewed-by: Sage Weil <sage@redhat.com>
Sage Weil [Thu, 3 May 2018 22:32:29 +0000 (17:32 -0500)]
Merge pull request #21795 from wido/influx-string-split
mgr/influx: Only split string on first occurence of dot (.)
Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: John Spray <john.spray@redhat.com>
Sage Weil [Thu, 3 May 2018 22:29:53 +0000 (17:29 -0500)]
Merge pull request #21798 from liewegas/wip-23980
osd/PG: fix uninit read in Incomplete::react(AdvMap&)
Reviewed-by: Kefu Chai <kchai@redhat.com>
Yuri Weinstein [Thu, 3 May 2018 20:28:40 +0000 (13:28 -0700)]
Merge pull request #21771 from majianpeng/osd-remove-pgslot
osd: fix bug which cause can't erase OSDShardPGSlot.
Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
Jenkins Build Slave User [Thu, 3 May 2018 17:57:34 +0000 (17:57 +0000)]
13.1.0
Josh Durgin [Thu, 3 May 2018 17:07:57 +0000 (10:07 -0700)]
Merge pull request #21546 from dzafman/wip-22881
osd: process _scan_snaps() with all snapshots with head
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Patrick Donnelly [Thu, 3 May 2018 16:45:04 +0000 (09:45 -0700)]
Merge PR #21374 into master
* refs/pull/21374/head:
qa: add test for snap format upgrade
mds: initialize SnapServer::snaprealm_v2_since after journal replay
mds: properly distinguish cap update from snap flush
mds: update dev document of cephfs snapshot
doc: add release notes for cephfs snapshot
mds: allow snapshot by default for new filesystem
mds: close past parents after snaprealm format gets converted
mds: automaticly allow multi-active MDS after scrubbing all inodes
mds: don't mark primary dentry damaged if inode has been repaired
mds: upgrade snaprealm format during scrub
mds: allow scrubbing mdsdir
mds: cleanup scrub code
mds: show health warning if multimds with old format snapshots
mds: automaticly allow multi-active MDS after removing all old snapshots
mds: disallow multi-active MDS if snapshot was ever created by pre-mimic mds
mds: validate SnapInfo::long_name before using it
mds: don't bump snaptable last_snap when renaming snapshot
mds: properly save snaptable after upgrading version
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Patrick Donnelly [Mon, 30 Apr 2018 21:43:28 +0000 (14:43 -0700)]
qa: add test for snap format upgrade
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
Lenz Grimmer [Thu, 3 May 2018 14:18:51 +0000 (16:18 +0200)]
Merge pull request #21677 from Devp00l/wip-convert-floating-values
mgr/dashboard: Convert floating values to bytes
Reviewed-by: Volker Theile <vtheile@suse.com>
Lenz Grimmer [Thu, 3 May 2018 14:01:37 +0000 (16:01 +0200)]
Merge pull request #21780 from votdev/use_bootstrap_css
mgr/dashboard: Use Bootstrap CSS
Reviewed-by: Ricardo Marques <rimarques@suse.com>
Wido den Hollander [Thu, 3 May 2018 10:11:58 +0000 (12:11 +0200)]
mgr/influx: Only split string on first occurence of dot (.)
Service names are not always osd.X or mon.X, they might be
rgw.radosgw.rgw1
This would lead to:
Unhandled exception from module 'influx' while running on mgr.mon01: too many values to unpack
Only split on the first dot as the rest is the service name
Fixes: http://tracker.ceph.com/issues/23996
Signed-off-by: Wido den Hollander <wido@42on.com>
Sage Weil [Thu, 3 May 2018 13:45:09 +0000 (08:45 -0500)]
osd/PG: fix uninit read in Incomplete::react(AdvMap&)
If a PG is incomplete when the pool is deleted we'll dereference invalid
iterators here.
Fixes: http://tracker.ceph.com/issues/23980
Signed-off-by: Sage Weil <sage@redhat.com>
Sage Weil [Thu, 3 May 2018 13:40:25 +0000 (08:40 -0500)]
Merge pull request #21684 from liewegas/wip-23769
mon: fix slow op warning on mon, improve slow op warnings
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Lenz Grimmer [Thu, 3 May 2018 10:50:05 +0000 (12:50 +0200)]
Merge pull request #21694 from sebastian-philipp/dashboard-review-pylint
mgr/dashboard: Clean up Pylint warnings
Reviewed-by: Tatjana Dehler <tdehler@suse.com>
Reviewed-by: Volker Theile <vtheile@suse.com>
Lenz Grimmer [Thu, 3 May 2018 10:04:15 +0000 (12:04 +0200)]
Merge pull request #21774 from sebastian-philipp/dashboard-mypy-fixes
mgr/dashboard: fix two type errors found by mypy
Reviewed-by: Volker Theile <vtheile@suse.com>
Lenz Grimmer [Thu, 3 May 2018 10:02:30 +0000 (12:02 +0200)]
Merge pull request #21787 from tspmelo/fix-checkbox-fork-awesome
mgr/dashboard: Change font-family of checkbox
Reviewed-by: Ricardo Marques <rimarques@suse.com>
Patrick Donnelly [Wed, 2 May 2018 22:56:54 +0000 (15:56 -0700)]
Merge PR #21789 into master
* refs/pull/21789/head:
qa: fix blacklisted check for test_lifecycle
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Patrick Donnelly [Wed, 2 May 2018 19:50:53 +0000 (12:50 -0700)]
qa: fix blacklisted check for test_lifecycle
Caused by:
36f89c5acf0385f13be2f39bc8d30621f4bf0115
Fixes: http://tracker.ceph.com/issues/23975
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
Matt Benjamin [Wed, 2 May 2018 20:40:49 +0000 (16:40 -0400)]
Merge pull request #21791 from cbodley/wip-23974
rgw: raise log level on coroutine shutdown errors
Casey Bodley [Wed, 2 May 2018 20:11:29 +0000 (16:11 -0400)]
rgw: raise log level on coroutine shutdown errors
Fixes: http://tracker.ceph.com/issues/23974
Signed-off-by: Casey Bodley <cbodley@redhat.com>
Sage Weil [Wed, 2 May 2018 19:48:31 +0000 (14:48 -0500)]
mon/MDSMonitor: no_reply on MMDSLoadTargets
If we don't note that we don't reply then we don't close out the routed
mon request and the op will appear as slow on the forwarding mon.
Fixes: http://tracker.ceph.com/issues/23769
Signed-off-by: Sage Weil <sage@redhat.com>
Tiago Melo [Wed, 2 May 2018 17:38:06 +0000 (18:38 +0100)]
mgr/dashboard: Change font-family of checkbox
awesome-bootstrap-checkbox was still trying to use Font Awesome,
this will force it to use Fork Awesome.
Signed-off-by: Tiago Melo <tmelo@suse.com>