]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
10 years agoosd: tolerate sessionless con in fast dispatch path 3048/head
Sage Weil [Tue, 2 Dec 2014 02:15:59 +0000 (18:15 -0800)]
osd: tolerate sessionless con in fast dispatch path

We can now get a session cleared from a Connection at any time.  Change
the assert to an if in ms_fast_dispatch to cope.  It's pretty rare, but it
can happen, especially with delay injection.  In particular, a racing
thread can call mark_down() on us.

Fixes: #10209
Backport: giant
Signed-off-by: Sage Weil <sage@redhat.com>
10 years agoMerge pull request #2825 from ceph/wip-9921
Sage Weil [Mon, 1 Dec 2014 17:23:39 +0000 (09:23 -0800)]
Merge pull request #2825 from ceph/wip-9921

SimpleMessenger: Pipe: do not block on takeover while holding global locks

Reviewed-by: Sage Weil <sage@redhat.com>
10 years agoMerge pull request #3046 from yuyuyu101/fix-kinetic
Sage Weil [Mon, 1 Dec 2014 17:10:17 +0000 (09:10 -0800)]
Merge pull request #3046 from yuyuyu101/fix-kinetic

KnieticStore: add necessary header file

Reviewed-by: Sage Weil <sage@redhat.com>
10 years agoMerge pull request #2922 from ceph/wip-da-SCA-20141111
Samuel Just [Mon, 1 Dec 2014 17:08:13 +0000 (09:08 -0800)]
Merge pull request #2922 from ceph/wip-da-SCA-20141111

Coverity fixes

Reviewed-by: Sage Weil <sage@redhat.com>
10 years agoMerge pull request #2937 from simon3z/master
Samuel Just [Mon, 1 Dec 2014 17:07:38 +0000 (09:07 -0800)]
Merge pull request #2937 from simon3z/master

common: do not unlock rwlock on destruction

Reviewed-by: Samuel Just <sjust@redhat.com>
Reviewed-by: Sage Weil <sage@redhat.com>
10 years agoMerge pull request #2788 from ceph/wip-warn-max-pg
Samuel Just [Mon, 1 Dec 2014 17:05:04 +0000 (09:05 -0800)]
Merge pull request #2788 from ceph/wip-warn-max-pg

mon: warn when there are too many pgs per osd

Reviewed-by: Joao Eduardo Luis <joao@redhat.com>
Reviewed-by: Samuel Just <sjust@redhat.com>
10 years agoMerge pull request #2735 from ceph/wip-pg-stat
Samuel Just [Mon, 1 Dec 2014 17:00:06 +0000 (09:00 -0800)]
Merge pull request #2735 from ceph/wip-pg-stat

mon: make 'pg stat -f json' not pg dump; make JSON dump of floats floats and not strings

Reviewed-by: Samuel Just <sjust@redhat.com>
10 years agoKnieticStore: add necessary header file 3046/head
Haomai Wang [Mon, 1 Dec 2014 14:24:45 +0000 (22:24 +0800)]
KnieticStore: add necessary header file

Signed-off-by: Haomai Wang <haomaiwang@gmail.com>
10 years agoMerge pull request #2855 from ceph/wip-9881
John Spray [Mon, 1 Dec 2014 12:20:44 +0000 (12:20 +0000)]
Merge pull request #2855 from ceph/wip-9881

#9881 MDS flush journal asok command

Reviewed-by: Yan, Zheng <zyan@redhat.com>
10 years agomds: implement "flush journal" asok 2855/head
John Spray [Fri, 31 Oct 2014 12:41:18 +0000 (12:41 +0000)]
mds: implement "flush journal" asok

Start a new segment and flush everything older
to the backing store.

Signed-off-by: John Spray <john.spray@redhat.com>
10 years agomds: in segment expiry, use end instead of start
John Spray [Mon, 3 Nov 2014 12:39:56 +0000 (12:39 +0000)]
mds: in segment expiry, use end instead of start

Previously we were always leaving the last log
segment un-expired from Journaler's POV, because
we were updating expire_pos to the *start* of the
expired journal segment instead of the *end*.

This was harmless, but cleaning it up makes it
easier to see what's going on during journal flushes
in testing.

Signed-off-by: John Spray <john.spray@redhat.com>
10 years agomds: fix MDLog I/O callback without finisher
John Spray [Thu, 20 Nov 2014 14:27:27 +0000 (14:27 +0000)]
mds: fix MDLog I/O callback without finisher

This could deadlock if another caller was waiting
on a write_head callback while holding mds_lock.

Signed-off-by: John Spray <john.spray@redhat.com>
10 years agoMerge pull request #3037 from stiopaa1/cleanup
Loic Dachary [Sun, 30 Nov 2014 22:31:17 +0000 (23:31 +0100)]
Merge pull request #3037 from stiopaa1/cleanup

