]>
git.apps.os.sepia.ceph.com Git - ceph.git/log
Kefu Chai [Wed, 23 Nov 2016 06:48:11 +0000 (14:48 +0800)]
FileStore::_do_fiemap: do not reference fiemap after it is freed
`last` points to fiemap::fm_extends[n], and if fiemap gets freed, we can
not reference any of its fieldis. so we could remember the check result before
freeing it.
Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit
c3748fa7737b6c43de2dae5d957fcff01322515c )
Conflicts:
src/os/FileStore.cc
put the parameter is_last in the right place
Ning Yao [Thu, 13 Oct 2016 08:53:18 +0000 (16:53 +0800)]
FileStore:: fix fiemap issue in xfs when #extents > 1364
Fixes: #17610
Backport: jewel, hammer
Signed-off-by: Ning Yao <yaoning@unitedstack.com>
(cherry picked from commit
1a1c126d80b427d5230347fbc71a4edea5c0b6c8 )
Conflicts:
src/os/FileStore.cc
in hammer, there is no _do_seek_hole_data() function so remove it
in hammer, the logic is in FileStore::fiemap not in _do_fiemap()
so port the logic to the else branch in FileStore::fiemap
Loic Dachary [Sat, 29 Oct 2016 08:24:18 +0000 (10:24 +0200)]
Merge pull request #11372 from ceph/wip-17386-hammer
hammer: doc: add "Upgrading to Hammer" section
Reviewed-by: Samuel Just <sjust@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
Kefu Chai [Thu, 27 Oct 2016 07:44:09 +0000 (15:44 +0800)]
doc: add "to Hammer" upgrade section
Fixes: http://tracker.ceph.com/issues/17534
Signed-off-by: Kefu Chai <kchai@redhat.com>
Josh Durgin [Fri, 30 Sep 2016 04:34:26 +0000 (21:34 -0700)]
Merge pull request #11253 from ceph/wip-offline-split-hammer2
ceph-objectstore-tool: add a way to split filestore directories offline
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Josh Durgin [Fri, 5 Aug 2016 18:45:00 +0000 (11:45 -0700)]
ceph-objectstore-tool: add a way to split filestore directories offline
Use the usual split code, and split each dir that meets the
usual split criteria.
This can be run with lower than usual split settings, to avoid costly
online splits. To make sure the directories are not merged again, use
a load merge threshold (e.g. filestore merge threshold = 1), and
adjust the split multiplier accordingly.
Fixes: http://tracker.ceph.com/issues/17220
Signed-off-by: Josh Durgin <jdurgin@redhat.com>
(cherry picked from commit
e7b0428e0e8d8f5459311dc698d94a3ac4f04684 )
Conflicts:
src/tools/ceph_objectstore_tool.cc
* remove c++11 auto usage
* change HashIndex::list_subdirs() call to use set instead of vector
* adjust to hammer signature of coll_t::is_pg()
Casey Bodley [Tue, 20 Sep 2016 14:33:02 +0000 (10:33 -0400)]
Merge pull request #11140 from cbodley/wip-radosgw-admin-man-hammer
hammer: add orphan options to radosgw-admin --help and man page
Reviewed-by: Ken Dreyer <kdreyer@redhat.com>
Casey Bodley [Tue, 20 Sep 2016 13:27:52 +0000 (09:27 -0400)]
man: add orphan options to radosgw-admin.8
Signed-off-by: Casey Bodley <cbodley@redhat.com>
tserlin [Mon, 19 Sep 2016 18:40:12 +0000 (14:40 -0400)]
Add two options to radosgw-admin.rst manpage
Add '--job-id' and '--max-concurrent-ios' to Orphan Search Options
Fixes: http://tracker.ceph.com/issues/17281
Signed-off-by: Thomas Serlin <tserlin@redhat.com>
(cherry picked from commit
697f30d86f49b73c981c06375ab2937570b1db01 )
Ken Dreyer [Thu, 15 Sep 2016 18:56:39 +0000 (12:56 -0600)]
radosgw-admin: add "--orphan-stale-secs" to --help
The radosgw-admin --help did not include the description of the
`--orphan-stale-secs` option of the `orphans find` command. The option
sets the number of seconds to wait before declaring an object to be an
orphan.
Fixes: http://tracker.ceph.com/issues/17280
Signed-off-by: Ken Dreyer <kdreyer@redhat.com>
(cherry picked from commit
354059ae43b4f4cc797da1669715399cd96a4738 )
Abhishek Lekshmanan [Fri, 1 Apr 2016 11:46:30 +0000 (13:46 +0200)]
rgw_admin: improve the orphans find help
Adding a few missing commandline switches and improve the help message
Signed-off-by: Abhishek Lekshmanan <abhishek@suse.com>
(cherry picked from commit
27e4c46f741a5f908d5c8ca1af227b3581c697f6 )
Ken Dreyer [Thu, 15 Sep 2016 17:40:14 +0000 (11:40 -0600)]
doc: add "--orphan-stale-secs" to radosgw-admin(8)
The radosgw-admin(8) manual page did not include the description of the
`--orphan-stale-secs` option of the `orphans find` command. The option sets
the number of seconds to wait before declaring an object to be an
orphan.
Fixes: http://tracker.ceph.com/issues/17280
Signed-off-by: Ken Dreyer <kdreyer@redhat.com>
(cherry picked from commit
a676c516069cc448591018ecf4f7d1f7f7bc3bfd )
Casey Bodley [Wed, 7 Sep 2016 17:06:33 +0000 (13:06 -0400)]
Merge pull request #10839 from oritwas/hammer-default-quota
Hammer default quota
Reviewed-by: Daniel Gryniewicz <dang@redhat.com>
Jenkins Build Slave User [Tue, 30 Aug 2016 11:33:34 +0000 (11:33 +0000)]
0.94.9
Alfredo Deza [Tue, 30 Aug 2016 11:12:09 +0000 (07:12 -0400)]
Merge pull request #10913 from ceph/wip-revert-random-uuid-hammer
hammer: revert use of boost for uuids
Reviewed-by: Alfredo Deza <adeza@redhat.com>
root [Sun, 19 Jun 2016 07:36:06 +0000 (13:06 +0530)]
rgw: Add documentation for RGW default quota
Fixes http://tracker.ceph.com/issues/16447
Cherry picked from
e3ab3476146cf0fe604783e9e5a0d63237271735
This was modified to use size in kB, rather than size in bytes, since
Jewel has not yet been converted to use size in bytes.
Signed-off-by: Pavan Rallabhandi <PRallabhandi@walmartlabs.com>
Signed-off-by: Daniel Gryniewicz <dang@redhat.com>
(cherry picked from commit
11328d7dcc6634ab81ebce4801ebc243a27b84b0 )
root [Sun, 19 Jun 2016 07:18:42 +0000 (12:48 +0530)]
rgw: Do not bother to check against conf values during quota handling
Fixes http://tracker.ceph.com/issues/16447
Cherry picked from
17d2c1712a5b72315a47ab0f8380331bfd478c0b
This was modified to use size in kB, rather than size in bytes, since
Jewel has not yet been converted to use size in bytes.
Signed-off-by: Pavan Rallabhandi <PRallabhandi@walmartlabs.com>
Signed-off-by: Daniel Gryniewicz <dang@redhat.com>
(cherry picked from commit
c85e9d4e1e3f367150314c08995c7a4d418910ff )
root [Mon, 23 May 2016 10:04:58 +0000 (15:34 +0530)]
rgw: Let the default quota settings take effect during user creation
Fixes http://tracker.ceph.com/issues/16447
Cherry picked from
400d7c982f18efd7cf96acfc3a63078791d1ec0a
Signed-off-by: Pavan Rallabhandi <PRallabhandi@walmartlabs.com>
Signed-off-by: Daniel Gryniewicz <dang@redhat.com>
(cherry picked from commit
e07fa1befabd56a3f353bcca50229620abd08dec )
Nathan Cutler [Tue, 30 Aug 2016 01:03:57 +0000 (03:03 +0200)]
Merge pull request #10898 from SUSE/wip-release-notes-hammer
doc: release-notes: add missing hammer releases
Reviewed-by: Loic Dachary <ldachary@redhat.com>
Sage Weil [Mon, 29 Aug 2016 19:29:29 +0000 (15:29 -0400)]
Revert "moved to use boost uuid implementation, based on commit
4fe89a7b14c97b2ed7f357132901beb2bdcec551 "
This reverts commit
174de7fce8080df6e02b363e7821e8cca6f8157f .
Sage Weil [Mon, 29 Aug 2016 15:55:24 +0000 (11:55 -0400)]
Revert "uuid: use boost::random:random_device"
This reverts commit
187d308b5b0cb0512b442bbad1bddfda8ef9203f .
This breaks precise builds.
Nathan Cutler [Sun, 28 Aug 2016 07:27:00 +0000 (09:27 +0200)]
doc: release-notes.rst: add missing line to v0.94.8
see
46264a3b6cb7f490680c79bf0957c36aeaea5f6c and
b83d25d2918cbd880fbaeec976bffcea8868d5d9 in master
Signed-off-by: Nathan Cutler <ncutler@suse.com>
Nathan Cutler [Sat, 27 Aug 2016 10:50:09 +0000 (12:50 +0200)]
doc: add missing changelogs up to 0.94.8
Signed-off-by: Nathan Cutler <ncutler@suse.com>
Nathan Cutler [Sat, 27 Aug 2016 07:28:48 +0000 (09:28 +0200)]
doc: release-notes: add missing hammer releases
Signed-off-by: Nathan Cutler <ncutler@suse.com>
Jenkins Build Slave User [Fri, 26 Aug 2016 00:02:49 +0000 (00:02 +0000)]
0.94.8
Loic Dachary [Wed, 17 Aug 2016 13:26:49 +0000 (15:26 +0200)]
Merge pull request #10750 from ceph/wip-14799-hammer
hammer: rocksdb do not link against tcmalloc if it's disabled
Reviewed-by: Loic Dachary <ldachary@redhat.com>
Kefu Chai [Wed, 17 Aug 2016 06:45:18 +0000 (23:45 -0700)]
rocksdb: disable tcmalloc if disabled
the rocksdb/configure.ac does not support --with-tcmalloc before,
and the updated rocksdb commit has the change for '--with-tcmalloc'
option, so let's pick it up.
Fixes: http://tracker.ceph.com/issues/14799
Signed-off-by: Kefu Chai <kchai@redhat.com>
Sage Weil [Sat, 12 Sep 2015 18:12:20 +0000 (14:12 -0400)]
ceph.spec: respect CEPH_EXTRA_CONFIGURE_ARGS
Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit
51abff11688f0201b8f4076ac515e4515929d4cb )
Signed-off-by: Brad Hubbard <bhubbard@redhat.com>
Orit Wasserman [Sat, 13 Aug 2016 17:19:37 +0000 (19:19 +0200)]
Merge pull request #10718 from oritwas/wip-14328-hammer
hammer: rgw: the swift key remains after removing a subuser
Orit Wasserman [Sat, 13 Aug 2016 16:22:19 +0000 (18:22 +0200)]
Merge pull request #10509 from yehudasa/wip-15557-hammer
rgw: Have a flavor of bucket deletion to bypass GC and to trigger
Orit Wasserman [Wed, 20 Jan 2016 16:24:38 +0000 (17:24 +0100)]
rgw: fix subuser rm command failure
Fixes: 14375
Signed-off-by: Orit Wasserman <owasserm@redhat.com>
(cherry picked from commit
bbc06e70b49b2917ee63985727cb92724fb99209 )
Sangdi Xu [Wed, 16 Dec 2015 01:09:16 +0000 (09:09 +0800)]
rgw: add a method to purge all associate keys when removing a subuser
Fixes: #12890
When removing a subuser, make sure all of its keys, including the swift key and possible s3 keys, are also deleted.
Signed-off-by: Sangdi Xu <xu.sangdi@h3c.com>
(cherry picked from commit
e7b7e1afc7a81c3f97976f7442fbdc5118b532b5 )
Nathan Cutler [Fri, 12 Aug 2016 10:23:41 +0000 (12:23 +0200)]
Merge pull request #10291 from badone/wip-13829-hammer
hammer: config set with negative value results in "error setting 'filestore_merge_threshold' to '-40': (22) Invalid argument"
Reviewed-by: Samuel Just <sjust@redhat.com>
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Nathan Cutler <ncutler@suse.com>
Loic Dachary [Fri, 12 Aug 2016 07:46:30 +0000 (09:46 +0200)]
Merge pull request #10699 from ktdreyer/wip-15867-nroff
jewel: doc: fix by-parttypeuuid in ceph-disk(8) nroff
Reviewed-by: Loic Dachary <ldachary@redhat.com>
Ken Dreyer [Thu, 11 Aug 2016 23:11:41 +0000 (17:11 -0600)]
doc: fix by-parttypeuuid in ceph-disk(8) nroff
Commit
221efb0b893adbfd7a19df171cf967fee87afcc7 altered the rST source
for the ceph-disk man page. In Hammer, we also have to modify the nroff
sources, because static copies of the generated man pages are stored in
Git.
Fixes: http://tracker.ceph.com/issues/15867
Signed-off-by: Ken Dreyer <kdreyer@redhat.com>
Nathan Cutler [Thu, 11 Aug 2016 20:58:33 +0000 (22:58 +0200)]
Merge pull request #9741 from SUSE/wip-16343-hammer
hammer: boost uuid makes valgrind complain
Reviewed-by: Samuel Just <sjust@redhat.com>
Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Ken Dreyer <kdreyer@redhat.com>
Reviewed-by: Nathan Cutler <ncutler@suse.com>
Orit Wasserman [Thu, 11 Aug 2016 13:58:51 +0000 (15:58 +0200)]
Merge pull request #10554 from Vicente-Cheng/wip-16815-hammer
hammer: radosgw-admin region-map set is not reporting the bucket quota correctly
Reviewed-by: Orit Wasserman <owasserm@redhat.com>
Orit Wasserman [Thu, 11 Aug 2016 13:56:39 +0000 (15:56 +0200)]
Merge pull request #10555 from Vicente-Cheng/wip-16317-hammer
hammer: rgw: bucket listing following object delete is partial
Reviewed-by: Orit Wasserman <owasserm@redhat.com>
Orit Wasserman [Thu, 11 Aug 2016 13:55:01 +0000 (15:55 +0200)]
Merge pull request #10530 from yehudasa/wip-16412-hammer
rgw: remove bucket index objects when deleting the bucket
Reviewed-by: Orit Wasserman <owasserm@redhat.com>
Orit Wasserman [Thu, 11 Aug 2016 09:14:53 +0000 (11:14 +0200)]
Merge pull request #8755 from kmroz/wip-hammer-convert-plain-object-to-versioned
hammer: rgw: convert plain object to versioned (with null version) when removing
Reviewed-by: Orit Wasserman <owasserm@redhat.com>
Nathan Cutler [Thu, 4 Aug 2016 19:41:15 +0000 (21:41 +0200)]
Merge pull request #9271 from XinzeChi/wip-fix-digest-hammer
osd: fix omap digest compare when scrub
Reviewed-by: Samuel Just <sjust@redhat.com>
Reviewed-by: David Zafman <dzafman@redhat.com>
Reviewed-by: Nathan Cutler <ncutler@suse.com>
Nathan Cutler [Thu, 4 Aug 2016 19:38:57 +0000 (21:38 +0200)]
Merge pull request #8805 from SUSE/wip-15482-hammer
hammer: is_split crash in handle_pg_create
Reviewed-by: Kefu Chai <kchai@redhat.com>
Nathan Cutler [Thu, 4 Aug 2016 19:37:24 +0000 (21:37 +0200)]
Merge pull request #8593 from renhwsky/wip-15478-hammer
hammer: Pool quota alarm is not in effect
Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Nathan Cutler <ncutler@suse.com>
John Spray [Wed, 3 Aug 2016 12:31:41 +0000 (13:31 +0100)]
Merge pull request #7542 from SUSE/wip-14668-hammer
hammer: Wrong ceph get mdsmap assertion
Reviewed-by: John Spray <john.spray@redhat.com>
John Spray [Wed, 3 Aug 2016 12:31:30 +0000 (13:31 +0100)]
Merge pull request #8042 from ukernel/hammer-15050
hammer: mds: fix stray purging in 'stripe_count > 1' case
Reviewed-by: John Spray <john.spray@redhat.com>
John Spray [Wed, 3 Aug 2016 12:31:22 +0000 (13:31 +0100)]
Merge pull request #8804 from SUSE/wip-15512-hammer
hammer: Double decreased the count to trim caps which will cause failing to respond to cache pressure
Reviewed-by: John Spray <john.spray@redhat.com>
John Spray [Wed, 3 Aug 2016 12:31:09 +0000 (13:31 +0100)]
Merge pull request #9404 from SUSE/wip-16082-hammer
hammer: mds: wrongly treat symlink inode as normal file/dir when symlink inode is stale on kcephfs
Reviewed-by: John Spray <john.spray@redhat.com>
John Spray [Wed, 3 Aug 2016 12:30:58 +0000 (13:30 +0100)]
Merge pull request #10198 from SUSE/wip-16626-hammer
hammer: Failing file operations on kernel based cephfs mount point leaves unaccessible file behind on hammer 0.94.7
Reviewed-by: John Spray <john.spray@redhat.com>
Orit Wasserman [Thu, 25 Feb 2016 15:02:15 +0000 (16:02 +0100)]
rgw: reset return code in when iterating over the bucket the objects
Fixes: #14826
Signed-off-by: Orit Wasserman <owasserm@redhat.com>
(cherry picked from commit
e23fdcbbce47aaf041b9f8a0812c8a729aa5014b )
Yehuda Sadeh [Wed, 14 Oct 2015 00:04:57 +0000 (17:04 -0700)]
rgw: fix compilation
Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
(cherry picked from commit
9dfbae6d65bf6f8ab7cdf8597d556505b81cedd9 )
Orit Wasserman [Mon, 12 Oct 2015 09:14:19 +0000 (11:14 +0200)]
rgw: add bucket_quota to RGWRegionMap::encode_json
Signed-off-by: Orit Wasserman <owasserm@redhat.com>
(cherry picked from commit
e18b72f7e97a65af681e368d3706a465603df89d )
root [Wed, 20 Apr 2016 08:45:55 +0000 (14:15 +0530)]
rgw: Have a flavor of bucket deletion to bypass GC and to trigger
object deletions async.
Fixes: http://tracker.ceph.com/issues/15557
Signed-off-by: Pavan Rallabhandi <PRallabhandi@walmartlabs.com>
(cherry picked from commit
b7a69fca248afeef1de1278890076693b16cf6d3 )
Conflicts:
src/rgw/rgw_admin.cc
src/rgw/rgw_bucket.cc
src/rgw/rgw_bucket.h
src/test/cli/radosgw-admin/help.t
Orit Wasserman [Mon, 4 Jul 2016 13:01:51 +0000 (15:01 +0200)]
rgw: remove bucket index objects when deleting the bucket
Fixes: http://tracker.ceph.com/issues/16412
Signed-off-by: Orit Wasserman <owasserm@redhat.com>
(cherry picked from commit
3ae276390641ad5fc4fef0c03971db95948880b4 )
Nathan Cutler [Fri, 29 Jul 2016 21:51:47 +0000 (23:51 +0200)]
Merge pull request #10182 from gaurav36/wip-configure-xfs-issue-hammer
hammer: configure: Add -D_LARGEFILE64_SOURCE to Linux build.
Reviewed-by: Samuel Just <sjust@redhat.com>
Reviewed-by: Casey Bodley <cbodley@redhat.com>
Reviewed-by: Nathan Cutler <ncutler@suse.com>
Nathan Cutler [Fri, 29 Jul 2016 07:40:46 +0000 (09:40 +0200)]
Merge pull request #7961 from dzafman/wip-15002
hammer: objects unfound after repair (fixed by repeering the pg)
Reviewed-by: Samuel Just <sjust@redhat.com>
Reviewed-by: Nathan Cutler <ncutler@suse.com>
Nathan Cutler [Fri, 29 Jul 2016 07:38:15 +0000 (09:38 +0200)]
Merge pull request #9125 from dzafman/wip-15635
hammer: [MON] Fixed calculation of %USED
Reviewed-by: Samuel Just <sjust@redhat.com>
Reviewed-by: Nathan Cutler <ncutler@suse.com>
Nathan Cutler [Fri, 29 Jul 2016 07:36:05 +0000 (09:36 +0200)]
Merge pull request #8464 from dzafman/wip-13039-15315
hammer: "FAILED assert(pg->info.history.same_interval_since == p.same_interval_since)" in upgrade:hammer-x-jewel-distro-basic-openstack
Reviewed-by: Samuel Just <sjust@redhat.com>
Reviewed-by: Nathan Cutler <ncutler@suse.com>
Nathan Cutler [Fri, 29 Jul 2016 07:32:47 +0000 (09:32 +0200)]
Merge pull request #8573 from Vicente-Cheng/wip-15293-hammer
hammer: ECBackend: send write and read sub ops on behalf of client ops at normal priority
Reviewed-by: Samuel Just <sjust@redhat.com>
Reviewed-by: Nathan Cutler <ncutler@suse.com>
Nathan Cutler [Fri, 29 Jul 2016 07:31:16 +0000 (09:31 +0200)]
Merge pull request #8665 from Vicente-Cheng/wip-15525-hammer
hammer: ReplicatedPG.cc: 430: FAILED assert(!actingbackfill.empty()): old watch timeout tries to queue repop on replica
Reviewed-by: Samuel Just <sjust@redhat.com>
Reviewed-by: Nathan Cutler <ncutler@suse.com>
Nathan Cutler [Fri, 29 Jul 2016 07:29:58 +0000 (09:29 +0200)]
Merge pull request #8806 from SUSE/wip-15320-hammer
hammer: LibRadosMiscConnectFailure.ConnectFailure (not so intermittent) failure in upgrade/hammer-x
Reviewed-by: Samuel Just <sjust@redhat.com>
Reviewed-by: Nathan Cutler <ncutler@suse.com>
Nathan Cutler [Fri, 29 Jul 2016 07:28:32 +0000 (09:28 +0200)]
Merge pull request #9001 from Vicente-Cheng/wip-15730-hammer
hammer: osd: acting_primary not updated on split
Reviewed-by: Samuel Just <sjust@redhat.com>
Reviewed-by: Nathan Cutler <ncutler@suse.com>
Nathan Cutler [Fri, 29 Jul 2016 07:26:55 +0000 (09:26 +0200)]
Merge pull request #9400 from Vicente-Cheng/wip-15796-hammer
hammer: LibRadosWatchNotifyPPTests/LibRadosWatchNotifyPP.WatchNotify2Timeout/1 segv
Reviewed-by: Samuel Just <sjust@redhat.com>
Reviewed-by: Nathan Cutler <ncutler@suse.com>
Nathan Cutler [Fri, 29 Jul 2016 07:24:42 +0000 (09:24 +0200)]
Merge pull request #9416 from chardan/wip-15770-hammer
hammer: mon/OSDMonistor: improve reweight_by_utilization() logic
Reviewed-by: Samuel Just <sjust@redhat.com>
Reviewed-by: Nathan Cutler <ncutler@suse.com>
Nathan Cutler [Fri, 29 Jul 2016 07:21:25 +0000 (09:21 +0200)]
Merge pull request #10189 from dreamhost/wip-16618-hammer
rgw: fix multi-delete query param parsing.
Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
Reviewed-by: Nathan Cutler <ncutler@suse.com>
Nathan Cutler [Fri, 29 Jul 2016 07:17:57 +0000 (09:17 +0200)]
Merge pull request #8379 from Vicente-Cheng/wip-15283-hammer
hammer: RGW shouldn't send Content-Type nor Content-Length for 304 responses
Reviewed-by: Orit Wasserman <owasserm@redhat.com>
Reviewed-by: Nathan Cutler <ncutler@suse.com>
Nathan Cutler [Fri, 29 Jul 2016 07:14:39 +0000 (09:14 +0200)]
Merge pull request #8313 from SUSE/wip-15257-hammer
hammer: rgw: radosgw server abort when user passed bad parameters to set quota
Reviewed-by: Orit Wasserman <owasserm@redhat.com>
Nathan Cutler [Fri, 29 Jul 2016 07:13:09 +0000 (09:13 +0200)]
Merge pull request #8528 from wido/hammer-issue-15348
rgw: Set Access-Control-Allow-Origin to a Asterisk if allowed in a rule
Reviewed-by: Orit Wasserman <owasserm@redhat.com>
Reviewed-by: Nathan Cutler <ncutler@suse.com>
Nathan Cutler [Fri, 29 Jul 2016 07:10:57 +0000 (09:10 +0200)]
Merge pull request #9671 from ceph/hammer-rgw-copy-if-newer
hammer: rgw: backport rgwx-copy-if-newer for radosgw-agent
Reviewed-by: Orit Wasserman <owasserm@redhat.com>
Reviewed-by: Nathan Cutler <ncutler@suse.com>
Nathan Cutler [Fri, 29 Jul 2016 07:09:14 +0000 (09:09 +0200)]
Merge pull request #9961 from SUSE/wip-16190-hammer
hammer: subuser rm fails with status 125
Reviewed-by: Orit Wasserman <owasserm@redhat.com>
Nathan Cutler [Fri, 29 Jul 2016 07:07:10 +0000 (09:07 +0200)]
Merge pull request #9402 from SUSE/wip-15966-hammer
hammer: No Last-Modified, Content-Size and X-Object-Manifest headers if no segments in DLO manifest
Reviewed-by: Orit Wasserman <owasserm@redhat.com>
Reviewed-by: Nathan Cutler <ncutler@suse.com>
xie xingguo [Tue, 31 May 2016 22:40:05 +0000 (15:40 -0700)]
mon/OSDMonitor: avoid potential expensive grace calculation
The grace calculation during check_failure() is now very complicated
and time-consuming. Therefore we shall skip this when it is possible.
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
(cherry picked from commit
3557903d5d57642179b2ae137bedc389974b1956 )
Conflicts:
src/mon/OSDMonitor.cc
Resolved by choosing the move-to-top implementation. Removed unused vars.
xie xingguo [Tue, 26 Apr 2016 03:13:32 +0000 (11:13 +0800)]
mon/OSDMonitor: improve reweight_by_utilization() logic
By calling reweight_by_utilization() method, we are aiming at an evener result
of utilization among all osds. To achieve this, we shall decrease weights of
osds which are currently overloaded, and try to increase weights of osds which
are currently underloaded when it is possible.
However, we can't do this all at a time in order to avoid a massive pg migrations
between osds. Thus we introduce a max_osds limit to smooth the progress.
The problem here is that we have sorted the utilization of all osds in a descending
manner and we always try to decrease the weights of the most overloaded osds
since they are most likely to encounter a nearfull/full transition soon, but
we won't increase the weights from the most underloaded(least utilized by contrast)
at the same time, which I think is not quite reasonable.
Actually, the best thing would probably be to iterate over teh low and high osds
in parallel, and do the ones that are furthest from the average first.
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
(cherry picked from commit
e7a32534ebc9e27f955ff2d7a8d1db511383301e )
Conflicts:
src/mon/OSDMonitor.cc
Resolved by picking the lambda implemenation.
NOTE: Because hammer does not support C++11, the lambda functionality from the
current master has been moved into the "Sorter" function object.
Nathan Cutler [Wed, 27 Jul 2016 06:28:38 +0000 (08:28 +0200)]
Merge pull request #10038 from tchaikov/wip-16297-hammer
mon: Monitor: validate prefix on handle_command()
Reviewed-by: Samuel Just <sjust@redhat.com>
Reviewed-by: Nathan Cutler <ncutler@suse.com>
Nathan Cutler [Tue, 26 Jul 2016 17:08:23 +0000 (19:08 +0200)]
Merge pull request #9090 from tchaikov/wip-13990-hammer
hammer: osd: remove all stale osdmaps in handle_osd_map()
Reviewed-by: Samuel Just <sjust@redhat.com>
Reviewed-by: Nathan Cutler <ncutler@suse.com>
Nathan Cutler [Mon, 25 Jul 2016 19:44:14 +0000 (21:44 +0200)]
Merge pull request #10227 from SUSE/wip-15081-hammer
hammer: When logging to a file fails, ceph logs excessively to stderr
Reviewed-by: Samuel Just <sjust@redhat.com>
Nathan Cutler [Mon, 25 Jul 2016 19:43:49 +0000 (21:43 +0200)]
Merge pull request #9893 from Vicente-Cheng/wip-16430-hammer
hammer: OSDMonitor: drop pg temps from not the current primary
Reviewed-by: Samuel Just <sjust@redhat.com>
Reviewed-by: Nathan Cutler <ncutler@suse.com>
Nathan Cutler [Mon, 25 Jul 2016 19:42:54 +0000 (21:42 +0200)]
Merge pull request #9238 from SUSE/wip-15962-hammer
hammer: ceph-osd valgrind invalid reads/writes
Reviewed-by: Samuel Just <sjust@redhat.com>
Nathan Cutler [Mon, 25 Jul 2016 19:42:06 +0000 (21:42 +0200)]
Merge pull request #8849 from SUSE/wip-14326-hammer
hammer: osd/PGLog.h: 88: FAILED assert(rollback_info_trimmed_to == head)
Reviewed-by: Samuel Just <sjust@redhat.com>
Nathan Cutler [Mon, 25 Jul 2016 19:40:57 +0000 (21:40 +0200)]
Merge pull request #8845 from SUSE/wip-15647-hammer
hammer: osd: rados cppool omap to ec pool crashes osd
Reviewed-by: Samuel Just <sjust@redhat.com>
Reviewed-by: Nathan Cutler <ncutler@suse.com>
Loic Dachary [Mon, 25 Jul 2016 13:05:54 +0000 (15:05 +0200)]
Merge pull request #8470 from dachary/wip-15403-api-test-timeout-hammer
hammer: tests: be more generous with test timeout
Reviewed-by: Loic Dachary <ldachary@redhat.com>
Nathan Cutler [Mon, 25 Jul 2016 13:05:31 +0000 (15:05 +0200)]
Merge pull request #9977 from shun-s/hammer
replcatedBackend: delete one of the repeated op->mark_started in ReplicatedBackend::sub_op_modify_impl
Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Nathan Cutler <ncutler@suse.com>
Nathan Cutler [Mon, 25 Jul 2016 10:51:45 +0000 (12:51 +0200)]
Merge pull request #8960 from badone/wip-hammer-rados-bench-units
hammer: Add units to rados bench output and clean up formatting
Reviewed-by: Nathan Cutler <ncutler@suse.com>
Samuel Just [Thu, 2 Jun 2016 17:43:17 +0000 (10:43 -0700)]
OSDMonitor: drop pg temp from sources other than the current primary
Fixes: http://tracker.ceph.com/issues/16127
Signed-off-by: Samuel Just <sjust@redhat.com>
(cherry picked from commit
1a07123c38e3fecb3fb2e43bbbae962d8411d287 )
change:
use NULL to replace the nullptr because we don't have C++11
Kefu Chai [Thu, 12 May 2016 12:28:11 +0000 (20:28 +0800)]
osd: reset session->osdmap if session is not waiting for a map anymore
we should release the osdmap reference once we are done with it,
otherwise we might need to wait very long to update that reference with
a newer osdmap ref. this appears to be an OSDMap leak: it is held by an
quiet OSD::Session forever.
the osdmap is not reset in OSD::session_notify_pg_create(), because its
only caller is wake_pg_waiters(), which will call
dispatch_session_waiting() later. and dispatch_session_waiting() will
check the session->osdmap, and will also reset the osdmap if
session->waiting_for_pg.empty().
Fixes: http://tracker.ceph.com/issues/13990
Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit
82b0af7cedc3071cd83ee53479f834c23c62b7d0 )
Brad Hubbard [Wed, 27 Jan 2016 01:34:47 +0000 (11:34 +1000)]
qa: Add test for #13829
qa/workunits/cephtool/test.sh: add test for setting negative int options
src/test/daemon_config.cc: remove tests for failed negative values
Fixes: #13829
Signed-off-by: Brad Hubbard <bhubbard@redhat.com>
(cherry picked from commit
994ac2942d04584d1617e6d4bbd5b880b1ea0448 )
Brad Hubbard [Wed, 27 Jan 2016 01:18:16 +0000 (11:18 +1000)]
common: Allow config set with negative value
A recent commit disabled negative values but they are required for variables
such as filestore_merge_threshold.
Modified patch to remove C++11 specific elements so it will build for hammer
Fixes: #13829
Signed-off-by: Kefu Chai <kchai@redhat.com>
Signed-off-by: Brad Hubbard <bhubbard@redhat.com>
(cherry picked from commit
8b777a0c346bc70fd10d07e89368b3785b58f10e )
Sage Weil [Thu, 10 Mar 2016 14:50:07 +0000 (09:50 -0500)]
log: do not repeat errors to stderr
If we get an error writing to the log, log it only once to stderr.
This avoids generating, say, 72 GB of ENOSPC errors in
teuthology.log when /var/log fills up.
Fixes: #14616
Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit
d9ac0474b864afda58a44b9012cca4bbc6aaf509 )
Conflicts:
src/log/Log.cc (drop m_uid and m_gid which are not used in hammer;
order of do_stderr, do_syslog, do_fd conditional blocks is reversed in
hammer; drop irrelevant speed optimization code from
5bfe05aebfefdff9022f0eb990805758e0edb1dc )
Yan, Zheng [Fri, 15 Apr 2016 12:15:14 +0000 (20:15 +0800)]
mds: disallow 'open truncate' non-regular inode
Signed-off-by: Yan, Zheng <zyan@redhat.com>
(cherry picked from commit
0e4b6f2332bb4822cf324587a94144f1c98e4b97 )
Conflicts:
src/mds/Server.cc (hammer has cur->inode.inline_version - in master
this has been changed to cur->inode.inline_data.version)
Yan, Zheng [Fri, 15 Apr 2016 11:45:23 +0000 (19:45 +0800)]
mds: only open non-regular inode with mode FILE_MODE_PIN
ceph_atomic_open() in kernel client does lookup and open at the same
time. So it can open a symlink inode with mode CEPH_FILE_MODE_WR.
Open a symlink inode with mode CEPH_FILE_MODE_WR triggers assertion
in Locker::check_inode_max_size();
Signed-off-by: Yan, Zheng <zyan@redhat.com>
(cherry picked from commit
4d15eb12298e007744486e28924a6f0ae071bd06 )
Robin H. Johnson [Thu, 7 Jul 2016 21:14:36 +0000 (14:14 -0700)]
rgw: fix multi-delete query param parsing.
Multi-delete is triggered by a query parameter on POST, but there are
multiple valid ways of representing it, and Ceph should accept ANY way
that has the query parameter set, regardless of what value or absence of
value.
This caused the RubyGem aws-sdk-v1 to break, and has been present since
multi-delete was first added in commit
0a1f4a97da , for the bobtail
release.
Fixes: http://tracker.ceph.com/issues/16618
Signed-off-by: Robin H. Johnson <robin.johnson@dreamhost.com>
(cherry picked from commit
a7016e1b67e82641f0702fda4eae799e953063e6 )
Yehuda Sadeh [Thu, 7 Jul 2016 17:16:31 +0000 (10:16 -0700)]
Merge pull request #9407 from SUSE/wip-15833-hammer
hammer: RGW :: Subset of uploaded objects via radosgw are unretrievable when using erasure coded pool
Ira Cooper [Thu, 31 Mar 2016 16:30:45 +0000 (12:30 -0400)]
configure: Add -D_LARGEFILE64_SOURCE to Linux build.
Fixes: http://tracker.ceph.com/issues/16612
Without -D_LARGEFILE64_SOURCE we can't build against libxfs,
because off64_t must be defined.
Signed-off-by: Ira Cooper <ira@redhat.com>
(cherry picked from commit
602425a )
Orit Wasserman [Wed, 6 Jul 2016 18:25:20 +0000 (20:25 +0200)]
Merge pull request #8475 from Vicente-Cheng/wip-15343-hammer
hammer: Multipart ListPartsResult has missing quotes on ETag
Reviewed-bu: Orit Wasserman <owasserm@redhat.com>
shun-s [Tue, 28 Jun 2016 07:30:16 +0000 (15:30 +0800)]
replcatedBackend: delete one useless op->mark_started as there are two in ReplicatedBackend::sub_op_modify_impl
delete one mark_start event as there are two same op->mark_started in ReplicatedBackend::sub_op_modify_impl
Fixes: http://tracker.ceph.com/issues/16572
Signed-off-by: shun-s <song.shun3@zte.com.cn>
Wido den Hollander [Tue, 5 Apr 2016 09:14:16 +0000 (11:14 +0200)]
rgw: Set Access-Control-Allow-Origin to a Asterisk if allowed in a rule
Before this patch the RGW would respond with the Origin send by the client in the request
if a wildcard/asterisk was specified as a valid Origin.
This patch makes sure we respond with a header like this:
Access-Control-Allow-Origin: *
This way a resource can be used on different Origins by the same browser and that browser
will use the content as the asterisk.
We also keep in mind that when Authorization is send by the client different rules apply.
In the case of Authorization we may not respond with an Asterisk, but we do have to
add the Vary header with 'Origin' as a value to let the browser know that for different
Origins it has to perform a new request.
More information: https://developer.mozilla.org/en-US/docs/Web/HTTP/Access_control_CORS
Fixes: #15348
Signed-off-by: Wido den Hollander <wido@42on.com>
(cherry picked from commit
0021e224480c7164330eaa7cc1078bb8795169bf )
Conflicts:
src/rgw/rgw_rest.cc
hammer still uses s->cio->print() where master uses STREAM_IO(s)->print()
Kefu Chai [Thu, 30 Jun 2016 05:24:22 +0000 (13:24 +0800)]
mon: Monitor: validate prefix on handle_command()
Fixes: http://tracker.ceph.com/issues/16297
Signed-off-by: You Ji <youji@ebay.com>
(cherry picked from commit
7cb3434fed03a5497abfd00bcec7276b70df0654 )
Conflicts:
src/mon/Monitor.cc (the signature of Monitor::reply_command()
changed a little bit in master, so adapt the
commit to work with the old method)
Nathan Cutler [Mon, 27 Jun 2016 15:51:19 +0000 (17:51 +0200)]
Merge pull request #8538 from Vicente-Cheng/wip-15360-hammer
hammer: Linking to -lrbd causes process startup times to balloon
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Orit Wasserman [Wed, 20 Jan 2016 16:24:38 +0000 (17:24 +0100)]
rgw: fix subuser rm command failure
Fixes: 14375
Signed-off-by: Orit Wasserman <owasserm@redhat.com>
(cherry picked from commit
bbc06e70b49b2917ee63985727cb92724fb99209 )
Conflicts:
src/rgw/rgw_user.cc The "if (op_state.will_purge_keys())" block was
later changed to "always purge all associated keys" by
e7b7e1afc7a81c3f97976f7442fbdc5118b532b5 - keep the hammer version
Samuel Just [Thu, 12 May 2016 23:57:49 +0000 (16:57 -0700)]
Pipe: take a ref to existing while we are waiting
Otherwise, if it is reaped while we are waiting, it'll be a
use-after-free.
Fixes: http://tracker.ceph.com/issues/15870
Signed-off-by: Samuel Just <sjust@redhat.com>
(cherry picked from commit
b224912d249453d754fc0478d3680f8cfa1a5c22 )
Conflicts:
src/msg/simple/Pipe.cc: nullptr changed to 0 because hammer is not compiled
with -std=c++11
Nathan Cutler [Wed, 15 Jun 2016 14:53:16 +0000 (16:53 +0200)]
rgw: check for -ERR_NOT_MODIFIED in rgw_rest_s3.cc
Fixes: http://tracker.ceph.com/issues/16327
Signed-off-by: Nathan Cutler <ncutler@suse.com>
(cherry picked from commit
fc38346c596d8b0bc156183970d6a327943cb577 )
Conflicts:
src/rgw/rgw_rest_s3.cc
use ret instead of op_ret to check op result