]>
git.apps.os.sepia.ceph.com Git - ceph.git/log
Orit Wasserman [Tue, 11 Oct 2016 12:18:29 +0000 (14:18 +0200)]
rgw: avoid corruption when running old radosgw-admin on a newer rgw
Fixes:http://tracker.ceph.com/issues/17371
Signed-off-by: Orit Wasserman <owasserm@redhat.com>
(cherry picked from commit
8eab9454b4d45ed8092a1292bd1904ef928c2120 )
Orit Wasserman [Tue, 11 Oct 2016 09:19:01 +0000 (11:19 +0200)]
rgw: Fix missing master zone for default region conversion
Fixes:http://tracker.ceph.com/issues/17371
Signed-off-by: Orit Wasserman <owasserm@redhat.com>
(cherry picked from commit
cd3bccdef2ecd1d294ab1192ab3b9e731b5592e0 )
Orit Wasserman [Tue, 11 Oct 2016 09:00:00 +0000 (11:00 +0200)]
rgw: mark configuration as converted to avoid corruption when running older admins
Fixes: http://tracker.ceph.com/issues/17371
Signed-off-by: Orit Wasserman <owasserm@redhat.com>
(cherry picked from commit
ceafa2863dd9c02da8a30c5a5324b472ed5d3404 )
Loic Dachary [Fri, 14 Oct 2016 16:13:09 +0000 (18:13 +0200)]
Merge pull request #10864 from dachary/wip-17131-jewel
jewel: Jewel: segfault in ObjectCacher::FlusherThread
Reviewed-by: Greg Farnum <gfarnum@redhat.com>
Sage Weil [Fri, 14 Oct 2016 14:26:32 +0000 (09:26 -0500)]
Merge pull request #11417 from dachary/wip-17347-jewel
jewel: ceph-create-keys: sometimes blocks forever if mds allow is set
Reviewed-by: Sage Weil <sage@redhat.com>
Sage Weil [Fri, 14 Oct 2016 14:25:42 +0000 (09:25 -0500)]
Merge pull request #11272 from aiicore/wip-17402-jewel
jewel: OSDMonitor: Missing nearfull flag set
Reviewed-by: Sage Weil <sage@redhat.com>
Sage Weil [Fri, 14 Oct 2016 14:24:42 +0000 (09:24 -0500)]
Merge pull request #11193 from SUSE/wip-17377-jewel
jewel: LIBRADOS modify Pipe::connect() to return the error code
Reviewed-by: Sage Weil <sage@redhat.com>
Sage Weil [Fri, 14 Oct 2016 14:23:30 +0000 (09:23 -0500)]
Merge pull request #10861 from dachary/wip-17135-jewel
jewel: ceph mon Segmentation fault after set crush_ruleset ceph 10.2.2
Reviewed-by: Sage Weil <sage@redhat.com>
Sage Weil [Fri, 14 Oct 2016 14:22:05 +0000 (09:22 -0500)]
Merge pull request #10855 from dachary/wip-16657-jewel
jewel: i386 tarball gitbuilder failure on master
Reviewed-by: Sage Weil <sage@redhat.com>
Loic Dachary [Fri, 14 Oct 2016 13:37:25 +0000 (15:37 +0200)]
Merge pull request #11409 from dachary/wip-17341-jewel
jewel: librados memory leaks from ceph::crypto (WITH_NSS)
Reviewed-by: Orit Wasserman <owasserm@redhat.com>
Loic Dachary [Fri, 14 Oct 2016 11:45:46 +0000 (13:45 +0200)]
Merge pull request #11311 from dzafman/wip-scrub-boundary-jewel
jewel: osd: adjust scrub boundary to object without SnapSet
Reviewed-by: Sage Weil <sage@redhat.com>
Loic Dachary [Fri, 14 Oct 2016 11:43:27 +0000 (13:43 +0200)]
Merge pull request #11231 from badone/wip-17376
jewel: common: Log.cc: Assign LOG_INFO priority to syslog calls
Reviewed-by: Loic Dachary <ldachary@redhat.com>
Loic Dachary [Fri, 14 Oct 2016 11:30:05 +0000 (13:30 +0200)]
Merge pull request #9872 from odivlad/fix-init-el7-jewel
jewel: remove SYSTEMD_RUN from initscript
Reviewed-by: Orit Wasserman <owasserm@redhat.com>
Casey Bodley [Thu, 13 Oct 2016 18:52:30 +0000 (14:52 -0400)]
Merge pull request #10891 from dachary/wip-16793-jewel
jewel: rgw: upgrade from old multisite to new multisite fails
Reviewed-by: Casey Bodley <cbodley@redhat.com>
Casey Bodley [Thu, 13 Oct 2016 18:51:59 +0000 (14:51 -0400)]
Merge pull request #10889 from dachary/wip-17143-jewel
jewel: rgw: rgw file uses too much CPU in gc/idle thread
Reviewed-by: Casey Bodley <cbodley@redhat.com>
Casey Bodley [Thu, 13 Oct 2016 18:51:38 +0000 (14:51 -0400)]
Merge pull request #10868 from dachary/wip-17064-jewel
jewel: rgw: radosgw daemon core when reopen logs
Reviewed-by: Casey Bodley <cbodley@redhat.com>
Casey Bodley [Thu, 13 Oct 2016 18:51:17 +0000 (14:51 -0400)]
Merge pull request #10867 from dachary/wip-17118-jewel
jewel: rgw: period commit return error when the current period has a zonegroup which doesn't have a master zone
Reviewed-by: Casey Bodley <cbodley@redhat.com>
Loic Dachary [Thu, 13 Oct 2016 15:43:52 +0000 (17:43 +0200)]
Merge pull request #11367 from linuxbox2/jewel-s3-versioning
jewel: rgw: S3 object versioning fails when applied on a non-master zone
Reviewed-by: Orit Wasserman <owasserm@redhat.com>
Loic Dachary [Thu, 13 Oct 2016 14:43:04 +0000 (16:43 +0200)]
Merge pull request #11342 from SUSE/wip-17505-jewel
jewel: rgw: doc: description of multipart part entity is wrong
Reviewed-by: Loic Dachary <ldachary@redhat.com>
Loic Dachary [Thu, 13 Oct 2016 14:42:45 +0000 (16:42 +0200)]
Merge pull request #11330 from cbodley/wip-17073
jewel: rgw: RGWDataSyncCR fails on errors from RGWListBucketIndexesCR
Reviewed-by: Loic Dachary <ldachary@redhat.com>
Loic Dachary [Thu, 13 Oct 2016 14:39:06 +0000 (16:39 +0200)]
Merge pull request #11139 from cbodley/wip-radosgw-admin-man-jewel
jewel: add orphan options to radosgw-admin --help and man page
Reviewed-by: Loic Dachary <ldachary@redhat.com>
Loic Dachary [Thu, 13 Oct 2016 14:35:57 +0000 (16:35 +0200)]
Merge pull request #10832 from ceph/jewel-default-quota
jewel: rgw - default quota fixes
Reviewed-by: Loic Dachary <ldachary@redhat.com>
Loic Dachary [Thu, 13 Oct 2016 12:58:33 +0000 (14:58 +0200)]
Merge pull request #10107 from xiaoxichen/wip-16313-jewel
jewel: client: FAILED assert(root_ancestor->qtree == __null)
Reviewed-by: John Spray <john.spray@redhat.com>
Reviewed-by: Yan, Zheng <zyan@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
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
e3ab3476146cf0fe604783e9e5a0d63237271735 )
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
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
17d2c1712a5b72315a47ab0f8380331bfd478c0b )
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
Signed-off-by: Pavan Rallabhandi <PRallabhandi@walmartlabs.com>
Signed-off-by: Daniel Gryniewicz <dang@redhat.com>
(cherry picked from commit
400d7c982f18efd7cf96acfc3a63078791d1ec0a )
Loic Dachary [Tue, 11 Oct 2016 10:30:44 +0000 (12:30 +0200)]
Merge pull request #11389 from jcsp/wip-17466-jewel
jewel: mon: don't crash on invalid standby_for_fscid
Reviewed-by: John Spray <john.spray@redhat.com>
Loic Dachary [Tue, 11 Oct 2016 10:30:25 +0000 (12:30 +0200)]
Merge pull request #10997 from batrick/i17105-backport
jewel: multimds: allow_multimds not required when max_mds is set in ceph.conf at startup
Reviewed-by: John Spray <john.spray@redhat.com>
Loic Dachary [Tue, 11 Oct 2016 10:30:03 +0000 (12:30 +0200)]
Merge pull request #10958 from ukernel/jewel-16764
jewel: client: fix shutdown with open inodes
Reviewed-by: John Spray <john.spray@redhat.com>
Loic Dachary [Tue, 11 Oct 2016 10:29:36 +0000 (12:29 +0200)]
Merge pull request #10921 from jcsp/wip-client-lock-backport
jewel: client: add missing client_lock for get_root
Reviewed-by: John Spray <john.spray@redhat.com>
Loic Dachary [Tue, 11 Oct 2016 10:29:05 +0000 (12:29 +0200)]
Merge pull request #11400 from ceph/wip-rbd-cli-jewel
jewel: krbd-related CLI patches
Reviewed-by: Loic Dachary <ldachary@redhat.com>
Loic Dachary [Tue, 11 Oct 2016 09:03:40 +0000 (11:03 +0200)]
Merge pull request #11171 from ceph/wip-rasize-doc-jewel
jewel: doc: fix description for rsize and rasize
Reviewed-by: Loic Dachary <ldachary@redhat.com>
Ilya Dryomov [Fri, 7 Oct 2016 10:32:43 +0000 (12:32 +0200)]
rbd: expose rbd unmap options
Reuse rbd map -o infrastructure to expose rbd unmap options in
a similar fashion. Currently it's just one bool option, but we may
need more in the future.
Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
(cherry picked from commit
620f5e1455fdcb05cd3873c1e260141849829e35 )
Conflicts:
doc/man/8/rbd.rst [ PR #9151 ("rbd: add methods to set and get
snapshot limits") not in jewel ]
Ilya Dryomov [Fri, 7 Oct 2016 09:14:16 +0000 (11:14 +0200)]
rbd: fix up terminology in help texts
Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
(cherry picked from commit
ba8f9ee791d55c4cf25ad751213ea6ba770b7434 )
Ilya Dryomov [Mon, 3 Oct 2016 12:09:11 +0000 (14:09 +0200)]
rbd: recognize lock_on_read option
Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
(cherry picked from commit
e857b7896527b676155d6e01c78567337dc33b1c )
Ilya Dryomov [Tue, 4 Oct 2016 08:21:36 +0000 (10:21 +0200)]
doc: clarify rbd size units
It wasn't clear from the man page that --size defaults to M.
Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
(cherry picked from commit
d38dc29ed588b8933da3b66e46e1f0dd4cbb2cf4 )
Conflicts:
doc/man/8/rbd.rst [ PR #9066 ("rbd: introduce a simple bench
for read") not in jewel ]
John Spray [Sat, 23 Jul 2016 21:56:45 +0000 (22:56 +0100)]
ceph-create-keys: fix existing-but-different case
We just have to refrain from calling get-or-create
if the named key already exists, to avoid potentially
having an error when the default creation args don't
match the key as it has already been created, such
as on certain upgrades.
Fixes: http://tracker.ceph.com/issues/16255
Signed-off-by: John Spray <john.spray@redhat.com>
(cherry picked from commit
278196d86c52b0be3cb9c17ed7f8f3e3502a217a )
Casey Bodley [Fri, 2 Sep 2016 18:13:19 +0000 (14:13 -0400)]
common: only call crypto::init once per CephContext
Fixes: http://tracker.ceph.com/issues/17205
Signed-off-by: Casey Bodley <cbodley@redhat.com>
(cherry picked from commit
9dfc1537564c4ce65e4d0230a83f0d8d47503b16 )
Loic Dachary [Mon, 10 Oct 2016 18:30:54 +0000 (20:30 +0200)]
Merge pull request #10812 from SUSE/wip-17094-jewel
jewel: build/ops: ceph-osd-prestart.sh fails confusingly when data directory does not exist
Reviewed-by: Loic Dachary <ldachary@redhat.com>
Matt Benjamin [Mon, 10 Oct 2016 14:46:33 +0000 (10:46 -0400)]
Merge pull request #11335 from linuxbox2/jewel-nfs
jewel: rgw: nfs backports
Matt Benjamin [Mon, 10 Oct 2016 14:45:07 +0000 (10:45 -0400)]
Merge pull request #11332 from linuxbox2/jewel-ldap
jewel: rgw: combined LDAP backports
Patrick Donnelly [Mon, 29 Aug 2016 20:25:10 +0000 (16:25 -0400)]
mds: remove max_mds config option
It is now required that all changes to max_mds use the run-time `ceph fs
set max_mds` command. The rationale for this change is that it is
confusing to have a configuration for max_mds which is only observed at
file system creation.
Fixes: http://tracker.ceph.com/issues/17105
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
(cherry picked from commit
52f4e545e0ce4782d5f2239d31080d392c12eba2 )
Sage Weil [Mon, 10 Oct 2016 13:54:02 +0000 (08:54 -0500)]
Merge pull request #10761 from dachary/wip-16377-jewel
jewel: msgr/async: Messenger thread long time lock hold risk
Reviewed-by: Sage Weil <sage@redhat.com>
Sage Weil [Mon, 10 Oct 2016 13:52:59 +0000 (08:52 -0500)]
Merge pull request #10278 from SUSE/wip-16667-jewel
jewel: incorrect value of CINIT_FLAG_DEFER_DROP_PRIVILEGES
Reviewed-by: Sage Weil <sage@redhat.com>
John Spray [Fri, 30 Sep 2016 20:57:35 +0000 (21:57 +0100)]
mds: make mds_role_t member order match constructor
Previously this was mildy confusing.
Signed-off-by: John Spray <john.spray@redhat.com>
(cherry picked from commit
63d711d4e9decd2940c55aa697e6a588593da23a )
John Spray [Mon, 3 Oct 2016 06:33:27 +0000 (07:33 +0100)]
mon: don't crash on invalid standby_for_fscid
Fixes: http://tracker.ceph.com/issues/17466
Signed-off-by: John Spray <john.spray@redhat.com>
(cherry picked from commit
92fdcf36bd7d57b97f5d887d0370a181860e388c )
John Spray [Mon, 3 Oct 2016 06:40:12 +0000 (07:40 +0100)]
messages: fix MMDSBeacon constructor
This was leaving garbage in some fields during decode
when decoding messages with an older version.
Fixes: http://tracker.ceph.com/issues/17466
Signed-off-by: John Spray <john.spray@redhat.com>
(cherry picked from commit
f1fb667dfd21cd241f4f45ce9ef3f8393d114c60 )
Loic Dachary [Mon, 10 Oct 2016 10:26:02 +0000 (12:26 +0200)]
Merge pull request #10794 from SUSE/wip-17082-jewel
jewel: disable LTTng-UST in openSUSE builds
Reviewed-by: Loic Dachary <ldachary@redhat.com>
Loic Dachary [Mon, 10 Oct 2016 10:21:59 +0000 (12:21 +0200)]
Merge pull request #9739 from vumrao/wip-vumrao-16337
jewel: osd: add peer_addr in heartbeat_check log message
Reviewed-by: Samuel Just <sjust@redhat.com>
Loic Dachary [Mon, 10 Oct 2016 10:20:30 +0000 (12:20 +0200)]
Merge pull request #9388 from vumrao/wip-vumrao-16069
jewel: mon: Display full flag in ceph status if full flag is set
Reviewed-by: Loic Dachary <ldachary@redhat.com>
Loic Dachary [Mon, 10 Oct 2016 10:03:51 +0000 (12:03 +0200)]
Merge pull request #10496 from Abhishekvrshny/wip-16583-jewel
jewel: mon crash: crush/CrushWrapper.h: 940: FAILED assert(successful_detach)
Reviewed-by: Kefu Chai <kchai@redhat.com>
Loic Dachary [Mon, 10 Oct 2016 07:31:29 +0000 (09:31 +0200)]
Merge pull request #11018 from ceph/wip-17223-jewel
jewel: krbd qa scripts and concurrent.sh test fix
Reviewed-by: Loic Dachary <ldachary@redhat.com>
Vladislav Odintsov [Mon, 4 Jul 2016 12:29:22 +0000 (15:29 +0300)]
init-radosgw: do not use systemd-run in sysvinit
`systemd-run` logic in initscripts was introduced because of ticket
http://tracker.ceph.com/issues/7627.
If we have systemd-based operating system, we should use systemd unit files
from systemd directory to start/stop ceph daemons.
Otherwise, `daemon()` from `/etc/init.d/functions` on systemd distro starts service
in `system.slice` and everything works well.
`systemd-run` can not be run on non-systemd distros, so it's not needed
on SysV systems.
also, ceph-disk is now able to run the "systemctl"
to enable and start the ceph-osd, and ceph-deploy is also now
playing well with systemd when it comes to ceph-mon and ceph-mds
Fixes: http://tracker.ceph.com/issues/16440
Signed-off-by: Vladislav Odintsov <odivlad@gmail.com>
(cherry picked from commit
1fd4f92a025e80092b8d08d9b7da2e0b73a52f0f )
Yehuda Sadeh [Fri, 1 Jul 2016 00:36:16 +0000 (17:36 -0700)]
rgw: forward input data when forwarding set_bucket_version to master
Fixes: http://tracker.ceph.com/issues/16494
Needed to keep input data around to be forwarded correctly. Also, master
does not send any data back, so don't try to parse anything.
Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
(cherry picked from commit
1eec00bef1e5540bf3e31d1f8fb1645eb64b1e62 )
Yehuda Sadeh [Fri, 1 Jul 2016 00:34:38 +0000 (17:34 -0700)]
rgw: set args when rebuilding req_info
Was missing args, so it didn't sign requests with subresources
correctly when forwarding.
Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
(cherry picked from commit
dd1068c54e50671d8904b99189823418a5a5bc07 )
weiqiaomiao [Wed, 10 Aug 2016 06:11:43 +0000 (14:11 +0800)]
doc/radosgw: fix description of response elements 'Part'
Signed-off-by: weiqiaomiao <wei.qiaomiao@zte.com.cn>
(cherry picked from commit
9c3fe46a7eb89aedc52582737c200e58d63738a5 )
Matt Benjamin [Wed, 21 Sep 2016 21:18:20 +0000 (17:18 -0400)]
rgw_file: pre-assign times
Set unix timestamps based on RGW values for creation, modification
time for buckets, objects in stat requests. Regard any saved
value of these in unix attributes as an overlay.
Fixes: http://tracker.ceph.com/issues/17367
Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
(cherry picked from commit
969750e96380859a350e25015bc8cbf9bdf88512 )
Fixes: http://tracker.ceph.com/issues/17394
Matt Benjamin [Tue, 20 Sep 2016 21:32:03 +0000 (17:32 -0400)]
rgw_file: fix set_attrs operation
The effective part of this change is to always set a value
for RGW_ATTR_UNIX_KEY1 (because it is expected later).
Secondarily, do not pass the address of the to-set attributes
buffer::list as remove attrs--this is confusing.
Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
(cherry picked from commit
08afb40b2812270a6af3cd1965e8c03c10392ace )
Fixes: http://tracker.ceph.com/issues/17393
Matt Benjamin [Thu, 14 Apr 2016 23:18:37 +0000 (19:18 -0400)]
rgw_file: implement rgw_setattr
Introduce a new RGWSetattrs RGWOp descendant, to create or replace
sets of attrs on buckets or objects.
This version of the change uses the standard RGWRADOS::set_attrs op
(we want attribute changes to (e.g.) sync with other changes).
Previous versions of this changed incorrectly masked the values
of st->st_ino in RGWFileHandle::stat(), now fixed.
Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
(cherry picked from commit
4de1c3c260265f821ebee842d49cb35bf49d8e4e )
Fixes: http://tracker.ceph.com/issues/17311
Fixes: http://tracker.ceph.com/issues/17332
zhangweibing [Fri, 26 Aug 2016 02:49:48 +0000 (10:49 +0800)]
rgw: remove duplicated calls to getattr
Signed-off-by: Weibing Zhang <zhangweibing@unitedstack.com>
(cherry picked from commit
87b550ed2fba472d4ef2e1f771bb5f9fd248804f )
Fixes: http://tracker.ceph.com/issues/17327
Min Chen [Fri, 19 Aug 2016 05:02:50 +0000 (01:02 -0400)]
rgw: rgw file fix bug of rgw_lookup can not exact match file name
bug reproduce steps:
in nfs-client (connect to nfs-ganesha server):
1. mv file file.rename
2. stat file // get file attrs, not return with -ENOENT
the reason is that:
RGWStatLeafRequest does not exact match the file name,
just take file name as a prefix filter
Signed-off-by: Min Chen <chenmin@xsky.com>
(cherry picked from commit
9d813bafc8e197507457c58ab4f365ccdb7f3589 )
Fixes: http://tracker.ceph.com/issues/17326
Yan Jun [Tue, 23 Aug 2016 04:51:10 +0000 (12:51 +0800)]
rgw: fix the wrong return value
Here `parent->readdir` will return negative numbers When there is an error.
so we should just return it.
Signed-off-by: Yan Jun <yan.jun8@zte.com.cn>
(cherry picked from commit
c979be7810793534715c24c6a9f7c8b0ed31de8d )
Fixes: http://tracker.ceph.com/issues/17325
Matt Benjamin [Wed, 17 Aug 2016 14:28:48 +0000 (10:28 -0400)]
rgw_file: restore local definition of RGWLibFS gc interval
Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
(cherry picked from commit
31936caa09b46e86700faad969adfa9d43176206 )
Fixes: http://tracker.ceph.com/issues/17323
Matt Benjamin [Tue, 23 Aug 2016 20:50:42 +0000 (16:50 -0400)]
rgw_file: explain semantics of RGWFileHandle::commit
Add a comment explaining why the method currently returns 0
unconditionally.
Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
(cherry picked from commit
b1da1354320cc5f69277b225a293a03cc2a5054f )
Matt Benjamin [Tue, 23 Aug 2016 19:57:06 +0000 (15:57 -0400)]
ceph_timer: prefer using directive to typedef
This change replaces the existing member-hook typedef as well as
the new set-type typedefs, so committed separately.
Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
(cherry picked from commit
f7d4d418658d2091652033045abdb4bfbeb637aa )
Matt Benjamin [Tue, 23 Aug 2016 18:18:43 +0000 (14:18 -0400)]
librgw: add API version defines for librgw and rgw_file
This change borrows the major, minor+extra format used by libcephfs.
The version numbering is starting at 1,1,0 on the theory that the
implicit version at Jewel is 1,0,0.
Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
(cherry picked from commit
355ccc5ded7f0b459bca24bc8b504b41807c583d )
Matt Benjamin [Wed, 17 Aug 2016 15:24:01 +0000 (11:24 -0400)]
rgw file: allow RGWLibFS::write_completion_interval_s to be set in conf
Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
(cherry picked from commit
70dad0fba561edaf0bb4e746e29b92a4e9b014b2 )
Matt Benjamin [Wed, 17 Aug 2016 15:00:22 +0000 (11:00 -0400)]
rgw_file: log on write completion events at level 10
Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
(cherry picked from commit
d1e512d8c0e20df5a96ccb5f775a7a2ca123efbe )
Matt Benjamin [Wed, 17 Aug 2016 14:52:58 +0000 (10:52 -0400)]
rgw_file: add RGW_OPEN_FLAG_STATELESS as a synonym for V3
Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
(cherry picked from commit
da596eb3af69c2cdf191893eb44a8947662634cf )
Matt Benjamin [Tue, 16 Aug 2016 22:17:53 +0000 (18:17 -0400)]
rgw_file: implement stateless write completion timer
Implements a temporal mechanism to enforce write completion for setups
which lack open state tracking (e.g., NFS3).
Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
(cherry picked from commit
2c83ed4bd43fcb5d5497151a157b1dc08022fed9 )
Matt Benjamin [Fri, 12 Aug 2016 20:52:51 +0000 (16:52 -0400)]
rgw_file: fix/update rgw_create flag arguments
Allow passing POSIX open flags as well as api call flags. Needed
for NFS3 support.
Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
(cherry picked from commit
2d0ea2b4649e76cbbb87f44c57754d7ea9c46dce )
Matt Benjamin [Fri, 12 Aug 2016 14:39:21 +0000 (10:39 -0400)]
rgw_file: fix/update rgw_open flag arguments
Allow passing POSIX open flags as well as api call flags. Needed
for NFS3 support.
Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
(cherry picked from commit
ada29f7f8323be2301588941bcd5c60190b32a4b )
Matt Benjamin [Tue, 9 Aug 2016 20:49:41 +0000 (16:49 -0400)]
rgw file: remove busy-wait in RGWLibFS::gc()
This is a background thread. However, CPU is wasted.
Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
(cherry picked from commit
ca33241286f52d849dbde8092507131b8b1108cc )
Fixes: http://tracker.ceph.com/issues/17321
Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
Matt Benjamin [Tue, 9 Aug 2016 18:23:00 +0000 (14:23 -0400)]
rgw_file: unlock() must precede out label
In lookup_handle(...).
Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
(cherry picked from commit
9f64f34e481278a683e962b17c7aa811005783a8 )
Matt Benjamin [Sun, 7 Aug 2016 22:39:33 +0000 (18:39 -0400)]
rgw nfs: fix write continuations
Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
(cherry picked from commit
b4d079f2b5a4d49b2ba7576b272a2a3f3b0d66c8 )
Matt Benjamin [Fri, 5 Aug 2016 14:03:33 +0000 (10:03 -0400)]
rgw nfs: don't leak fh->mtx in lookup_handle()
This change fixes a serious latent locking problem, noticed after
updating the ganesha/rgw driver invalidation after renames.
Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
(cherry picked from commit
d74d46170d7104a6553674f111bbdbe3a116cf54 )
Matt Benjamin [Mon, 8 Aug 2016 14:18:35 +0000 (10:18 -0400)]
rgw file: refuse to rename directories
The representation of paths as an aggregate involving any
number of objects argues against ever permitting such
operations.
Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
(cherry picked from commit
297220fd2a96c0cf34701127b8cf724e24e6865f )
Matt Benjamin [Wed, 3 Aug 2016 17:53:15 +0000 (13:53 -0400)]
rgw_file: refuse ops on deleted targets
Detect these illegal cases, as they are indicate various incorrect
behaviors/bugs.
Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
(cherry picked from commit
34224ecd8360e03603a1a5dd1c1c9f0a31f1c1d5 )
Matt Benjamin [Thu, 14 Apr 2016 23:18:37 +0000 (19:18 -0400)]
rgw_file: implement rgw_setattr
Introduce a new RGWSetattrs RGWOp descendant, to create or replace
sets of attrs on buckets or objects.
This version of the change uses the standard RGWRADOS::set_attrs op
(we want attribute changes to (e.g.) sync with other changes).
Previous versions of this changed incorrectly masked the values
of st->st_ino in RGWFileHandle::stat(), now fixed.
Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
(cherry picked from commit
4de1c3c260265f821ebee842d49cb35bf49d8e4e )
Matt Benjamin [Wed, 13 Jul 2016 14:16:59 +0000 (10:16 -0400)]
rgw_file: refuse partial, out-of-order writes
A single file object may be opened only once per gateway
instance, and writes to that object must be complete, and in-order.
Enforce this.
If an invalid write is seen, deletes the current write transaction.
Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
(cherry picked from commit
12aded803e24539266ce9698c678088e2158a82a )
Matt Benjamin [Tue, 12 Jul 2016 21:43:43 +0000 (17:43 -0400)]
rgw_file: fix rename cases and unify unlink
Rather ordinary rename cases failed in the unlink step. Fix this,
unifying the unlink path while at it.
Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
(cherry picked from commit
05af1fbb870a905ea8903594dfc607d346c9dd31 )
Harald Klein [Wed, 31 Aug 2016 15:41:26 +0000 (17:41 +0200)]
add ldap auth custom search filter feature patch - http://tracker.ceph.com/issues/17185
Signed-off-by: Harald Klein <hari@vt100.at>
(cherry picked from commit
c935885ae9d5fd413495448a0b0e5fce899c9b73 )
Fixes: http://tracker.ceph.com/issues/17185
Matt Benjamin [Thu, 18 Aug 2016 14:54:16 +0000 (10:54 -0400)]
rgw ldap: protect rgw::from_base64 from non-base64 input
Also adds unit tests for:
1. empty output from from_base64 (turns out to be harmless)
2. random and specific non-base64 and sort strings
(modified from upstream to avoid alteration of src/test/test_rgw_token.cc)
Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
(cherry picked from commit
0a4c91ec7652d02673a9b156cd16144d778a3844 )
Fixes: http://tracker.ceph.com/issues/17324
Matt Benjamin [Fri, 5 Aug 2016 14:02:03 +0000 (10:02 -0400)]
rgw ldap: enforce simple_bind w/LDAPv3
Found by Harald Klein <hklein@redhat.com>.
Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
(cherry picked from commit
08d54291435e4d1cb5e02cda3951bc6e8510b0e2 )
Matt Benjamin [Mon, 1 Aug 2016 21:36:17 +0000 (17:36 -0400)]
rgw: add reinit/rebind logic (ldap)
Gracefully handle stale LDAP connections by rebinding--verified
with MS AD. Rebind is attempted once per request until rebound--
not worse than misconfiguring the environment.
Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
(cherry picked from commit
9b8fccf68789ba5c5986766c544b23aeada0e87e )
Casey Bodley [Tue, 16 Aug 2016 20:58:51 +0000 (16:58 -0400)]
rgw: RGWDataSyncCR fails on errors from RGWListBucketIndexesCR
Fixes: http://tracker.ceph.com/issues/17073
Signed-off-by: Casey Bodley <cbodley@redhat.com>
(cherry picked from commit
e77a523f1d74768f4fef58c05cc167705d219036 )
Samuel Just [Mon, 3 Oct 2016 17:34:51 +0000 (10:34 -0700)]
PG: block writes and scan log for scrub using inclusive upper bound
See comment in commit.
Signed-off-by: Samuel Just <sjust@redhat.com>
David Zafman [Mon, 3 Oct 2016 21:34:19 +0000 (14:34 -0700)]
osd_types,PG: force the map used in _scrub to be sorted correctly
Previously, ScrubMap::objects was always sorted bitwise (nibblewise
before the comparator change was made. It didn't matter because we
always scrubbed whole hash values. Now, we need the objects in the
objectstore ordering because we may be missing objects at the tail of
the scanned range and need them to show up at the tail of the
ScrubMap::objects mapping. We don't need to do anything else to handle
the upgrade process since the actual objects *in* the map were
determined by the objectstore ordering.
Signed-off-by: Samuel Just <sjust@redhat.com>
(cherry picked from commit
6d410e97232afdad4f226151333b209d8b50f4ed )
Samuel Just [Wed, 28 Sep 2016 20:24:56 +0000 (13:24 -0700)]
src/osd: relax the requirement that we scrub a whole hash value
Previously, we needed to scrub all objects in clones in a single
hash value mainly to ensure that _scrub had access to all clones
of a single object at the same time. Instead, just avoid letting
head or snapdir be a boundary (see the comment in the commit
for details).
Signed-off-by: Samuel Just <sjust@redhat.com>
(cherry picked from commit
27bdc8ce6d0a7d8ae47f29540f281ba417e16b4c )
Samuel Just [Wed, 28 Sep 2016 20:25:42 +0000 (13:25 -0700)]
hobject: clarify is_snap and has_snapset for max
Signed-off-by: Samuel Just <sjust@redhat.com>
(cherry picked from commit
a2c27c9423b43b8c5633fb0af95f28b0de94b365 )
Matt Benjamin [Fri, 30 Sep 2016 18:02:43 +0000 (14:02 -0400)]
Merge pull request #10656 from dachary/wip-16564-jewel
jewel: cors auto memleak
Igor Podoski [Wed, 14 Sep 2016 11:36:43 +0000 (07:36 -0400)]
mon: OSDMonitor: Missing nearfull flag set
Output from 'ceph -s -f json-pretty' wans't showing nearfull flag set.
Signed-off-by: Igor Podoski <igor.podoski@ts.fujitsu.com>
(cherry picked from commit
754887b575795ef96cda095f7f0d8c898e20f00f )
Josh Durgin [Thu, 29 Sep 2016 22:54:05 +0000 (15:54 -0700)]
Merge pull request #11252 from ceph/wip-offline-split-jewel
ceph-objectstore-tool: add a way to split filestore directories offline
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Yehuda Sadeh [Thu, 29 Sep 2016 18:34:44 +0000 (11:34 -0700)]
Merge pull request #10866 from dachary/wip-17122-jewel
jewel: COPY broke multipart files uploaded under dumpling
Yehuda Sadeh [Thu, 29 Sep 2016 18:32:09 +0000 (11:32 -0700)]
Merge pull request #10890 from dachary/wip-17140-jewel
jewel: rgw: period commit loses zonegroup changes: region_map converted repeatedly
Yehuda Sadeh [Thu, 29 Sep 2016 17:51:09 +0000 (10:51 -0700)]
Merge pull request #11021 from cbodley/wip-16794
jewel: rgw: back off bucket sync on failures, don't store marker
Yehuda Sadeh [Thu, 29 Sep 2016 17:49:28 +0000 (10:49 -0700)]
Merge pull request #10657 from dachary/wip-16792-jewel
jewel: metadata sync can skip markers for failed/incomplete entries
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/os/filestore/FileStore.cc
src/tools/ceph_objectstore_tool.cc
(trivial resolution)
Sage Weil [Tue, 27 Sep 2016 20:37:17 +0000 (15:37 -0500)]
Merge pull request #10888 from dachary/wip-17062-jewel
jewel: tests: fix TestClsRbd.mirror_image failure in upgrade:jewel-x-master-distro-basic-vps
Brad Hubbard [Tue, 10 May 2016 06:44:44 +0000 (16:44 +1000)]
log: Log.cc: Assign LOG_INFO priority to syslog calls
LOG_DEBUG prio messages are not logged by a default syslog
configuration so log at LOG_INFO instead.
Fixes: http://tracker.ceph.com/issues/15808
Signed-off-by: Brad Hubbard <bhubbard@redhat.com>
(cherry picked from commit
3ab5a660a45506d6c4c41bfeb5babdf188e62b3d )