added some consts, some cleanup

Reviewed-by: Loic Dachary <ldachary@redhat.com>
10 years agoadded consts, cleanup 3037/head
Michal Jarzabek [Sun, 30 Nov 2014 20:18:25 +0000 (20:18 +0000)]
added consts, cleanup
Signed-off-by: Michal Jarzabek <stiopa@gmail.com>
10 years agoMerge pull request #3019 from theanalyst/doc/typo/ceph-auth
Loic Dachary [Sun, 30 Nov 2014 09:23:43 +0000 (10:23 +0100)]
Merge pull request #3019 from theanalyst/doc/typo/ceph-auth

doc: minor fix in ceph-authtool man page

Reviewed-by: Loic Dachary <ldachary@redhat.com>
10 years agoMerge pull request #3023 from ktdreyer/rpm-rbd-replay-prep-conditional
Loic Dachary [Sun, 30 Nov 2014 09:18:26 +0000 (10:18 +0100)]
Merge pull request #3023 from ktdreyer/rpm-rbd-replay-prep-conditional

rpm: unconditionally package rbd-replay-prep(8)

Reviewed-by: Adam Crume <adamcrume@gmail.com>
10 years agodoc: minor fix in ceph-authtool man page 3019/head
Abhishek Lekshmanan [Wed, 26 Nov 2014 16:13:10 +0000 (21:43 +0530)]
doc: minor fix in ceph-authtool man page

Signed-off-by: Abhishek Lekshmanan <abhishek.lekshmanan@gmail.com>
10 years agoMerge pull request #3032 from dachary/wip-osd-log-cosmetics
Loic Dachary [Fri, 28 Nov 2014 23:04:49 +0000 (00:04 +0100)]
Merge pull request #3032 from dachary/wip-osd-log-cosmetics

osd: log message content cosmetics

Reviewed-by: Sahid Orentino Ferdjaoui <sahid.ferdjaoui@redhat.com>
10 years agoosd: log message content cosmetics 3032/head
Loic Dachary [Fri, 28 Nov 2014 15:20:00 +0000 (16:20 +0100)]
osd: log message content cosmetics

Signed-off-by: Loic Dachary <ldachary@redhat.com>
10 years agoMerge pull request #2769 from ceph/wip-9557
John Spray [Fri, 28 Nov 2014 12:59:29 +0000 (12:59 +0000)]
Merge pull request #2769 from ceph/wip-9557

mds: verify backtrace when fetching dirfrag

Reviewed-by: John Spray <john.spray@redhat.com>
10 years agoMerge pull request #3027 from majianpeng/fix1
Loic Dachary [Fri, 28 Nov 2014 07:12:50 +0000 (08:12 +0100)]
Merge pull request #3027 from majianpeng/fix1

Add "make check" dep python-virtualenv in deps.rpm.txt

Reviewed-by: Loic Dachary <ldachary@redhat.com>
10 years agoAdd "make check" dep python-virtualenv in deps.rpm.txt 3027/head
Jianpeng Ma [Fri, 28 Nov 2014 06:24:58 +0000 (14:24 +0800)]
Add "make check" dep python-virtualenv in deps.rpm.txt

In fedora20, When 'make  check' and met those error messages:
/src/test/run-cli-tests: virtualenv not installed, skipping python-using
tests.

Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
10 years agoMerge pull request #3025 from majianpeng/fix1
Loic Dachary [Thu, 27 Nov 2014 08:56:03 +0000 (09:56 +0100)]
Merge pull request #3025 from majianpeng/fix1

Add isa-erasure yasm dep for deps.rpm.txt

Reviewed-by: Loic Dachary <ldachary@redhat.com>
10 years agoAdd isa-erasure yasm dep for deps.rpm.txt 3025/head
Jianpeng Ma [Thu, 27 Nov 2014 07:11:09 +0000 (15:11 +0800)]
Add isa-erasure yasm dep for deps.rpm.txt

Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
10 years agorpm: unconditionally package rbd-replay-prep(8) 3023/head
Ken Dreyer [Wed, 26 Nov 2014 23:49:53 +0000 (16:49 -0700)]
rpm: unconditionally package rbd-replay-prep(8)

The build system will conditionally build and install the
rbd-replay-prep utility based on the presence of lttng.

Commit 230c5b8e7f58e2e8be32c3f31c6abcc5bdabc5ca adjusted the RPM
packaging so that we only package and ship the rbd-replay-prep utility
and its man page when we're on a platform that has lttng.

The problem is that this is only half-correct. The build system
unconditionally installs the man page for rbd-replay-prep, regardless of
whether lttng was present or absent, and (by extension,) without regard
for whether we've built and installed the rbd-replay-prep binary or not.

