]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
10 years agorgw: improve format of X-Timestamp on Swift objects. 3795/head
Radoslaw Zarzynski [Wed, 25 Feb 2015 15:12:58 +0000 (16:12 +0100)]
rgw: improve format of X-Timestamp on Swift objects.

Backport: hammer
Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
10 years agorgw: add support for X-Timestamp on Swift containers.
Radoslaw Zarzynski [Wed, 25 Feb 2015 13:11:40 +0000 (14:11 +0100)]
rgw: add support for X-Timestamp on Swift containers.

Fixes: #10938
Backport: hammer
Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
10 years agoMerge pull request #3757 from theanalyst/0.93/contributors
Loic Dachary [Wed, 25 Feb 2015 10:34:12 +0000 (11:34 +0100)]
Merge pull request #3757 from theanalyst/0.93/contributors

mailmap updates

Reviewed-by: Loic Dachary <ldachary@redhat.com>
10 years agomailmap: Kefu Chai affiliation 3757/head
Abhishek Lekshmanan [Thu, 19 Feb 2015 09:51:04 +0000 (15:21 +0530)]
mailmap: Kefu Chai affiliation

Signed-off-by: Abhishek Lekshmanan <abhishek.lekshmanan@ril.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
10 years agomailmap: Andy Allan affiliation
Abhishek Lekshmanan [Thu, 19 Feb 2015 17:00:17 +0000 (22:30 +0530)]
mailmap: Andy Allan affiliation

Signed-off-by: Abhishek Lekshmanan <abhishek.lekshmanan@ril.com>
10 years agomailmap: Anis Ayari affiliation
Abhishek Lekshmanan [Thu, 19 Feb 2015 14:13:12 +0000 (19:43 +0530)]
mailmap: Anis Ayari affiliation

Signed-off-by: Abhishek Lekshmanan <abhishek.lekshmanan@ril.com>
Reviewed-by: Loic Dachary <loic@dachary.org>
10 years agomailmap: Armando Segnini affiliation
Abhishek Lekshmanan [Thu, 19 Feb 2015 14:09:30 +0000 (19:39 +0530)]
mailmap: Armando Segnini affiliation

Signed-off-by: Abhishek Lekshmanan <abhishek.lekshmanan@ril.com>
10 years agomailmap: Billy Olsen affiliation
Abhishek Lekshmanan [Thu, 19 Feb 2015 14:08:54 +0000 (19:38 +0530)]
mailmap: Billy Olsen affiliation

Signed-off-by: Abhishek Lekshmanan <abhishek.lekshmanan@ril.com>
Reviewed-by: Billy Olsen <billy.olsen@canonical.com>
10 years agomailmap: Ahoussi Armand affiliation
Abhishek Lekshmanan [Thu, 19 Feb 2015 14:07:22 +0000 (19:37 +0530)]
mailmap: Ahoussi Armand affiliation

Signed-off-by: Abhishek Lekshmanan <abhishek.lekshmanan@ril.com>
10 years agomailmap: Hazem Amara affiliation
Abhishek Lekshmanan [Thu, 19 Feb 2015 14:05:08 +0000 (19:35 +0530)]
mailmap: Hazem Amara affiliation

Signed-off-by: Abhishek Lekshmanan <abhishek.lekshmanan@ril.com>
10 years agomailmap: Karel Striegel affiliation
Abhishek Lekshmanan [Thu, 19 Feb 2015 13:59:25 +0000 (19:29 +0530)]
mailmap: Karel Striegel affiliation

Signed-off-by: Abhishek Lekshmanan <abhishek.lekshmanan@ril.com>
10 years agomailmap: Florian Coste affiliation
Abhishek Lekshmanan [Thu, 19 Feb 2015 13:56:06 +0000 (19:26 +0530)]
mailmap: Florian Coste affiliation

Signed-off-by: Abhishek Lekshmanan <abhishek.lekshmanan@ril.com>
10 years agomailmap: Petr Machata affiliation
Abhishek Lekshmanan [Thu, 19 Feb 2015 13:53:36 +0000 (19:23 +0530)]
mailmap: Petr Machata affiliation

