]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
8 years agoMerge pull request #11125 from tchaikov/wip-17179-hammer
Nathan Cutler [Wed, 23 Nov 2016 21:13:05 +0000 (22:13 +0100)]
Merge pull request #11125 from tchaikov/wip-17179-hammer

hammer: tools: add a tool to rebuild mon store from OSD

Reviewed-by: Nathan Cutler <ncutler@suse.com>
8 years agoMerge pull request #11273 from aiicore/wip-17403-hammer
Nathan Cutler [Wed, 23 Nov 2016 21:10:54 +0000 (22:10 +0100)]
Merge pull request #11273 from aiicore/wip-17403-hammer

hammer: mon: OSDMonitor: Missing nearfull flag set

Reviewed-by: Sage Weil <sage@redhat.com>
8 years agoMerge pull request #11618 from asheplyakov/hammer-16546
Nathan Cutler [Wed, 23 Nov 2016 21:06:32 +0000 (22:06 +0100)]
Merge pull request #11618 from asheplyakov/hammer-16546

hammer: rbd: fix possible rbd data corruption

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
8 years agoMerge pull request #11676 from asheplyakov/hammer-16151
Nathan Cutler [Wed, 23 Nov 2016 20:56:22 +0000 (21:56 +0100)]
Merge pull request #11676 from asheplyakov/hammer-16151

hammer: osd: update PGPool to detect map gaps and reset cached_removed_snaps

Reviewed-by: Samuel Just <sjust@redhat.com>
8 years agoMerge pull request #11899 from SUSE/wip-17840-hammer
Nathan Cutler [Wed, 23 Nov 2016 20:54:39 +0000 (21:54 +0100)]
Merge pull request #11899 from SUSE/wip-17840-hammer

hammer: rgw: the value of total_time is wrong in the result of 'radosgw-admin log show' opt

Reviewed-by: Orit Wasserman <owasserm@redhat.com>
8 years agoMerge pull request #11927 from SUSE/wip-17764-hammer
Nathan Cutler [Wed, 23 Nov 2016 20:53:40 +0000 (21:53 +0100)]
Merge pull request #11927 from SUSE/wip-17764-hammer

hammer: osd: fix collection_list shadow return value

Reviewed-by: Haomai Wang <haomai@xsky.com>
Reviewed-by: Samuel Just <sjust@redhat.com>
8 years agoMerge pull request #12071 from SUSE/wip-17957-hammer
Nathan Cutler [Wed, 23 Nov 2016 20:50:04 +0000 (21:50 +0100)]
Merge pull request #12071 from SUSE/wip-17957-hammer

hammer: RWLock.h: 124: FAILED assert(r == 0) in rados-jewel-distro-basic-smithi

Reviewed-by: Samuel Just <sjust@redhat.com>
8 years agoMerge pull request #11929 from SUSE/wip-17359-hammer
Nathan Cutler [Wed, 23 Nov 2016 20:47:24 +0000 (21:47 +0100)]
Merge pull request #11929 from SUSE/wip-17359-hammer

hammer: tools: ceph-objectstore-tool crashes if --journal-path <a-directory>

Reviewed-by: Kefu Chai <kchai@redhat.com>
8 years agoMerge pull request #11930 from SUSE/wip-17346-hammer
Nathan Cutler [Wed, 23 Nov 2016 20:46:08 +0000 (21:46 +0100)]
Merge pull request #11930 from SUSE/wip-17346-hammer

hammer: cephx: Fix multiple segfaults due to attempts to encrypt or decrypt

Reviewed-by: Brad Hubbard <bhubbard@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
8 years agoMerge pull request #11931 from SUSE/wip-17333-hammer
Nathan Cutler [Wed, 23 Nov 2016 20:44:39 +0000 (21:44 +0100)]
Merge pull request #11931 from SUSE/wip-17333-hammer

hammer: tools: crushtool --compile generates output despite missing item

Reviewed-by: Kefu Chai <kchai@redhat.com>
8 years agoMerge pull request #11932 from SUSE/wip-17146-hammer
Nathan Cutler [Wed, 23 Nov 2016 20:43:19 +0000 (21:43 +0100)]
Merge pull request #11932 from SUSE/wip-17146-hammer

