]>
git.apps.os.sepia.ceph.com Git - ceph.git/log
Nathan Cutler [Wed, 21 Mar 2018 20:14:22 +0000 (21:14 +0100)]
Merge pull request #20293 from smithfarm/wip-22572-jewel
jewel: rgw: stale bucket index entry remains after object deletion
Reviewed-by: Casey Bodley <cbodley@redhat.com>
Nathan Cutler [Wed, 21 Mar 2018 20:12:54 +0000 (21:12 +0100)]
Merge pull request #20292 from smithfarm/wip-22018-jewel
jewel: rgw: segmentation fault when starting radosgw after reverting .rgw.root
Reviewed-by: Orit Wasserman <owasserm@redhat.com>
Nathan Cutler [Wed, 21 Mar 2018 20:10:13 +0000 (21:10 +0100)]
Merge pull request #20291 from smithfarm/wip-21954-jewel
jewel: rgw: list bucket which enable versioning get wrong result when user marker
Reviewed-by: Casey Bodley <cbodley@redhat.com>
Nathan Cutler [Wed, 21 Mar 2018 20:08:14 +0000 (21:08 +0100)]
Merge pull request #20269 from smithfarm/wip-21951-jewel
jewel: rgw: multisite: data sync status advances despite failure in RGWListBucketIndexesCR
Reviewed-by: Casey Bodley <cbodley@redhat.com>
Nathan Cutler [Wed, 21 Mar 2018 20:01:05 +0000 (21:01 +0100)]
Merge pull request #20262 from smithfarm/wip-21950-jewel
jewel: rgw: null instance mtime incorrect when enable versioning
Reviewed-by: Casey Bodley <cbodley@redhat.com>
Nathan Cutler [Wed, 21 Mar 2018 19:59:30 +0000 (20:59 +0100)]
Merge pull request #20179 from shinobu-x/wip-21655-jewel
jewel: rgw: add ability to sync user stats from admin api
Reviewed-by: Matt Benjamin <mbenjamin@redhat.com>
Nathan Cutler [Wed, 21 Mar 2018 19:33:12 +0000 (20:33 +0100)]
Merge pull request #19057 from shinobu-x/wip-22188-jewel
jewel: rgw: add cors header rule check in cors option request
Reviewed-by: Casey Bodley <cbodley@redhat.com>
Nathan Cutler [Wed, 21 Mar 2018 19:31:14 +0000 (20:31 +0100)]
Merge pull request #18772 from smithfarm/wip-22028-jewel
jewel: rgw: boto3 v4 SignatureDoesNotMatch failure due to sorting of sse-kms headers
Reviewed-by: Matt Benjamin <mbenjamin@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
Nathan Cutler [Fri, 23 Feb 2018 16:22:13 +0000 (17:22 +0100)]
Merge pull request #20061 from cbodley/wip-jewel-rgw-log-trim
jewel: rgw: automated trimming of datalog and mdlog
Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
Nathan Cutler [Fri, 23 Feb 2018 13:17:06 +0000 (14:17 +0100)]
Merge pull request #20557 from smithfarm/wip-really-disable-pidfile-test
test/CMakeLists: disable test_pidfile.sh
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
Sage Weil [Thu, 10 Aug 2017 19:41:38 +0000 (15:41 -0400)]
test/CMakeLists: disable test_pidfile.sh
Too flaky, see http://tracker.ceph.com/issues/20975
Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit
ff3de2304497544033837bb8d0c809a9e54a3e6e )
Conflicts:
src/test/Makefile.am: applied change manually because jewel uses autotools
Nathan Cutler [Thu, 22 Feb 2018 18:05:41 +0000 (19:05 +0100)]
Merge pull request #20344 from pdvian/wip-22866-jewel
jewel: mon/OSDMonitor: fix dividing by zero in OSDUtilizationDumper
Reviewed-by: Kefu Chai <kchai@redhat.com>
Nathan Cutler [Thu, 22 Feb 2018 16:06:55 +0000 (17:06 +0100)]
Merge pull request #20463 from dzafman/wip-23006
test: Adjust for Jewel quirk caused of differences with master
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Nathan Cutler [Thu, 22 Feb 2018 16:05:55 +0000 (17:05 +0100)]
Merge pull request #20446 from smithfarm/wip-23010-jewel
jewel: Filestore rocksdb compaction readahead option not set by default
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Nathan Cutler [Thu, 22 Feb 2018 16:03:00 +0000 (17:03 +0100)]
Merge pull request #20289 from smithfarm/wip-21239-jewel
jewel: test_health_warnings.sh can fail
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
Nathan Cutler [Thu, 22 Feb 2018 16:00:18 +0000 (17:00 +0100)]
Merge pull request #20284 from dzafman/wip-22912
jewel: ceph-objectstore-tool: "$OBJ get-omaphdr" and "$OBJ list-omap" scan all pgs instead of using specific pg
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Nathan Cutler [Thu, 22 Feb 2018 15:58:26 +0000 (16:58 +0100)]
Merge pull request #19611 from ukernel/jewel-22494
jewel: include/fs_types: fix unsigned integer overflow
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Reviewed-by: Amit Kumar <amitkuma@redhat.com>
Kefu Chai [Thu, 22 Feb 2018 09:18:28 +0000 (17:18 +0800)]
Merge pull request #20520 from smithfarm/wip-disable-test-pidfile
test/CMakeLists: disable test-pidfile.sh
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: David Zafman <dzafman@redhat.com>
Sage Weil [Thu, 31 Aug 2017 13:11:56 +0000 (09:11 -0400)]
test/CMakeLists: disable test-pidfile.sh
Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit
c4936f4493d34341aab8f01488b45dc981d4ef3f )
Nathan Cutler [Tue, 20 Feb 2018 09:45:20 +0000 (10:45 +0100)]
Merge pull request #17707 from liewegas/wip-17445
jewel: osd: also check the exsistence of clone obc for "CEPH_SNAPDIR" requests
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Nathan Cutler [Tue, 20 Feb 2018 09:44:29 +0000 (10:44 +0100)]
Merge pull request #17883 from andyli029/wip-jewel-signal-handler-typo
jewel: core: global/signal_handler.cc: fix typo
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Nathan Cutler [Tue, 20 Feb 2018 09:42:43 +0000 (10:42 +0100)]
Merge pull request #19906 from jdurgin/jewel-filestore-split
jewel: HashIndex: randomize split threshold by a configurable amount
Reviewed-by: Sage Weil <sage@redhat.com>
Nathan Cutler [Tue, 20 Feb 2018 09:41:55 +0000 (10:41 +0100)]
Merge pull request #20331 from dzafman/wip-21036
jewel: snapset xattr corruption propagated from primary to other shards
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Nathan Cutler [Tue, 20 Feb 2018 09:41:07 +0000 (10:41 +0100)]
Merge pull request #18294 from smithfarm/wip-21796-jewel
jewel: Ubuntu amd64 client can not discover the ubuntu arm64 ceph cluster
Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Nathan Cutler [Tue, 20 Feb 2018 09:40:30 +0000 (10:40 +0100)]
Merge pull request #18850 from vumrao/vumrao-jewel-rocksdb-cache-size
jewel: common/config: set rocksdb_cache_size to OPT_U64
Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Nathan Cutler [Tue, 20 Feb 2018 09:39:47 +0000 (10:39 +0100)]
Merge pull request #19330 from ovh/bp-21862-jewel
jewel: tools/ceph-conf: dump parsed config in plain text or as json
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
Nathan Cutler [Tue, 20 Feb 2018 09:37:34 +0000 (10:37 +0100)]
Merge pull request #19927 from jdurgin/wip-jewel-omap-recovery
jewel: config: lower default omap entries recovered at once
Reviewed-by: Nathan Cutler <ncutler@suse.com>
Nathan Cutler [Tue, 20 Feb 2018 09:36:40 +0000 (10:36 +0100)]
Merge pull request #19978 from pdvian/wip-22693-jewel
jewel: common: compute SimpleLRU's size with contents.size() instead of lru
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
Nathan Cutler [Tue, 20 Feb 2018 09:35:18 +0000 (10:35 +0100)]
Merge pull request #20108 from tchaikov/wip-18004-jewel
jewel: osd: update heartbeat peers when a new OSD is added
Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: Pan Liu <wanjun.lp@alibaba-inc.com>
Nathan Cutler [Tue, 20 Feb 2018 09:32:37 +0000 (10:32 +0100)]
Merge pull request #20146 from smithfarm/wip-22818-jewel
jewel: repair_test fails due to race with osd start
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: David Zafman <dzafman@redhat.com>
Nathan Cutler [Tue, 20 Feb 2018 09:31:39 +0000 (10:31 +0100)]
Merge pull request #20306 from tchaikov/wip-pr-16661-jewel
jewel: throttle: Minimal destructor fix for Luminous
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: Adam C. Emerson <aemerson@redhat.com>
David Zafman [Fri, 16 Feb 2018 16:48:12 +0000 (08:48 -0800)]
test: Adjust for Jewel quirk caused of differences with master
Fixes: http://tracker.ceph.com/issues/23006
Signed-off-by: David Zafman <dzafman@redhat.com>
Boris Ranto [Fri, 16 Feb 2018 05:40:22 +0000 (06:40 +0100)]
Merge pull request #18780 from shinobu-x/wip-21053-jewel
jewel: RHEL 7.3 Selinux denials at OSD start
Reviewed-by: Boris Ranto <branto@redhat.com>
Nathan Cutler [Thu, 15 Feb 2018 15:39:12 +0000 (16:39 +0100)]
Merge pull request #20143 from smithfarm/wip-21872-jewel
jewel: ObjectStore/StoreTest.FiemapHoles/3 fails with kstore
Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: David Zafman <dzafman@redhat.com>
Mark Nelson [Thu, 21 Sep 2017 22:21:16 +0000 (17:21 -0500)]
common/options.cc: Set Filestore rocksdb compaction readahead option.
fixes: http://tracker.ceph.com/issues/21505
Signed-off-by: Mark Nelson <mnelson@redhat.com>
(cherry picked from commit
66567e573836c570040c8d8148c34b0cf9dc9ce2 )
Conflicts:
src/common/options.cc (master commit made the change in
src/common/options.cc, which doesn't exist in jewel)
Mingxin Liu [Mon, 20 Feb 2017 06:36:02 +0000 (14:36 +0800)]
mon/OSDMonitor: fix deviding by zero in OSDUtilizationDumper
Signed-off-by: Mingxin Liu <mingxin@xsky.com>
(cherry picked from commit
9fe103233eaee965849c00c66c1b352f31932e01 )
Nathan Cutler [Tue, 6 Feb 2018 23:16:33 +0000 (00:16 +0100)]
Merge pull request #19907 from pdvian/wip-22590-jewel
jewel: cephfs: ceph.in: pass RADOS inst to LibCephFS
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Nathan Cutler [Tue, 6 Feb 2018 14:38:56 +0000 (15:38 +0100)]
Merge pull request #20067 from smithfarm/wip-22762-jewel
jewel: mds: unbalanced auth_pin/auth_unpin in RecoveryQueue code
Reviewed-by: Yan, Zheng <zyan@redhat.com>
Nathan Cutler [Tue, 6 Feb 2018 14:35:34 +0000 (15:35 +0100)]
Merge pull request #20074 from smithfarm/wip-22772-jewel
jewel: rgw: user creation can overwrite existing user even if different uid is given
Reviewed-by: Casey Bodley <cbodley@redhat.com>
Nathan Cutler [Tue, 6 Feb 2018 14:34:31 +0000 (15:34 +0100)]
Merge pull request #20057 from linuxbox2/jewel-rgw-latchfix
jewel: rgw: rgw_file: alternate fix deadlock on lru eviction
Reviewed-by: Nathan Cutler <ncutler@suse.com>
Nathan Cutler [Tue, 6 Feb 2018 14:33:15 +0000 (15:33 +0100)]
Merge pull request #20039 from oritwas/wip-rgw-jewel-22703
jewel: rgw: resharding needs to set back the bucket ACL after link
Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
Nathan Cutler [Tue, 6 Feb 2018 14:31:33 +0000 (15:31 +0100)]
Merge pull request #19908 from pdvian/wip-22582-jewel
jewel: rgw: dont log EBUSY errors in 'sync error list'
Reviewed-by: Casey Bodley <cbodley@redhat.com>
Nathan Cutler [Tue, 6 Feb 2018 14:30:18 +0000 (15:30 +0100)]
Merge pull request #19783 from ceph/wip-rgw-22182
jewel: rgw: segfaults after running radosgw-admin data sync init
Reviewed-by: Casey Bodley <cbodley@redhat.com>
Nathan Cutler [Tue, 6 Feb 2018 14:26:56 +0000 (15:26 +0100)]
Merge pull request #18305 from smithfarm/wip-21447-jewel
jewel: rgw: multisite: Get bucket location which is located in another zonegroup, will return 301 Moved Permanently
Reviewed-by: Orit Wasserman <owasserm@redhat.com>
Nathan Cutler [Tue, 6 Feb 2018 14:25:26 +0000 (15:25 +0100)]
Merge pull request #18121 from linuxbox2/jewel-quota-multipart
jewel: RGW: Multipart upload may double the quota
Reviewed-by: Nathan Cutler <ncutler@suse.com>
Nathan Cutler [Tue, 6 Feb 2018 14:15:59 +0000 (15:15 +0100)]
Merge pull request #18116 from linuxbox2/jewel-mpserializer
jewel: rgw: release cls lock if taken in RGWCompleteMultipart
Reviewed-by: Casey Bodley <cbodley@redhat.com>
Nathan Cutler [Tue, 6 Feb 2018 14:14:20 +0000 (15:14 +0100)]
Merge pull request #17731 from ceph/wip-rgw-jewel-15998
jewel: rgw: fix marker encoding problem
Reviewed-by: Matt Benjamin <mbenjamin@redhat.com>
Reviewed-by: Marcus Watts <mwatts@redhat.com>
Nathan Cutler [Tue, 6 Feb 2018 14:12:42 +0000 (15:12 +0100)]
Merge pull request #17151 from smithfarm/wip-20480-jewel
jewel: rgw: log includes zero byte sometimes
Reviewed-by: Casey Bodley <cbodley@redhat.com>
Nathan Cutler [Tue, 6 Feb 2018 14:10:34 +0000 (15:10 +0100)]
Merge pull request #17149 from smithfarm/wip-20399-jewel
jewel: rgw: rgw_file: recursive lane lock can occur in LRU drain
Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
Nathan Cutler [Tue, 6 Feb 2018 13:53:55 +0000 (14:53 +0100)]
Merge pull request #16763 from linuxbox2/mb-jewel-rgw-delparts
jewel: rgw: fix the bug that part's index can't be removed after completing
Reviewed-by: Nathan Cutler <ncutler@suse.com>
Nathan Cutler [Tue, 6 Feb 2018 13:51:07 +0000 (14:51 +0100)]
Merge pull request #16708 from linuxbox2/wip-jewel-15912-15673
jewel: rgw: Fix duplicate tag removal during GC, cls/refcount: store and use list of retired tags)
Reviewed-by: Nathan Cutler <ncutler@suse.com>
Nathan Cutler [Tue, 6 Feb 2018 13:48:06 +0000 (14:48 +0100)]
Merge pull request #19975 from pdvian/wip-22689-jewel
jewel: client: release revoking Fc after invalidate cache
Reviewed-by: Yan, Zheng <zyan@redhat.com>
Nathan Cutler [Tue, 6 Feb 2018 13:45:42 +0000 (14:45 +0100)]
Merge pull request #18084 from batrick/i17935
jewel: ceph_volume_client: fix setting caps for IDs
Reviewed-by: Ramana Raja <rraja@redhat.com>
Nathan Cutler [Tue, 6 Feb 2018 13:42:32 +0000 (14:42 +0100)]
Merge pull request #17925 from batrick/i21519
jewel: client: set client_try_dentry_invalidate to false by default
Reviewed-by: Yan, Zheng <zyan@redhat.com>
Nathan Cutler [Tue, 6 Feb 2018 13:40:50 +0000 (14:40 +0100)]
Merge pull request #17188 from smithfarm/wip-21067-jewel
jewel: mds: fix integer overflow
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Nathan Cutler [Tue, 6 Feb 2018 13:38:04 +0000 (14:38 +0100)]
Merge pull request #20287 from smithfarm/wip-22191-jewel
jewel: class rbd.Image discard----OSError: [errno
2147483648 ] error discarding region
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
Reviewed-by: Mykola Golub <mgolub@suse.com>
Nathan Cutler [Tue, 6 Feb 2018 13:37:10 +0000 (14:37 +0100)]
Merge pull request #20286 from smithfarm/wip-22186-jewel
jewel: abort in listing mapped nbd devices when running in a container
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
Reviewed-by: Mykola Golub <mgolub@suse.com>
Nathan Cutler [Tue, 6 Feb 2018 13:36:13 +0000 (14:36 +0100)]
Merge pull request #19801 from smithfarm/wip-21642-jewel
jewel: rbd ls -l crashes with SIGABRT
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
Reviewed-by: Mykola Golub <mgolub@suse.com>
Nathan Cutler [Tue, 6 Feb 2018 13:33:16 +0000 (14:33 +0100)]
Merge pull request #20282 from smithfarm/wip-21971-jewel
jewel: [journal] tags are not being expired if no other clients are registered
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
Nathan Cutler [Tue, 6 Feb 2018 13:32:10 +0000 (14:32 +0100)]
Merge pull request #20281 from smithfarm/wip-21290-jewel
jewel: [rbd] image-meta list does not return all entries
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
Nathan Cutler [Tue, 6 Feb 2018 13:30:55 +0000 (14:30 +0100)]
Merge pull request #20280 from smithfarm/wip-21266-jewel
jewel: [cli] rename of non-existent image results in seg fault
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
Nathan Cutler [Tue, 6 Feb 2018 13:28:25 +0000 (14:28 +0100)]
Merge pull request #19855 from pdvian/wip-22594-jewel
jewel: rbd: librbd: filter out potential race with image rename
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
Nathan Cutler [Tue, 6 Feb 2018 13:26:20 +0000 (14:26 +0100)]
Merge pull request #19644 from pdvian/wip-22498-jewel
jewel: rbd-mirror: cluster watcher should ensure it has latest OSD map
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
Nathan Cutler [Tue, 6 Feb 2018 13:25:12 +0000 (14:25 +0100)]
Merge pull request #19186 from pdvian/wip-22209-jewel
jewel: rbd: disk usage on empty pool no longer returns an error message
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
Nathan Cutler [Tue, 6 Feb 2018 13:24:10 +0000 (14:24 +0100)]
Merge pull request #19115 from pdvian/wip-22173-jewel
jewel: [rbd-nbd] Fedora does not register resize events
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
Nathan Cutler [Tue, 6 Feb 2018 13:22:53 +0000 (14:22 +0100)]
Merge pull request #19098 from pdvian/wip-22170-jewel
jewel: librbd: set deleted parent pointer to null
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
Nathan Cutler [Tue, 6 Feb 2018 13:21:13 +0000 (14:21 +0100)]
Merge pull request #18843 from shinobu-x/wip-21866-jewel
jewel: rbd: rbd crashes during map
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
Nathan Cutler [Tue, 6 Feb 2018 12:47:20 +0000 (13:47 +0100)]
Merge pull request #19194 from mdw-at-linuxbox/wip-jewel-rgw-swift-anon
jewel: rgw: fix swift anonymous access
Reviewed-by: Casey Bodley <cbodley@redhat.com>
Reviewed-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
Casey Bodley [Mon, 9 Oct 2017 18:46:47 +0000 (14:46 -0400)]
rgw: RGWDataSyncControlCR retries on all errors
similar to RGWMetaSyncShardControlCR, we don't want to exit and
stop the data sync processor thread on failures. we want to keep
retrying with backoff
Signed-off-by: Casey Bodley <cbodley@redhat.com>
(cherry picked from commit
065e67bbd312240f5128c31f5525098c62f3afce )
Conflicts:
src/rgw/rgw_data_sync.cc (no data sync tracing in jewel,
i.e.
065e67bbd312240f5128c31f5525098c62f3afce and follow-on
commits will not be backported)
David Zafman [Mon, 12 Jun 2017 18:28:48 +0000 (11:28 -0700)]
osd: be_select_auth_object() sanity check oi soid
Fixes: http://tracker.ceph.com/issues/18409
Signed-off-by: David Zafman <dzafman@redhat.com>
(cherry picked from commit
9614ab556ca8e4e5daec1e71d9b6032633ba21a0 )
David Zafman [Sat, 21 Oct 2017 00:34:49 +0000 (17:34 -0700)]
osd: Primary shard needs to be at the front to be preferred
Caused by:
cd0d8b0714d8684cf61b4650e170027ef46f489b
Fixes: http://tracker.ceph.com/issues/21907
Signed-off-by: David Zafman <dzafman@redhat.com>
(cherry picked from commit
b7d2f27da1a68046a688749f95093a88e6362b28 )
David Zafman [Wed, 7 Jun 2017 16:05:16 +0000 (09:05 -0700)]
osd: Check snapset for validity when selecting authoritative shard
Fixes: http://tracker.ceph.com/issues/20186
Signed-off-by: David Zafman <dzafman@redhat.com>
(cherry picked from commit
cd0d8b0714d8684cf61b4650e170027ef46f489b )
Conflicts:
src/osd/PGBackend.cc (trivial, jewel has BitwiseComparator)
Adam C. Emerson [Fri, 28 Jul 2017 18:14:48 +0000 (14:14 -0400)]
throttle: Minimal destructor fix for Luminous
Get rid of the undefined behavior of destroying condition variables
while they're being waited on.
Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
(cherry picked from commit
0f52f486ef05edf8bf89e2bbb7b79f1bc1644cfa )
Conflicts:
src/common/Throttle.cc
src/common/Throttle.h
src/test/common/Throttle.cc: in jewel, we don't have perfconter
for throttles, neither do we have backport14.h back then, so we need to
resolve these conflicts, by removing perfcounter related change in
Throttle.cc, and add the make_unique helper for test/common/Throttle.cc,
add scope_guard to Throttle.cc.
Orit Wasserman [Sun, 21 Jan 2018 10:11:34 +0000 (12:11 +0200)]
rgw: resharding needs to set back the bucket ACL after link
Jewel only fix. New implementation of resharding in Luminous.
Fixes: http://tracker.ceph.com/issues/22703
Signed-off-by: Orit Wasserman <owasserm@redhat.com>
J. Eric Ivancich [Fri, 3 Nov 2017 13:15:13 +0000 (09:15 -0400)]
rgw: fix BZ
1500904 , Stale bucket index entry remains after object deletion
We have a race condition:
1. RGW client #1: requests an object be deleted.
2. RGW client #1: sends a prepare op to bucket index OSD #1.
3. OSD #1: prepares the op, adding pending ops to the bucket dir entry
4. RGW client #2: sends a list bucket to OSD #1
5. RGW client #2: sees that there are pending operations on bucket
dir entry, and calls check_disk_state
6. RGW client #2: check_disk_state sees that the object still exists, so it
sends CEPH_RGW_UPDATE to bucket index OSD (#1)
7. RGW client #1: sends a delete object to object OSD (#2)
8. OSD #2: deletes the object
9. RGW client #2: sends a complete op to bucket index OSD (#1)
10. OSD #1: completes the op
11. OSD #1: receives the CEPH_RGW_UPDATE and updates the bucket index
entry, thereby **RECREATING** it
Solution implemented:
At step #5 the object's dir entry exists. If we get to beginning of
step #11 and the object's dir entry no longer exists, we know that the
dir entry was just actively being modified, and ignore the
CEPH_RGW_UPDATE operation, thereby NOT recreating it.
Signed-off-by: J. Eric Ivancich <ivancich@redhat.com>
(cherry picked from commit
b33f529e79b74314a2030231e1308ee225717743 )
Conflicts: (backported substantial changes only; omitted cleanups)
src/cls/rgw/cls_rgw.cc
src/rgw/rgw_rados.cc
Orit Wasserman [Wed, 1 Nov 2017 15:49:46 +0000 (17:49 +0200)]
rgw: add missing current_history initialization
Fixes: http://tracker.ceph.com/issues/21996
Signed-off-by: Orit Wasserman <owasserm@redhat.com>
Signed-off-by: Casey Bodley <cbodley@redhat.com>
(cherry picked from commit
cc3246cf46ba26604e4b3bef1f8fe0c9990bdeb6 )
Orit Wasserman [Wed, 1 Nov 2017 10:15:35 +0000 (12:15 +0200)]
rgw: init oldest period after setting run_sync_thread
Fixes: http://tracker.ceph.com/issues/21996
Signed-off-by: Orit Wasserman <owasserm@redhat.com>
(cherry picked from commit
8b301679161d1405fdae379ff93c33d4d637698d )
yuliyang [Sun, 24 Sep 2017 00:41:04 +0000 (08:41 +0800)]
rgw:fix list objects with marker when bucket is enable versioning
fix: http://tracker.ceph.com/issues/21500
Signed-off-by: yuliyang <yuliyang@cmss.chinamobile.com>
(cherry picked from commit
bc16b162cf757b9c6ceae30912eb647ef9304f75 )
Jason Dillaman [Sun, 4 Feb 2018 02:29:12 +0000 (21:29 -0500)]
Merge pull request #19804 from smithfarm/wip-21691-jewel
jewel: tests: rbd_mirror_helpers.sh request_resync_image function saves image id to wrong variable
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
Huan Zhang [Fri, 24 Jun 2016 03:27:53 +0000 (11:27 +0800)]
rbd discard return -EINVAL if len > MAX_INT32
rbd discard use 'int' to return discarded length, but the 'len' user
passed is 'uint64', in some case, the ret value will be truncated
and return a negative value which means discard failed. ret -EINVAL
if len > MAX_INT32 to indicate support len <= MAX_INT32 only.
Fixes: http://tracker.ceph.com/issues/16465
Signed-off-by: Huan Zhang <zhanghuan@chinac.com>
(cherry picked from commit
ec259dfde87ed9bc5e7247f311b629707c636895 )
Jason Dillaman [Wed, 15 Nov 2017 14:09:15 +0000 (09:09 -0500)]
librbd: prevent overflow of discard API result code
Prevent discard/writesame lengths larger than 2GB.
Fixes: http://tracker.ceph.com/issues/21966
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit
3effd324db181e625665be33b5c6529dca723cc5 )
Signed-off-by: Nathan Cutler <ncutler@suse.com>
Conflicts:
PendingReleaseNotes (adapted for jewel)
src/librbd/librbd.cc (no writesame in jewel)
Sage Weil [Thu, 24 Aug 2017 21:56:13 +0000 (17:56 -0400)]
osd: subscribe to new osdmap while waiting_for_healthy
If we are sitting around waiting until we are able to ping our "up" peers,
we need to be sure that our notion of "up" is still correct and we're not
just stuck on an old, stale OSDMap.
Fixes: http://tracker.ceph.com/issues/21121
Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit
fbafa659dae94faba435ca449ee5e77b51108b4b )
Li Wang [Wed, 1 Nov 2017 09:21:29 +0000 (09:21 +0000)]
rbd-nbd: fix unused nbd device search bug in container
In some container scenarios, the host may choose to
map a specific nbd device, for example, /dev/nbd6 into the
container, in that case, the nbd device available in the
container is not numbered from 0. The current unused
nbd device search function will return no result.
This patch fixes it.
Fixes: http://tracker.ceph.com/issues/22012
Signed-off-by: Li Wang <laurence.liwang@gmail.com>
Reviewed-by: Yunchuan Wen <yunchuan.wen@kylin-cloud.com>
(cherry picked from commit
be0f9581f9727187ca03232e0b368e7da7a60609 )
Pan Liu [Sat, 11 Mar 2017 13:50:00 +0000 (21:50 +0800)]
rbd-nbd: only try to load nbd module once when open nbd device, during do_map operation.
Signed-off-by: Pan Liu <liupan1111@gmail.com>
(cherry picked from commit
37aa18858b38cee61e122adc0a1834ca797ea84f )
Jason Dillaman [Fri, 27 Oct 2017 20:45:54 +0000 (16:45 -0400)]
cls/journal: ensure tags are properly expired
Previously, if only the local image was using the journal or if
a disconnected peer was attached, the tag entries could not be
expired even if unreferenced.
Fixes: http://tracker.ceph.com/issues/21960
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit
19fa1c7f5b2809e9a223b7b196dfc031e97a5dcd )
Conflicts:
src/cls/journal/cls_journal.cc (jewel does not have
d3de6f5e07cb30d81ce8cc539256c6cf754b28d5 )
Jason Dillaman [Wed, 6 Sep 2017 20:14:58 +0000 (16:14 -0400)]
rbd: support iterating over metadata items when listing
Fixes: http://tracker.ceph.com/issues/21179
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit
9c4f9856b034061aed052192b0ee09b9a9d09bc0 )
Jason Dillaman [Tue, 5 Sep 2017 16:11:45 +0000 (12:11 -0400)]
librbd: rename of non-existent image results in seg fault
Fixes: http://tracker.ceph.com/issues/21248
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit
4a75ee43d3b108a9593a010160479fd62884eda8 )
Conflicts:
src/librbd/internal.cc (retain redundant "delete ictx" that has been
dropped in master)
David Zafman [Tue, 26 Sep 2017 22:32:24 +0000 (15:32 -0700)]
ceph-objectstore-tool: performance: Add --pgid for faster search for object by name
Fixes: http://tracker.ceph.com/issues/21327
Signed-off-by: David Zafman <dzafman@redhat.com>
(cherry picked from commit
14c5c834b9cfbf505197d999a776dd69d5e4d109 )
Conflicts:
src/tools/ceph_objectstore_tool.cc (trivial)
David Zafman [Sat, 3 Feb 2018 00:44:42 +0000 (16:44 -0800)]
Merge pull request #20070 from smithfarm/wip-22771-jewel
jewel: tools: ceph-objectstore-tool set-size should clear data-digest
Reviewed-by: David Zafman <dzafman@redhat.com>
Casey Bodley [Mon, 9 Oct 2017 18:09:40 +0000 (14:09 -0400)]
rgw: fix error handling in ListBucketIndexesCR
the call to set_state() returns 0, when we want operate() to return the
error code instead. use set_cr_error() to do this
Fixes: http://tracker.ceph.com/issues/21735
Signed-off-by: Casey Bodley <cbodley@redhat.com>
(cherry picked from commit
ed6340a47f32472bb1f650407dbe739c44bf4bd6 )
Casey Bodley [Mon, 9 Oct 2017 18:08:21 +0000 (14:08 -0400)]
rgw: ListBucketIndexesCR spawns entries_index after listing metadata
if the metadata listing fails, we won't have to clean up entries_index
Signed-off-by: Casey Bodley <cbodley@redhat.com>
(cherry picked from commit
7f127f54406ef0e08a1265b9bc20433fe3f21523 )
Nathan Cutler [Fri, 2 Feb 2018 21:20:33 +0000 (22:20 +0100)]
Merge pull request #19469 from linuxbox2/jewel-22410
jewel: rgw: fix chained cache invalidation to prevent cache size growth
Reviewed-by: Mark Kogan <mkogan@redhat.com>
Reviewed-by: Nathan Cutler <ncutler@suse.com>
Nathan Cutler [Fri, 2 Feb 2018 21:17:55 +0000 (22:17 +0100)]
Merge pull request #19747 from linuxbox2/jewel-rgw-21984
jewel: rgw: fix doubled underscore with s3/swift server-side copy
Reviewed-by: Casey Bodley <cbodley@redhat.com>
Reviewed-by: Marcus Watts <mwatts@redhat.com>
Nathan Cutler [Fri, 2 Feb 2018 21:15:21 +0000 (22:15 +0100)]
Merge pull request #19769 from linuxbox2/jewel-rgw-22517
jewel: rgw: resolve Random 500 errors in Swift PutObject (22517)
Reviewed-by: Adam C. Emerson <aemerson@redhat.com>
Reviewed-by: Orit Wasserman <owasserm@redhat.com>
lu.shasha [Tue, 10 Oct 2017 07:51:04 +0000 (15:51 +0800)]
rgw: don't change rados object's mtime when update olh
null instance and olh share rados object. Null instance using the rados object mtime as its mtime. When olh updated, the rados object mtime will change.
Thus the null instance will be incorrect. When list objects in bucket, the mtime is correct, down the null instance the last modified time is incorrect.
So when update olh, using the previous mtime, thus the null instance mtime will be correct.
Fixes: http://tracker.ceph.com/issues/21743
Signed-off-by: Shasha Lu <lu.shasha@eisoo.com>
(cherry picked from commit
3189edc28ea6d3c117c2e2f0664f45c69f67ab50 )
Nathan Cutler [Thu, 1 Feb 2018 23:18:49 +0000 (00:18 +0100)]
Merge pull request #18303 from smithfarm/wip-21632-jewel
jewel: doc: remove region from INSTALL CEPH OBJECT GATEWAY
Reviewed-by: Orit Wasserman <owasserm@redhat.com>
Casey Bodley [Tue, 12 Dec 2017 19:12:00 +0000 (14:12 -0500)]
rgw: use bucket marker for multipart complete oid
the use of bucket_id breaks multipart uploads if the bucket has been
resharded, because InitMultipart uses the old bucket_id and Complete
uses the new
Fixes: http://tracker.ceph.com/issues/22368
(this fixes a previous backport, so has no associated commit from master)
Signed-off-by: Casey Bodley <cbodley@redhat.com>
(cherry picked from commit
0dd77b24819323808860c6fb98a0bc2f9f27e26f )
Matt Benjamin [Tue, 3 Oct 2017 21:48:29 +0000 (17:48 -0400)]
rgw: release cls lock if taken in RGWCompleteMultipart
Follows Casey's proposal to conditionally release the lock in
::complete(), in order to avoid duplicated code in various early
return cases.
Fixes: http://tracker.ceph.com/issues/21596
Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
(cherry picked from commit
704f793f08a02760d23eb5778b738bb07be0e7cf )
Jens Rosenboom [Mon, 26 Jun 2017 11:14:06 +0000 (11:14 +0000)]
RGW: Fix duplicate tag removal during GC
We need to remove all processed tags before we fetch a new batch of tags
for removal, otherwise some tags might get processed twice.
Fixes: http://tracker.ceph.com/issues/20107
Signed-off-by: Jens Rosenboom <j.rosenboom@x-ion.de>
(cherry picked from commit
8eeee2b78d6f4176fb20c2b1499e3237ee229bf4 )
Nathan Johnson [Fri, 8 Sep 2017 04:27:40 +0000 (23:27 -0500)]
rgw: admin api - add ability to sync user stats from admin api
Fixes: http://tracker.ceph.com/issues/21301
Signed-off-by: Nathan Johnson <nathan@nathanjohnson.org>
(cherry picked from commit
828412d573a0b31387fc9f6a879f9a6083535730 )