We have two options: either the build system should be adjusted to
conditionally skip installing rbd-replay-prep(8), or else we should just
adjust the RPM packaging to always ship the man page. This commit does
the latter.

Backport: firefly
Signed-off-by: Ken Dreyer <kdreyer@redhat.com>
10 years agoMerge pull request #3022 from leseb/fix-opts
Loic Dachary [Wed, 26 Nov 2014 21:37:31 +0000 (22:37 +0100)]
Merge pull request #3022 from leseb/fix-opts

Minor typos and trailing spaces

Reviewed-by: Loic Dachary <ldachary@redhat.com>
10 years agoMinor typos and trailing spaces 3022/head
Sébastien Han [Wed, 26 Nov 2014 21:33:31 +0000 (22:33 +0100)]
Minor typos and trailing spaces

Fix typos and trailing spaces.

Signed-off-by: Sébastien Han <sebastien.han@enovance.com>
10 years agoMerge pull request #3016 from yuyuyu101/fix-kinetic-support
Josh Durgin [Wed, 26 Nov 2014 19:30:16 +0000 (11:30 -0800)]
Merge pull request #3016 from yuyuyu101/fix-kinetic-support

KineticStore: Fix compile error and add _test_init

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
10 years agoKineticStore: Fix compile error and add _test_init 3016/head
Haomai Wang [Wed, 26 Nov 2014 12:37:53 +0000 (20:37 +0800)]
KineticStore: Fix compile error and add _test_init

Signed-off-by: Haomai Wang <haomaiwang@gmail.com>
10 years agoMerge pull request #2995 from nilamdyuti/wip-doc-ceph-disk
Loic Dachary [Wed, 26 Nov 2014 18:24:56 +0000 (19:24 +0100)]
Merge pull request #2995 from nilamdyuti/wip-doc-ceph-disk

doc: Adds man page for ceph-disk utility.

Reviewed-by: Loic Dachary <ldachary@redhat.com>
10 years agoMerge pull request #3021 from tchaikov/wip-fix-typos
Loic Dachary [Wed, 26 Nov 2014 18:21:18 +0000 (19:21 +0100)]
Merge pull request #3021 from tchaikov/wip-fix-typos

doc: fix some typos in ObjectStore.h

Reviewed-by: Loic Dachary <ldachary@redhat.com>
10 years agodoc: fix some typos in ObjectStore.h 3021/head
Kefu Chai [Wed, 26 Nov 2014 18:03:27 +0000 (02:03 +0800)]
doc: fix some typos in ObjectStore.h

Signed-off-by: Kefu Chai <tchaikov@gmail.com>
10 years agodoc: Adds the updated man page for ceph-disk utility. 2995/head
Nilamdyuti Goswami [Wed, 26 Nov 2014 16:51:32 +0000 (22:21 +0530)]
doc: Adds the updated man page for ceph-disk utility.

Signed-off-by: Nilamdyuti Goswami <ngoswami@redhat.com>
10 years agodoc: Updates the man page for ceph-disk utility with some changes.
Nilamdyuti Goswami [Wed, 26 Nov 2014 16:49:01 +0000 (22:19 +0530)]
doc: Updates the man page for ceph-disk utility with some changes.

Signed-off-by: Nilamdyuti Goswami <ngoswami@redhat.com>
10 years agoMerge pull request #3011 from stiopaa1/someConsts
Loic Dachary [Tue, 25 Nov 2014 23:20:24 +0000 (00:20 +0100)]
Merge pull request #3011 from stiopaa1/someConsts

added some consts

Reviewed-by: Loic Dachary <ldachary@redhat.com>
10 years agoadded some consts 3011/head
Michal Jarzabek [Tue, 25 Nov 2014 20:58:04 +0000 (20:58 +0000)]
added some consts
Signed-off-by: Michal Jarzabek <stiopa@gmail.com>
10 years agodoc: Adds man page for ceph-disk utility.
Nilamdyuti Goswami [Tue, 25 Nov 2014 15:53:08 +0000 (21:23 +0530)]
doc: Adds man page for ceph-disk utility.

Signed-off-by: Nilamdyuti Goswami <ngoswami@redhat.com>
10 years agodoc: Removes ceph-deploy usage instances from ceph-disk man page.
Nilamdyuti Goswami [Tue, 25 Nov 2014 15:46:16 +0000 (21:16 +0530)]
doc: Removes ceph-deploy usage instances from ceph-disk man page.

Signed-off-by: Nilamdyuti Goswami <ngoswami@redhat.com>
10 years agoMerge pull request #3003 from dachary/wip-10185-neon 3017/head
Loic Dachary [Tue, 25 Nov 2014 13:14:20 +0000 (14:14 +0100)]
Merge pull request #3003 from dachary/wip-10185-neon