hammer: 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>
8 years agoMerge pull request #11933 from SUSE/wip-17142-hammer
Nathan Cutler [Wed, 23 Nov 2016 20:42:24 +0000 (21:42 +0100)]
Merge pull request #11933 from SUSE/wip-17142-hammer

hammer: osd: PG::_update_calc_stats wrong for CRUSH_ITEM_NONE up set items

Reviewed-by: Samuel Just <sjust@redhat.com>
8 years agoMerge pull request #11934 from SUSE/wip-17120-hammer
Nathan Cutler [Wed, 23 Nov 2016 20:40:47 +0000 (21:40 +0100)]
Merge pull request #11934 from SUSE/wip-17120-hammer

hammer: mon: %USED of ceph df is wrong

Reviewed-by: Kefu Chai <kchai@redhat.com>
8 years agoMerge pull request #11935 from SUSE/wip-16870-hammer
Nathan Cutler [Wed, 23 Nov 2016 20:39:12 +0000 (21:39 +0100)]
Merge pull request #11935 from SUSE/wip-16870-hammer

hammer: osd: crash on EIO during deep-scrubbing

Reviewed-by: Samuel Just <sjust@redhat.com>
8 years agoMerge pull request #11937 from SUSE/wip-16428-hammer
Nathan Cutler [Wed, 23 Nov 2016 20:33:27 +0000 (21:33 +0100)]
Merge pull request #11937 from SUSE/wip-16428-hammer

hammer: mon: prepare_pgtemp needs to only update up_thru if newer than the existing one

Reviewed-by: Samuel Just <sjust@redhat.com>
8 years agoMerge pull request #11938 from SUSE/wip-14323-hammer
Nathan Cutler [Wed, 23 Nov 2016 20:31:15 +0000 (21:31 +0100)]
Merge pull request #11938 from SUSE/wip-14323-hammer

hammer: msg: OpTracker needs to release the message throttle in _unregistered

Reviewed-by: Samuel Just <sjust@redhat.com>
8 years agoMerge pull request #11939 from SUSE/wip-13927-hammer
Nathan Cutler [Wed, 23 Nov 2016 20:29:45 +0000 (21:29 +0100)]
Merge pull request #11939 from SUSE/wip-13927-hammer

hammer: mds: fix cephfs-java ftruncate unit test failure

Reviewed-by: John Spray <john.spray@redhat.com>
8 years agoMerge pull request #11946 from SUSE/wip-17883-hammer
Nathan Cutler [Wed, 23 Nov 2016 09:52:43 +0000 (10:52 +0100)]
Merge pull request #11946 from SUSE/wip-17883-hammer

hammer: mon: OSDs marked OUT wrongly after monitor failover

Reviewed-by: Kefu Chai <kchai@redhat.com>
8 years agoMerge pull request #11948 from SUSE/wip-17671-hammer
Nathan Cutler [Wed, 23 Nov 2016 09:51:51 +0000 (10:51 +0100)]
Merge pull request #11948 from SUSE/wip-17671-hammer

hammer: rbd: export diff should open image as read-only

Reviewed-by: Mykola Golub <mgolub@mirantis.com>
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
8 years agoMerge pull request #11949 from SUSE/wip-17374-hammer
Nathan Cutler [Wed, 23 Nov 2016 09:48:06 +0000 (10:48 +0100)]
Merge pull request #11949 from SUSE/wip-17374-hammer

hammer: librbd: image.stat() call in librbdpy fails sometimes

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
8 years agoMerge pull request #11950 from SUSE/wip-17123-hammer
Nathan Cutler [Wed, 23 Nov 2016 09:41:03 +0000 (10:41 +0100)]
Merge pull request #11950 from SUSE/wip-17123-hammer

hammer: rgw: COPY broke multipart files uploaded under dumpling

Reviewed-by: Orit Wasserman <owasserm@redhat.com>
8 years agoMerge pull request #11951 from SUSE/wip-16594-hammer
Nathan Cutler [Wed, 23 Nov 2016 09:39:46 +0000 (10:39 +0100)]
Merge pull request #11951 from SUSE/wip-16594-hammer

hammer: rgw: swift: ranged request on a DLO provides wrong values in Content-Range HTTP header

