]>
git.apps.os.sepia.ceph.com Git - ceph.git/log
Yuri Weinstein [Mon, 25 Feb 2019 20:46:20 +0000 (12:46 -0800)]
Merge pull request #26310 from pdvian/wip-38193-luminous
luminous: Object can still be deleted even if s3:DeleteObject policy is set
Reviewed-by: Casey Bodley <cbodley@redhat.com>
Yuri Weinstein [Mon, 25 Feb 2019 20:43:57 +0000 (12:43 -0800)]
Merge pull request #25738 from pdvian/wip-37648-luminous
luminous: rgw: feature -- log successful bucket resharding events
Reviewed-by: J. Eric Ivancich <ivancich@redhat.com>
Reviewed-by: Casey Bodley <cbodley@redhat.com>
Yuri Weinstein [Mon, 25 Feb 2019 20:43:20 +0000 (12:43 -0800)]
Merge pull request #25901 from ashishkumsingh/wip-37559-luminous
luminous: rgw: handle S3 version 2 pre-signed urls with meta-data
Reviewed-by: Matt Benjamin <mbenjami@redhat.com>
Yuri Weinstein [Mon, 25 Feb 2019 20:42:40 +0000 (12:42 -0800)]
Merge pull request #26131 from pdvian/wip-38038-luminous
luminous: rgw: fails to start on Fedora 28 from default configuration
Reviewed-by: Casey Bodley <cbodley@redhat.com>
Yuri Weinstein [Mon, 25 Feb 2019 20:42:08 +0000 (12:42 -0800)]
Merge pull request #26192 from cbodley/wip-38079-luminous
luminous: rgw: bucket full sync handles delete markers
Reviewed-by: Casey Bodley <cbodley@redhat.com>
Yuri Weinstein [Mon, 25 Feb 2019 20:41:20 +0000 (12:41 -0800)]
Merge pull request #26263 from pdvian/wip-38148-luminous
luminous: rgw: "radosgw-admin bucket rm ... --purge-objects" can hang
Reviewed-by: J. Eric Ivancich <ivancich@redhat.com>
Yuri Weinstein [Mon, 25 Feb 2019 20:40:36 +0000 (12:40 -0800)]
Merge pull request #26332 from smithfarm/wip-38232-luminous
luminous: rgw: fix radosgw linkage with WITH_RADOSGW_BEAST_FRONTEND=OFF
Reviewed-by: Willem Jan Withagen <wjw@digiware.nl>
Nathan Cutler [Fri, 22 Feb 2019 13:00:37 +0000 (14:00 +0100)]
Merge pull request #26587 from smithfarm/wip-doc-fix-luminous
luminous: doc: Fix default value of 'mon_osd_max_split_count'
Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Mykola Golub <mgolub@suse.com>
Kai Wagner [Fri, 22 Feb 2019 10:25:06 +0000 (11:25 +0100)]
doc: Fix default value of 'mon_osd_max_split_count'
This commit is not cherry-picked from master because the config
parameter mon_osd_max_split_count has been dropped in master
Signed-off-by: Kai Wagner <kwagner@suse.com>
(cherry picked from commit
17d503f5adfbfd96502877bcb55c42ba1eb34a5c )
Yuri Weinstein [Thu, 21 Feb 2019 23:29:07 +0000 (15:29 -0800)]
Merge pull request #24906 from tchaikov/wip-23673-luminous
luminous: auth: ceph auth add does not sanity-check caps
Reviewed-by: Nathan Cutler <ncutler@suse.com>
Yuri Weinstein [Thu, 21 Feb 2019 23:27:41 +0000 (15:27 -0800)]
Merge pull request #25711 from ashishkumsingh/wip-37756-luminous
luminous: osd/PrimaryLogPG: fix the extent length error of the sync read
Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Neha Ojha <nojha@redhat.com>
Yuri Weinstein [Thu, 21 Feb 2019 23:26:41 +0000 (15:26 -0800)]
Merge pull request #25722 from ashishkumsingh/wip-37690-luminous
luminous: tools: ceph-objectstore-tool: Dump hashinfo
Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: David Zafman <dzafman@redhat.com>
Yuri Weinstein [Thu, 21 Feb 2019 23:25:38 +0000 (15:25 -0800)]
Merge pull request #25851 from ashishkumsingh/wip-37815-luminous
luminous: qa/workunits/rados/test_health_warnings: prevent out osds
Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Nathan Cutler <ncutler@suse.com>
Yuri Weinstein [Thu, 21 Feb 2019 23:24:52 +0000 (15:24 -0800)]
Merge pull request #25853 from ashishkumsingh/wip-37833-luminous
luminous: objecter: avoid race when reset down osd's session
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Yuri Weinstein [Thu, 21 Feb 2019 23:23:42 +0000 (15:23 -0800)]
Merge pull request #26305 from dzafman/wip-38207
luminous: mon: A PG with PG_STATE_REPAIR doesn't mean damaged data, PG_STATE_IN…
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Yuri Weinstein [Thu, 21 Feb 2019 21:54:12 +0000 (13:54 -0800)]
Merge pull request #26078 from ashishkumsingh/wip-37993-luminous
luminous: osd: keep using cache even if op will invalid cache
Reviewed-by: Kefu Chai <kchai@redhat.com>
Yuri Weinstein [Thu, 21 Feb 2019 21:53:43 +0000 (13:53 -0800)]
Merge pull request #26148 from ashishkumsingh/wip-38046-luminous
luminous: tests: qa/overrides/short_pg_log.yaml: reduce osd_{min,max}_pg_log_entries
Reviewed-by: Neha Ojha <nojha@redhat.com>
Yuri Weinstein [Thu, 21 Feb 2019 21:53:16 +0000 (13:53 -0800)]
Merge pull request #26236 from pdvian/wip-38105-luminous
luminous: osd/PG.cc: account for missing set irrespective of last_complete
Reviewed-by: David Zafman <dzafman@redhat.com>
Reviewed-by: Neha Ojha <nojha@redhat.com>
Yuri Weinstein [Thu, 21 Feb 2019 21:52:38 +0000 (13:52 -0800)]
Merge pull request #26261 from pdvian/wip-38142-luminous
luminous: os/bluestore: fixup access a destroy cond cause deadlock or undefine
Reviewed-by: Igor Fedotov <ifedotov@suse.com>
Yuri Weinstein [Mon, 18 Feb 2019 17:06:25 +0000 (09:06 -0800)]
Merge pull request #25720 from ashishkumsingh/wip-36692-luminous
luminous: rbd-mirror: update mirror status when stopping
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
Yuri Weinstein [Mon, 18 Feb 2019 17:05:42 +0000 (09:05 -0800)]
Merge pull request #25768 from ashishkumsingh/wip-26913-luminous
luminous: mgr: "balancer execute" only requires read permissions
Reviewed-by: Jan Fajerski <jfajerski@suse.com>
Yuri Weinstein [Mon, 18 Feb 2019 17:04:50 +0000 (09:04 -0800)]
Merge pull request #25955 from pdvian/wip-37901-luminous
luminous: [journal] max journal order is incorrectly set at 64
Reviewed-by: Mykola Golub <mgolub@mirantis.com>
Yuri Weinstein [Mon, 18 Feb 2019 17:04:19 +0000 (09:04 -0800)]
Merge pull request #26000 from pdvian/wip-37926-luminous
luminous: common: fix for broken rbdmap parameter parsing
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
Yuri Weinstein [Mon, 18 Feb 2019 17:03:49 +0000 (09:03 -0800)]
Merge pull request #26286 from smithfarm/wip-38186-luminous
luminous: tests: krbd discard no longer guarantees zeroing
Reviewed-by: Ilya Dryomov <idryomov@redhat.com>
Yuri Weinstein [Tue, 12 Feb 2019 21:52:53 +0000 (13:52 -0800)]
Merge pull request #25990 from ukernel/luminous-37760
luminous: mds: handle fragment notify race
Reviewed-by: Venky Shankar <vshankar@redhat.com>
Yuri Weinstein [Tue, 12 Feb 2019 21:52:21 +0000 (13:52 -0800)]
Merge pull request #26005 from ukernel/luminous-37481
luminous: mds: handle state change race
Reviewed-by: Venky Shankar <vshankar@redhat.com>
Yuri Weinstein [Tue, 12 Feb 2019 21:51:56 +0000 (13:51 -0800)]
Merge pull request #26257 from batrick/i38084
luminous: mds: log new client sessions with various metadata
Reviewed-by: Venky Shankar <vshankar@redhat.com>
Yuri Weinstein [Tue, 12 Feb 2019 21:51:24 +0000 (13:51 -0800)]
Merge pull request #26271 from batrick/i38104
luminous: client: session flush does not cause cap release message flush
Reviewed-by: Venky Shankar <vshankar@redhat.com>
Reviewed-by: Nathan Cutler <ncutler@suse.com>
Yuri Weinstein [Tue, 12 Feb 2019 21:50:52 +0000 (13:50 -0800)]
Merge pull request #26278 from ukernel/luminous-stale-caps
luminous: mds: optimize revoking stale caps
Reviewed-by: Venky Shankar <vshankar@redhat.com>
Andrew Schoen [Fri, 8 Feb 2019 15:58:07 +0000 (09:58 -0600)]
Merge pull request #26326 from alfredodeza/luminous-rm38229
luminous: doc: pin the version for "breathe" to 4.1.11
Reviewed-by: Andrew Schoen <aschoen@redhat.com>
Nathan Cutler [Fri, 8 Feb 2019 11:34:19 +0000 (12:34 +0100)]
rgw: fix radosgw linkage with WITH_RADOSGW_BEAST_FRONTEND=OFF
The master commit
5c040d991510cb4ff0d74305889130e2d84fedc1 fixing issue
http://tracker.ceph.com/issues/23680 was backported to luminous for v12.2.11 by
a47e714e7f5ce803ba7d8986c5d954123b85fc8e which was included in
https://github.com/ceph/ceph/pull/24621, where it came as the first of a series
of five cherry-picks.
This, it turns out, was the wrong order - it should have come last since it
was a follow-up fix.
Signed-off-by: Nathan Cutler <ncutler@suse.com>
(partial manual backport of
5c040d991510cb4ff0d74305889130e2d84fedc1 )
Alfredo Deza [Thu, 7 Feb 2019 22:04:47 +0000 (17:04 -0500)]
doc: pin the version for `breathe` to 4.1.11
It has the compatibility needed for Sphinx version 1.6.3
Signed-off-by: Alfredo Deza <adeza@redhat.com>
Andrew Schoen [Thu, 7 Feb 2019 21:29:43 +0000 (15:29 -0600)]
Merge pull request #26295 from jan--f/25390-luminous
[luminous] ceph-volume: revert partition as disk
Reviewed-by: Andrew Schoen <aschoen@redhat.com>
Enming.Zhang [Tue, 27 Nov 2018 11:41:56 +0000 (06:41 -0500)]
rgw: cleanup for RGWDeleteObj::verify_permission()
- if the 'Effect' field of user policy and bucket policy
is set to 'Allow', RGWDeleteObj::verify_permission()
should return 0 instead of true;
- as the same with bucket policy, if the 'Effect' field
of user policy is set to 'Deny', RGWDeleteObj::verify_permission()
should return -EACCES instead of false;
Signed-off-by: Enming.Zhang <zvampirem77@gmail.com>
(cherry picked from commit
86334645cf96c03515d30804e2df0bdf22916fb5 )
Conflicts:
src/rgw/rgw_op.cc : Resolved in verify_permission
Enming.Zhang [Tue, 27 Nov 2018 10:05:32 +0000 (05:05 -0500)]
rgw: fix obj can still be deleted even if deleteobject policy is set
Fixes: http://tracker.ceph.com/issues/37403
Signed-off-by: Enming.Zhang <zvampirem77@gmail.com>
(cherry picked from commit
84879e915eb3f01b453aa2138cd44c09925e7cd1 )
Conflicts:
src/rgw/rgw_op.cc : Resolved in verify_permission
Jan Fajerski [Fri, 7 Dec 2018 08:59:34 +0000 (09:59 +0100)]
ceph-volume: add inventory call to functional tests
Signed-off-by: Jan Fajerski <jfajerski@suse.com>
(cherry picked from commit
a183a28c5e423c5658a37f7a1d3add9d64c6d683 )
Jan Fajerski [Tue, 4 Dec 2018 16:00:59 +0000 (17:00 +0100)]
ceph-volume: add partition support to Device
Signed-off-by: Jan Fajerski <jfajerski@suse.com>
(cherry picked from commit
05ac680cb37fd15fdeadaea86780bf1b4f2d566a )
Jan Fajerski [Tue, 4 Dec 2018 07:33:53 +0000 (08:33 +0100)]
Revert "ceph-volume tests.util ensure partitions are listed as top-level keys"
This reverts commit
6dc01772245e557b73551111f7c48cc60aec0893 .
Signed-off-by: Jan Fajerski <jfajerski@suse.com>
(cherry picked from commit
3c1c32cbc2736d72295f1bd7921c4a3cd2f4727e )
Jan Fajerski [Tue, 4 Dec 2018 07:29:39 +0000 (08:29 +0100)]
Revert "ceph-volume util.disk include partitions as top level devices in get_devices"
This reverts commit
7f3c3598491e556ec1b93ea0a54f52144202fab6 .
Fixes: http://tracker.ceph.com/issues/37506
Signed-off-by: Jan Fajerski <jfajerski@suse.com>
(cherry picked from commit
50bc44f1c2327ad38504950fe62820a44ead9b14 )
Ilya Dryomov [Fri, 1 Feb 2019 09:35:33 +0000 (10:35 +0100)]
qa: update krbd tests for zeroout
Discard no longer guarantees zeroing, use BLKZEROOUT and "fallocate -z"
instead (blkdiscard(8) in xenial doesn't support -z).
Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
(cherry picked from commit
04f5b343f9987f0cf67509c2a76ddf7ef46288e5 )
Conflicts:
qa/rbd/krbd_whole_object_zeroout.t
qa/suites/krbd/basic/tasks/krbd_whole_object_zeroout.yaml
- the modifications to these files are not relevant for luminous
Yan, Zheng [Mon, 10 Dec 2018 03:37:32 +0000 (11:37 +0800)]
mds: optimize resuming stale caps
If client doesn't want any cap, there is no need to re-issue stale
caps.
A special case is that client wants some caps, but skipped updating
'wanted'. For this case, client needs to update 'wanted' when stale
session get renewed.
Fixes: http://tracker.ceph.com/issues/38043
Signed-off-by: "Yan, Zheng" <zyan@redhat.com>
(cherry picked from commit
e824b3d2024db36789fdf579f0af9bf3bbe55d51 )
Conflicts:
src/client/Client.cc
src/mds/cephfs_features.h
Yan, Zheng [Thu, 6 Dec 2018 09:22:25 +0000 (17:22 +0800)]
client: avoid unnecessary wakeup when handling RENEWCAPS
Signed-off-by: "Yan, Zheng" <zyan@redhat.com>
(cherry picked from commit
c744bc1673ca0b4e50f41516fdf49c8560db073a )
Yan, Zheng [Thu, 6 Dec 2018 07:30:44 +0000 (15:30 +0800)]
client: set cap->wanted when adding new cap
This avoids unnecessary cap message if cap is added by open/create
request reply.
Signed-off-by: "Yan, Zheng" <zyan@redhat.com>
(cherry picked from commit
314660a46a8a1af97f70b2bac05b2f6fa5d23bc4 )
Conflicts:
src/client/Client.cc
src/client/Client.h
Yan, Zheng [Thu, 6 Dec 2018 09:16:49 +0000 (17:16 +0800)]
client: don't wakeup cap waiters twice when mds recovered
Both kick_maxsize_requests() and wake_inode_waiters() wake up cap
waiters
Signed-off-by: "Yan, Zheng" <zyan@redhat.com>
(cherry picked from commit
5993a93e606d23ef311831863444294d7c64cc04 )
Conflicts:
src/client/Client.cc
src/client/Client.h
Yan, Zheng [Tue, 5 Feb 2019 09:06:48 +0000 (17:06 +0800)]
mds: optimize revoking stale caps
For caps that are not being revoked and don't have writeable range
and don't want exclusive caps or file read/write. there is no need
to call Locker::revoke_stale_caps(Capability*). Because these caps
don't need recover and don't affect eval_gather()/try_eval().
Signed-off-by: "Yan, Zheng" <zyan@redhat.com>
(cherry picked from commit
cb62030f0468fc04735c1b4cff73da779cb11ad8 )
Conflicts:
src/mds/CInode.cc
src/mds/Capability.h
src/mds/Locker.cc
src/mds/Migrator.cc
Yan, Zheng [Thu, 22 Nov 2018 09:28:15 +0000 (17:28 +0800)]
mds: put notable caps at the front of session's caps list
Notable Capabilities are ones that are being revoked, ones that
have writeable ranges and ones that want exclusive caps or want
file read/write.
Signed-off-by: "Yan, Zheng" <zyan@redhat.com>
(cherry picked from commit
cb6e7184458e64720ad83c266e5e393a80c32697 )
Conflicts:
src/mds/Capability.cc
Yan, Zheng [Wed, 21 Nov 2018 12:22:25 +0000 (20:22 +0800)]
mds: track if client has writeable range in Capability
Signed-off-by: "Yan, Zheng" <zyan@redhat.com>
(cherry picked from commit
370ae1cb3e5dc07867d80e998082bc514e8fccfd )
Conflicts:
src/mds/Capability.h
src/mds/Locker.cc
src/mds/MDCache.h
src/mds/Server.cc
Yan, Zheng [Mon, 26 Nov 2018 01:44:56 +0000 (09:44 +0800)]
mds: add session pointer to Capability
Signed-off-by: "Yan, Zheng" <zyan@redhat.com>
(cherry picked from commit
7c628472a86c6acebb20f0a2504744b10f250587 )
Conflicts:
src/mds/CInode.cc
src/mds/Capability.cc
src/mds/Capability.h
src/mds/Locker.cc
Yan, Zheng [Thu, 22 Nov 2018 07:02:36 +0000 (15:02 +0800)]
client: skip updating 'wanted' caps if caps are already issued
When reading cached inode that already has Fscr caps, this can avoid
two cap messages (one updats 'wanted' caps, one clears 'wanted' caps).
Signed-off-by: "Yan, Zheng" <zyan@redhat.com>
(cherry picked from commit
d20b260ecf3f323c87ad1e6865f87e2381444546 )
Conflicts:
src/client/Client.cc
Yan, Zheng [Thu, 22 Nov 2018 07:55:12 +0000 (15:55 +0800)]
client: sync 'retain caps' logical from kernel client
The main change is keeping CEPH_CAP_ANY_RD for unused file inodes
Signed-off-by: "Yan, Zheng" <zyan@redhat.com>
(cherry picked from commit
29034396398b1706db625e1abf2e6682be7130a5 )
Neha Ojha [Mon, 4 Feb 2019 16:43:53 +0000 (08:43 -0800)]
Merge pull request #26207 from vumrao/wip-vumrao-38108
luminous: mgr/DaemonServer: log pgmap usage to cluster log
Reviewed-by: Neha Ojha <nojha@redhat.com>
Kefu Chai [Mon, 4 Feb 2019 16:20:53 +0000 (00:20 +0800)]
Merge pull request #26186 from tchaikov/luminous-36737
luminous: build/ops: Allow multi instances of "make tests" on the same machine
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: Yuri Weinstein <yweins@redhat.com>
Reviewed-by: Willem Jan Withagen <wjw@digiware.nl>
Patrick Donnelly [Tue, 22 Jan 2019 18:44:26 +0000 (10:44 -0800)]
client: flush cap release on session flush
MDS expects the completed cap release prior to responding to the session flush
for cache drop.
Fixes: http://tracker.ceph.com/issues/38009
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
(cherry picked from commit
59eca7a17816317d5064840745ea5e28d3349d1a )
Conflicts:
src/client/Client.cc
J. Eric Ivancich [Thu, 31 Jan 2019 19:21:07 +0000 (14:21 -0500)]
rgw: `radosgw-admin bucket rm ... --purge-objects` can hang...
This command can hang (i.e., enter an infinite loop) due to
problematic bucket index entries left as a result of bug
https://tracker.ceph.com/issues/38007 .
The fix is to ignore the false bucket index entries -- since they do
not represent actual objects -- and remove all actual objects in the
bucket, so that bucket itself can be removed.
This fixes the both code paths whether `--bypass-gc` is specified or
not.
Furthermore, to made these operations more efficient, the internal
listing of the bucket is done unordered. This would improve behavior
when removing buckets with a large number of objects.
Fixes: http://tracker.ceph.com/issues/38134
Signed-off-by: J. Eric Ivancich <ivancich@redhat.com>
(cherry picked from commit
5b3dc38c628728651b26415ab3d2190cf06b9e39 )
David Zafman [Mon, 28 Jan 2019 22:30:29 +0000 (14:30 -0800)]
mon: A PG with PG_STATE_REPAIR doesn't mean damaged data, PG_STATE_INCONSISTENT does
Fixes: http://tracker.ceph.com/issues/38070
Signed-off-by: David Zafman <dzafman@redhat.com>
(cherry picked from commit
a4b1574532ee4f789b30634f0eca03cc30ddcf8d )
linbing [Fri, 21 Dec 2018 00:22:30 +0000 (08:22 +0800)]
os/bluestore: fixup access a destroy cond cause deadlock or undefine
behavior.
Fixes: https://tracker.ceph.com/issues/37733
Signed-off-by: linbing <linbing@t2cloud.net>
(cherry picked from commit
dbbde306484276251cbd7a7b7a6fde0093f98ba2 )
Conflicts:
src/os/bluestore/BlockDevice.h : Resolved in try_aio_wake
Patrick Donnelly [Thu, 3 Jan 2019 22:02:52 +0000 (14:02 -0800)]
mds: do not log internal journal error
MDS can't reach this code due to assert in C_MDS_session_finish.
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
(cherry picked from commit
0992ac1fa62edb6143efc80a6fea7b4704107705 )
Conflicts:
src/mds/Server.cc
Patrick Donnelly [Mon, 17 Dec 2018 23:05:24 +0000 (15:05 -0800)]
mds: clean up log level 2 messages
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
(cherry picked from commit
a225c266052d09ffcb066aead83a18dec918aa35 )
Conflicts:
src/mds/MDSRank.cc
Patrick Donnelly [Sat, 15 Dec 2018 02:16:09 +0000 (18:16 -0800)]
mds: log session open stats
This is to assist with tracking what clients are connecting and how long it
takes for them to open a session (a rough estimate of how long it takes to
mount).
Example line:
2018-12-17 17:21:31.682
7f822703c700 2 mds.0.server New client session: addr="127.0.0.1:60552/
2307908923 ",elapsed=0.013384,throttled=0.000071,status="ACCEPTED",root="/"
Fixes: http://tracker.ceph.com/issues/37678
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
(cherry picked from commit
c89cd8cac16789ed98dc1487ec17f45adf03dd26 )
Conflicts:
src/mds/Server.cc
src/mds/SessionMap.cc
src/mds/SessionMap.h
src/mds/events/ESession.h
Neha Ojha [Thu, 24 Jan 2019 20:46:49 +0000 (12:46 -0800)]
osd/PG.cc: account for missing set irrespective of last_complete
When adding source info from another OSD, check if an object that needs
recovery is present in its missing set. If yes, do not include the OSD
as a missing loc.
Fixes: http://tracker.ceph.com/issues/37919
Signed-off-by: Neha Ojha <nojha@redhat.com>
(cherry picked from commit
e6b1637e00a3e98e588e4b83a13db5703fb96fce )
Kefu Chai [Wed, 23 Jan 2019 11:41:18 +0000 (19:41 +0800)]
cmake: use $CMAKE_BINARY_DIR for default $CEPH_BUILD_VIRTUALENV
to avoid conflict with other `make check` runs in the same host
See-also: http://tracker.ceph.com/issues/36737
Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit
a8d6b2170dfa0838dad0d1b7b03fc8cf19e4eeff )
Conflicts:
- drop the change to mgr/*/run-tox.sh, as they don't exist in
luminous.
- apply the change to ceph-disk/run-tox.sh
- apply the change to ceph-helpers.sh: as it set $PATH using
$TMPDIR, which is set to /tmp if $TMPDIR is empty.
Neha Ojha [Thu, 24 Jan 2019 03:25:12 +0000 (19:25 -0800)]
mgr/DaemonServer: log pgmap usage to cluster log
- change default of mon_cluster_log_file_level to debug
- log to clog->debug()
Fixes: https://tracker.ceph.com/issues/37886
Signed-off-by: Neha Ojha <nojha@redhat.com>
(cherry picked from commit
f64a69e5054fb319e9f717bbcb7ddd8541e01c6f )
Conflicts:
src/common/options.cc
dropped master .add_service, .add_see_also
Jenkins Build Slave User [Wed, 30 Jan 2019 15:51:26 +0000 (15:51 +0000)]
12.2.11
Casey Bodley [Tue, 22 Jan 2019 17:04:43 +0000 (12:04 -0500)]
rgw: bucket full sync handles delete markers
full sync uses CLS_RGW_OP_LINK_OLH_DM for delete markers instead of
trying to fetch them from the source zone
Fixes: http://tracker.ceph.com/issues/38007
Signed-off-by: Casey Bodley <cbodley@redhat.com>
(cherry picked from commit
5ffd34c5a6a9bbdba086eb57cded915b879513d4 )
Conflicts:
src/rgw/rgw_data_sync.cc sync tracing
Casey Bodley [Tue, 22 Jan 2019 15:56:56 +0000 (10:56 -0500)]
test/rgw: add multisite test_suspended_delete_marker_full_sync()
Signed-off-by: Casey Bodley <cbodley@redhat.com>
(cherry picked from commit
8686b6429c520aff388fb64d46172d691d71950d )
Casey Bodley [Tue, 22 Jan 2019 15:30:04 +0000 (10:30 -0500)]
test/rgw: add multisite test_delete_marker_full_sync()
Signed-off-by: Casey Bodley <cbodley@redhat.com>
(cherry picked from commit
fba4ed72fd8b3ebec25b18ecce44ffd2717c0d91 )
Casey Bodley [Wed, 23 Jan 2019 15:19:42 +0000 (10:19 -0500)]
test/rgw: check_bucket_eq() uses bucket.list_versions()
get_all_versions() is documented as a lower-level api that doesn't
handle paging, ands suggests list_versions() instead. also caches the
results to avoid listing each bucket twice
Signed-off-by: Casey Bodley <cbodley@redhat.com>
(cherry picked from commit
22d1da72405cbfb522ac661139abf6a22722980c )
Casey Bodley [Tue, 22 May 2018 16:52:11 +0000 (12:52 -0400)]
test/rgw: check_bucket_eq() supports delete markers
Signed-off-by: Casey Bodley <cbodley@redhat.com>
(cherry picked from commit
305f6dd6e94498afa53554075009cb490803e255 )
Kefu Chai [Sun, 27 Jan 2019 06:27:57 +0000 (14:27 +0800)]
test: listen on random port in tests which start ceph-mon
See-also: http://tracker.ceph.com/issues/36737
Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit
94a84b6f5adad75b3cbf956447ee5d9caf1018d2 )
Kefu Chai [Wed, 26 Dec 2018 04:58:08 +0000 (12:58 +0800)]
test: write log file to current directory
instead of writing log files to '/tmp', write them to current directory.
by default, ctest runs the tests in ${CMAKE_CURRENT_BINARY_DIR}, so, in
this case, the log files are located in build/src/test/. this ensure
that current user has enough previledge to remove the log files.
this also allows multiple instances of 'unittest_log' to run in parallel.
See-also: http://tracker.ceph.com/issues/36737
Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit
a13a6f1d0b39a541896591cd04fc1980bb1acfee )
Conflicts:
src/log/test.cc: trivial resolution
Alfredo Deza [Fri, 25 Jan 2019 15:59:11 +0000 (10:59 -0500)]
Merge pull request #26117 from ceph/backport-luminous-26084
luminous: ceph-volume: mark a device not available if it belongs to ceph-disk
Andrew Schoen [Fri, 25 Jan 2019 15:59:02 +0000 (09:59 -0600)]
Merge pull request #26114 from alfredodeza/luminous-rm37963
luminous ceph-volume fix TypeError on dmcrypt when using Python3
Reviewed-by: Andrew Schoen <aschoen@redhat.com>
Neha Ojha [Wed, 23 Jan 2019 20:46:42 +0000 (12:46 -0800)]
qa/overrides/short_pg_log.yaml: reduce osd_{min,max}_pg_log_entries
Fixes: http://tracker.ceph.com/issues/38025
Signed-off-by: Neha Ojha <nojha@redhat.com>
(cherry picked from commit
4d87071bff8b4cdc1a8d167167362e98fc7f8fcf )
Matt Benjamin [Fri, 4 Jan 2019 21:25:16 +0000 (16:25 -0500)]
rgw ldap: move conditional LDAPEngine init into it's ctor
rgw::auth::ExternalAuthStrategy defines an LDAPEngine in a
ctor-initializer list, making it too late to conditionally initialize
-it- in ExternalAuthStrategy's ctor.
Fixes: https://tracker.ceph.com/issues/24228
Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
(cherry picked from commit
97e6c9dac7ca9050d7b16ac160120acbe6ddc33c )
Conflicts:
src/rgw/rgw_rest_s3.h : Added valid
Matt Benjamin [Fri, 4 Jan 2019 20:31:56 +0000 (15:31 -0500)]
rgw ldap: safe_read_file can return < 0
Avoid invalid string access when LDAP auth is enabled, but LDAP
secret is not set. This is Casey's fix for the problem.
Fixes: https://tracker.ceph.com/issues/24228
Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
(cherry picked from commit
65cd8accc127c6765f083a389455ce73b7517e11 )
Andrew Schoen [Tue, 22 Jan 2019 15:32:00 +0000 (09:32 -0600)]
ceph-volume: mark a device not available if it belongs to ceph-disk
The `ceph-volume inventory` command will now show if a device is being
used by ceph-disk and mark it not available if so.
Fixes: https://tracker.ceph.com/issues/24871
Signed-off-by: Andrew Schoen <aschoen@redhat.com>
(cherry picked from commit
d14a6b284c44a3f61c0dd8c60ccc474203003653 )
Alfredo Deza [Fri, 18 Jan 2019 17:51:04 +0000 (12:51 -0500)]
ceph-volume tests verify behavior of create_dmcrypt_key in python 3
Signed-off-by: Alfredo Deza <adeza@redhat.com>
(cherry picked from commit
69613cc5a8b2e111e24b75ad5b69f924c89fd75b )
Alfredo Deza [Fri, 18 Jan 2019 17:50:38 +0000 (12:50 -0500)]
ceph-volume util.encryption ensure int is used for urandom (py3 compat)
Signed-off-by: Alfredo Deza <adeza@redhat.com>
(cherry picked from commit
0ab9fa62d6d46464b16f08d3a5bb3da50f5030e7 )
Abhishek L [Wed, 23 Jan 2019 15:42:14 +0000 (16:42 +0100)]
Merge pull request #26088 from ukernel/luminous-37977
luminous: mds: fix infinite loop in OpTracker::check_ops_in_flight
Reviewed-By: Patrick Donelly <pdonelly@redhat.com>
Yan, Zheng [Wed, 23 Jan 2019 09:32:05 +0000 (17:32 +0800)]
mds: fix infinite loop in OpTracker::check_ops_in_flight
introduced by backport commit
02faf3d
"mds: don't report slow request for blocked filelock request"
Fixes: http://tracker.ceph.com/issues/37977
Signed-off-by: "Yan, Zheng" <zyan@redhat.com>
Yan, Zheng [Wed, 23 Jan 2019 09:29:27 +0000 (17:29 +0800)]
Revert "mds: fix infinite loop in OpTracker::check_ops_in_flight"
This reverts commit
adad2d873a37770e4910b04dfddf92f70964be4a .
Signed-off-by: "Yan, Zheng" <zyan@redhat.com>
Yuri Weinstein [Tue, 22 Jan 2019 16:38:04 +0000 (08:38 -0800)]
Merge pull request #26037 from yuriw/wip-yuriw-p2p-luminous
luminous: qa/tests: changed to `supported' distro and moved all `p2p` suites un…
Reviewed-by: Neha Ojha <nojha@redhat.com>
Sage Weil [Tue, 22 Jan 2019 16:09:06 +0000 (10:09 -0600)]
Merge pull request #25867 from ashishkumsingh/wip-37827-luminous
luminous: mgr: fix crash due to multiple sessions from daemons with same name
Zengran Zhang [Tue, 11 Dec 2018 11:32:55 +0000 (19:32 +0800)]
osd: keep using cache even if op will invalid cache
the current wrong process on same obj in ec 4+2 pool with 16K stripe:
obj has 16K~16K with content-0
new op1 will write 8K~32K (16K~16K content-1)
op1 reserve 0K~48K in cache
op1 read 0~16K & 32K~48K from disk
new op2 will write 20K~24K (20K~4K content-2) *** (invalid_cache dur to clone)
op2 read 16K~32K from disk (content-0) ***** dur to not using_cache
op1 write 0~48K to disk (content-1)
op1 present 0~48K to cache (content-1)
op2 write 16~32K to disk (content-0 + content-2) *** here we drop the content1
even if the op will invalid cache, it should do that *after* itself,
the op should use the cache by itself.
Signed-off-by: Zengran Zhang <zhangzengran@sangfor.com.cn>
(cherry picked from commit
e2dbb8058261e8cc3a3fb00362e2785f0ac6cf18 )
Yuri Weinstein [Fri, 18 Jan 2019 20:53:05 +0000 (12:53 -0800)]
qa/tests: changed to `supported' distro and moved all `p2p` suites under the same folder
Signed-off-by: Yuri Weinstein <yweinste@redhat.com>
Yuri Weinstein [Mon, 21 Jan 2019 23:53:56 +0000 (15:53 -0800)]
Merge pull request #26061 from yuriw/wip-yuriw-p2p-luminous_3
qa/tests: changed start point from `luminous` to v12.2.10
Reviewed-by: Neha Ojha <nojha@redhat.com>
Yuri Weinstein [Mon, 21 Jan 2019 23:25:33 +0000 (15:25 -0800)]
Merge pull request #26048 from ukernel/luminous-37977
luminous: mds: fix infinite loop in OpTracker::check_ops_in_flight
Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Noah Watkins [Mon, 21 Jan 2019 21:33:01 +0000 (13:33 -0800)]
Merge pull request #26036 from noahdesu/luminous-pr26015
luminous: cli: dump osd-fsid as part of osd find <id>
Reviewed-by: Neha Ojha <nojha@redhat.com>
Andrew Schoen [Mon, 21 Jan 2019 21:28:07 +0000 (15:28 -0600)]
Merge pull request #26030 from alfredodeza/luminous-fix_raw_input
luminous ceph-volume: Adapt code to support Python3
Reviewed-by: Andrew Schoen <aschoen@redhat.com>
Yuri Weinstein [Mon, 21 Jan 2019 19:10:39 +0000 (11:10 -0800)]
qa/tests: changed start point from `luminous` to v12.2.10
Signed-off-by: Yuri Weinstein <yweinste@redhat.com>
Andrew Schoen [Mon, 21 Jan 2019 19:39:41 +0000 (13:39 -0600)]
Merge pull request #26014 from alfredodeza/luminous-bz1644847
luminous ceph-volume zap devices associated with an OSD ID and/or OSD FSID
Reviewed-by: Andrew Schoen <aschoen@redhat.com>
Alfredo Deza [Mon, 21 Jan 2019 17:15:45 +0000 (12:15 -0500)]
Merge pull request #25553 from jan--f/25238-luminous
luminous ceph-volume: introduce class hierachy for strategies
Reviewed-by: Alfredo Deza <adeza@redhat.com>
Yan, Zheng [Mon, 21 Jan 2019 02:08:51 +0000 (10:08 +0800)]
mds: fix infinite loop in OpTracker::check_ops_in_flight
introduced by backport commit
02faf3dc321
"mds: don't report slow request for blocked filelock request"
Fixes: http://tracker.ceph.com/issues/37977
Signed-off-by: "Yan, Zheng" <zyan@redhat.com>
Yuri Weinstein [Fri, 18 Jan 2019 21:56:15 +0000 (13:56 -0800)]
Merge pull request #25307 from trociny/wip-37438-luminous
luminous: crushtool: add --reclassify operation to convert legacy crush maps to use device classes
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Yuri Weinstein [Fri, 18 Jan 2019 20:38:00 +0000 (12:38 -0800)]
Merge pull request #25949 from neha-ojha/wip-36686-luminous
luminous: osd/mon: pg log hard limit with upgrades fixed
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Yuri Weinstein [Fri, 18 Jan 2019 20:33:59 +0000 (12:33 -0800)]
Merge pull request #25804 from ashishkumsingh/wip-37758-luminous
luminous: mds: clean up log messages for standby-replay
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Reviewed-by: Yan, Zheng <zyan@redhat.com>
Yuri Weinstein [Fri, 18 Jan 2019 20:33:13 +0000 (12:33 -0800)]
Merge pull request #25904 from pdvian/wip-37829-luminous
luminous : client: fix fuse client hang because its pipe to mds is not ok4
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Yuri Weinstein [Fri, 18 Jan 2019 20:30:04 +0000 (12:30 -0800)]
Merge pull request #26011 from batrick/i37953
luminous: qa: test_damage needs to silence MDS_READ_ONLY
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Noah Watkins [Thu, 17 Jan 2019 19:16:44 +0000 (11:16 -0800)]
cli: dump osd-fsid as part of osd find <id>
Dumps the osd-fsid uuid as part of the `osd find <id>` command.
Currently this uuid is only available as part of `osd dump` but
ceph-ansible has a use case to interrogate a single osd without needing
the entire osdmap dump.
Fixes: http://tracker.ceph.com/issues/37966
Signed-off-by: Noah Watkins <noahwatkins@gmail.com>
(cherry picked from commit
4d01b2c96e0ea1122225c30da21bc39c40e15c0e )
Neha Ojha [Fri, 18 Jan 2019 19:01:18 +0000 (14:01 -0500)]
doc: pglog_hardlimit flag recommendations
Signed-off-by: Neha Ojha <nojha@redhat.com>