]>
git.apps.os.sepia.ceph.com Git - ceph.git/log
Vasu Kulkarni [Wed, 20 Sep 2017 00:06:03 +0000 (17:06 -0700)]
qa/tests: update required ceph-ansbile vars
Signed-off-by: Vasu Kulkarni <vasu@redhat.com>
(cherry picked from commit
184d5e6bad46451b3a8c5787f56148566bb42f20 )
Vasu Kulkarni [Wed, 20 Sep 2017 00:03:46 +0000 (17:03 -0700)]
qa/tests: Fix ceph-ansible upstream vars
Signed-off-by: Vasu Kulkarni <vasu@redhat.com>
(cherry picked from commit
077904a0b5dffe9d64feade94cf30ffc92f1c0e5 )
Vasu Kulkarni [Sun, 10 Sep 2017 19:42:16 +0000 (12:42 -0700)]
Fix get_system_type failure due to invalid remote name
recent changes caused the remote name to be invalid, fix the
arg passed to get_system_type
Signed-off-by: Vasu Kulkarni <vasu@redhat.com>
(cherry picked from commit
9fe58d5ed6bd2338271a9e003f51d80c2e440e23 )
Vasu Kulkarni [Fri, 8 Sep 2017 17:00:49 +0000 (10:00 -0700)]
Stop the mgr on node which is not client, this will ensure
the client.0's mgr is active mgr for workunit to work.
Signed-off-by: Vasu Kulkarni <vasu@redhat.com>
(cherry picked from commit
b1fd615e9f507d4243744b34887366086c1890ac )
Vasu Kulkarni [Fri, 8 Sep 2017 00:10:04 +0000 (17:10 -0700)]
Test ceph-mgr RESTful api
Signed-off-by: Vasu Kulkarni <vasu@redhat.com>
(cherry picked from commit
e5b5a1b8c8d0e750d29fe41a16252dcb0adf449f )
Vasu Kulkarni [Thu, 7 Sep 2017 23:54:51 +0000 (16:54 -0700)]
Add additional variables as required by ceph-ansible for upstream
installation.
possible revert if those are made default
issue: https://github.com/ceph/ceph-ansible/issues/1834
Signed-off-by: Vasu Kulkarni <vasu@redhat.com>
(cherry picked from commit
e963bfd6ca0ea1525e37dc35bf3309548c7a3831 )
Vasu Kulkarni [Fri, 18 Aug 2017 18:35:54 +0000 (11:35 -0700)]
Rename folders to fix task order
Signed-off-by: Vasu Kulkarni <vasu@redhat.com>
(cherry picked from commit
9cc00c5c1a6e99323a4655aad5c093b8d87609f6 )
Vasu Kulkarni [Fri, 18 Aug 2017 18:09:50 +0000 (11:09 -0700)]
use bluestore with dmcrypt option
Signed-off-by: Vasu Kulkarni <vasu@redhat.com>
(cherry picked from commit
1041c803f1f8f7be0edd0e78df352152fa3c4e6f )
Vasu Kulkarni [Fri, 18 Aug 2017 18:08:00 +0000 (11:08 -0700)]
Add dmcrypt option
Signed-off-by: Vasu Kulkarni <vasu@redhat.com>
(cherry picked from commit
f6de5d9f9e2a3666116311c146a8f2a45f3b8dbb )
Vasu Kulkarni [Fri, 18 Aug 2017 18:05:01 +0000 (11:05 -0700)]
Separate the main task from options
Signed-off-by: Vasu Kulkarni <vasu@redhat.com>
(cherry picked from commit
60d00e0eadda3a7a7cfbac2acdc81a4d55a27570 )
Vasu Kulkarni [Fri, 18 Aug 2017 17:47:22 +0000 (10:47 -0700)]
Catchup with recent changes with ceph-ansible
Adds osd_scenario and ceph_stable_release variables
Signed-off-by: Vasu Kulkarni <vasu@redhat.com>
(cherry picked from commit
0395b844884a63a2cb7480dcc40762df6915b403 )
Vasu Kulkarni [Thu, 24 Aug 2017 18:02:20 +0000 (11:02 -0700)]
Add workaround for http://tracker.ceph.com/issues/20950
mgr bootstrap key differs on disk, rewrite the new key
using auth get.
Signed-off-by: Vasu Kulkarni <vasu@redhat.com>
(cherry picked from commit
5c43c5972ddb04724c8659a1b8d71cda1e0acdfb )
Vasu Kulkarni [Thu, 24 Aug 2017 16:24:52 +0000 (09:24 -0700)]
Add kraken to luminous upgrade case
Signed-off-by: Vasu Kulkarni <vasu@redhat.com>
(cherry picked from commit
71ea4987e0d55cc49e90dfbaf9722769cc892f3f )
Vasu Kulkarni [Mon, 7 Aug 2017 19:19:41 +0000 (12:19 -0700)]
Add kernel tar/untar and systemd task
Signed-off-by: Vasu Kulkarni <vasu@redhat.com>
(cherry picked from commit
526d4aef1cb73ffa6f73e1353dc06eed6cccb9f9 )
Vasu Kulkarni [Tue, 1 Aug 2017 23:32:42 +0000 (16:32 -0700)]
Restart services after upgrade
This seems to be an issue and should be fixed in our systemd scripts,
need to discuss more on this.
Signed-off-by: Vasu Kulkarni <vasu@redhat.com>
(cherry picked from commit
2116f76a1f1fbb32ca5844c1d051e22b1b657e0f )
Vasu Kulkarni [Sat, 29 Jul 2017 06:11:41 +0000 (23:11 -0700)]
since the roles are mapped inside ceph-deploy, store the roles that
are mapped and use the new mapped role for upgrades during later
stage.
eg: mon.a is mapped to mon.mira002 during install, store this mapping
and durig upgrade map it back to appropriate name to find the hostname
with that role
Signed-off-by: Vasu Kulkarni <vasu@redhat.com>
(cherry picked from commit
8a2b9a08095dc97e0e440cc900c650d5efb55a4f )
Vasu Kulkarni [Sat, 29 Jul 2017 00:48:09 +0000 (17:48 -0700)]
Add doc string for missing ceph-deploy-branch
Signed-off-by: Vasu Kulkarni <vasu@redhat.com>
(cherry picked from commit
e7a0a4f87f2fbea0c9e27341c952245f1ad34ab8 )
Vasu Kulkarni [Thu, 27 Jul 2017 22:24:25 +0000 (15:24 -0700)]
use mon.a as ceph-admin node, the previous get_first_mon returns
a sorted(mons)[0] as first mon.
Signed-off-by: Vasu Kulkarni <vasu@redhat.com>
(cherry picked from commit
407ce2613d37252e48c2a648b94b065ab070ec46 )
Vasu Kulkarni [Thu, 27 Jul 2017 18:17:31 +0000 (11:17 -0700)]
use elif instead of else to handle cases for jewel install
jewel needs neither filestore or bluestore as an option, so provide none
when running with jewel branch.
Signed-off-by: Vasu Kulkarni <vasu@redhat.com>
(cherry picked from commit
f3ec7cabf66c76d712f77a4dfefe96f374507982 )
Vasu Kulkarni [Thu, 27 Jul 2017 02:18:11 +0000 (19:18 -0700)]
Jewel to luminous upgrade scenario using ceph-deploy
Signed-off-by: Vasu Kulkarni <vasu@redhat.com>
(cherry picked from commit
9c85c76a90dcf46ec2bcc6840f4fc57ed86583b5 )
Vasu Kulkarni [Thu, 27 Jul 2017 01:56:08 +0000 (18:56 -0700)]
Add upgrade functionality using ceph-deploy
This is to test for customer like upgrade scenarios and to find
any issues that may be related to systemd, packaging etc
Signed-off-by: Vasu Kulkarni <vasu@redhat.com>
(cherry picked from commit
9a73127c16d3395934d003024964ed1373d81083 )
Vasu Kulkarni [Wed, 26 Jul 2017 22:01:15 +0000 (15:01 -0700)]
Fix old flake8 issues
Signed-off-by: Vasu Kulkarni <vasu@redhat.com>
(cherry picked from commit
b409c3d163194b0b65e26b0fbc93def8e17a10b4 )
Vasu Kulkarni [Wed, 26 Jul 2017 21:58:50 +0000 (14:58 -0700)]
Add option to skip mgr install for old release
Signed-off-by: Vasu Kulkarni <vasu@redhat.com>
(cherry picked from commit
a9be0c387ed2ae09227dad833c8647af110bd2de )
Nathan Cutler [Mon, 25 Sep 2017 20:40:05 +0000 (22:40 +0200)]
Merge pull request #17945 from batrick/i21540
luminous: qa whitelist fixes
Reviewed-by: Nathan Cutler <ncutler@suse.com>
Nathan Cutler [Mon, 25 Sep 2017 20:32:17 +0000 (22:32 +0200)]
Merge pull request #17821 from smithfarm/wip-21472-luminous
luminous: tests: kcephfs: ignorable MDS cache too large warning
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Reviewed-by: Yan, Zheng <zyan@redhat.com>
Patrick Donnelly [Mon, 28 Aug 2017 18:47:29 +0000 (11:47 -0700)]
qa: whitelist expected MDS_CACHE_OVERSIZED
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
(cherry picked from commit
71f0066f6ec32be18abc0c220a49e203ac3b9786 )
Conflicts:
qa/suites/kcephfs/recovery/tasks/client-limits.yaml - fix
already applied by some other commit
Patrick Donnelly [Mon, 28 Aug 2017 18:52:36 +0000 (11:52 -0700)]
qa: whitelist expected rstat warning
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
(cherry picked from commit
c53d091e5110011866aa85495ff4e5abe0442d71 )
Nathan Cutler [Mon, 25 Sep 2017 13:43:06 +0000 (15:43 +0200)]
Merge pull request #17922 from batrick/kcephfs-backports
luminous: qa: kcephfs whitelist fixes
Reviewed-by: Yan, Zheng <zyan@redhat.com>
Yuri Weinstein [Fri, 22 Sep 2017 20:25:59 +0000 (13:25 -0700)]
Merge pull request #17855 from smithfarm/wip-21490-luminous
luminous: tests: test_rebuild_simple_altpool triggers MDS assertion
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Patrick Donnelly [Wed, 20 Sep 2017 22:44:40 +0000 (15:44 -0700)]
qa: get config only on running MDS
Fixes: http://tracker.ceph.com/issues/21466
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
(cherry picked from commit
8a535d9c72965c79692dccc6ff418b46fb86c3eb )
Patrick Donnelly [Fri, 22 Sep 2017 16:44:43 +0000 (09:44 -0700)]
qa: whitelist cache too large in client-limits
Fixes: http://tracker.ceph.com/issues/21510
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
(cherry picked from commit
87039eb30a25158a192ab7099fa81fbb9ce02953 )
Patrick Donnelly [Fri, 22 Sep 2017 16:42:06 +0000 (09:42 -0700)]
qa: whitelist failover log warnings
Fixes: http://tracker.ceph.com/issues/21509
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
(cherry picked from commit
37a7737712f36422b5f035a0e02bab25ae2da890 )
Patrick Donnelly [Fri, 22 Sep 2017 16:38:59 +0000 (09:38 -0700)]
qa: ignore evicted client in client-recovery
Fixes: http://tracker.ceph.com/issues/21508
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
(cherry picked from commit
8ecef57bb10a83587f02ce087b657d303ae7c589 )
Patrick Donnelly [Fri, 22 Sep 2017 16:53:43 +0000 (09:53 -0700)]
Merge PR #17878 into luminous
* refs/remotes/upstream/pull/17878/head:
qa/cephfs: Fix error in test_filtered_df
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Reviewed-by: Amit Kumar <amitkuma@redhat.com>
Patrick Donnelly [Fri, 22 Sep 2017 16:53:41 +0000 (09:53 -0700)]
Merge PR #17877 into luminous
* refs/remotes/upstream/pull/17877/head:
client: Delete onsafe
client: add mountedness check inside client_lock
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Patrick Donnelly [Fri, 22 Sep 2017 16:53:39 +0000 (09:53 -0700)]
Merge PR #17870 into luminous
* refs/remotes/upstream/pull/17870/head:
mds: reset Formatter on error
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Reviewed-by: Amit Kumar <amitkuma@redhat.com>
Patrick Donnelly [Fri, 22 Sep 2017 16:53:37 +0000 (09:53 -0700)]
Merge PR #17854 into luminous
* refs/remotes/upstream/pull/17854/head:
mds: void sending cap import message when inode is frozen
client: fix message order check in handle_cap_export()
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Patrick Donnelly [Fri, 22 Sep 2017 16:53:35 +0000 (09:53 -0700)]
Merge PR #17852 into luminous
* refs/remotes/upstream/pull/17852/head:
mds: check ongoing catter-gather process before capping log
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Patrick Donnelly [Fri, 22 Sep 2017 16:53:33 +0000 (09:53 -0700)]
Merge PR #17822 into luminous
* refs/remotes/upstream/pull/17822/head:
qa/cephfs: kill mount if it gets evicted by mds
qa/cephfs: fix test_evict_client
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Reviewed-by: Zheng Yan <zyan@redhat.com>
Yuri Weinstein [Fri, 22 Sep 2017 16:44:54 +0000 (09:44 -0700)]
Merge pull request #17817 from smithfarm/wip-21464-luminous
luminous: qa: ignorable MDS_READ_ONLY warning
Reviewed-by: Yan, Zheng <ukernel@gmail.com>
Reviewed-by: Yuri Weinstein <yweins@redhat.com>
Yuri Weinstein [Fri, 22 Sep 2017 16:41:18 +0000 (09:41 -0700)]
Merge pull request #17879 from smithfarm/wip-21449-luminous
luminous: tests: test_misc creates metadata pool with dummy object resulting in WRN: POOL_APP_NOT_ENABLED
Reviewed-by: Amit Kumar amitkuma@redhat.com
Reviewed-by: Yan, Zheng <ukernel@gmail.com>
Yuri Weinstein [Fri, 22 Sep 2017 16:40:46 +0000 (09:40 -0700)]
Merge pull request #17886 from smithfarm/wip-21486-luminous
luminous: tests: [kcephfs] test_client_pin times out waiting for dentry release from kernel
Reviewed-by: Amit Kumar amitkuma@redhat.com
Reviewed-by: Yan, Zheng <ukernel@gmail.com>
Yuri Weinstein [Fri, 22 Sep 2017 16:39:26 +0000 (09:39 -0700)]
Merge pull request #17887 from smithfarm/wip-21487-luminous
luminous: cephfs: MDS rank add/remove log messages say wrong number of ranks
Reviewed-by: Amit Kumar amitkuma@redhat.com
Reviewed-by: Yan, Zheng <ukernel@gmail.com>
Yuri Weinstein [Fri, 22 Sep 2017 16:37:42 +0000 (09:37 -0700)]
Merge pull request #17888 from smithfarm/wip-21488-luminous
luminous: tests: failures from pjd fstest
Reviewed-by: Amit Kumar amitkuma@redhat.com
Reviewed-by: Yan, Zheng <ukernel@gmail.com>
Sage Weil [Thu, 21 Sep 2017 15:56:16 +0000 (10:56 -0500)]
Merge pull request #17812 from liewegas/wip-21410-luminous
Revert "osd/OSDMap: allow bidirectional swap of pg-upmap-items"
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
Yan, Zheng [Sun, 17 Sep 2017 08:51:04 +0000 (16:51 +0800)]
ceph: do link/rename semantic checks after srcdn is readable
For hard link, source inode must not be directory. For rename,
types of source/destination inodes must match. If srcdn is replica
and we do these checks while it's not readble, it's possible that
wrong source inode is used in these checks.
Fixes: http://tracker.ceph.com/issues/21383
Signed-off-by: "Yan, Zheng" <zyan@redhat.com>
(cherry picked from commit
46962b253563a867707e7c5d7887abf2060cc4d7 )
John Spray [Mon, 18 Sep 2017 17:16:40 +0000 (13:16 -0400)]
mon/MDSMonitor: fix clog msgs on MDS rank add/rm
Because these were generated before the actual
change, the get_num_in values did not make sense.
Fixes: http://tracker.ceph.com/issues/21421
Signed-off-by: John Spray <john.spray@redhat.com>
(cherry picked from commit
511439b515414ae93d791f54a187e44d5fdffa7b )
Yan, Zheng [Tue, 19 Sep 2017 06:38:13 +0000 (14:38 +0800)]
client: set client_try_dentry_invalidate to false by default
By default, ceph-fuse uses side effect of 'dentry invalidation' to
trim kernel dcache if it runs on kernel < 3.18. The implemention of
kernel function d_invalidate() changed in 3.18 kernel, the method no
longer works for upstream kernel >= 3.18.
RHEL 3.10 kernel includes backport of patches that change implemention
of d_invalidate(). So checking kernel version to decide if 'dentry
invalidation' method works is unreliable.
Fixes: http://tracker.ceph.com/issues/21423
Signed-off-by: "Yan, Zheng" <zyan@redhat.com>
(cherry picked from commit
69adaabface27880dd6c8dbfdeeb06cf3f3d346a )
Douglas Fuller [Tue, 12 Sep 2017 17:22:09 +0000 (13:22 -0400)]
qa/tasks/cephfs: Whitelist POOL_APP_NOT_ENABLED for test_misc
test_misc verifies that ceph fs new will not create a filesystem
on a pool that already contains objects. As part of the test, it
inserts a dummy object into a pool and then attempts to use it for
CephFS. This triggers POOL_APP_NOT_ENABLED. Setting the application
metadata for the pool (and having ceph fs new fail because of the
existing metadata) would then exercise a different failure case.
Signed-off-by: Douglas Fuller <dfuller@redhat.com>
(cherry picked from commit
eba01c48ca8b3113b1faf353990533a5ae39232c )
Douglas Fuller [Wed, 13 Sep 2017 18:00:20 +0000 (14:00 -0400)]
qa/cephfs: Fix error in test_filtered_df
ceph df accounts for pool size, so there is no need to do it in the test.
Fixes: http://tracker.ceph.com/issues/21381
Signed-off-by: Douglas Fuller <dfuller@redhat.com>
(cherry picked from commit
b059cb6290d81df07bd8ec4e1ec9ef0be24892a2 )
Jos Collin [Thu, 7 Sep 2017 07:11:40 +0000 (12:41 +0530)]
client: Delete onsafe
Variable "onsafe" going out of scope leaks the storage it points to. This fixes the Coverity
Scan CID
1417473 .
Signed-off-by: Jos Collin <jcollin@redhat.com>
(cherry picked from commit
e24a91e9189587c800ef5709c78f1bc0e0ac8419 )
Jeff Layton [Fri, 25 Aug 2017 12:31:47 +0000 (08:31 -0400)]
client: add mountedness check inside client_lock
Currently we check for mountedness in the high level wrappers, but those
checks are lockless. It's possible to have a call that races with
ceph_unmount(). It could pass one of the is_mounted() checks in the
wrapper, and then block on the client_lock while the unmount is actually
running. Eventually it picks up and runs after the unmount returns, with
questionable results -- possibly even a crash in some cases.
For now, we can explain this away with a simple admonition that
applications should ensure that no calls are running when ceph_unmount
is called. In the future though, we may need to forcibly shut down the
mount when certain events occur (not returning a lease or delegation in
time, for instance).
Sprinkle in a bunch of "unmounting" checks after taking the client_lock,
and simply have the functions return errors (or sensible values in some
cases) when the Client is being downed. With that, we ensure that this
sort of race can't occur, even when the unmount is not being driven by
userland. Note too that in some places I've replaced assertions in the
code with error returns, as that's nicer behavior for libraries.
Note that this can't replace the ->is_mounted() checks in the lockless
wrappers as those are needed to determine whether the client pointer in
the ceph_mount_info is still valid. The admonition not to allow
ceph_unmount to race with other calls is therefore still necessary.
Signed-off-by: Jeff Layton <jlayton@redhat.com>
(cherry picked from commit
efca340596ef4da2b254ff1c64ec4c462d7b95a5 )
Patrick Donnelly [Tue, 5 Sep 2017 21:44:49 +0000 (14:44 -0700)]
mds: reset Formatter on error
This prevents partial results from concatenating with the error message.
Fixes: http://tracker.ceph.com/issues/21252
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
(cherry picked from commit
2b2b3d2035a700a65c3c469eedae69ad31023cf6 )
Douglas Fuller [Wed, 12 Jul 2017 15:48:42 +0000 (10:48 -0500)]
qa/cephfs: Refactor alternate pool test
Remove the alternate pool recovery test from test_data_scan. Newer
commits will place the test in its own file.
Signed-off-by: Douglas Fuller <dfuller@redhat.com>
(cherry picked from commit
47318f8ac4391148a1394846dd77c8452b7cf5ae )
Douglas Fuller [Wed, 12 Jul 2017 15:45:13 +0000 (10:45 -0500)]
qa/cephfs: test CephFS recovery pools
Test recovering metadata in to a separate RADOS pool with
cephfs_data_scan and friends.
Signed-off-by: Douglas Fuller <dfuller@redhat.com>
(cherry picked from commit
6af2ae80d327e564ad17f2caeded9c8142becf29 )
Douglas Fuller [Wed, 12 Jul 2017 15:43:39 +0000 (10:43 -0500)]
qa/cephfs: support CephFS recovery pools
Add support for testing recovery of CephFS metadata into an alternate
RADOS pool, useful as a disaster recovery mechanism that avoids
modifying the metadata in-place.
Signed-off-by: Douglas Fuller <dfuller@redhat.com>
(cherry picked from commit
8f9a25202093339afb5308051d354d3ae79c6b2d )
Douglas Fuller [Wed, 26 Jul 2017 17:05:59 +0000 (13:05 -0400)]
qa/cephfs: Allow deferred fs creation
Permit Filesystem objects to be created and settings modified before
calling Filesystem.create().
Signed-off-by: Douglas Fuller <dfuller@redhat.com>
(cherry picked from commit
5fafc03cb9e6d5f39ce494375ea28c89b896e2f5 )
Douglas Fuller [Wed, 12 Jul 2017 15:41:11 +0000 (10:41 -0500)]
qa/ceph_test_case: support CephFS recovery pools
Add support for testing recovery of CephFS metadata into an alternate
RADOS pool, useful as a disaster recovery mechanism that avoids
modifying the metadata in-place.
Signed-off-by: Douglas Fuller <dfuller@redhat.com>
(cherry picked from commit
c85562c94a80b8a18975b8d0ee6a7fbd932cf024 )
Yan, Zheng [Tue, 29 Aug 2017 03:35:56 +0000 (11:35 +0800)]
mds: void sending cap import message when inode is frozen
To export an inode to other mds, mds need to:
- Freeze the inode (stop issuing caps to clients)
- Flush client sessions (ensure client have received all cap messages)
- Send cap export message
These steps guarantee that clients receive cap import/export messages
in proper order (In the case that inode gets exported servel times
within a short time)
When inode is frozen, mds may have already flushed client sessions.
So mds shouldn't send cap import messages.
Signed-off-by: "Yan, Zheng" <zyan@redhat.com>
(cherry picked from commit
48a9e695e58ac15f1e494977e0db7a164bb2fe98 )
Yan, Zheng [Mon, 28 Aug 2017 09:13:31 +0000 (17:13 +0800)]
client: fix message order check in handle_cap_export()
If importer mds' cap already exists, but cap ID mismatches, client
should have received corresponding import message (the imported caps
got released later). Because cap ID does not change as long as client
holds the caps.
Signed-off-by: "Yan, Zheng" <zyan@redhat.com>
(cherry picked from commit
3c31256a4addcc4eca30c62109e33f77224258c2 )
Yan, Zheng [Thu, 21 Sep 2017 02:56:07 +0000 (10:56 +0800)]
mds: check ongoing catter-gather process before capping log
When deactivating mds, MDLog::trim() may start scatter-gather
process on mdsdir inode. Locker::scatter_writebehind() submits
log entry. So mds should make sure there is no scatter-gather
before capping log.
Fixes: http://tracker.ceph.com/issues/21467
Signed-off-by: "Yan, Zheng" <zyan@redhat.com>
Josh Durgin [Wed, 20 Sep 2017 15:08:14 +0000 (08:08 -0700)]
Merge pull request #17829 from jdurgin/wip-21428-luminous
osd/PrimaryLogPG: request osdmap update in the right block
Reviewed-by: Sage Weil <sage@redhat.com>
Josh Durgin [Wed, 20 Sep 2017 05:18:35 +0000 (01:18 -0400)]
osd/PrimaryLogPG: request osdmap update in the right block
Fixes: http://tracker.ceph.com/issues/21428
Signed-off-by: Josh Durgin <jdurgin@redhat.com>
(cherry picked from commit
afc6624f768ea3c6e2d155122797db5cce8836f7 )
Yan, Zheng [Wed, 13 Sep 2017 08:34:40 +0000 (16:34 +0800)]
qa/cephfs: kill mount if it gets evicted by mds
otherwise, teardown() hange at umount
Fixes: http://tracker.ceph.com/issues/21275
Signed-off-by: "Yan, Zheng" <zyan@redhat.com>
(cherry picked from commit
98d86a075242f0c4576814db15cc3f8fd8e06017 )
Yan, Zheng [Wed, 13 Sep 2017 08:15:31 +0000 (16:15 +0800)]
qa/cephfs: fix test_evict_client
executing mount_a.kill() twice, then executing mount_b.kill_cleanup()
twice do not make sense.
Signed-off-by: "Yan, Zheng" <zyan@redhat.com>
(cherry picked from commit
8433ced84733da86d545ccacc06ddea3a0282071 )
Josh Durgin [Tue, 19 Sep 2017 23:45:40 +0000 (16:45 -0700)]
Merge pull request #17796 from jdurgin/wip-21428-luminous
osd: request new map from PG when needed
Reviewed-by: Sage Weil <sage@redhat.com>
Yan, Zheng [Tue, 5 Sep 2017 09:09:32 +0000 (17:09 +0800)]
qa: whitelist expected MDS_READ_ONLY for kcephfs test
Signed-off-by: "Yan, Zheng" <zyan@redhat.com>
(cherry picked from commit
584241285f52fc420ebc4a6a6455497a3ed4d45a )
Josh Durgin [Tue, 19 Sep 2017 02:31:10 +0000 (22:31 -0400)]
osd: request new map from PG when needed
The fast dispatch refactor in
3cc48278bf0ee5c9535d04b60a661f988c50063b
eliminated the osdmap subscription in the ms_fast_dispatch path, which
meant ops could reach a PG without having the latest map. In a cluster
with few osdmap updates, where the monitor fails to send a new map to
an osd (it tries one random osd), this can result in indefinitely
blocked requests.
Fix this by adding an OSDService mechanism for scheduling a new osdmap
subscription request.
Fixes: http://tracker.ceph.com/issues/21428
Signed-off-by: Josh Durgin <jdurgin@redhat.com>
(cherry picked from commit
dd33360e5a4ed06228af552edadee88e66c5aba9 )
Sage Weil [Fri, 15 Sep 2017 20:52:28 +0000 (16:52 -0400)]
Revert "osd/OSDMap: allow bidirectional swap of pg-upmap-items"
This reverts commit
09af9b8afb40cc8aa629501582a75e03edf0bf2e .
We need to prevent duplicates in the final result. For example, we
can currently take
[1,2,3] and apply [(1,2)] and get [2,2,3]
or
[1,2,3] and apply [(3,2)] and get [1,2,2]
The rest of the system is not prepared to handle duplicates in the
result set like this.
The reverted commit was intended to allow
[1,2,3] and [(1,2),(2,1)] to get [2,1,3]
to reorder primaries. First, this bidirectional swap is hard to implement
in a way that also prevents dups. For example,
[1,2,3] and [(1,4),(2,3),(3,4)] would give [4,3,4]
but would we just drop the last step we'd have [4,3,3] which
is also invalid, etc. Simpler to just not handle bidirectional
swaps. In practice, they are not needed: if you just want to choose
a different primary then use primary_affinity, or pg_upmap
(not pg_upmap_items).
Fixes: http://tracker.ceph.com/issues/21410
Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit
9c73305e3ad11177d58632eba6ece5d2c0e701da )
Abhishek L [Fri, 15 Sep 2017 20:46:27 +0000 (22:46 +0200)]
Merge pull request #17724 from theanalyst/wip-21374-luminous
luminous: incorrect erasure-code space in command ceph df
Reviewed-By: Josh Durgin <jdurgin@redhat.com>
Josh Durgin [Fri, 15 Sep 2017 20:35:36 +0000 (13:35 -0700)]
Merge pull request #17745 from tchaikov/wip-luminous-20529
luminous: rocksdb,cmake: build portable binaries
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Abhishek L [Fri, 15 Sep 2017 19:58:05 +0000 (21:58 +0200)]
Merge pull request #17635 from smithfarm/wip-21342-luminous
luminous: ceph mgr versions shows active mgr as Unknown
Reviewed-By: Josh Durgin <jdurgin@redhat.com>
Abhishek L [Fri, 15 Sep 2017 19:57:54 +0000 (21:57 +0200)]
Merge pull request #17634 from smithfarm/wip-21341-luminous
luminous: mon/OSDMonitor: deleting pool while pgs are being created leads to assert(p != pools.end) in update_creating_pgs()
Reviewed-By: Josh Durgin <jdurgin@redhat.com>
Abhishek L [Fri, 15 Sep 2017 19:57:13 +0000 (21:57 +0200)]
Merge pull request #17624 from tchaikov/wip-luminous-pr-17599
luminous: encoding: reset optional<> if it is uninitialized
Reviewed-By: Josh Durgin <jdurgin@redhat.com>
Abhishek L [Fri, 15 Sep 2017 19:55:41 +0000 (21:55 +0200)]
Merge pull request #17487 from smithfarm/wip-21231-luminous
luminous: core: interval_set: optimize intersect_of insert operations
Reviewed-By: Josh Durgin <jdurgin@redhat.com>
Abhishek L [Fri, 15 Sep 2017 19:49:37 +0000 (21:49 +0200)]
Merge pull request #17712 from batrick/bp21221
luminous: MDCache::try_subtree_merge() may print N^2 lines of debug message
Reviewed-By: Yan Zhen <zyan@redhat.com>
Abhishek L [Fri, 15 Sep 2017 19:45:04 +0000 (21:45 +0200)]
Merge pull request #17623 from liewegas/wip-pr-17572-luminous
tools/ceph_objectstore_tool: fix 'dup' unable to duplicate meta PG
Reviewed-By: Josh Durgin <jdurgin@redhat.com>
Abhishek L [Fri, 15 Sep 2017 19:43:22 +0000 (21:43 +0200)]
Merge pull request #17584 from jdurgin/wip-recovery-delete-encoding-luminous
osd/PGBackend, MOSDPGRecoveryDelete[Reply]: handle incompatible encoding
Reviewed-By: Sage Weil <sage@redhat.com>
Abhishek L [Fri, 15 Sep 2017 19:39:49 +0000 (21:39 +0200)]
Merge pull request #17686 from ukernel/luminous-21070
luminous: mds: fix 'dirfrag end' check in Server::handle_client_readdir
Reviewed-By: Patrick Donnelly <pdonelly@redhat.com>
Abhishek L [Fri, 15 Sep 2017 19:38:36 +0000 (21:38 +0200)]
Merge pull request #17711 from batrick/bp20594
luminous: mds: support limiting cache by memory
Reviewed-By: Yan Zheng <zyan@redhat.com>
Abhishek L [Fri, 15 Sep 2017 19:36:00 +0000 (21:36 +0200)]
Merge pull request #17714 from batrick/bp21222
luminous: MDS: standby-replay mds should avoid initiating subtree export
Reviewed-By: Yan, Zheng <zyan@redhat.com>
Abhishek L [Fri, 15 Sep 2017 19:25:56 +0000 (21:25 +0200)]
Merge pull request #17570 from theanalyst/wip-luminous-21233
luminous: rgw: memory leak in MetadataHandlers
Reviewed-By: Casey Bodley <cbodley@redhat.com>
Abhishek L [Fri, 15 Sep 2017 19:25:31 +0000 (21:25 +0200)]
Merge pull request #17642 from theanalyst/wip-21350-luminous
luminous: rgw: data encryption sometimes fails to follow AWS settings
Reviewed-By: Casey Bodley <cbodley@redhat.com>
Abhishek L [Fri, 15 Sep 2017 19:23:01 +0000 (21:23 +0200)]
Merge pull request #17674 from theanalyst/luminous-rgw-reshard-enable
luminous: rgw: reshard enable
Reviewed-By: Orit Wasserman <owasserm@redhat.com>
Abhishek L [Fri, 15 Sep 2017 19:22:05 +0000 (21:22 +0200)]
Merge pull request #17479 from smithfarm/wip-21139-luminous
luminous: rgw: put lifecycle configuration fails if Prefix is not set
Reviewed-By: Daniel Gryniewicz <dang@redhat.com>
Kefu Chai [Fri, 15 Sep 2017 02:30:16 +0000 (10:30 +0800)]
cmake: do not pass $SIMD_COMPILE_FLAGS to rocksdb cmake
which enables SSE42 globally in rocksdb. and we will end up with a
binary not portable on non-SSE42 enabled machines.
Fixes: http://tracker.ceph.com/issues/20529
Signed-off-by: Kefu Chai <kchai@redhat.com>
Conflicts:
this change is not cherry-picked from master. because the
PR targeting master (https://github.com/ceph/ceph/pull/17388) is
still pending on review. and the cmake changes is different if
we want to use a recent commit of rocksdb, as it's doing differently
in cmake to address the portability issues.
Kefu Chai [Fri, 15 Sep 2017 02:23:47 +0000 (10:23 +0800)]
rocksdb: pick up portable fixes
to pick up the the fix to disable SSE42 globally, and only enable it on
crc32c. this change is pushed to ceph/rocksdb:luminous.
Signed-off-by: Kefu Chai <kchai@redhat.com>
Conflicts:
this change is not cherry-picked from master, as the master PR
(https://github.com/ceph/ceph/pull/17388) is still pending on review.
and the latest rocksdb's cmake was revised to address the portability
issues. so the fix on ceph side is different if we want to use a
recent rocksdb's commit.
Luo Kexue [Wed, 30 Aug 2017 01:32:18 +0000 (09:32 +0800)]
rgw: fix resource leak in rgw_bucket.cc and rgw_user.cc
Fixes: http://tracker.ceph.com/issues/21214
Signed-off-by: Luo Kexue <luo.kexue@zte.com.cn>
(cherry picked from commit
1f23976adab74e25ce06941692a881521885c6ee )
Jos Collin [Fri, 25 Aug 2017 10:02:56 +0000 (15:32 +0530)]
rgw: add missing override in list_keys_init()
Added missing override in list_keys_init().
Signed-off-by: Jos Collin <jcollin@redhat.com>
(cherry picked from commit
bfc999f1db96293e6a2188922074031fa0b40ecc )
Abhishek L [Thu, 14 Sep 2017 09:32:28 +0000 (11:32 +0200)]
Merge pull request #17612 from smithfarm/wip-qemu-cleanup
build/ops: rpm: do not create librbd.so.1 symlink in /usr/lib64/qemu
Reviewed-By: Ken Dreyer <kdreyer@redhat.com>
Abhishek L [Thu, 14 Sep 2017 09:31:40 +0000 (11:31 +0200)]
Merge pull request #17478 from smithfarm/wip-21138-luminous
luminous: rgw: object copied from remote src acl permission become full-control issue
Reviewed-By: Orit Wasserman <owasserm@redhat.com>
Abhishek L [Thu, 14 Sep 2017 09:31:23 +0000 (11:31 +0200)]
Merge pull request #17445 from smithfarm/wip-21110-luminous
luminous: rgw: send data-log list infinitely
Reviewed-By: Orit Wasserman <owasserm@redhat.com>
liuchang0812 [Wed, 6 Sep 2017 03:50:17 +0000 (11:50 +0800)]
mon: incorrect MAX AVAIL in "ceph df"
Fixes: http://tracker.ceph.com/issues/21243
Signed-off-by: liuchang0812 <liuchang0812@gmail.com>
(cherry picked from commit
365558571c59dd42cf0934e6c31c7b4bf2c65026 )
Abhishek L [Thu, 14 Sep 2017 08:33:29 +0000 (10:33 +0200)]
Merge pull request #17488 from smithfarm/wip-21241-luminous
luminous: rgw: usage of --inconsistent-index should require user confirmation and print a warning
Reviewed-By: Casey Bodley <cbodley@redhat.com>
Abhishek L [Thu, 14 Sep 2017 08:28:16 +0000 (10:28 +0200)]
Merge pull request #17484 from smithfarm/wip-21184-luminous
luminous: tests: NameError: global name 'name' is not defined
Reviewed-By: Orit Wasserman <owasserm@redhat.com>
Abhishek L [Thu, 14 Sep 2017 08:26:12 +0000 (10:26 +0200)]
Merge pull request #17474 from smithfarm/wip-21114-luminous
luminous: cephfs: tests: FS_DEGRADED spurious health warnings in some sub-suites
Reviewed-By: Patrick Donelly <pdonelly@redhat.com>
Abhishek L [Thu, 14 Sep 2017 08:25:51 +0000 (10:25 +0200)]
Merge pull request #17471 from smithfarm/wip-21107-luminous
luminous: cephfs: client/mds has wrong check to clear S_ISGID on chown
Reviewed-By: Patrick Donelly <pdonelly@redhat.com>
Yan, Zheng [Wed, 13 Sep 2017 03:27:18 +0000 (11:27 +0800)]
ceph: fix "stopping mds can't export subtree"
caused by commit
790c34138f "Make standby-replay mds avoid initiating subtree export"
Fixes: http://tracker.ceph.com/issues/21378
Signed-off-by: "Yan, Zheng" <zyan@redhat.com>
(cherry picked from commit
c294051987de1ff79540060a0563fa02c8f03f91 )
Jianyu Li [Mon, 4 Sep 2017 13:49:26 +0000 (21:49 +0800)]
Make standby-replay mds not migrate empty subtree when trimming cache
Signed-off-by: Jianyu Li <joannyli@tencent.com>
(cherry picked from commit
178ca58fec2d820f61724d223addac1c4fa67086 )
Jianyu Li [Mon, 4 Sep 2017 10:03:30 +0000 (18:03 +0800)]
Make standby-replay mds avoid initiating subtree export
Signed-off-by: Jianyu Li <joannyli@tencent.com>
(cherry picked from commit
790c34138fbdf995c72e558057b9e64c882b522b )