Reviewed-by: Orit Wasserman <owasserm@redhat.com>
8 years agoMerge pull request #11952 from SUSE/wip-16318-hammer
Nathan Cutler [Wed, 23 Nov 2016 09:17:00 +0000 (10:17 +0100)]
Merge pull request #11952 from SUSE/wip-16318-hammer

hammer: rgw: fix inconsistent uid/email handling in radosgw-admin

Reviewed-by: Orit Wasserman <owasserm@redhat.com>
8 years agoMerge pull request #12018 from trociny/wip-17068-hammer
Nathan Cutler [Wed, 23 Nov 2016 09:14:10 +0000 (10:14 +0100)]
Merge pull request #12018 from trociny/wip-17068-hammer

hammer: librbd: request exclusive lock if current owner cannot execute op

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
8 years agoMerge pull request #11045 from SUSE/wip-17150-hammer
Nathan Cutler [Wed, 23 Nov 2016 05:42:06 +0000 (06:42 +0100)]
Merge pull request #11045 from SUSE/wip-17150-hammer

hammer: rgw: Anonymous user is able to read bucket with authenticated read ACL

Reviewed-by: Orit Wasserman <owasserm@redhat.com>
8 years agoMerge pull request #11809 from SUSE/wip-17631-hammer
Nathan Cutler [Wed, 23 Nov 2016 05:32:09 +0000 (06:32 +0100)]
Merge pull request #11809 from SUSE/wip-17631-hammer

hammer: rgw: fix crash when client posts object with null condition

Reviewed-by: Orit Wasserman <owasserm@redhat.com>
8 years agoPendingReleaseNotes: document the feature to rebuild monstore 11125/head
Kefu Chai [Tue, 22 Nov 2016 03:53:57 +0000 (11:53 +0800)]
PendingReleaseNotes: document the feature to rebuild monstore

Signed-off-by: Kefu Chai <kchai@redhat.com>
8 years agodoc: fill keyring with caps before passing it to ceph-monstore-tool
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)

8 years agotools/ceph_monstore_tool: bail out if no caps found for a key
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)

8 years agotools/ceph_monstore_tool: update pgmap_meta also when rebuilding store.db
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)
Conflicts:
src/tools/ceph_monstore_tool.cc: remove C++11-ism

8 years agotools/rebuild_mondb: kill compiling warning
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)

8 years agotools/rebuild_mondb: return error if ondisk version of pg_info is incompatible
xie xingguo [Sun, 18 Sep 2016 02:43:10 +0000 (10:43 +0800)]
tools/rebuild_mondb: return error if ondisk version of pg_info is incompatible

In this case "r" will be >= 0 and caller will be able to catch
this kind of error.

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
(cherry picked from commit ac7c1dca0a4f6e92e50d362784122e2d3200e6b5)

8 years agotools/rebuild_mondb: avoid unnecessary result code cast
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)

8 years agodoc: add rados/operations/disaster-recovery.rst
Kefu Chai [Tue, 30 Aug 2016 16:59:58 +0000 (00:59 +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)

8 years agotools/ceph_monstore_tool: add "rebuild" command
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)

Conflicts:
ceph_monstore_tool.cc: remove C++11ish

8 years agotools/ceph-objectstore-tool: add "update-mon-db" command
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>
(cherry picked from commit 24faea7ce446bbf09cbd4a9d3434dd5444a6c295)

Conflicts:
src/tools/Makefile-server.am: add rebuild_mondb.{cc,h}, as autotools
          support is dropped in master
ceph_objectstore_tool.cc, rebuild_mondb.cc: remove C++11ish
          adapt to hammer

8 years agomon/AuthMonitor: make AuthMonitor::IncType public
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)

8 years agohammer: ObjectCacher: fix bh_read_finish offset logic 11618/head
Greg Farnum [Mon, 23 May 2016 22:14:21 +0000 (15:14 -0700)]
hammer: ObjectCacher: fix bh_read_finish offset logic

If we have an incoming read split across multiple BufferHeads, we want to
line up the BufferHead's bl with the incoming OSDOp's bl at the right offset. We
were erroneously using this nonsense calculation (always equal to zero!) when
a much simpler comparison of the BufferHead's logical object offset to the
incoming OSDOp's logical offset will do the trick nicely.

