]>
git.apps.os.sepia.ceph.com Git - ceph.git/log
Aleksei Gutikov [Mon, 21 Aug 2017 14:04:45 +0000 (17:04 +0300)]
rgw: Prevent overflow of stats cached values
Signed-off-by: Pavan Rallabhandi <PRallabhandi@walmartlabs.com>
Fixes: http://tracker.ceph.com/issues/20934
Signed-off-by: Aleksei Gutikov <aleksey.gutikov@synesis.ru>
(cherry picked from commit
634215eea1ddd4e4f5dc0066c4a2e745cfc20475 )
Conflicts:
src/rgw/rgw_quota.cc
Have the quota stats structures to reflect rounded values in KB and honor the signed integer values
Pavan Rallabhandi [Tue, 18 Jul 2017 09:10:04 +0000 (14:40 +0530)]
rgw: Do not decrement stats cache when the cache values are zero
With RGWs configured in a load balancer, there is a possibility of
having the cached values going unbound, when PUT/DELETE operations
do not land up on the same RGW. To avoid such cases, make sure the
decrement of stats happen only when the cached values are sane.
Fixes: http://tracker.ceph.com/issues/20661
Signed-off-by: Pavan Rallabhandi <PRallabhandi@walmartlabs.com>
(cherry picked from commit
3903e213c7ac7624e3452f5f3b1ca1c339bf2ca2 )
Conflicts:
src/rgw/rgw_quota.cc
Nathan Cutler [Sun, 27 Aug 2017 16:10:39 +0000 (18:10 +0200)]
Merge pull request #14874 from ceph/wip-19805-jewel
jewel: rbd: default features should be negotiated with the OSD
Reviewed-by: Mykola Golub <mgolub@mirantis.com>
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
Nathan Cutler [Sun, 27 Aug 2017 16:09:03 +0000 (18:09 +0200)]
Merge pull request #14977 from dillaman/wip-19873-jewel
jewel: rbd: rbd-mirror: failover and failback of unmodified image results in split-brain
Reviewed-by: Mykola Golub <mgolub@mirantis.com>
Nathan Cutler [Sun, 27 Aug 2017 15:53:15 +0000 (17:53 +0200)]
Merge pull request #15461 from smithfarm/wip-19795-jewel
jewel: tests: test_notify.py: assert(not image.is_exclusive_lock_owner()) on line 147
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
Reviewed-by: Mykola Golub <mgolub@mirantis.com>
Nathan Cutler [Sun, 27 Aug 2017 15:51:35 +0000 (17:51 +0200)]
Merge pull request #15463 from smithfarm/wip-20017-jewel
jewel: rbd: rbd-nbd: kernel reported invalid device size (0, expected
1073741824 )
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
Reviewed-by: Mykola Golub <mgolub@mirantis.com>
Nathan Cutler [Sun, 27 Aug 2017 15:49:36 +0000 (17:49 +0200)]
Merge pull request #15464 from smithfarm/wip-20153-jewel
jewel: rbd: Potential IO hang if image is flattened while read request is in-flight
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
Reviewed-by: Mykola Golub <mgolub@mirantis.com>
Nathan Cutler [Sat, 26 Aug 2017 17:43:55 +0000 (19:43 +0200)]
Merge pull request #15455 from smithfarm/wip-19838-jewel
jewel: rgw: reduce log level of 'storing entry at' in cls_log
Reviewed-by: Casey Bodley <cbodley@redhat.com>
Nathan Cutler [Sat, 26 Aug 2017 17:42:23 +0000 (19:42 +0200)]
Merge pull request #15456 from smithfarm/wip-20003-jewel
jewel: rgw: rgw_file: v3 write timer does not close open handles
Reviewed-by: Matt Benjamin <mbenjamin@redhat.com>
Nathan Cutler [Sat, 26 Aug 2017 17:38:29 +0000 (19:38 +0200)]
Merge pull request #15457 from smithfarm/wip-20018-jewel
jewel: rgw: multisite: memory leak on failed lease in RGWDataSyncShardCR
Reviewed-by: Casey Bodley <cbodley@redhat.com>
Nathan Cutler [Sat, 26 Aug 2017 17:33:42 +0000 (19:33 +0200)]
Merge pull request #15459 from smithfarm/wip-20144-jewel
jewel: rgw: rgw_file: cannot delete bucket w/uxattrs
Reviewed-by: Matt Benjamin <mbenjamin@redhat.com>
Nathan Cutler [Sat, 26 Aug 2017 17:32:40 +0000 (19:32 +0200)]
Merge pull request #15465 from smithfarm/wip-20155-jewel
jewel: rgw: fix crash caused by shard id out of range when listing data log
Reviewed-by: Casey Bodley <cbodley@redhat.com>
Patrick Donnelly [Fri, 25 Aug 2017 21:26:21 +0000 (14:26 -0700)]
Merge PR #16248 into jewel
* refs/remotes/upstream/pull/16248/head:
client: don't re-send interrupted flock request
mds/flock: properly remove item from global_waiting_locks
mds/flock: properly update ceph_lock_state_t::client_waiting_lock_counts
mds/flock: don't import ceph_lock_state_t::waiting_locks
Reviewed-by: Zheng Yan <zyan@redhat.com>
Nathan Cutler [Fri, 25 Aug 2017 18:09:58 +0000 (20:09 +0200)]
Merge pull request #15454 from smithfarm/wip-19775-jewel
jewel: rgw: multisite: realm rename does not propagate to other clusters
Reviewed-by: Orit Wasserman <owasserm@redhat.com>
Nathan Cutler [Fri, 25 Aug 2017 18:09:15 +0000 (20:09 +0200)]
Merge pull request #15453 from smithfarm/wip-19768-jewel
jewel: rgw: multisite: operating bucket's acl&cors is not restricted on slave zone
Reviewed-by: Casey Bodley <cbodley@redhat.com>
Nathan Cutler [Fri, 25 Aug 2017 18:08:26 +0000 (20:08 +0200)]
Merge pull request #15452 from smithfarm/wip-19765-jewel
jewel: rgw: when uploading objects continuously into a versioned bucket, some objects will not sync
Reviewed-by: Casey Bodley <cbodley@redhat.com>
Nathan Cutler [Fri, 25 Aug 2017 18:06:37 +0000 (20:06 +0200)]
Merge pull request #15451 from smithfarm/wip-19764-jewel
jewel: rgw: set latest object's acl failed
Reviewed-by: Casey Bodley <cbodley@redhat.com>
Nathan Cutler [Fri, 25 Aug 2017 18:05:54 +0000 (20:05 +0200)]
Merge pull request #15450 from smithfarm/wip-19758-jewel
jewel: rgw: multisite: after CreateBucket is forwarded to master, local bucket may use different value for bucket index shards
Reviewed-by: Casey Bodley <cbodley@redhat.com>
Sage Weil [Thu, 24 Aug 2017 14:27:22 +0000 (10:27 -0400)]
qa/workunits/rados/test-upgrade-v11.0.0: skip ListObjectsError
Signed-off-by: Sage Weil <sage@redhat.com>
Sage Weil [Thu, 24 Aug 2017 14:20:00 +0000 (10:20 -0400)]
qa/workunits/rados/test-upgrade-v11.0.0: skip more tests
Signed-off-by: Sage Weil <sage@redhat.com>
Sage Weil [Thu, 24 Aug 2017 14:16:19 +0000 (09:16 -0500)]
Merge pull request #16870 from liewegas/wip-20929-jewel
jewel: ceph-disk: dmcrypt cluster must default to ceph
Reviewed-by: Loic Dachary <ldachary@redhat.com>
Reviewed-by: Alfredo Deza <adeza@redhat.com>
Nathan Cutler [Thu, 24 Aug 2017 08:15:57 +0000 (10:15 +0200)]
Merge pull request #14659 from asheplyakov/19473-jewel
jewel: rgw: add the remove-x-delete feature to cancel swift object expiration
Reviewed-by: Casey Bodley <cbodley@redhat.com>
Nathan Cutler [Thu, 24 Aug 2017 07:13:23 +0000 (09:13 +0200)]
Merge pull request #15322 from gregsfortytwo/jewel-19931-snaptrim-shutdown
jewel: osd: Reset() snaptrimmer on shutdown and do not default-abort on leaked pg refs
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Nathan Cutler [Thu, 24 Aug 2017 07:11:52 +0000 (09:11 +0200)]
Merge pull request #15236 from asheplyakov/20036-bp-jewel
jewel: mon: factor mon_osd_full_ratio into MAX AVAIL calc
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Nathan Cutler [Thu, 24 Aug 2017 07:07:08 +0000 (09:07 +0200)]
Merge pull request #14346 from ceph/wip-ceph-disk-fix-jewel
jewel: build/ops: Add fix subcommand to ceph-disk, fix SELinux denials, and speed up upgrade from non-SELinux enabled ceph to an SELinux enabled one
Reviewed-by: Kefu Chai <kchai@redhat.com>
Nathan Cutler [Thu, 24 Aug 2017 07:04:49 +0000 (09:04 +0200)]
Merge pull request #15083 from asheplyakov/19926-bp-jewel
jewel: mon: crash on shutdown, lease_ack_timeout event
Reviewed-by: Kefu Chai <kchai@redhat.com>
Nathan Cutler [Wed, 23 Aug 2017 18:56:38 +0000 (20:56 +0200)]
Merge pull request #14663 from smithfarm/wip-19228-jewel
jewel: rbd: Enabling mirroring for a pool with clones may fail
Reviewed-by: Mykola Golub <mgolub@mirantis.com>
Nathan Cutler [Wed, 23 Aug 2017 18:52:04 +0000 (20:52 +0200)]
Merge pull request #15050 from asheplyakov/19265-bp-jewel
jewel: core: an OSD was seen getting ENOSPC even with osd_failsafe_full_ratio passed
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: David Zafman <dzafman@redhat.com>
Nathan Cutler [Wed, 23 Aug 2017 18:50:01 +0000 (20:50 +0200)]
Merge pull request #15065 from asheplyakov/19915-bp-jewel
jewel: osd: PrimaryLogPG: do not call on_shutdown() if (pg.deleting)
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: Brad Hubbard <bhubbard@redhat.com>
Nathan Cutler [Wed, 23 Aug 2017 18:48:38 +0000 (20:48 +0200)]
Merge pull request #14943 from shinobu-x/wip-18293-jewel
jewel: osd: leaked MOSDMap
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: Sage Weil <sage@redhat.com>
Nathan Cutler [Wed, 23 Aug 2017 18:12:01 +0000 (20:12 +0200)]
Merge pull request #14699 from smithfarm/wip-19679-jewel
jewel: mds: damage reporting by ino number is useless
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Nathan Cutler [Wed, 23 Aug 2017 18:10:07 +0000 (20:10 +0200)]
Merge pull request #14673 from smithfarm/wip-19466-jewel
jewel: mds: log rotation doesn't work if mds has respawned
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Sage Weil [Wed, 23 Aug 2017 17:53:48 +0000 (13:53 -0400)]
qa/workunits/rados/test-upgrade-v11.0.0.sh: more tests skipped
Signed-off-by: Sage Weil <sage@redhat.com>
Nathan Cutler [Wed, 23 Aug 2017 06:41:55 +0000 (08:41 +0200)]
Merge pull request #15442 from Vicente-Cheng/wip-20025-jewel
jewel: cephfs: osdc/Filer: truncate large file party by party
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Reviewed-by: Yan, Zheng <zyan@redhat.com>
Nathan Cutler [Wed, 23 Aug 2017 06:40:20 +0000 (08:40 +0200)]
Merge pull request #14691 from smithfarm/wip-19571-jewel
jewel: tests: upgrade:client-upgrade/firefly-client-x: drop CentOS
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
Jason Dillaman [Fri, 28 Apr 2017 16:52:18 +0000 (12:52 -0400)]
librbd: default features should be negotiated with the OSD
Derived from
f066ce8f80bce929edc209590efd47cce2196ae2
Signed-off-by: Mykola Golub <mgolub@mirantis.com>
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
Mykola Golub [Sat, 5 Nov 2016 20:44:33 +0000 (22:44 +0200)]
cls/rbd: add get_all_features on client side
Signed-off-by: Mykola Golub <mgolub@mirantis.com>
(cherry picked from commit
84f6d5c109911923c25414de639308921983e438 )
Conflicts:
src/cls/rbd/cls_rbd_client.h: trivial resolution
Nathan Cutler [Tue, 22 Aug 2017 14:25:14 +0000 (16:25 +0200)]
Merge pull request #15448 from smithfarm/wip-19615-jewel
jewel: rgw: multisite: bucket zonegroup redirect not working
Reviewed-by: Casey Bodley <cbodley@redhat.com>
Nathan Cutler [Thu, 20 Apr 2017 17:15:29 +0000 (19:15 +0200)]
tests: upgrade:client-upgrade/firefly-client-x: drop CentOS
The RBD suite needs ceph-cm-ansible to install qemu-kvm on CentOS, but doing
that breaks the firefly install on CentOS because:
1. the qemu-kvm that gets installed is from hammer (0.94.5)
2. qemu-kvm brings in librados2, librbd1 as dependencies
As a result, the hammer librados2 and librbd1 are installed on the test nodes
even before the teuthology install task starts. When it does start and tries
to install firefly, it fails because firefly librados2 and librbd1 cannot be
installed over their hammer versions.
Fixes: http://tracker.ceph.com/issues/19571
Signed-off-by: Nathan Cutler <ncutler@suse.com>
Nathan Cutler [Tue, 22 Aug 2017 11:47:21 +0000 (13:47 +0200)]
Merge pull request #15197 from smithfarm/wip-20007-jewel
jewel: rgw: remove unnecessary 'error in read_id for object name: default'
Reviewed-by: Jos Collin <jcollin@redhat.com>
Reviewed-by: Orit Wasserman <owasserm@redhat.com>
Nathan Cutler [Tue, 22 Aug 2017 08:00:07 +0000 (10:00 +0200)]
Merge pull request #15051 from asheplyakov/19910-bp-jewel
jewel: build/ops: extended, customizable systemd ceph-disk timeout
Reviewed-by: David Disseldorp <ddiss@suse.com>
Reviewed-by: Nathan Cutler <ncutler@suse.com>
Nathan Cutler [Tue, 22 Aug 2017 07:54:12 +0000 (09:54 +0200)]
Merge pull request #15428 from smithfarm/wip-20162-jewel
jewel: build/ops: deb: Fix logrotate packaging
Reviewed-by: Kefu Chai <kchai@redhat.com>
Nathan Cutler [Tue, 22 Aug 2017 07:52:49 +0000 (09:52 +0200)]
Merge pull request #15447 from smithfarm/wip-19613-jewel
jewel: rgw: multisite: rest api fails to decode large period on "period commit"
Reviewed-by: Casey Bodley <cbodley@redhat.com>
Jason Dillaman [Thu, 27 Apr 2017 20:21:33 +0000 (16:21 -0400)]
test: remove hard-coded image name from RBD metadata test
Fixes: http://tracker.ceph.com/issues/19798
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit
8f72e745e157cc12d76ca6babe956c5698ee297f )
Mykola Golub [Thu, 2 Mar 2017 16:18:18 +0000 (17:18 +0100)]
librbd: relax "is parent mirrored" check when enabling mirroring for pool
If the parent is in the same pool and has the journaling feature enabled
we can assume the mirroring will eventually be enabled for it.
Fixes: http://tracker.ceph.com/issues/19130
Signed-off-by: Mykola Golub <mgolub@mirantis.com>
(cherry picked from commit
fe31bca22f90ce02f461d6421a4f66539db888d3 )
Nathan Cutler [Tue, 22 Aug 2017 07:31:04 +0000 (09:31 +0200)]
Merge pull request #15196 from smithfarm/wip-20006-jewel
jewel: build/ops: rpm: fix python-Sphinx package name for SUSE
Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Ken Dreyer <kdreyer@redhat.com>
Reviewed-by: Abhishek Lekshmanan <abhishek@suse.com>
Sage Weil [Sat, 12 Aug 2017 13:00:22 +0000 (09:00 -0400)]
qa/workunits/rados/test/test-upgrade-v11.0.0: skip Quota test
This makes a pool go full which confounds the wait for healthy check
during restarts.
Signed-off-by: Sage Weil <sage@redhat.com>
Sage Weil [Wed, 9 Aug 2017 13:56:21 +0000 (09:56 -0400)]
qa/workunits/rados/test-upgrade-v11.0.0: skip api_io *CmpExt*
Signed-off-by: Sage Weil <sage@redhat.com>
Sage Weil [Mon, 7 Aug 2017 18:01:58 +0000 (14:01 -0400)]
qa/workunits/rados/test-upgrade-11.0.0: skip RoundTrip3
This does the crc op, which isn't in jewel.
Signed-off-by: Sage Weil <sage@redhat.com>
Jason Dillaman [Mon, 7 Aug 2017 14:07:13 +0000 (10:07 -0400)]
Merge pull request #16343 from dillaman/wip-20630-jewel
jewel: tests: qa/tasks: rbd-mirror daemon not properly run in foreground mode
Reviewed-by: Mykola Golub <mgolub@mirantis.com>
Loic Dachary [Thu, 3 Aug 2017 08:56:24 +0000 (10:56 +0200)]
ceph-disk: dmcrypt cluster must default to ceph
If ceph_fsid is not found, which is the case for legacy dmcrypted OSD,
the cluster must default to ceph, as it was before support for non
standard cluster names was introduced.
Fixes: http://tracker.ceph.com/issues/20893
Signed-off-by: Loic Dachary <loic@dachary.org>
(cherry picked from commit
ed22159fdd7071a110e81cd7b63d7e0f2296761b )
Nathan Cutler [Tue, 1 Aug 2017 11:06:54 +0000 (13:06 +0200)]
Merge pull request #13507 from shinobu-x/wip-18468-jewel
jewel: mon: Disallow enabling 'hashpspool' option to a pool without some kind of --i-understand-this-will-remap-all-pgs flag
Reviewed-by: Kefu Chai <kchai@redhat.com>
Yan, Zheng [Tue, 25 Apr 2017 08:21:24 +0000 (16:21 +0800)]
osdc/Filer: truncate large file party by party
Fixes: http://tracker.ceph.com/issues/19755
Signed-off-by: "Yan, Zheng" <zyan@redhat.com>
(cherry picked from commit
5fab215e461e5ecc36c0f9d9ea867f6c45e80263 )
Conflicts:
src/osdc/Filer.h
src/osdc/Filer.cc
- add parameter to fit _modify (need onack parameter)
src/mds/MDCache.cc
- make truncate() consistency
David Zafman [Fri, 7 Jul 2017 17:53:41 +0000 (10:53 -0700)]
jewel: mon: Fix status output warning for mon_warn_osd_usage_min_max_delta
Fixes: http://tracker.ceph.com/issues/20544
Caued by:
489e810c37ed6fb9d32d1015634041a577501ee4
Signed-off-by: David Zafman <dzafman@redhat.com>
(cherry picked from commit
56f9808016ab289bdc0ce7cfbb0503c78b509593 )
Conflicts:
apply changes to src/mon/PGMonitor.cc instead of src/mon/PGMap.cc
Matt Benjamin [Thu, 20 Jul 2017 19:00:32 +0000 (15:00 -0400)]
Merge pull request #16289 from cbodley/wip-20513
jewel: rgw: cls: ceph::timespan tag_timeout wrong units
Jason Dillaman [Fri, 14 Jul 2017 14:32:28 +0000 (10:32 -0400)]
qa/tasks: rbd-mirror daemon not properly run in foreground mode
Fixes: http://tracker.ceph.com/issues/20630
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit
4fa1918717b25a5ffafbf649eedcfe7d5ab829c2 )
Jenkins Build Slave User [Thu, 13 Jul 2017 13:04:57 +0000 (13:04 +0000)]
10.2.9
Nathan Cutler [Thu, 13 Jul 2017 08:31:31 +0000 (10:31 +0200)]
Merge pull request #16282 from smithfarm/wip-20599-jewel
jewel: cephfs: Damaged MDS with 10.2.8
Reviewed-by: Yan, Zheng <zyan@redhat.com>
Casey Bodley [Wed, 5 Apr 2017 18:20:20 +0000 (14:20 -0400)]
rgw: allow larger payload for period commit
testing with 3 zonegroups and 3 zones each, the period json grew larger
than 4k and caused decode failures on period commit
updated to use the new config variable rgw_max_put_param_size
Fixes: http://tracker.ceph.com/issues/19505
Signed-off-by: Casey Bodley <cbodley@redhat.com>
(cherry picked from commit
7f2871fe59d933b03f37fde40f1781b2320d0d50 )
Conflicts:
src/rgw/rgw_rest_realm.cc - in RGWOp_Period_Post::execute(), set max_size
explicitly instead of backporting rgw_max_put_param_size
lu.shasha [Tue, 9 May 2017 07:05:03 +0000 (15:05 +0800)]
rgw: when create_bucket use the same num_shards with info.num_shards
pr #14388 only fix the num_shards in BucketInfo, "init_bucket_index" function still use local num_shards
Fixes: http://tracker.ceph.com/issues/19745
Signed-off-by: Shasha Lu <lu.shasha@eisoo.com>
(cherry picked from commit
4ce64a190b4ff36985e785e574c077d39796feea )
Conflicts:
src/rgw/rgw_rados.cc: init_bucket_index() called earlier
lu.shasha [Fri, 7 Apr 2017 07:34:27 +0000 (15:34 +0800)]
rgw: using the same bucket num_shards as master zg when create bucket in secondary zg
create bucket in secondary zonegroup will forward to master. The master may have different num_shards option.
So when create bucket in local, should use master's num_shards instead of local num_shards option.
Fixes: http://tracker.ceph.com/issues/19745
Signed-off-by: Shasha Lu <lu.shasha@eisoo.com>
(cherry picked from commit
a34c4b8fb13dd5590eb3c6ecb5e55207ed8e3ee8 )
Conflicts:
src/rgw/rgw_op.cc
- different argument list of store->create_bucket() in jewel, compared to
master
- no RGWBulkUploadOp:: in jewel; modifications to
RGWBulkUploadOp::handle_dir() omitted
Matt Benjamin [Thu, 29 Jun 2017 19:19:36 +0000 (15:19 -0400)]
rgw: cls: ceph::timespan tag_timeout wrong units
In rgw_dir_suggest(), the ceph::timespan tag_timeout is intended
to be a value in seconds, but has been taken as something much
smaller (millis?). The incorrect time scale likely induces a race
condition with object deletes.
Fixes: http://tracker.ceph.com/issues/20380
Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
(cherry picked from commit
e6763ebd6124c1b4736c5c7850077df7644bc8f5 )
Nathan Cutler [Wed, 12 Jul 2017 06:40:20 +0000 (08:40 +0200)]
Revert "osdc/Journaler: make header write_pos align to boundary of flushed entry"
This reverts commit
2e299b50de4a297fee2aec21290632336d239857 .
Signed-off-by: Nathan Cutler <ncutler@suse.com>
Nathan Cutler [Wed, 12 Jul 2017 06:40:13 +0000 (08:40 +0200)]
Revert "osdc/Journaler: avoid executing on_safe contexts prematurely"
This reverts commit
06cf9f365033f7913051bdf4060f0bc6fc0444d7 .
Signed-off-by: Nathan Cutler <ncutler@suse.com>
Sage Weil [Tue, 11 Jul 2017 20:58:04 +0000 (15:58 -0500)]
Merge pull request #16273 from smithfarm/wip-jewel-pending-release-notes
jewel: doc: clarify status of jewel PendingReleaseNotes
Nathan Cutler [Tue, 11 Jul 2017 20:53:56 +0000 (22:53 +0200)]
doc: zero PendingReleaseNotes in preparation for v10.2.9
Signed-off-by: Nathan Cutler <ncutler@suse.com>
Nathan Cutler [Tue, 11 Jul 2017 20:27:33 +0000 (22:27 +0200)]
doc: clarify status of jewel PendingReleaseNotes
Status as of 10.2.8 release
Signed-off-by: Nathan Cutler <ncutler@suse.com>
Yan, Zheng [Sat, 3 Jun 2017 04:33:36 +0000 (12:33 +0800)]
client: don't re-send interrupted flock request
don't re-send interrupted flock request in cases of mds failover
and receiving request forward.
Signed-off-by: "Yan, Zheng" <zyan@redhat.com>
(cherry picked from commit
044fabd669fdc8287f5cab0f38a82dfbfe41f0cd )
Conflicts:
src/client/Client.cc: UserPerms not in jewel
Yan, Zheng [Sat, 3 Jun 2017 04:06:10 +0000 (12:06 +0800)]
mds/flock: properly remove item from global_waiting_locks
ceph_lock_state_t::remove_waiting() uses wrong key to search
global_waiting_locks. It should use item in waiting_locks as
key.
Signed-off-by: "Yan, Zheng" <zyan@redhat.com>
(cherry picked from commit
0d71c6120e61f31b803c3fb6488fc7e97134e348 )
Yan, Zheng [Sat, 3 Jun 2017 04:01:27 +0000 (12:01 +0800)]
mds/flock: properly update ceph_lock_state_t::client_waiting_lock_counts
no item is added to waiting_locks when deadlock check fails
Signed-off-by: "Yan, Zheng" <zyan@redhat.com>
(cherry picked from commit
a6b01939a199833568961ae4d30d8540a25a7740 )
Yan, Zheng [Sat, 3 Jun 2017 03:42:12 +0000 (11:42 +0800)]
mds/flock: don't import ceph_lock_state_t::waiting_locks
Item in waiting_locks is associated with flock mds request in
exporter mds. If client re-sends the flock mds request to the
importer, the importer starts a new MDRequest. The new one's
'flock_was_waiting' is false.
Signed-off-by: "Yan, Zheng" <zyan@redhat.com>
(cherry picked from commit
8d777c4855b0c8e58a8d6966371698b8b7721a42 )
Boris Ranto [Fri, 7 Jul 2017 10:37:55 +0000 (12:37 +0200)]
rpm: Fix undefined FIRST_ARG
If FIRST_ARG is undefined, the rpms will show an error on upgrade
because the condition in the postun script gets broken.
This was a regression introduced by commit for issue 20077 that moved
ceph-disk unit files to ceph-base.
Fixes: http://tracker.ceph.com/issues/20077
Signed-off-by: Boris Ranto <branto@redhat.com>
(cherry picked from commit
562816914ccca8e4e7d9c31f333db2f0da6f7c99 )
Boris Ranto [Mon, 5 Jun 2017 16:44:18 +0000 (18:44 +0200)]
selinux: Install ceph-base before ceph-selinux
We need to have ceph-base installed before ceph-selinux to use ceph-disk
in %post script. The default ordering is random and so the installation
randomly failed to relabel the files.
Fixes: http://tracker.ceph.com/issues/20184
Signed-off-by: Boris Ranto <branto@redhat.com>
(cherry picked from commit
e69086645d3411a2ed781609b670eb5f16ac4810 )
Conflicts:
ceph.spec.in: No _epoch_prefix in jewel
Jenkins Build Slave User [Thu, 6 Jul 2017 14:56:18 +0000 (14:56 +0000)]
10.2.8
Nathan Cutler [Tue, 4 Jul 2017 15:43:57 +0000 (17:43 +0200)]
Merge pull request #14710 from smithfarm/wip-start-race
tests: rados: sleep before ceph tell osd.0 flush_pg_stats after restart
Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: David Zafman <dzafman@redhat.com>
Yuri Weinstein [Tue, 4 Jul 2017 14:31:50 +0000 (07:31 -0700)]
Merge pull request #16089 from ceph/wip_fix_point_jewel
qa/Fixed upgrade sequence to 10.2.0 -> 10.2.7 -> latest -x (10.2.8)
Reviewed-by: Nathan Cutler <ncutler@suse.com>
Yuri Weinstein [Tue, 4 Jul 2017 00:23:43 +0000 (17:23 -0700)]
Merge pull request #16088 from smithfarm/wip-fix-client-upgrade-centos
tests: run upgrade/client-upgrade on latest CentOS 7.3
Reviewed-by: Yuri Weinstein <yweins@redhat.com>
Yuri Weinstein [Mon, 3 Jul 2017 21:18:14 +0000 (14:18 -0700)]
Fixed upgrade sequence to 10.2.0 -> 10.2.7 -> latest -x (10.2.8)
Signed-off-by: Yuri Weinstein <yweinste@redhat.com>
Nathan Cutler [Mon, 3 Jul 2017 20:55:21 +0000 (22:55 +0200)]
tests: run upgrade/client-upgrade on latest CentOS 7.3
Before this patch, all centos jobs were failing because there are no longer any
CentOS 7.2 machines in Sepia.
Signed-off-by: Nathan Cutler <ncutler@suse.com>
Nathan Cutler [Fri, 30 Jun 2017 14:43:38 +0000 (16:43 +0200)]
Merge pull request #15504 from Vicente-Cheng/wip-20151-jewel
jewel: ceph-disk: do not setup_statedir on trigger
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Nathan Cutler [Wed, 28 Jun 2017 08:20:23 +0000 (10:20 +0200)]
Merge pull request #15904 from smithfarm/wip-20413-jewel
jewel: tests: upgrade:hammer-x/stress-split-erasure-code-x86_64 fails in 10.2.8 integration testing
Reviewed-by: Brad Hubbard <bhubbard@redhat.com>
Nathan Cutler [Wed, 28 Jun 2017 06:16:33 +0000 (08:16 +0200)]
Merge pull request #14930 from smithfarm/wip-19829-jewel
jewel: tests: New upgrade test for #14930
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Nathan Cutler [Wed, 28 Jun 2017 06:16:04 +0000 (08:16 +0200)]
Merge pull request #14392 from asheplyakov/19508-jewel
jewel: osd: pg_pool_t::encode(): be compatible with Hammer <= 0.94.6
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Nathan Cutler [Sun, 25 Jun 2017 08:32:16 +0000 (10:32 +0200)]
tests: upgrade/hammer-x/v0-94-6-mon-overload: tweak packages list
Include some hammer dependencies that aren't in the jewel default packages
list, and exclude some java packages that may not be in the hammer repo and are
not needed for the upgrade test in any case.
N.B.: This cannot be cherry-picked from master because upgrade/hammer-x was
dropped in master.
Signed-off-by: Nathan Cutler <ncutler@suse.com>
Nathan Cutler [Wed, 3 May 2017 09:39:27 +0000 (11:39 +0200)]
tests: upgrade/hammer-x: new v0-94-6-mon-overload subsuite
This is not a cherry-pick from master because direct upgrades
from hammer to kraken+ are not supported.
Fixes: http://tracker.ceph.com/issues/19829
References: http://tracker.ceph.com/issues/19508
Signed-off-by: Nathan Cutler <ncutler@suse.com>
Nathan Cutler [Tue, 27 Jun 2017 10:41:59 +0000 (12:41 +0200)]
Merge pull request #15936 from batrick/i20412
qa: enable quotas for pre-luminous quota tests
Reviewed-by: John Spray <john.spray@redhat.com>
Reviewed-by: Nathan Cutler <ncutler@suse.com>
Patrick Donnelly [Tue, 27 Jun 2017 02:04:48 +0000 (19:04 -0700)]
qa: enable quotas for pre-luminous quota tests
This cannot be cherry-picked from master because the config option is removed
since
0f250a889dba2100d3afcea0a18e4f6a8d086b86 .
Fixes: http://tracker.ceph.com/issues/20412
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
Sage Weil [Tue, 27 Jun 2017 02:24:11 +0000 (21:24 -0500)]
Merge pull request #15933 from smithfarm/wip-hammer-jewel-x
jewel: tests: drop upgrade/hammer-jewel-x
Nathan Cutler [Tue, 27 Jun 2017 00:27:22 +0000 (02:27 +0200)]
tests: drop upgrade/hammer-jewel-x
This suite doesn't have any test logic in it. Its existence in the jewel branch
appears to be an oversight.
This cannot be cherry-picked from master because the upgrade/hammer-jewel-x
suite is present (and justified) in master and is not currently being dropped
there.
Signed-off-by: Nathan Cutler <ncutler@suse.com>
John Spray [Mon, 26 Jun 2017 20:25:12 +0000 (16:25 -0400)]
Merge pull request #15438 from Vicente-Cheng/wip-20027-jewel
jewel: mds: issue new caps when sending reply to client
Reviewed-by: John Spray <john.spray@redhat.com>
John Spray [Mon, 26 Jun 2017 20:23:48 +0000 (16:23 -0400)]
Merge pull request #15000 from jan--f/wip-19846-jewel
jewel: cephfs: normalize file open flags internally used by cephfs
Reviewed-by: John Spray <john.spray@redhat.com>
Nathan Cutler [Mon, 26 Jun 2017 16:25:03 +0000 (18:25 +0200)]
Merge pull request #15383 from asheplyakov/20014-bp-jewel
jewel: cls/rgw: list_plain_entries() stops before bi_log entries
Reviewed-by: Orit Wasserman <owasserm@redhat.com>
Zack Cerza [Mon, 26 Jun 2017 16:17:03 +0000 (10:17 -0600)]
Merge pull request #15870 from smithfarm/wip-swift-task-move-jewel
tests: move swift.py task from teuthology to ceph, phase one (jewel)
Nathan Cutler [Mon, 26 Jun 2017 07:24:04 +0000 (09:24 +0200)]
Merge pull request #15842 from smithfarm/wip-sortbitwise-jewel
qa/suites/upgrade/hammer-x: set "sortbitwise" for jewel clusters
Reviewed-by: Kefu Chai <kchai@redhat.com>
John Spray [Sun, 25 Jun 2017 23:59:40 +0000 (19:59 -0400)]
Merge pull request #15468 from smithfarm/wip-20140-jewel
jewel: cephfs: Journaler may execute on_safe contexts prematurely
Reviewed-by: John Spray <john.spray@redhat.com>
Nathan Cutler [Sun, 25 Jun 2017 10:42:36 +0000 (12:42 +0200)]
tests: swift.py: tweak imports
The ".." form only works within the teuthology repo. With swift.py now in the
Ceph repo, we have to be explicit.
Error message was: "ValueError: Attempted relative import beyond toplevel
package
Signed-off-by: Nathan Cutler <ncutler@suse.com>
Nathan Cutler [Sun, 25 Jun 2017 08:27:58 +0000 (10:27 +0200)]
tests: upgrade/hammer-x/stress-split: tweak packages list
Include some hammer dependencies that aren't in the jewel default packages
list, and exclude some java packages that may not be in the hammer repo and are
not needed for the upgrade test in any case.
N.B.: This cannot be cherry-picked from master because upgrade/hammer-x was
dropped in master.
Signed-off-by: Nathan Cutler <ncutler@suse.com>
Nathan Cutler [Sun, 25 Jun 2017 07:27:47 +0000 (09:27 +0200)]
tests: swift.py: clone the ceph-jewel branch
The master branch of ceph/swift.git contains tests that are incompatible with
Jewel and Hammer. The ceph-jewel branch omits these tests.
Signed-off-by: Nathan Cutler <ncutler@suse.com>
John Spray [Fri, 23 Jun 2017 12:02:48 +0000 (08:02 -0400)]
Merge pull request #15472 from smithfarm/wip-20148-jewel
jewel: mds: Too many stat ops when trying to probe a large file
Reviewed-by: John Spray <john.spray@redhat.com>
Nathan Cutler [Fri, 23 Jun 2017 06:35:27 +0000 (08:35 +0200)]
Merge branch 'master' of /home/smithfarm/src/ceph/upstream/teuthology into wip-swift-task-move-jewel