arch: fix neon feature detection

Reviewed-by: Sahid Orentino Ferdjaoui <sahid.ferdjaoui@redhat.com>
10 years agoarch: fix neon feature detection 3003/head
Loic Dachary [Tue, 25 Nov 2014 09:39:21 +0000 (10:39 +0100)]
arch: fix neon feature detection

The fread function returns the number of elements read, not the number
of bytes.

Introduced by 1cef8339f7a2a503327c20c014e696c91d36281e , after giant.

Add tests for protection against similar regressions.

http://tracker.ceph.com/issues/10185 Fixes: #10185

Signed-off-by: Loic Dachary <ldachary@redhat.com>
10 years agoMerge pull request #3002 from thesues/fix-init
Loic Dachary [Tue, 25 Nov 2014 11:07:37 +0000 (12:07 +0100)]
Merge pull request #3002 from thesues/fix-init

Remove pidfile and asok after stopping ceph

Reviewed-by: Loic Dachary <ldachary@redhat.com>
10 years agoRemove pidfile and asok after stopping ceph 3002/head
Dongmao Zhang [Tue, 25 Nov 2014 07:34:46 +0000 (15:34 +0800)]
Remove pidfile and asok after stopping ceph

Signed-off-by: Dongmao Zhang <deanraccoon@gmail.com>
10 years agoMerge pull request #2872 from dachary/wip-10018-primary-erasure-code-hinfo
David Zafman [Mon, 24 Nov 2014 21:26:21 +0000 (13:26 -0800)]
Merge pull request #2872 from dachary/wip-10018-primary-erasure-code-hinfo

osd: erasure code deep scrub must not abort if hinfo is missing

Reviewed-by: David Zafman <dzafman@redhat.com>
10 years agoMerge pull request #2984 from stiopaa1/includeFix
Sage Weil [Mon, 24 Nov 2014 20:47:43 +0000 (12:47 -0800)]
Merge pull request #2984 from stiopaa1/includeFix

remove unneeded include file

Reviewed-by: Sage Weil <sage@redhat.com>
10 years agodoc: Updates man page for ceph-disk utility.
Nilamdyuti Goswami [Mon, 24 Nov 2014 20:36:39 +0000 (02:06 +0530)]
doc: Updates man page for ceph-disk utility.

Signed-off-by: Nilamdyuti Goswami <ngoswami@redhat.com>
10 years agoremove unneeded include file 2984/head
Michal Jarzabek [Sun, 23 Nov 2014 20:42:20 +0000 (20:42 +0000)]
remove unneeded include file

Signed-off-by: Michal Jarzabek <stiopa@gmail.com>
10 years agoMerge pull request #2998 from theanalyst/doc/rgw-s3-bucket-loc
John Wilkins [Mon, 24 Nov 2014 19:35:26 +0000 (11:35 -0800)]
Merge pull request #2998 from theanalyst/doc/rgw-s3-bucket-loc

doc: rgw document s3 bucket location features.

Reviewed-by: John Wilkins <jowilkin@redhat.com>
10 years agodoc: rgw document s3 bucket location features 2998/head
Abhishek Lekshmanan [Mon, 24 Nov 2014 17:27:44 +0000 (22:57 +0530)]
doc: rgw document s3 bucket location features

Fixes: #10142
Reported-by: Neil Levine <nlevine@redhat.com>
Signed-off-by: Abhishek Lekshmanan <abhishek.lekshmanan@ril.com>
10 years agodoc: Adds man page for ceph-disk utility.
Nilamdyuti Goswami [Mon, 24 Nov 2014 16:35:11 +0000 (22:05 +0530)]
doc: Adds man page for ceph-disk utility.

Signed-off-by: Nilamdyuti Goswami <ngoswami@redhat.com>
10 years agoMerge pull request #2992 from dachary/wip-10173-autogen
Sage Weil [Mon, 24 Nov 2014 15:33:59 +0000 (07:33 -0800)]
Merge pull request #2992 from dachary/wip-10173-autogen

autogen.sh: git submodule sync

Reviewed-by: Sage Weil <sage@redhat.com>
10 years agoautogen.sh: git submodule sync 2992/head
Loic Dachary [Mon, 24 Nov 2014 11:35:50 +0000 (12:35 +0100)]
autogen.sh: git submodule sync

It is not enough to git submodule update on a existing git clone: if the
URL of the repository has been changed, the

   git submodule sync

command must be called to synchronizes submodules' remote URL
configuration setting to the value specified in .gitmodules.

http://tracker.ceph.com/issues/10173 Fixes: #10173