Fixes: http://tracker.ceph.com/issues/16002
Signed-off-by: Greg Farnum <gfarnum@redhat.com>
(cherry picked from commit 9ec6e7f608608088d51e449c9d375844631dcdde)

8 years agohammer: test: build a correctness test for the ObjectCacher
Greg Farnum [Sat, 11 Jun 2016 00:01:09 +0000 (17:01 -0700)]
hammer: test: build a correctness test for the ObjectCacher

For now it's very specifically designed to reproduce
http://tracker.ceph.com/issues/16002, but it can
be extended to other patterns in the future.

Signed-off-by: Greg Farnum <gfarnum@redhat.com>
(cherry picked from commit 0fd55a9886dd8da344c23a5e9898ee5c5061e8f9)

Hammer specific changes:

* use utime_t instead of ceph::real_time
* ObjectCacher::prepare_write() has no journal_tid argument
* rewrite the code in C++98

8 years agohammer: test: split objectcacher test into 'stress' and 'correctness'
Greg Farnum [Tue, 31 May 2016 23:18:19 +0000 (16:18 -0700)]
hammer: test: split objectcacher test into 'stress' and 'correctness'

Signed-off-by: Greg Farnum <gfarnum@redhat.com>
(cherry picked from commit cc9aab1b0a22c3f7320046b97f75dccf2b86cc6d)

8 years agohammer: test: add a data-storing MemWriteback for testing ObjectCacher
Greg Farnum [Thu, 23 Jun 2016 20:41:46 +0000 (13:41 -0700)]
hammer: test: add a data-storing MemWriteback for testing ObjectCacher

Signed-off-by: Greg Farnum <gfarnum@redhat.com>
(cherry picked from commit ed5801492bf2850e80a328ce5a61cb1ff2709215)

Hammer specific changes:

* use utime_t instead of ceph::real_time
* ObjectCacher::prepare_write() has no journal_tid argument
* rewrite code in C++98

8 years agohammer: objectcacher: introduce ObjectCacher::flush_all()
Yan, Zheng [Wed, 28 Oct 2015 09:06:59 +0000 (17:06 +0800)]
hammer: objectcacher: introduce ObjectCacher::flush_all()

Signed-off-by: Yan, Zheng <zyan@redhat.com>
(cherry picked from commit bd86c301a54a6e23cf2ce257b8024b6b92dfbe11)

Conflicts:
src/osdc/ObjectCacher.h - whitespace only changes

Semantic conflicts:
        ObjectCacher::flush_all(): dirty_or_tx_bh is a set<BufferHead *>
in Hammer

8 years agohammer: osd: provide some contents on ObjectExtent usage in testing
Greg Farnum [Thu, 23 Jun 2016 21:23:51 +0000 (14:23 -0700)]
hammer: osd: provide some contents on ObjectExtent usage in testing

Signed-off-by: Greg Farnum <gfarnum@redhat.com>
(cherry picked from commit a555d9a0c7d3b6c2206520cf78445234b0834639)

8 years agoMerge pull request #12006 from SUSE/wip-17905-hammer
Sage Weil [Mon, 21 Nov 2016 15:03:44 +0000 (09:03 -0600)]
Merge pull request #12006 from SUSE/wip-17905-hammer

hammer: mon: MonmapMonitor should return success when MON will be removed

Reviewed-by: Sage Weil <sage@redhat.com>
8 years agoos/ObjectStore: fix _update_op for split dest_cid 12071/head
Sage Weil [Tue, 29 Mar 2016 19:24:34 +0000 (15:24 -0400)]
os/ObjectStore: fix _update_op for split dest_cid

Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit e3dc7c772f563f97bc68ebc6dc6e0d408e7c11f3)

8 years agomon: OSDMonitor: Missing nearfull flag set 11273/head
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)

8 years agorbd: this command should be EXPORT_DIFF 11948/head
YankunLi [Tue, 6 Sep 2016 08:16:58 +0000 (16:16 +0800)]
rbd: this command should be EXPORT_DIFF

Fixes: http://tracker.ceph.com/issues/17671
Signed-off-by: liyankun <lioveni99@gmail.com>
8 years agomon: update mon(peon)'s down_pending_out when osd up 11946/head
Dong Wu [Thu, 27 Oct 2016 03:02:36 +0000 (11:02 +0800)]
mon: update mon(peon)'s down_pending_out when osd up

