]>
git.apps.os.sepia.ceph.com Git - ceph.git/log
Loic Dachary [Thu, 20 Oct 2016 09:48:49 +0000 (11:48 +0200)]
Merge pull request #11474 from dachary/wip-17350-jewel
jewel: rgw:response information is error when geting token of swift account
Reviewed-by: Orit Wasserman <owasserm@redhat.com>
Loic Dachary [Thu, 20 Oct 2016 09:47:43 +0000 (11:47 +0200)]
Merge pull request #11492 from SUSE/wip-17575-jewel
jewel: aarch64: Compiler-based detection of crc32 extended CPU type is broken
Reviewed-by: Kefu Chai <kchai@redhat.com>
Loic Dachary [Thu, 20 Oct 2016 09:28:29 +0000 (11:28 +0200)]
Merge pull request #11475 from dachary/wip-17349-jewel
jewel: Modification for TEST S3 ACCESS section in INSTALL CEPH OBJECT GATEWAY page
Reviewed-by: Loic Dachary <ldachary@redhat.com>
Loic Dachary [Thu, 20 Oct 2016 09:27:54 +0000 (11:27 +0200)]
Merge pull request #11473 from dachary/wip-17509-jewel
jewel: Config parameter rgw keystone make new tenants in radosgw multitenancy does not work
Reviewed-by: Loic Dachary <ldachary@redhat.com>
Loic Dachary [Thu, 20 Oct 2016 09:27:18 +0000 (11:27 +0200)]
Merge pull request #11201 from ceph/wip-backport-logrotate-jewel
jewel: build/ops: backport 'logrotate: Run as root/ceph'
Reviewed-by: Loic Dachary <ldachary@redhat.com>
Loic Dachary [Thu, 20 Oct 2016 09:22:45 +0000 (11:22 +0200)]
Merge pull request #11126 from tchaikov/wip-17179-jewel
jewel: add a tool to rebuild mon store from OSD
Reviewed-by: huanwen ren <ren.huanwen@zte.com.cn>
Reviewed-by: Ken Dreyer <kdreyer@redhat.com>
Loic Dachary [Thu, 20 Oct 2016 07:39:15 +0000 (09:39 +0200)]
Merge pull request #11563 from ceph/wip-jewel-acl-underscore
rgw: fix regression with handling double underscore
Reviewed-by: Loic Dachary <ldachary@redhat.com>
Yehuda Sadeh [Fri, 30 Sep 2016 01:35:59 +0000 (18:35 -0700)]
rgw: set correct instance on the object
Fixes: http://tracker.ceph.com/issues/17443
This was broken by commit
bc840afafdfe5e528e5c1b711e71420ac3cb5a67
Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
(cherry picked from commit
d2ada35c8c0d938a704ecf9974988ea30a9c0105 )
Loic Dachary [Wed, 19 Oct 2016 21:14:23 +0000 (23:14 +0200)]
Merge pull request #11548 from dachary/wip-17609-jewel
jewel: tests: ceph-disk must ignore debug monc
Reviewed-by: Sage Weil <sage@redhat.com>
Loic Dachary [Wed, 19 Oct 2016 21:11:24 +0000 (23:11 +0200)]
Merge pull request #11411 from dachary/wip-17245-jewel
jewel: tests: scsi_debug fails /dev/disk/by-partuuid
Reviewed-by: Loic Dachary <ldachary@redhat.com>
Loic Dachary [Wed, 19 Oct 2016 21:11:04 +0000 (23:11 +0200)]
Merge pull request #10884 from dachary/wip-17149-jewel
jewel: ceph-disk: expected systemd unit failures are confusing
Reviewed-by: Loic Dachary <ldachary@redhat.com>
Orit Wasserman [Wed, 31 Aug 2016 20:25:57 +0000 (22:25 +0200)]
rgw: fix regression with handling double underscore
Fixes: http://tracker.ceph.com/issues/16856
Signed-off-by: Orit Wasserman <owasserm@redhat.com>
(cherry picked from commit
bc840afafdfe5e528e5c1b711e71420ac3cb5a67 )
Loic Dachary [Wed, 19 Oct 2016 14:50:44 +0000 (16:50 +0200)]
Merge pull request #11408 from dachary/wip-17345-jewel
jewel: Ceph Status - Segmentation Fault
Reviewed-by: Kefu Chai <kchai@redhat.com>
Loic Dachary [Wed, 19 Oct 2016 14:50:22 +0000 (16:50 +0200)]
Merge pull request #11407 from dachary/wip-17360-jewel
jewel: ceph-objectstore-tool crashes if --journal-path <a-directory>
Reviewed-by: Kefu Chai <kchai@redhat.com>
Loic Dachary [Wed, 19 Oct 2016 07:47:00 +0000 (09:47 +0200)]
Merge pull request #11158 from dillaman/wip-rbdmap-jewel
jewel: systemd: add install section to rbdmap.service file
Reviewed-by: Loic Dachary <ldachary@redhat.com>
Loic Dachary [Wed, 19 Oct 2016 07:46:19 +0000 (09:46 +0200)]
Merge pull request #10862 from dachary/wip-17095-jewel
jewel: rpm: ceph installs stuff in %_udevrulesdir but does not own that directory
Reviewed-by: Loic Dachary <ldachary@redhat.com>
Loic Dachary [Tue, 18 Oct 2016 15:33:23 +0000 (17:33 +0200)]
tests: ceph-disk: force debug monc = 0
The sh function will collect both stderr and stdout and debug
will mess the json parsing.
Fixes: http://tracker.ceph.com/issues/17607
Signed-off-by: Loic Dachary <ldachary@redhat.com>
(cherry picked from commit
469a53a4adc335ea4ff8e34a958b12f0f222a6c1 )
Loic Dachary [Wed, 19 Oct 2016 06:56:46 +0000 (08:56 +0200)]
Merge pull request #10860 from dachary/wip-17121-jewel
jewel: the %USED of ceph df is wrong
Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Samuel Just <sjust@redhat.com>
Loic Dachary [Tue, 18 Oct 2016 23:35:13 +0000 (01:35 +0200)]
Merge pull request #10886 from dachary/wip-17144-jewel
jewel: mark_all_unfound_lost() leaves unapplied changes
Reviewed-by: David Zafman <dzafman@redhat.com>
Loic Dachary [Tue, 18 Oct 2016 11:05:43 +0000 (13:05 +0200)]
Merge pull request #10784 from dachary/wip-17067-jewel
jewel: Request exclusive lock if owner sends -ENOTSUPP for proxied maintenance op
Reviewed-by: Ilya Dryomov <idryomov@redhat.com>
Kefu Chai [Mon, 10 Oct 2016 10:43:39 +0000 (18:43 +0800)]
doc: fill keyring with caps before passing it to ceph-monstore-tool
to make sure the recovered monitor store is ready for use.
Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit
af8e21163735377071b6832d8a81b035bb835257 )
Kefu Chai [Mon, 10 Oct 2016 08:32:27 +0000 (16:32 +0800)]
tools/ceph_monstore_tool: bail out if no caps found for a key
we take it as an error if no caps is granted to an entity in the
specified keyring file when rebuilding the monitor db.
Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit
b4bd4004a836121c11b0bb97d8123df54c271f04 )
Kefu Chai [Fri, 30 Sep 2016 09:58:14 +0000 (17:58 +0800)]
tools/ceph_monstore_tool: update pgmap_meta also when rebuilding store.db
we should rebuild pgmap_meta table from the collected osdmaps
Fixes: http://tracker.ceph.com/issues/17400
Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit
cdfa7a69f63d047205dcfccd63b5d58ab0d4695b )
xie xingguo [Sun, 18 Sep 2016 03:40:56 +0000 (11:40 +0800)]
tools/rebuild_mondb: kill compiling warning
As follow:
[ 72%] Building CXX object src/tools/CMakeFiles/ceph-objectstore-tool.dir/RadosDump.cc.o
/home/jenkins-build/build/workspace/ceph-pull-requests/src/tools/rebuild_mondb.cc: In function ‘int update_mon_db(ObjectStore&, OSDSuperblock&, const string&, const string&)’:
/home/jenkins-build/build/workspace/ceph-pull-requests/src/tools/rebuild_mondb.cc:289:22: warning: ‘crc’ may be used uninitialized in this function [-Wmaybe-uninitialized]
if (have_crc && osdmap.get_crc() != crc) {
^
/home/jenkins-build/build/workspace/ceph-pull-requests/src/tools/rebuild_mondb.cc:238:14: note: ‘crc’ was declared here
uint32_t crc;
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
(cherry picked from commit
f16a31476a3f9b44a7c3dabf0dfd2a0d015b11b9 )
xie xingguo [Sun, 18 Sep 2016 02:33:56 +0000 (10:33 +0800)]
tools/rebuild_mondb: avoid unnecessary result code cast
In general we return negative codes for error cases, so there is
no need perform the cast here.
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
(cherry picked from commit
6a1c01d334fe65124043aa68a6e0cfaea43836b5 )
Kefu Chai [Sat, 1 Oct 2016 06:18:55 +0000 (14:18 +0800)]
doc: add rados/operations/disaster-recovery.rst
document the process to recover from leveldb corruption.
Fixes: http://tracker.ceph.com/issues/17179
Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit
79a9f299253e24d20547131b3c9c9e0667e3b869 )
Conflicts:
src/tools/rebuild_mondb.cc:
remove the code change in this file from this commit.
and the code gets removed is added in anther commit.
Kefu Chai [Mon, 29 Aug 2016 11:53:11 +0000 (19:53 +0800)]
tools/ceph_monstore_tool: add "rebuild" command
Fixes: http://tracker.ceph.com/issues/17179
Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit
d909fa035c8fbbded786b2ca072acc10ea6b6052 )
Kefu Chai [Mon, 29 Aug 2016 11:52:19 +0000 (19:52 +0800)]
tools/ceph-objectstore-tool: add "update-mon-db" command
Fixes: http://tracker.ceph.com/issues/17179
Signed-off-by: Kefu Chai <kchai@redhat.com>
Conflicts:
src/tools/CMakeLists.txt: this file was added in master, so
update src/CMakeLists.txt instead
src/tools/Makefile-server.am: jewel is still using autotools,
so update this file also.
src/tools/rebuild_mondb.cc: move the code spilled into
doc/rados/troubleshooting/troubleshooting-mon.rst
by accident back to this commit.
(cherry picked from commit
24faea7ce446bbf09cbd4a9d3434dd5444a6c295 )
Kefu Chai [Wed, 31 Aug 2016 05:11:24 +0000 (13:11 +0800)]
mon/AuthMonitor: make AuthMonitor::IncType public
so ceph-objectstore-tool is able to use it when rebuilding monitor
db.
Fixes: http://tracker.ceph.com/issues/17179
Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit
19ef4f16b3aba04119ac647cd6261c74a57ce829 )
Samuel Just [Mon, 17 Oct 2016 18:56:30 +0000 (11:56 -0700)]
Merge pull request #10885 from dachary/wip-17145-jewel
jewel: PG::choose_acting valgrind error or ./common/hobject.h: 182: FAILED assert(!max || (*this == hobject_t(hobject_t::get_max())))
Reviewed-by: Samuel Just <sjust@redhat.com>
Samuel Just [Mon, 17 Oct 2016 18:54:29 +0000 (11:54 -0700)]
Merge pull request #10883 from dachary/wip-17141-jewel
jewel: PG::_update_calc_stats wrong for CRUSH_ITEM_NONE up set items
Reviewed-by: Samuel Just <sjust@redhat.com>
Loic Dachary [Mon, 17 Oct 2016 16:08:46 +0000 (18:08 +0200)]
Merge pull request #11420 from dachary/wip-17556-jewel
jewel: librbd::Operations: update notification failed: (2) No such file or directory
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
Loic Dachary [Mon, 17 Oct 2016 16:08:32 +0000 (18:08 +0200)]
Merge pull request #10857 from dachary/wip-16984-jewel
jewel: Disabling pool mirror mode with registered peers results orphaned mirrored images
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
Loic Dachary [Mon, 17 Oct 2016 15:55:10 +0000 (17:55 +0200)]
Merge pull request #10645 from dachary/wip-16458-jewel
jewel: Potential crash during journal::Replay shut down
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
Loic Dachary [Mon, 17 Oct 2016 15:54:55 +0000 (17:54 +0200)]
Merge pull request #10652 from dachary/wip-16951-jewel
jewel: ceph 10.2.2 rbd status on image format 2 returns (2) No such file or directory
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
Loic Dachary [Mon, 17 Oct 2016 15:37:41 +0000 (17:37 +0200)]
Merge pull request #11337 from SUSE/wip-17060-jewel
jewel: librbd: cannot disable journaling or remove non-mirrored, non-primary image
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
Loic Dachary [Mon, 17 Oct 2016 15:37:06 +0000 (17:37 +0200)]
Merge pull request #10650 from dachary/wip-16868-jewel
jewel: Prevent the creation of a clone from a non-primary mirrored image
Reviewed-by: Loic Dachary <ldachary@redhat.com>
Loic Dachary [Mon, 17 Oct 2016 15:06:51 +0000 (17:06 +0200)]
Merge pull request #11433 from dillaman/wip-17416-jewel
jewel: rbd-mirror: improve resiliency of stress test case
Reviewed-by: Loic Dachary <ldachary@redhat.com>
Loic Dachary [Mon, 17 Oct 2016 15:04:11 +0000 (17:04 +0200)]
Merge pull request #10796 from dillaman/wip-17059-jewel
jewel: rbd: bench io-size should not be larger than image size
Reviewed-by: Loic Dachary <ldachary@redhat.com>
Loic Dachary [Mon, 17 Oct 2016 12:28:06 +0000 (14:28 +0200)]
Merge pull request #11414 from dachary/wip-17477-jewel
jewel: Crash in Client::_invalidate_kernel_dcache when reconnecting during unmount
Reviewed-by: John Spray <john.spray@redhat.com>
Loic Dachary [Mon, 17 Oct 2016 12:27:53 +0000 (14:27 +0200)]
Merge pull request #11412 from dachary/wip-17479-jewel
jewel: Duplicate damage table entries
Reviewed-by: John Spray <john.spray@redhat.com>
Loic Dachary [Mon, 17 Oct 2016 12:27:43 +0000 (14:27 +0200)]
Merge pull request #11415 from dachary/wip-17476-jewel
jewel: Failure in snaptest-git-ceph.sh
Reviewed-by: John Spray <john.spray@redhat.com>
Loic Dachary [Mon, 17 Oct 2016 12:27:30 +0000 (14:27 +0200)]
Merge pull request #11416 from dachary/wip-17474-jewel
jewel: Failure in dirfrag.sh
Reviewed-by: John Spray <john.spray@redhat.com>
Loic Dachary [Mon, 17 Oct 2016 12:27:17 +0000 (14:27 +0200)]
Merge pull request #11418 from dachary/wip-17246-jewel
jewel: Log path as well as ino when detecting metadata damage
Reviewed-by: John Spray <john.spray@redhat.com>
Loic Dachary [Mon, 17 Oct 2016 12:27:04 +0000 (14:27 +0200)]
Merge pull request #11419 from dachary/wip-17244-jewel
jewel: Failure in snaptest-git-ceph.sh
Reviewed-by: John Spray <john.spray@redhat.com>
Loic Dachary [Mon, 17 Oct 2016 12:26:30 +0000 (14:26 +0200)]
Merge pull request #10877 from dachary/wip-16946-jewel
jewel: client: nlink count is not maintained correctly
Reviewed-by: John Spray <john.spray@redhat.com>
Loic Dachary [Mon, 17 Oct 2016 11:40:13 +0000 (13:40 +0200)]
Merge pull request #10758 from dachary/wip-17007-jewel
jewel: ceph-disk should timeout when a lock cannot be acquired
Reviewed-by: Loic Dachary <ldachary@redhat.com>
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>
Alexander Graf [Mon, 26 Sep 2016 08:26:30 +0000 (10:26 +0200)]
AArch64: Detect crc32 extension support from assembler
The used compiler may or may not be recent enough to recognize the
crc32 extended cpu type. However, it does not really have to know about
them either, since all we do is pass inline assembly instructions to
the assembler.
This patch moves the crc cpu extension detection from compiler based
to assembler based, so that we can build optimized code even when the
compiler does not know about the cpu type yet.
Signed-off-by: Alexander Graf <agraf@suse.de>
(manual backport of
e70ab48b7f6d39a281b3ec65098535a55018b681 - manual backport
was undertaken because jewel uses autotools)
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>
Loic Dachary [Tue, 23 Aug 2016 10:17:00 +0000 (12:17 +0200)]
tests: populate /dev/disk/by-partuuid for scsi_debug
The scsi_debug SCSI devices do not have a symlink in /dev/disk/by-partuuid
because they are filtered out by 60-persistent-storage.rules. That was
worked around by 60-ceph-partuuid-workaround-rules which has been
removed by
9f76b9ff31525eac01f04450d72559ec99927496 .
Add create rules targetting this specific case, only for tests since the
problem does not show in real use cases.
Fixes: http://tracker.ceph.com/issues/17100
Signed-off-by: Loic Dachary <loic@dachary.org>
(cherry picked from commit
7cbf1f0a5eced402e6c7242015550668e3b568f3 )
la-sguduru [Thu, 12 May 2016 06:23:25 +0000 (11:53 +0530)]
doc: Modification for "TEST S3 ACCESS" section
Signed-off-by: SirishaGuduru sirishaguduru99@gmail.com
(cherry picked from commit
27d6cf0c6958de9f0533bedb90a74c4020b53675 )
qiankunzheng [Fri, 18 Mar 2016 17:58:22 +0000 (13:58 -0400)]
rgw:response information is error when geting token of swift account
The header is X-Trans-Id instead of x-amz-request-id in the response header
Fixes:#15195
Signed-off-by: Qiankun Zheng <zheng.qiankun@h3c.com>
(cherry picked from commit
08e909d0b844e8be3cb82d6add3e87d38e19e80e )
SirishaGuduru [Mon, 19 Sep 2016 04:51:06 +0000 (10:21 +0530)]
doc: Radosgw multitenancy config paramater change
Radosgw multitenancy configuration parameter
"rgw keystone make new tenants" never works even
applied. When gone through the code, itseems this
parameter is not used. But "rgw keystone implicit
tenants" works as the code looks for this.
Modified the configuration parameter in two files
mentioned below from "rgw keystone make new tenants"
to "rgw keystone implicit tenants"
Fixes: http://tracker.ceph.com/issues/17293
Signed-off-by: SirishaGuduru <SGuduru@walmartlabs.com>
(cherry picked from commit
bd9695d50cfd472508a8a704f1ea5fc62dc08faf )
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 )
Mykola Golub [Sat, 1 Oct 2016 08:21:21 +0000 (11:21 +0300)]
journal: ensure in-flight ops are complete destroying journaler
Fixes: http://tracker.ceph.com/issues/17446
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit
a25b1d7cbebb7b19cebee4cfb362cd744bbb4607 )
Mykola Golub [Thu, 29 Sep 2016 13:55:22 +0000 (16:55 +0300)]
journal: complete action only after notification completed
Signed-off-by: Mykola Golub <mgolub@mirantis.com>
(cherry picked from commit
55762cca2bf586d037cb9f32775ec158dc3287c1 )
Jason Dillaman [Wed, 5 Oct 2016 01:29:31 +0000 (21:29 -0400)]
qa/workunits: reduce amount of client IO for rbd-mirror stress
Journal IO is faster now, resulting in OSDs quickly filling up
under the stress test case.
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit
a6dd6b50d632aa6995a0f4b6fc5e1a1bda23e2a0 )
Jason Dillaman [Tue, 4 Oct 2016 16:22:06 +0000 (12:22 -0400)]
rbd-mirror: potential race allocating tag during shut down
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit
8c2ff9bce61a8af024150b8be9dee484f339f7df )
Jason Dillaman [Fri, 30 Sep 2016 16:32:37 +0000 (12:32 -0400)]
librbd: ignore attempts to request lock if already lock owner
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit
355c79cb7c955e62e3153cf28046a9b8a6d0d25c )
Jason Dillaman [Fri, 30 Sep 2016 16:59:16 +0000 (12:59 -0400)]
journal: clean up object recorder closed/overflow callback
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit
24faead086a50ea1b9614268d4dd5f3ea7bbe445 )
Jason Dillaman [Thu, 29 Sep 2016 12:36:53 +0000 (08:36 -0400)]
journal: delay moving overflowed buffers until quiesced
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit
4483531aa3aa3d0f298778062e2b9a339ad05075 )
Jason Dillaman [Thu, 29 Sep 2016 12:19:52 +0000 (08:19 -0400)]
journal: use reverse iterator search to find flush record
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit
a96065815558e50361af4c701c23e5248962dfe0 )
Jason Dillaman [Wed, 28 Sep 2016 12:35:36 +0000 (08:35 -0400)]
journal: avoid holding lock while sending journal append
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit
dc77a629ed353d586b63f0bd8e20f54a7595afba )
Jason Dillaman [Wed, 21 Sep 2016 19:41:55 +0000 (15:41 -0400)]
rbd-mirror: wait for in-flight event commit notifications
Fixes: http://tracker.ceph.com/issues/17355
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit
f810c106ad4e9ae94494801fea6c580d81b9156b )
Jason Dillaman [Tue, 11 Oct 2016 17:55:21 +0000 (13:55 -0400)]
journal: fix AsyncOpTracker compiler error
The master branch has an async JournalTrimmer which shouldn't be
backported to the Jewel branch yet. This change addresses the
missing sync AsyncOpTracker::wait_for_ops method from the backported
class.
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
Jason Dillaman [Wed, 21 Sep 2016 17:02:34 +0000 (13:02 -0400)]
common: move AsyncOpTracker to common library
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit
72d8992f054a7e36f92fdd2e01278ce3b9ede2eb )
Conflicts:
src/journal/CMakeLists.txt: doesn't exist in Jewel
Jason Dillaman [Thu, 28 Jul 2016 20:35:48 +0000 (16:35 -0400)]
librbd: support deleting image by id instead of name
The rbd-mirror daemon will use this API to delete images instead
of attempting to use the local image name.
Fixes: http://tracker.ceph.com/issues/16227
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit
87b32d15914207f61595c1c943817d983faceacd )
Jason Dillaman [Wed, 13 Jul 2016 18:49:06 +0000 (14:49 -0400)]
rbd-mirror: use pool id + global image id as deletion primary key
Fixes: http://tracker.ceph.com/issues/16538
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit
25203a8a9d59ff025d223ec1afaeb14946d54993 )
Jason Dillaman [Thu, 15 Sep 2016 22:14:15 +0000 (18:14 -0400)]
rbd-mirror: concurrent access of event might result in heap corruption
Fixes: http://tracker.ceph.com/issues/17283
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit
ac9ad37ab80db8913f9f1149707bd0009f8235c4 )
Ricardo Dias [Wed, 21 Sep 2016 22:08:18 +0000 (23:08 +0100)]
rbd-mirror: test: Fixed timeout problem in rbd_mirror_stress.sh
Signed-off-by: Ricardo Dias <rdias@suse.com>
(cherry picked from commit
5c737038dd6d44bd76605587486ddf9457bc2d96 )
Ricardo Dias [Tue, 6 Sep 2016 16:28:22 +0000 (17:28 +0100)]
rbd: Fix race between journal flush and append events
Signed-off-by: Ricardo Dias <rdias@suse.com>
(cherry picked from commit
aa959e71fe5a8cec43de75007fc9cef8de5ee3a5 )
Ricardo Dias [Wed, 7 Sep 2016 14:26:34 +0000 (15:26 +0100)]
journal: make librados call async in ObjectRecorder
Signed-off-by: Ricardo Dias <rdias@suse.com>
(cherry picked from commit
7b740f5b4ac1c66ac3c80782d2d34e846d00fddd )
Ricardo Dias [Mon, 25 Jul 2016 16:00:50 +0000 (17:00 +0100)]
journal: increase concurrency of journal recorder
Signed-off-by: Ricardo Dias <rdias@suse.com>
(cherry picked from commit
5c88edd68a1ee7c77f11e4113251fbe5768b8d99 )
Jason Dillaman [Mon, 19 Sep 2016 15:24:17 +0000 (11:24 -0400)]
journal: send update notification when tag allocated
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit
f1cd613e3d8ccb6d05b9adfe1956927991a4f4fe )
Jason Dillaman [Wed, 14 Sep 2016 01:54:46 +0000 (21:54 -0400)]
librbd: new journal listener event for force promotion
Fixes: http://tracker.ceph.com/issues/16974
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit
fd005490e95d7fca85be4cad34344a58986f64d6 )
Jason Dillaman [Tue, 13 Sep 2016 20:38:51 +0000 (16:38 -0400)]
librbd: helper class for quiescing in-flight async ops
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit
39d9e5cc9b38de2ee9ad2faf8e04253314160811 )
Jason Dillaman [Tue, 13 Sep 2016 16:37:53 +0000 (12:37 -0400)]
librbd: unify journal event callbacks into single interface
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit
dbbcecf4a289ca36b734b7bda9530cc0a59f84ac )
Jason Dillaman [Tue, 13 Sep 2016 20:28:50 +0000 (16:28 -0400)]
journal: expose ability to retrieve partial tag list
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit
277b6dd9f13a8390cbf7c9ac7a313813ecad4d27 )
Jason Dillaman [Wed, 14 Sep 2016 12:49:39 +0000 (08:49 -0400)]
qa/workunits/rbd: fix remove mirrored image race conditions
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit
a0f65b968b350629dfad978c191fc878ca26d093 )