Signed-off-by: Abhishek Lekshmanan <abhishek.lekshmanan@ril.com>
10 years agomailmap: Shanggao Qiu affiliation
Abhishek Lekshmanan [Thu, 19 Feb 2015 13:52:10 +0000 (19:22 +0530)]
mailmap: Shanggao Qiu affiliation

Signed-off-by: Abhishek Lekshmanan <abhishek.lekshmanan@ril.com>
10 years agomailmap: Thomas Cantin affiliation
Abhishek Lekshmanan [Thu, 19 Feb 2015 13:48:09 +0000 (19:18 +0530)]
mailmap: Thomas Cantin affiliation

Signed-off-by: Abhishek Lekshmanan <abhishek.lekshmanan@ril.com>
10 years agomailmap: Tim Freund affiliation
Abhishek Lekshmanan [Thu, 19 Feb 2015 13:32:14 +0000 (19:02 +0530)]
mailmap: Tim Freund affiliation

Signed-off-by: Abhishek Lekshmanan <abhishek.lekshmanan@ril.com>
10 years agomailmap: Travis Rhoden affiliation
Abhishek Lekshmanan [Thu, 19 Feb 2015 13:30:06 +0000 (19:00 +0530)]
mailmap: Travis Rhoden affiliation

Signed-off-by: Abhishek Lekshmanan <abhishek.lekshmanan@ril.com>
10 years agomailmap: Kiseleva Alyona affiliation
Abhishek Lekshmanan [Thu, 19 Feb 2015 13:28:54 +0000 (18:58 +0530)]
mailmap: Kiseleva Alyona affiliation

Signed-off-by: Abhishek Lekshmanan <abhishek.lekshmanan@ril.com>
Reviewed-by: Loic Dachary <loic@dachary.org>
10 years agomailmap: Baptiste Veuillez affiliation
Abhishek Lekshmanan [Thu, 19 Feb 2015 13:28:32 +0000 (18:58 +0530)]
mailmap: Baptiste Veuillez affiliation

Signed-off-by: Abhishek Lekshmanan <abhishek.lekshmanan@ril.com>
10 years agomailmap: Viktor Suprun affiliation
Abhishek Lekshmanan [Thu, 19 Feb 2015 13:17:55 +0000 (18:47 +0530)]
mailmap: Viktor Suprun affiliation

Signed-off-by: Abhishek Lekshmanan <abhishek.lekshmanan@ril.com>
10 years agomailmap: Feng He affiliation
Abhishek Lekshmanan [Thu, 19 Feb 2015 13:16:07 +0000 (18:46 +0530)]
mailmap: Feng He affiliation

Signed-off-by: Abhishek Lekshmanan <abhishek.lekshmanan@ril.com>
10 years agomailmap: Jian Wen affiliation
Abhishek Lekshmanan [Thu, 19 Feb 2015 13:14:44 +0000 (18:44 +0530)]
mailmap: Jian Wen affiliation

Signed-off-by: Abhishek Lekshmanan <abhishek.lekshmanan@ril.com>
Reviewed-by: Jian Wen <wenjian@letv.com>
10 years agomailmap: Kim Vandry affiliation
Abhishek Lekshmanan [Thu, 19 Feb 2015 13:10:59 +0000 (18:40 +0530)]
mailmap: Kim Vandry affiliation

Signed-off-by: Abhishek Lekshmanan <abhishek.lekshmanan@ril.com>
10 years agomailmap: Robert Jansen affiliation
Abhishek Lekshmanan [Thu, 19 Feb 2015 13:06:22 +0000 (18:36 +0530)]
mailmap: Robert Jansen affiliation

Signed-off-by: Abhishek Lekshmanan <abhishek.lekshmanan@ril.com>
10 years agomailmap: MingXin Liu affiliation
Abhishek Lekshmanan [Thu, 19 Feb 2015 10:34:51 +0000 (16:04 +0530)]
mailmap: MingXin Liu affiliation