Fixes: http://tracker.ceph.com/issues/17719
Signed-off-by: Dong Wu <archer.wudong@gmail.com>
(cherry picked from commit 664254a17afbad86983ea5b5b8d385662d89e65e)

Conflicts:
    src/mon/OSDMonitor.cc (auto declaration for variable "found" is a C++11ism,
        replace with the full verbose C++98 type)

8 years agolibrbd: request exclusive lock if current owner cannot execute op 12018/head
Mykola Golub [Wed, 16 Nov 2016 10:01:00 +0000 (12:01 +0200)]
librbd: request exclusive lock if current owner cannot execute op

This is a direct commit to hammer due to librbd code has evolved
significantly in the master.

Fixes: http://tracker.ceph.com/issues/17068
Signed-off-by: Mykola Golub <mgolub@mirantis.com>
8 years agomon: MonmapMonitor: return success when monitor will be removed 12006/head
Joao Eduardo Luis [Wed, 2 Nov 2016 15:33:52 +0000 (15:33 +0000)]
mon: MonmapMonitor: return success when monitor will be removed

Fixes: http://tracker.ceph.com/issues/17725
Signed-off-by: Joao Eduardo Luis <joao@suse.de>
(cherry picked from commit c9d46cfbf2512bc3495c6901de2b8f711bef9bae)

Conflicts:
src/mon/MonmapMonitor.cc (just inserted the "err = 0" assignment
        immediately after the error message line)

8 years agoPG: update PGPool to detect map gaps and reset cached_removed_snaps 11676/head
Samuel Just [Thu, 19 May 2016 23:00:35 +0000 (16:00 -0700)]
PG: update PGPool to detect map gaps and reset cached_removed_snaps

Fixes: http://tracker.ceph.com/issues/15943
Signed-off-by: Samuel Just <sjust@redhat.com>
(cherry picked from commit 5798fb3bf6d726d14a9c5cb99dc5902eba5b878a)

Conflicts:
src/osd/OSD.cc: trivial, fuzz is too big so git prefers to be safe

8 years agorgw-admin: return error on email address conflict (add user) 11952/head
Matt Benjamin [Mon, 18 Jan 2016 20:58:07 +0000 (15:58 -0500)]
rgw-admin: return error on email address conflict (add user)

Fixes the error return inconsistency documented in upstream
Ceph issue #13598

Revised after upstream review, permits changing email address as
originally (but use case-insensitive comp).

Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
(cherry picked from commit 90c143efa2156e55dc017ebe81005315cacaf2c5)

Conflicts:
src/rgw/rgw_user.cc (there is no op_state.found_by_email
        conditional in hammer)

8 years agorgw-admin: convert user email addresses to lower case
Matt Benjamin [Mon, 18 Jan 2016 20:06:19 +0000 (15:06 -0500)]
rgw-admin: convert user email addresses to lower case

Fixes the email address inconsistency documented in upstream
Ceph BUG #13598

Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
(cherry picked from commit 4c438dbbc0e6eda6b9a3018d60019a1a780d6f65)

8 years agorgw: fix wrong length in Content-Range HTTP header of Swift's DLO. 11951/head
Radoslaw Zarzynski [Mon, 12 Oct 2015 16:43:27 +0000 (18:43 +0200)]
rgw: fix wrong length in Content-Range HTTP header of Swift's DLO.

Fixes: #13452
Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
(cherry picked from commit b48f3d774129e0b37531fccda513626bd8ef07e5)

8 years agorgw: fix wrong first byte pos in Content-Range HTTP header of Swift's DLO.
Radoslaw Zarzynski [Mon, 12 Oct 2015 15:32:21 +0000 (17:32 +0200)]
rgw: fix wrong first byte pos in Content-Range HTTP header of Swift's DLO.

Fixes: #13452
Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
(cherry picked from commit 66f47f35bbb4966cb289811672938b90ae6d44ae)

8 years agorgw: adjust manifest head object 11950/head
Yehuda Sadeh [Fri, 8 Jul 2016 01:01:54 +0000 (18:01 -0700)]
rgw: adjust manifest head object