Signed-off-by: Loic Dachary <ldachary@redhat.com>
10 years agoMerge pull request #2936 from ceph/wip-mailmap
Loic Dachary [Mon, 24 Nov 2014 07:27:51 +0000 (08:27 +0100)]
Merge pull request #2936 from ceph/wip-mailmap

Update Inktank attribution to point to Red Hat

Reviewed-by: Loic Dachary <ldachary@redhat.com>
10 years agomailmap: Update Warren Usui's attribution to Red Hat 2936/head
Greg Farnum [Fri, 14 Nov 2014 22:17:38 +0000 (14:17 -0800)]
mailmap: Update Warren Usui's attribution to Red Hat

Signed-off-by: Greg Farnum <gfarnum@redhat.com>
10 years agomailmap: Update Tyler Brekke's attribution to Red Hat
Greg Farnum [Fri, 14 Nov 2014 22:16:56 +0000 (14:16 -0800)]
mailmap: Update Tyler Brekke's attribution to Red Hat

Signed-off-by: Greg Farnum <gfarnum@redhat.com>
10 years agomailmap: Update Tamil Muthamizhan's attribution to Red Hat
Greg Farnum [Fri, 14 Nov 2014 22:16:00 +0000 (14:16 -0800)]
mailmap: Update Tamil Muthamizhan's attribution to Red Hat

Signed-off-by: Greg Farnum <gfarnum@redhat.com>
10 years agomailmap: Update Sandon Van Ness' attribution to Red Hat
Greg Farnum [Fri, 14 Nov 2014 22:14:16 +0000 (14:14 -0800)]
mailmap: Update Sandon Van Ness' attribution to Red Hat

Signed-off-by: Greg Farnum <gfarnum@redhat.com>
10 years agomailmap: Update Samuel Just's attribution to Red Hat
Greg Farnum [Fri, 14 Nov 2014 22:12:00 +0000 (14:12 -0800)]
mailmap: Update Samuel Just's attribution to Red Hat

Signed-off-by: Greg Farnum <gfarnum@redhat.com>
10 years agomailmap: Update Patrick McGarry's attribution to Red Hat
Greg Farnum [Fri, 14 Nov 2014 22:09:38 +0000 (14:09 -0800)]
mailmap: Update Patrick McGarry's attribution to Red Hat

Signed-off-by: Greg Farnum <gfarnum@redhat.com>
10 years agomailmap: Update Noah Watkins' attribution to Red Hat
Greg Farnum [Fri, 14 Nov 2014 22:07:07 +0000 (14:07 -0800)]
mailmap: Update Noah Watkins' attribution to Red Hat

Signed-off-by: Greg Farnum <gfarnum@redhat.com>
10 years agomailmap: Update Neil Levine's attribution to Red Hat
Greg Farnum [Fri, 14 Nov 2014 22:06:19 +0000 (14:06 -0800)]
mailmap: Update Neil Levine's attribution to Red Hat

Signed-off-by: Greg Farnum <gfarnum@redhat.com>
10 years agomailmap: Update Mark Nelson's attribution to Red Hat
Greg Farnum [Fri, 14 Nov 2014 22:06:05 +0000 (14:06 -0800)]
mailmap: Update Mark Nelson's attribution to Red Hat

Signed-off-by: Greg Farnum <gfarnum@redhat.com>
10 years agomailmap: Update Ken Dreyer's attribution to Red Hat
Greg Farnum [Fri, 14 Nov 2014 22:04:26 +0000 (14:04 -0800)]
mailmap: Update Ken Dreyer's attribution to Red Hat

Signed-off-by: Greg Farnum <gfarnum@redhat.com>
10 years agomailmap: Update Josh Durgin's attribution to Red Hat
Greg Farnum [Fri, 14 Nov 2014 22:01:35 +0000 (14:01 -0800)]
mailmap: Update Josh Durgin's attribution to Red Hat

Signed-off-by: Greg Farnum <gfarnum@redhat.com>
10 years agomailmap: Update John Wilkins' attribution to Red Hat
Greg Farnum [Fri, 14 Nov 2014 22:01:23 +0000 (14:01 -0800)]
mailmap: Update John Wilkins' attribution to Red Hat

Signed-off-by: Greg Farnum <gfarnum@redhat.com>
10 years agomailmap: Update Joao Luis' attribution to Red Hat
Greg Farnum [Fri, 14 Nov 2014 21:57:53 +0000 (13:57 -0800)]
mailmap: Update Joao Luis' attribution to Red Hat

Signed-off-by: Greg Farnum <gfarnum@redhat.com>
10 years agomailmap: Update Ilya Dryomov's attribution to Red Hat
Greg Farnum [Fri, 14 Nov 2014 21:53:39 +0000 (13:53 -0800)]
mailmap: Update Ilya Dryomov's attribution to Red Hat