Signed-off-by: Abhishek Lekshmanan <abhishek.lekshmanan@ril.com>
10 years agomailmap: Andrew Bartlett affiliation
Abhishek Lekshmanan [Thu, 19 Feb 2015 10:33:33 +0000 (16:03 +0530)]
mailmap: Andrew Bartlett affiliation

Signed-off-by: Abhishek Lekshmanan <abhishek.lekshmanan@ril.com>
Reviewed-by: Andrew Bartlett <abartlet@catalyst.net.nz>
10 years agoMerge pull request #3787 from ceph/wip-da-SCA-20150219
Sage Weil [Tue, 24 Feb 2015 18:53:21 +0000 (10:53 -0800)]
Merge pull request #3787 from ceph/wip-da-SCA-20150219

SCA fixes

Reviewed-by: Kefu Chai <kchai@redhat.com>
10 years agoCorrected arch diagram signed off by: pmcgarry@redhat.com
Patrick McGarry [Tue, 24 Feb 2015 18:35:38 +0000 (13:35 -0500)]
Corrected arch diagram signed off by: pmcgarry@redhat.com

10 years agotest/librados/misc.cc: fix -Wsign-compare 3787/head
Danny Al-Gaaf [Tue, 24 Feb 2015 16:37:07 +0000 (17:37 +0100)]
test/librados/misc.cc: fix -Wsign-compare

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
10 years agoMerge pull request #3785 from ceph/wip-da-doc-erasure
Loic Dachary [Tue, 24 Feb 2015 14:31:22 +0000 (15:31 +0100)]
Merge pull request #3785 from ceph/wip-da-doc-erasure

doc: add erasure-code-shec to plugin list

Reviewed-by: Loic Dachary <ldachary@redhat.com>
10 years agodoc: add erasure-code-shec to plugin list 3785/head
Danny Al-Gaaf [Tue, 24 Feb 2015 14:10:04 +0000 (15:10 +0100)]
doc: add erasure-code-shec to plugin list

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
10 years agofix build with clang/clang++
Danny Al-Gaaf [Tue, 24 Feb 2015 12:56:31 +0000 (13:56 +0100)]
fix build with clang/clang++

Fix for:

./include/types.h:121:9: error: call to function 'operator<<'
that is neither visible in the template definition nor found
by argument-dependent lookup

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
10 years agoMerge pull request #3784 from Ved-vampir/master
Loic Dachary [Tue, 24 Feb 2015 10:52:59 +0000 (11:52 +0100)]
Merge pull request #3784 from Ved-vampir/master

common: add perf counters description

Reviewed-by: Loic Dachary <ldachary@redhat.com>
10 years agoMerge pull request #3783 from tchaikov/update-doc
Loic Dachary [Tue, 24 Feb 2015 10:49:05 +0000 (11:49 +0100)]
Merge pull request #3783 from tchaikov/update-doc

doc: update doc with latest code

Reviewed-by: Loic Dachary <ldachary@redhat.com>
10 years agocommon: add perf counters description 3784/head
Ved-vampir [Tue, 24 Feb 2015 08:21:38 +0000 (11:21 +0300)]
common: add perf counters description

Signed-off-by: Kiseleva Alyona <akiselyova@mirantis.com>
10 years agoerasure-code/shec/shec.cc: fix resource leak
Danny Al-Gaaf [Tue, 24 Feb 2015 09:50:11 +0000 (10:50 +0100)]
erasure-code/shec/shec.cc: fix resource leak

Free tmpmat in error case. Fix for:

[src/erasure-code/shec/shec.cc:176]: (error) Memory leak: tmpmat

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
10 years agoTestErasureCodeShec_all.cc: prefer ++operator for non-primitive iter
Danny Al-Gaaf [Tue, 24 Feb 2015 09:47:07 +0000 (10:47 +0100)]
TestErasureCodeShec_all.cc: prefer ++operator for non-primitive iter

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
10 years agoosd/osd_types.cc: prefer ++operator for non-primitive iter
Danny Al-Gaaf [Tue, 24 Feb 2015 09:46:17 +0000 (10:46 +0100)]
osd/osd_types.cc: prefer ++operator for non-primitive iter

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
10 years agomon/PGMap.cc: prefer ++operator for non-primitive iter
Danny Al-Gaaf [Tue, 24 Feb 2015 09:45:27 +0000 (10:45 +0100)]
mon/PGMap.cc: prefer ++operator for non-primitive iter

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
10 years agoerasure-code/shec/shec.cc: reduce scope of variables
Danny Al-Gaaf [Tue, 24 Feb 2015 09:43:57 +0000 (10:43 +0100)]
erasure-code/shec/shec.cc: reduce scope of variables

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
10 years agoErasureCodeShec.cc: prefer ++operator for non-primitive iter
Danny Al-Gaaf [Tue, 24 Feb 2015 09:41:44 +0000 (10:41 +0100)]
ErasureCodeShec.cc: prefer ++operator for non-primitive iter

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
10 years agolibradosstriper/striping.cc: fix resource leak
Danny Al-Gaaf [Tue, 24 Feb 2015 08:21:17 +0000 (09:21 +0100)]
libradosstriper/striping.cc: fix resource leak

Fix for:

CID 1221525 (#1 of 1): Resource leak (RESOURCE_LEAK)
 leaked_storage: Failing to save or free storage allocated
 by this->getObjName(soid, 0UL) leaks it.

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
10 years agodoc: update doc with latest code 3783/head
Kefu Chai [Tue, 24 Feb 2015 08:02:08 +0000 (16:02 +0800)]
doc: update doc with latest code

* also silence some warnings of doxygen

Signed-off-by: Kefu Chai <kchai@redhat.com>
10 years agoMerge pull request #3782 from ceph/hadoop-workunits
Gregory Farnum [Tue, 24 Feb 2015 06:35:08 +0000 (22:35 -0800)]
Merge pull request #3782 from ceph/hadoop-workunits

Hadoop workunits

10 years agoMerge pull request #3753 from ceph/wip-10743
Gregory Farnum [Tue, 24 Feb 2015 06:26:36 +0000 (22:26 -0800)]
Merge pull request #3753 from ceph/wip-10743

mds: wait for mydir replicas to go away in stopping

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
10 years agoMerge pull request #3775 from ceph/wip-10862
Gregory Farnum [Tue, 24 Feb 2015 06:22:27 +0000 (22:22 -0800)]
Merge pull request #3775 from ceph/wip-10862

mon: do not try and "deactivate" the last MDS

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
10 years agoqa: update old replication tests 3782/head
Noah Watkins [Tue, 24 Feb 2015 03:59:51 +0000 (19:59 -0800)]
qa: update old replication tests

Signed-off-by: Noah Watkins <noahwatkins@gmail.com>
10 years agohadoop: add terasort workunit
Noah Watkins [Mon, 23 Feb 2015 01:35:50 +0000 (17:35 -0800)]
hadoop: add terasort workunit

Signed-off-by: Noah Watkins <noahwatkins@gmail.com>
10 years agoMerge pull request #3686 from ceph/wip-crushtool
Loic Dachary [Mon, 23 Feb 2015 22:20:32 +0000 (23:20 +0100)]
Merge pull request #3686 from ceph/wip-crushtool

crushtool: process commands in a sensible order

Reviewed-by: Loic Dachary <ldachary@redhat.com>
10 years agoMerge pull request #3778 from dachary/wip-crushtool 3686/head
Sage Weil [Mon, 23 Feb 2015 21:32:23 +0000 (13:32 -0800)]
Merge pull request #3778 from dachary/wip-crushtool

crush: re-organize the help to clarify ordering

10 years agocrush: re-organize the help to clarify ordering 3778/head
Loic Dachary [Mon, 23 Feb 2015 18:52:03 +0000 (19:52 +0100)]
crush: re-organize the help to clarify ordering

The options are grouped according to the stage they relate to

   - input/build
   - tunables adjustments
   - modifications
   - display/test
   - output

Signed-off-by: Loic Dachary <ldachary@redhat.com>
10 years agocrushtool: add test for crushtool ordering
Sage Weil [Sun, 8 Feb 2015 15:47:48 +0000 (07:47 -0800)]
crushtool: add test for crushtool ordering

Signed-off-by: Sage Weil <sage@redhat.com>
10 years agocrushtool: send --tree to stdout
Sage Weil [Sun, 8 Feb 2015 15:47:23 +0000 (07:47 -0800)]
crushtool: send --tree to stdout

Signed-off-by: Sage Weil <sage@redhat.com>
10 years agocrushtool: name osds with --build function
Sage Weil [Sun, 8 Feb 2015 15:44:08 +0000 (07:44 -0800)]
crushtool: name osds with --build function

Signed-off-by: Sage Weil <sage@redhat.com>
10 years agocrushtool: do not dump tree on build
Sage Weil [Sun, 8 Feb 2015 15:43:46 +0000 (07:43 -0800)]
crushtool: do not dump tree on build

This pollutes the output.

Signed-off-by: Sage Weil <sage@redhat.com>
10 years agodoc/release-notes: v0.87.1
Sage Weil [Mon, 23 Feb 2015 18:45:52 +0000 (10:45 -0800)]
doc/release-notes: v0.87.1

Signed-off-by: Sage Weil <sage@redhat.com>
10 years agoMerge pull request #3776 from dachary/wip-development-workflows
Loic Dachary [Mon, 23 Feb 2015 17:46:16 +0000 (18:46 +0100)]
Merge pull request #3776 from dachary/wip-development-workflows

doc: development workflows

Reviewed-by: Yuri Weinstein <yuriw@redhat.com>
10 years agodoc: development workflows 3776/head
Loic Dachary [Mon, 23 Feb 2015 15:32:18 +0000 (16:32 +0100)]
doc: development workflows

Document the high level view of the development workflows which are
otherwise implicit and non trivial to figure out.

Signed-off-by: Loic Dachary <ldachary@redhat.com>
10 years agodoc: page title suitable for :doc:
Loic Dachary [Mon, 23 Feb 2015 15:29:05 +0000 (16:29 +0100)]
doc: page title suitable for :doc:

When using :doc:`/dev/sepia` the page title is inlined. The modified
title is easier to include as part of a sensible sentence.

Signed-off-by: Loic Dachary <ldachary@redhat.com>
10 years agodoc: spellcheck quick development guide
Loic Dachary [Mon, 23 Feb 2015 15:27:40 +0000 (16:27 +0100)]
doc: spellcheck quick development guide

Signed-off-by: Loic Dachary <ldachary@redhat.com>
10 years agodoc: do not doxygen src/tracing
Loic Dachary [Mon, 23 Feb 2015 15:26:27 +0000 (16:26 +0100)]
doc: do not doxygen src/tracing

because it does not publish an API that needs to be documented and
because it triggers https://github.com/ceph/asphyxiate/issues/1 in some
contexts.

Signed-off-by: Loic Dachary <ldachary@redhat.com>
10 years agomon: do not try and "deactivate" the last MDS 3775/head
John Spray [Mon, 23 Feb 2015 14:23:56 +0000 (14:23 +0000)]
mon: do not try and "deactivate" the last MDS

Fixes: #10862
Signed-off-by: John Spray <john.spray@redhat.com>
10 years agoMerge pull request #3763 from Ved-vampir/master
Sage Weil [Mon, 23 Feb 2015 04:34:35 +0000 (20:34 -0800)]
Merge pull request #3763 from Ved-vampir/master

common: add description in PerfCounter class

Reviewed-by: Sage Weil <sage@redhat.com>
10 years agoMerge remote-tracking branch 'gh/hammer'
Sage Weil [Sun, 22 Feb 2015 05:52:03 +0000 (21:52 -0800)]
Merge remote-tracking branch 'gh/hammer'

10 years agoMerge pull request #3741 from ceph/wip-cmake-vstart
Kefu Chai [Sun, 22 Feb 2015 02:10:40 +0000 (10:10 +0800)]
Merge pull request #3741 from ceph/wip-cmake-vstart

cmake fixes and enable vstart with cmake build

Reviewed-by: Kefu Chai <kchai@redhat.com>
10 years agoMerge pull request #3729 from guangyy/wip-4254-hammer
Sage Weil [Sat, 21 Feb 2015 18:10:12 +0000 (10:10 -0800)]
Merge pull request #3729 from guangyy/wip-4254-hammer

osd: number of degraded objects in EC pool is wrong when there is OSD down(in).

Reviewed-by: Samuel Just <sjust@redhat.com>
Reviewed-by: Sage Weil <sage@redhat.com>
10 years agoMerge pull request #3722 from ceph/wip-10787
Sage Weil [Sat, 21 Feb 2015 18:08:59 +0000 (10:08 -0800)]
Merge pull request #3722 from ceph/wip-10787

mon: fix osd_epoch cache bug 10787

Reviewed-by: Joao Eduardo Luis <joao@redhat.com>
10 years agoMerge branch 'osd-fix' of git://github.com/wonzhq/ceph into hammer
Sage Weil [Sat, 21 Feb 2015 18:07:20 +0000 (10:07 -0800)]
Merge branch 'osd-fix' of git://github.com/wonzhq/ceph into hammer

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Samuel Just <sjust@redhat.com>
10 years agoMerge branch 'wip-5639' of git://github.com/rzarzynski/ceph into hammer
Sage Weil [Sat, 21 Feb 2015 18:05:55 +0000 (10:05 -0800)]
Merge branch 'wip-5639' of git://github.com/rzarzynski/ceph into hammer

Reviewed-by: Sage Weil <sage@redhat.com>
10 years agoMerge pull request #3760 from ceph/wip-10883
Sage Weil [Fri, 20 Feb 2015 23:18:41 +0000 (15:18 -0800)]
Merge pull request #3760 from ceph/wip-10883

osd: Fix FileJournal wrap to get header out first

Reviewed-by: Sage Weil <sage@redhat.com>
10 years agoMerge pull request #3767 from athanatos/wip-10881
Sage Weil [Fri, 20 Feb 2015 23:14:03 +0000 (15:14 -0800)]
Merge pull request #3767 from athanatos/wip-10881

Wip 10881

Reviewed-by: Sage Weil <sage@redhat.com>
10 years agoMerge pull request #3768 from athanatos/wip-10780
Sage Weil [Fri, 20 Feb 2015 23:10:35 +0000 (15:10 -0800)]
Merge pull request #3768 from athanatos/wip-10780

Wip 10780

Reviewed-by: Sage Weil <sage@redhat.com>
10 years agoMerge pull request #3769 from athanatos/wip-10908
Sage Weil [Fri, 20 Feb 2015 23:08:20 +0000 (15:08 -0800)]
Merge pull request #3769 from athanatos/wip-10908

Wip 10908

Reviewed-by: Sage Weil <sage@redhat.com>
10 years agocmake: radosgw, radosgw-admin related fixes 3741/head
Yehuda Sadeh [Fri, 13 Feb 2015 23:41:29 +0000 (15:41 -0800)]
cmake: radosgw, radosgw-admin related fixes

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
10 years agovstart.sh: can use binaries outside of ceph/src
Yehuda Sadeh [Fri, 13 Feb 2015 22:34:06 +0000 (14:34 -0800)]
vstart.sh: can use binaries outside of ceph/src

If setting CEPH_BUILD_ROOT, will use that path, otherwise runs
everything from current directory as before.

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
10 years agoMerge pull request #3612 from zhouyuan/acct_get_resp_headers
Yehuda Sadeh [Fri, 20 Feb 2015 21:06:44 +0000 (13:06 -0800)]
Merge pull request #3612 from zhouyuan/acct_get_resp_headers

rgw: Adding stats in the header of GET response on account

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
10 years agoMerge pull request #3648 from theanalyst/doc/swift-temp-url
Yehuda Sadeh [Fri, 20 Feb 2015 21:03:00 +0000 (13:03 -0800)]
Merge pull request #3648 from theanalyst/doc/swift-temp-url

doc: swift tempurl functionality

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
10 years agoMerge pull request #3766 from tchaikov/chain_xattr-wrong-size-for-snprintf
Loic Dachary [Fri, 20 Feb 2015 18:01:22 +0000 (19:01 +0100)]
Merge pull request #3766 from tchaikov/chain_xattr-wrong-size-for-snprintf

os/chain_xattr: fix wrong `size` for snprintf()

Reviewed-by: Loic Dachary <ldachary@redhat.com>
10 years agoMerge pull request #3744 from ceph/wip-10884-hammer-rpm-devel-split
Ken Dreyer [Fri, 20 Feb 2015 17:44:45 +0000 (10:44 -0700)]
Merge pull request #3744 from ceph/wip-10884-hammer-rpm-devel-split

ceph.spec: split ceph-devel to appropriate *-devel packages

Reviewed-by: Sandon Van Ness <sandon@redhat.com>
Reviewed-by: Boris Ranto <branto@redhat.com>
10 years agoos/chain_xattr: fix wrong `size` for snprintf() 3766/head
Kefu Chai [Fri, 20 Feb 2015 16:55:17 +0000 (00:55 +0800)]
os/chain_xattr: fix wrong `size` for snprintf()

Signed-off-by: Kefu Chai <kchai@redhat.com>
10 years agoMerge pull request #3764 from ceph/wip-10919
Josh Durgin [Fri, 20 Feb 2015 17:00:26 +0000 (09:00 -0800)]
Merge pull request #3764 from ceph/wip-10919

cls_rbd: invalidate bufferlist CRC when updating object map

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
10 years agoMerge pull request #3754 from ceph/wip-10907
Josh Durgin [Fri, 20 Feb 2015 16:56:58 +0000 (08:56 -0800)]
Merge pull request #3754 from ceph/wip-10907

rgw: pass civetweb configurables to civetweb

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
10 years agoMerge pull request #3762 from fghaas/master
Sage Weil [Fri, 20 Feb 2015 16:52:51 +0000 (08:52 -0800)]
Merge pull request #3762 from fghaas/master

doc: explain that ceph tell osd.N bench is non-destructive

10 years agomon: fix bug with counter name (win counter was inc-ed in lose func) 3763/head
Ved-vampir [Fri, 20 Feb 2015 16:32:46 +0000 (19:32 +0300)]
mon: fix bug with counter name (win counter was inc-ed in lose func)

Signed-off-by: Kiseleva Alyona akiselyova@mirantis.com
10 years agoMerge pull request #3697 from yuyuyu101/wip-async-fix-2
Sage Weil [Fri, 20 Feb 2015 16:18:48 +0000 (08:18 -0800)]
Merge pull request #3697 from yuyuyu101/wip-async-fix-2

AsyncMessenger: Fix fd leak and lossless_peer_reuse policy problem

10 years agocommon: add description in PerfCounter class
Ved-vampir [Fri, 20 Feb 2015 15:04:49 +0000 (18:04 +0300)]
common: add description in PerfCounter class

Signed-off-by: Kiseleva Alyona <akiselyova@mirantis.com>
10 years agocls_rbd: invalidate bufferlist CRC when updating object map 3764/head
Jason Dillaman [Fri, 20 Feb 2015 15:37:59 +0000 (10:37 -0500)]
cls_rbd: invalidate bufferlist CRC when updating object map

The bit vector was not invalidating the bufferlist's CRC, resulting
in peer OSDs rejecting write op due to a mismatched CRC on the
message.

Fixes: #10919
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
10 years agodoc: explain that tell bench is non-destructive 3762/head
Florian Haas [Fri, 20 Feb 2015 14:25:23 +0000 (15:25 +0100)]
doc: explain that tell bench is non-destructive

Mention that "ceph tell osd.N bench" will not overwrite data in a live
OSD, but might temporarily affect OSD performance.

Signed-off-by: Florian Haas <florian@hastexo.com>
10 years agoMerge remote-tracking branch 'gh/hammer'
Sage Weil [Fri, 20 Feb 2015 05:28:16 +0000 (21:28 -0800)]
Merge remote-tracking branch 'gh/hammer'

10 years agoMerge pull request #3759 from ceph/wip-10914
Josh Durgin [Fri, 20 Feb 2015 02:47:16 +0000 (18:47 -0800)]
Merge pull request #3759 from ceph/wip-10914

osdc: pass fadvise op flags to WritebackHandler read requests

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
10 years agoosd: Fix FileJournal wrap to get header out first 3760/head
David Zafman [Thu, 19 Feb 2015 00:21:12 +0000 (16:21 -0800)]
osd: Fix FileJournal wrap to get header out first

Correct and restore assert that was removed

Cause by f46b1b473fce0322a672b16c7739e569a45054b6
Fixes: #10883
Backport: dumpling, firefly, giant

Signed-off-by: David Zafman <dzafman@redhat.com>
10 years agoosdc: pass fadvise op flags to WritebackHandler read requests 3759/head
Jason Dillaman [Thu, 19 Feb 2015 20:38:32 +0000 (15:38 -0500)]
osdc: pass fadvise op flags to WritebackHandler read requests

librbd was previously attempting to cast the provided Context to
retrieve the fadvise flags.  To eliminate the unsafe cast, now
the fadvise flags are directly passed to the WritebackHandler::read
callback.

Fixes: #10914
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
10 years agoosd/OSDMap: include pg_temp count in summary
Sage Weil [Thu, 12 Feb 2015 22:16:53 +0000 (14:16 -0800)]
osd/OSDMap: include pg_temp count in summary

It is useful to know how big the pg_temp map is.  Strictly speaking
this is part of the OSDMap so I'm including it here.  It looks like
this:

     osdmap e25: 3 osds: 3 up, 3 in; 1 remapped pgs

It might be more user-friendly to put it in a line with the pgmap
somewhere (where other pg counts are included), but it doesn't quite
fit there either.  So sticking with where it lives in the data
structure!

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

10 years agoMerge pull request #3629 from liewegas/wip-pg-temp
Sage Weil [Thu, 19 Feb 2015 19:03:06 +0000 (11:03 -0800)]
Merge pull request #3629 from liewegas/wip-pg-temp

osd/OSDMap: include pg_temp count in summary

Reviewed-by: Joao Eduardo Luis <joao@redhat.com>
Reviewed-by: Samuel Just <sjust@redhat.com>
10 years agoMerge pull request #3663 from ceph/wip-10765
Sage Weil [Thu, 19 Feb 2015 19:02:26 +0000 (11:02 -0800)]
Merge pull request #3663 from ceph/wip-10765

librados: close watch/notify race

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
10 years agoMerge pull request #3693 from ceph/wip-objecter-linger-locking
Sage Weil [Thu, 19 Feb 2015 19:02:08 +0000 (11:02 -0800)]
Merge pull request #3693 from ceph/wip-objecter-linger-locking

objecter: clean up linger op locking

Reviewed-by: Sage Weil <sage@redhat.com>
10 years agoMerge pull request #3710 from ceph/wip-10844
Sage Weil [Thu, 19 Feb 2015 19:01:07 +0000 (11:01 -0800)]
Merge pull request #3710 from ceph/wip-10844

mon: MonCap: take EntityName instead when expanding profiles

Reviewed-by: Sage Weil <sage@redhat.com>
10 years agomailmap: Frank Yu affiliation
Abhishek Lekshmanan [Thu, 19 Feb 2015 10:30:10 +0000 (16:00 +0530)]
mailmap: Frank Yu affiliation

Signed-off-by: Abhishek Lekshmanan <abhishek.lekshmanan@ril.com>
10 years agomailmap: Ali Maredia affiliation
Abhishek Lekshmanan [Thu, 19 Feb 2015 10:16:58 +0000 (15:46 +0530)]
mailmap: Ali Maredia affiliation

Signed-off-by: Abhishek Lekshmanan <abhishek.lekshmanan@ril.com>
10 years agomailmap: Takeshi Miyamae affiliation
Abhishek Lekshmanan [Thu, 19 Feb 2015 10:15:32 +0000 (15:45 +0530)]
mailmap: Takeshi Miyamae affiliation

Signed-off-by: Abhishek Lekshmanan <abhishek.lekshmanan@ril.com>