adjust the manifest head object:
 - when reading manifest, set the head object to the object
   we read the manifest from (and its size). Some manifests are
   broken and point at a different object
 - when copying multipart object, set the manifest head object to
   point at the new head object

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
(cherry picked from commit 419264586fc46337322f0d60b0ffcdcce3bb5c5a)

8 years agorgw: adjust objs when copying obj with explicit_objs set
Yehuda Sadeh [Thu, 7 Jul 2016 22:49:07 +0000 (15:49 -0700)]
rgw: adjust objs when copying obj with explicit_objs set

If the head object contains data, need to set it in the list of
objs (in addition to being pointed at by head_obj).

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
(cherry picked from commit 1e012112b99004745952accc6fb11ada5e8e0045)

8 years agorgw: patch manifest to handle explicit objs copy issue
Yehuda Sadeh [Thu, 7 Jul 2016 22:36:33 +0000 (15:36 -0700)]
rgw: patch manifest to handle explicit objs copy issue

Fixes: http://tracker.ceph.com/issues/16435
Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
(cherry picked from commit b51476466e5bb03bbaa6e428bb6bb189a259b9fd)

8 years agolibrbd: block name prefix might overflow fixed size C-string 11949/head
Jason Dillaman [Tue, 20 Sep 2016 11:25:36 +0000 (07:25 -0400)]
librbd: block name prefix might overflow fixed size C-string

The issue which resulted in too large v2 image ids was fixed
under #16887.

Fixes: http://tracker.ceph.com/issues/17310
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit 61734d266c6ee476c2f5fcfbbaefc7d0c7939617)

8 years agoOpRequest: release the message throttle when unregistered 11938/head
Samuel Just [Wed, 6 Jan 2016 00:24:15 +0000 (16:24 -0800)]
OpRequest: release the message throttle when unregistered

We don't want messages in the OpTracker history hanging on to
message throttle.

Fixes: #14248
Backport: hammer, firefly
Signed-off-by: Samuel Just <sjust@redhat.com>
(cherry picked from commit 67be35cba7c384353b0b6d49284a4ead94c4152e)

Conflicts:
    src/msg/Message.h (s/nullptr/0/ because C++98)

8 years agoOSDMonitor::prepare_pgtemp: only update up_thru if newer 11937/head
Samuel Just [Wed, 8 Jun 2016 00:15:05 +0000 (17:15 -0700)]
OSDMonitor::prepare_pgtemp: only update up_thru if newer

Fixes: http://tracker.ceph.com/issues/16185
Signed-off-by: Samuel Just <sjust@redhat.com>
(cherry picked from commit 5f2bd7b6b28aad96d68444b22c04b8b24564616b)

Conflicts:
src/mon/OSDMonitor.cc (master uses C++11 "auto" for new_up_thru
        iterator, replace with explicit type)
src/mon/OSDMonitor.h (trivial resolution)

8 years agocrush/CrushCompiler: error out as long as parse fails 11931/head
Kefu Chai [Tue, 20 Sep 2016 06:10:16 +0000 (14:10 +0800)]
crush/CrushCompiler: error out as long as parse fails

do not output compiled crush map if anything goes wrong when parsing
crush map.

Fixes: http://tracker.ceph.com/issues/17306
Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit b2c0a079dc074c907e1bc429861230096534f597)

Conflicts:
    src/test/cli/crushtool/compile-decompile-recompile.t (hammer needs $TESTDIR/ prefix)

8 years agomds: fix out-of-order messages 11939/head
Yan, Zheng [Mon, 30 Mar 2015 09:35:59 +0000 (17:35 +0800)]
mds: fix out-of-order messages

When MDS is no longer laggy, it should process deferred messages
first, then process newly received messages.

Fix: #11258
Signed-off-by: Yan, Zheng <zyan@redhat.com>
(cherry picked from commit ccdeaf87df8b66e09f6b20950b57ac61bf213086)

8 years agopg: restore correct behavior of read() callers 11935/head
Nathan Cutler [Sat, 12 Nov 2016 11:37:00 +0000 (12:37 +0100)]
pg: restore correct behavior of read() callers

This patch is inspired by fabd6357e42e526d2704d7cb80375c12d731df8d but is not a
cherry-pick.