Signed-off-by: Greg Farnum <gfarnum@redhat.com>
10 years agomailmap: Update Dan Mick's attribution
Greg Farnum [Fri, 14 Nov 2014 21:51:10 +0000 (13:51 -0800)]
mailmap: Update Dan Mick's attribution

Point his addresses at Red Hat now, but revert the Inktank->Redhat mappings
so we have more historical accuracy.

Signed-off-by: Greg Farnum <gfarnum@redhat.com>
10 years agomailmap: Update Alfredo Deza's attribution to Red Hat
Greg Farnum [Fri, 14 Nov 2014 21:50:22 +0000 (13:50 -0800)]
mailmap: Update Alfredo Deza's attribution to Red Hat

Signed-off-by: Greg Farnum <gfarnum@redhat.com>
10 years agomailmap: Update Greg Farnum's attribution to Red Hat
Greg Farnum [Fri, 14 Nov 2014 21:41:20 +0000 (13:41 -0800)]
mailmap: Update Greg Farnum's attribution to Red Hat

Signed-off-by: Greg Farnum <gfarnum@redhat.com>
10 years agoMerge remote-tracking branch 'gh/next'
Sage Weil [Mon, 24 Nov 2014 02:55:32 +0000 (18:55 -0800)]
Merge remote-tracking branch 'gh/next'

10 years agoMerge pull request #2983 from tchaikov/wip-fix-lock-dep
Sage Weil [Sun, 23 Nov 2014 20:59:42 +0000 (12:59 -0800)]
Merge pull request #2983 from tchaikov/wip-fix-lock-dep

lockdep: do not use $CEPH_LOCKDEP for g_lockdep

Reviewed-by: Sage Weil <sage@redhat.com>
10 years agolockdep: do not use $CEPH_LOCKDEP for g_lockdep 2983/head
Kefu Chai [Sun, 23 Nov 2014 19:12:24 +0000 (03:12 +0800)]
lockdep: do not use $CEPH_LOCKDEP for g_lockdep

* a non-zero CEPH_LOCKDEP brings ceph down because g_lockdep_ceph_ctx
  is still being constructed when dout_impl() dereferences it.
* fix a typo in comment.
* remove dead code.

Signed-off-by: Kefu Chai <tchaikov@gmail.com>
10 years agorgw-admin: create subuser if needed when creating user
Yehuda Sadeh [Thu, 20 Nov 2014 18:36:05 +0000 (10:36 -0800)]
rgw-admin: create subuser if needed when creating user

Fixes: #10103
Backport: firefly, giant
This turned up after fixing #9973. Earlier we also didn't create the
subuser in this case, but we didn't really read the subuser info when it
was authenticating. Now we do that as required, so we end up failing the
authentication. This only applies to cases where a subuser was created
using 'user create', and not the 'subuser create' command.

Reviewed-by: Sage Weil <sage@redhat.com>
Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
10 years agoMerge pull request #2895 from yuyuyu101/wip-10022
Samuel Just [Sat, 22 Nov 2014 00:18:25 +0000 (16:18 -0800)]
Merge pull request #2895 from yuyuyu101/wip-10022

AsyncMessenger: Fix several problems

Reviewed-by: Sage Weil <sage@redhat.com>
10 years agoMerge pull request #2980 from ceph/wip-10123
Josh Durgin [Fri, 21 Nov 2014 22:35:24 +0000 (14:35 -0800)]
Merge pull request #2980 from ceph/wip-10123

librbd: protect list_children from invalid child pool IoCtxs

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
10 years agoMerge pull request #2981 from yuyuyu101/quick-fix
Haomai Wang [Fri, 21 Nov 2014 09:27:10 +0000 (17:27 +0800)]
Merge pull request #2981 from yuyuyu101/quick-fix

GenericObjectMap: Avoid master branch compile error

10 years agoGenericObjectMap: Fix typo 2981/head
Haomai Wang [Fri, 21 Nov 2014 09:25:06 +0000 (17:25 +0800)]
GenericObjectMap: Fix typo

Signed-off-by: Haomai Wang <haomaiwang@gmail.com>
10 years agoMerge pull request #2966 from yuyuyu101/wip-10119
Sage Weil [Fri, 21 Nov 2014 05:41:23 +0000 (21:41 -0800)]
Merge pull request #2966 from yuyuyu101/wip-10119

KeyValueStore: Fix EC+ KV OSDs crashing

Reviewed-by: Sage Weil <sage@redhat.com>
10 years agoMerge pull request #2978 from majianpeng/fix4
Sage Weil [Fri, 21 Nov 2014 04:51:38 +0000 (20:51 -0800)]
Merge pull request #2978 from majianpeng/fix4