Fixes: http://tracker.ceph.com/issues/16870
Signed-off-by: Nathan Cutler <ncutler@suse.com>
8 years agomon/PGMonitor: calc the %USED of pool using used/(used+avail) 11934/head
Kefu Chai [Fri, 5 Aug 2016 06:27:43 +0000 (14:27 +0800)]
mon/PGMonitor: calc the %USED of pool using used/(used+avail)

we were using
"the raw space used by this pool" / "the raw space of the whole cluster"
as the %USED. but it's wrong:

- there is chance that not all OSDs are assigned to the pool in question
- we can not utilize all the raw space for the pool: there is overhead.
  and the size of available space for a pool is capped by the assigned
  OSD with minimal free space.

so we should use
 USED / (USED + AVAIL)
as the %USED. so once we have no AVAIL space left, %USED will be 100%.

Fixes: http://tracker.ceph.com/issues/16933
Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit 08532ea166dfd97c548d9f1fb478e163021cdda3)

Conflicts:
src/test/mon/CMakeLists.txt (file does not exist in hammer)

8 years agomon/PGMonitor: mark dump_object_stat_sum() as static
Kefu Chai [Sat, 6 Aug 2016 16:58:04 +0000 (00:58 +0800)]
mon/PGMonitor: mark dump_object_stat_sum() as static

so we can test this method without create an instance of PGMonitor.

Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit af3d3e25823ca9b40ddf09835edb82795ac68f33)

Conflicts:
src/mon/PGMonitor.cc ("const" suffix of function definition was removed
            in master, but in hammer it wasn't there, so no change necessary)
src/mon/PGMonitor.h (added static prefix to function declaration; did
            not remove "const" suffix because it wasn't there in hammer)

8 years agoPG: use upset rather than up for _update_calc_stats 11933/head
Samuel Just [Thu, 11 Aug 2016 15:57:51 +0000 (08:57 -0700)]
PG: use upset rather than up for _update_calc_stats

Fixes: http://tracker.ceph.com/issues/16998
Signed-off-by: Samuel Just <sjust@redhat.com>
(cherry picked from commit 200cae8c9db99b3dede377f74413cc0b15033e1f)

8 years agoPG: introduce and maintain upset
Samuel Just [Thu, 11 Aug 2016 15:57:35 +0000 (08:57 -0700)]
PG: introduce and maintain upset

Signed-off-by: Samuel Just <sjust@redhat.com>
(cherry picked from commit 80a5c21d97116e7a66351a0e1f5d9b561f8663ac)

8 years agoCleanup: delete find_best_info again 11932/head
Tao Chang [Mon, 9 May 2016 13:50:17 +0000 (09:50 -0400)]
Cleanup: delete find_best_info again

After called find_best_info find a auth_pg_shard, it must be not incomplete,
so it will not enter find_best_info again.

Signed-off-by: Tao Chang <changtao@hihuron.com>
(cherry picked from commit a25cfc4d46c03d8d78e0254c728ea5c29e2246e1)

Conflicts:
src/osd/PG.cc (trivial resolution)

8 years agocephx: Fix multiple segfaults due to attempts to encrypt or decrypt 11930/head
Brad Hubbard [Tue, 14 Jun 2016 07:34:44 +0000 (17:34 +1000)]
cephx: Fix multiple segfaults due to attempts to encrypt or decrypt
an empty secret and a null CryptoKeyHandler

Fixes: http://tracker.ceph.com/issues/16266
Signed-off-by: Brad Hubbard <bhubbard@redhat.com>
(cherry picked from commit 009e777fbd18602e5fd66f97bdad95e977e6fecc)

8 years agoos/filestore/FileJournal: fail out if FileJournal is not block device or regular... 11929/head
Kefu Chai [Tue, 20 Sep 2016 09:39:24 +0000 (17:39 +0800)]
os/filestore/FileJournal: fail out if FileJournal is not block device or regular file

otherwise JournalingFileStore will assert when deleting FileJournal
which still has the non block/regular file opened.

Fixes: http://tracker.ceph.com/issues/17307
Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit 7431eec6fd24cd08ca6c76a9893e3f6e8c63a916)

8 years agoosd/PGBackend: fix collection_list shadow return value 11927/head
Haomai Wang [Sun, 9 Oct 2016 10:31:54 +0000 (18:31 +0800)]
osd/PGBackend: fix collection_list shadow return value

Fixes: http://tracker.ceph.com/issues/17713
Signed-off-by: Haomai Wang <haomai@xsky.com>
(cherry picked from commit 8a53a604f375eb568a6fc88a402a6afd83fa151a)

Conflicts:
src/osd/PGBackend.cc (master is using store->collection_list and ch;
            hammer is using store->collection_list_partial and coll)

8 years ago13207: Rados Gateway: Anonymous user is able to read bucket with authenticated read ACL 11045/head
root [Wed, 23 Sep 2015 18:51:13 +0000 (00:21 +0530)]
13207: Rados Gateway: Anonymous user is able to read bucket with authenticated read ACL

Signed-off-by: root <rahul.1aggarwal@gmail.com>
(cherry picked from commit 99ba6610a8f437604cadf68cbe9969def893e870)

8 years agorgw: fix the field 'total_time' of log entry in log show opt 11899/head
weiqiaomiao [Tue, 11 Oct 2016 11:32:43 +0000 (19:32 +0800)]
rgw: fix the field 'total_time'  of log entry in log show opt

Fixes: http://tracker.ceph.com/issues/17598
Signed-off-by: weiqiaomiao <wei.qiaomiao@zte.com.cn>
(cherry picked from commit 8f4825c5f012c77a3a91e22706dcab9c6067d77e)

8 years agorgw: handle empty POST condition 11809/head
Yehuda Sadeh [Thu, 20 Oct 2016 17:17:36 +0000 (10:17 -0700)]
rgw: handle empty POST condition

Fixes: http://tracker.ceph.com/issues/17635
Before accessing json entity, need to check that iterator is valid.
If there is no entry return appropriate error code.

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
(cherry picked from commit 23cb642243e09ca4a8e104f62a3bb7b2cbb6ea12)

8 years agoMerge pull request #11372 from ceph/wip-17386-hammer
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>
8 years agodoc: add "to Hammer" upgrade section 11372/head
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>
8 years agoMerge pull request #11253 from ceph/wip-offline-split-hammer2
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>
8 years agoceph-objectstore-tool: add a way to split filestore directories offline 11253/head
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()

8 years agoMerge pull request #11140 from cbodley/wip-radosgw-admin-man-hammer
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>
8 years agoman: add orphan options to radosgw-admin.8 11140/head
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>
8 years agoAdd two options to radosgw-admin.rst manpage
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)

8 years agoradosgw-admin: add "--orphan-stale-secs" to --help
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)

8 years agorgw_admin: improve the orphans find help
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)

8 years agodoc: add "--orphan-stale-secs" to radosgw-admin(8)
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)

8 years agoMerge pull request #10839 from oritwas/hammer-default-quota
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>
8 years ago0.94.9 v0.94.9
Jenkins Build Slave User [Tue, 30 Aug 2016 11:33:34 +0000 (11:33 +0000)]
0.94.9

8 years agoMerge pull request #10913 from ceph/wip-revert-random-uuid-hammer
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>
8 years agorgw: Add documentation for RGW default quota 10839/head
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)

8 years agorgw: Do not bother to check against conf values during quota handling
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)

8 years agorgw: Let the default quota settings take effect during user creation
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)

8 years agoMerge pull request #10898 from SUSE/wip-release-notes-hammer
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>
8 years agoRevert "moved to use boost uuid implementation, based on commit 4fe89a7b14c97b2ed7f35... 10913/head
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.

8 years agoRevert "uuid: use boost::random:random_device"
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.

8 years agodoc: release-notes.rst: add missing line to v0.94.8 10898/head
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>
8 years agodoc: add missing changelogs up to 0.94.8
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>
8 years agodoc: release-notes: add missing hammer releases
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>
8 years ago0.94.8 v0.94.8
Jenkins Build Slave User [Fri, 26 Aug 2016 00:02:49 +0000 (00:02 +0000)]
0.94.8

8 years agoMerge pull request #10750 from ceph/wip-14799-hammer
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>
8 years agorocksdb: disable tcmalloc if disabled 10750/head
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>