blkdev: using strncpy instead of strcpy.

Reviewed-by: Sage Weil <sage@redhat.com>
10 years agoblkdev: using strncpy instead of strcpy. 2978/head
Jianpeng Ma [Fri, 21 Nov 2014 01:55:02 +0000 (09:55 +0800)]
blkdev: using strncpy instead of strcpy.

Coverity Scan reported this bug:
> New defect(s) Reported-by: Coverity Scan Showing 1 of 1 defect(s)
> *** CID 1255369:  Copy into fixed size buffer  (STRING_OVERFLOW)
> /common/blkdev.cc: 34 in block_device_support_discard(const char *)()
> 28     bool block_device_support_discard(const char *devname)
> 29     {
> 30       bool can_trim = false;
> 31       char *p = strstr((char *)devname, "sd");
> 32       char name[32] = {0};
> 33
> >>>     CID 1255369:  Copy into fixed size buffer  (STRING_OVERFLOW)
> >>>     You might overrun the 32 byte fixed-size string "name" by
> >>>     copying "p" without checking the length.
> 34       strcpy(name, p);
> 35       for (unsigned int i = 0; i < strlen(name); i++) {
> 36         if(isdigit(name[i])) {
> 37           name[i] = 0;
> 38           break;
> 39         }
>

Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
10 years agoMerge pull request #2974 from ceph/wip-sepia-update
Sage Weil [Thu, 20 Nov 2014 19:34:36 +0000 (11:34 -0800)]
Merge pull request #2974 from ceph/wip-sepia-update

Updated sepia hardware list.

10 years agoUpdated sepia hardware list. 2974/head
Sandon Van Ness [Thu, 20 Nov 2014 19:13:38 +0000 (11:13 -0800)]
Updated sepia hardware list.

Added missing details and additional list of hardware.

Signed-off-by: Sandon Van Ness <sandon@redhat.com>
10 years agoMerge pull request #2752 from dachary/wip-9817-deep-scrub-start
Samuel Just [Thu, 20 Nov 2014 17:45:33 +0000 (09:45 -0800)]
Merge pull request #2752 from dachary/wip-9817-deep-scrub-start

osd: log when scrub,deep scrub, repair starts

Reviewed-by: Samuel Just <sjust@redhat.com>
10 years agoMerge pull request #2891 from XinzeChi/master
Samuel Just [Thu, 20 Nov 2014 17:44:09 +0000 (09:44 -0800)]
Merge pull request #2891 from XinzeChi/master

OSD: batch trim for pg_log

Reviewed-by: Samuel Just <sjust@redhat.com>
Reviewed-by: Sage Weil <sage@redhat.com>
10 years agoMerge pull request #2885 from ceph/wip-flush-snaps
Samuel Just [Thu, 20 Nov 2014 17:42:47 +0000 (09:42 -0800)]
Merge pull request #2885 from ceph/wip-flush-snaps

osd/ReplicatedPG: flush snaps immediately

Reviewed-by: Samuel Just <sjust@redhat.com>
10 years agoMerge pull request #2973 from wonzhq/unused-parm
Loic Dachary [Thu, 20 Nov 2014 10:19:37 +0000 (11:19 +0100)]
Merge pull request #2973 from wonzhq/unused-parm

ReplicatedPG: remove unused parameter in function write_update_size_and_usage

Reviewed-by: Loic Dachary <ldachary@redhat.com>
10 years agoReplicatedPG: remove unused parameter in function write_update_size_and_usage 2973/head
Zhiqiang Wang [Thu, 20 Nov 2014 08:26:32 +0000 (16:26 +0800)]
ReplicatedPG: remove unused parameter in function write_update_size_and_usage

Signed-off-by: Zhiqiang Wang <zhiqiang.wang@intel.com>
10 years agomds: store backtrace for straydir 2769/head
Yan, Zheng [Fri, 7 Nov 2014 03:38:37 +0000 (11:38 +0800)]
mds: store backtrace for straydir

Signed-off-by: Yan, Zheng <zyan@redhat.com>
10 years agomds: verify backtrace when fetching dirfrag
Yan, Zheng [Tue, 21 Oct 2014 18:02:21 +0000 (18:02 +0000)]
mds: verify backtrace when fetching dirfrag

Fixes: #9557
Signed-off-by: Yan, Zheng <zyan@redhat.com>
10 years agoKeyValueStore: Fix parse_header_key 2966/head
Haomai Wang [Thu, 20 Nov 2014 03:03:17 +0000 (11:03 +0800)]
KeyValueStore: Fix parse_header_key

Signed-off-by: Haomai Wang <haomaiwang@gmail.com>
10 years agoosd: deep scrub must not abort if hinfo is missing 2872/head
Loic Dachary [Thu, 6 Nov 2014 16:11:20 +0000 (17:11 +0100)]
osd: deep scrub must not abort if hinfo is missing

Instead it should set read_error.

http://tracker.ceph.com/issues/10018 Fixes: #10018

Signed-off-by: Loic Dachary <loic-201408@dachary.org>
10 years agoMerge pull request #2926 from ceph/wip-10052
Samuel Just [Wed, 19 Nov 2014 19:49:07 +0000 (11:49 -0800)]
Merge pull request #2926 from ceph/wip-10052

ceph_test_rados_api_tier: fix whiteout cleanup (10052)

Reviewed-by: Samuel Just <sjust@redhat.com>
10 years agoMerge pull request #2967 from ceph/wip-10077
David Zafman [Wed, 19 Nov 2014 19:37:22 +0000 (11:37 -0800)]
Merge pull request #2967 from ceph/wip-10077

ceph_objectstore_tool shard feature handling

Reviewed-by: Loic Dachary <ldachary@redhat.com>
10 years agoMerge pull request #2971 from dachary/wip-mailmap
Loic Dachary [Wed, 19 Nov 2014 19:30:38 +0000 (20:30 +0100)]
Merge pull request #2971 from dachary/wip-mailmap

mailmap: Loic Dachary name normalization

10 years agomailmap: Loic Dachary name normalization 2971/head
Loic Dachary [Wed, 19 Nov 2014 19:25:24 +0000 (20:25 +0100)]
mailmap: Loic Dachary name normalization

Signed-off-by: Loic Dachary <ldachary@redhat.com>
10 years agoMerge pull request #2962 from ceph/wip-9439
Loic Dachary [Wed, 19 Nov 2014 18:27:15 +0000 (19:27 +0100)]
Merge pull request #2962 from ceph/wip-9439

osd: Check filter ops for pgls and pgnls

Reviewed-by: Loic Dachary <ldachary@dachary.org>
10 years agoMerge pull request #2969 from dachary/wip-erasure-code-documentation
Loic Dachary [Wed, 19 Nov 2014 10:24:01 +0000 (11:24 +0100)]
Merge pull request #2969 from dachary/wip-erasure-code-documentation

doc: erasure-code developer documentation typo

Reviewed-by: Pavan Rallabhandi <Pavan.Rallabhandi@sandisk.com>
10 years agodoc: erasure-code developer documentation typo 2969/head
Loic Dachary [Wed, 19 Nov 2014 10:06:31 +0000 (11:06 +0100)]
doc: erasure-code developer documentation typo

Reported-by: Pavan Rallabhandi <Pavan.Rallabhandi@sandisk.com>
Signed-off-by: Loic Dachary <ldachary@redhat.com>
10 years agoStoreTest: Add scrub situation to tests
Haomai Wang [Wed, 19 Nov 2014 06:42:39 +0000 (14:42 +0800)]
StoreTest: Add scrub situation to tests

Signed-off-by: Haomai Wang <haomaiwang@gmail.com>
10 years agoKeyValueStore: Add KEY_ENDING sign to the end of key
Haomai Wang [Wed, 19 Nov 2014 06:34:52 +0000 (14:34 +0800)]
KeyValueStore: Add KEY_ENDING sign to the end of key

Keys stored in alphabetical order and need to follow ghobject_t comparison
rule. "generation" and "shard_id" are optional fields for object key, but
a default ghobject with UINT64_MAX generation(by default) will larger than
the same ghobject with other generation. GenericObjectMap rejects to store
generation if generation is UINT64_MAX in order to reduce too much words
in key. So we need to add a MAX sign to the end of key to make ordering
is same with ghobject's comparison rule.

For example:

_GHOBJTOSEQ_:1%e1ds0_head!D168A7E8!!1!!benchmark_last_metadata!head
_GHOBJTOSEQ_:1%e1ds0_head!D168A7E8!!1!!benchmark_last_metadata!head!78!0

The first key should larger than the second in ghobject_t ordering because
of generation. But the first key less than the second in GenericObjectMap.

_GHOBJTOSEQ_:1%e1ds0_head!D168A7E8!!1!!benchmark_last_metadata!head
_GHOBJTOSEQ_:1%e1ds0_head!D168A7E8!!1!!benchmark_last_metadata!head!78!0

After we add KEY_ENDING, '!' is (21) in hexadecimal:

_GHOBJTOSEQ_:1%e1ds0_head!D168A7E8!!1!!benchmark_last_metadata!head(21)78!0(FF)
_GHOBJTOSEQ_:1%e1ds0_head!D168A7E8!!1!!benchmark_last_metadata!head(FF)

Fix bug #10119
Signed-off-by: Haomai Wang <haomaiwang@gmail.com>