]>
git.apps.os.sepia.ceph.com Git - ceph.git/log
Ken Dreyer [Mon, 9 Mar 2015 19:12:25 +0000 (13:12 -0600)]
doc: rm Apache log permissions instructions
On all distros, Apache should be able to write to its own log directory.
If not, that is a severe distro bug that should be reported/fixed.
Remove the references to running "chown" on /var/log/httpd or
/var/log/apache2.
Signed-off-by: Ken Dreyer <kdreyer@redhat.com>
Sage Weil [Mon, 9 Mar 2015 17:56:11 +0000 (10:56 -0700)]
doc/release-notes: update notes for v0.80.9
Signed-off-by: Sage Weil <sage@redhat.com>
Yehuda Sadeh [Mon, 9 Mar 2015 16:39:58 +0000 (09:39 -0700)]
Merge pull request #3608 from guangyy/wip-rgw-quota-threads
rgw: make quota/gc thread configurable for starting
Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
Yehuda Sadeh [Mon, 9 Mar 2015 16:37:02 +0000 (09:37 -0700)]
Merge pull request #3795 from rzarzynski/wip-10938
rgw: improve support for X-Timestamp header of Swift API
Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
Gregory Farnum [Mon, 9 Mar 2015 16:17:40 +0000 (12:17 -0400)]
Merge pull request #3668 from ceph/wip-compact-container
Optimize memory usage of MDS
Reviewed-by: John Spray <john.spray@redhat.com>
Reviewed-by: Greg Farnum <gfarnum@redhat.com>
Loic Dachary [Mon, 9 Mar 2015 15:35:28 +0000 (16:35 +0100)]
Merge pull request #3908 from gravitystorm/patch-2
fix typo
Reviewed-by: Loic Dachary <ldachary@redhat.com>
Andy Allan [Mon, 9 Mar 2015 14:41:18 +0000 (14:41 +0000)]
doc: fix typo
Signed-off-by: Andy Allan <github@gravitystorm.co.uk>
Loic Dachary [Mon, 9 Mar 2015 12:28:17 +0000 (13:28 +0100)]
Merge pull request #3906 from dachary/wip-mailmap
mailmap: David Zhang affiliation
Reviewed-by: Zhi (David) Zhang <zhangz@yahoo-inc.com>
Loic Dachary [Mon, 9 Mar 2015 10:46:20 +0000 (11:46 +0100)]
mailmap: Zhi (David) Zhang affiliation
And name normalization
Reviewed-by: Zhi (David) Zhang <zhangz@yahoo-inc.com>
Signed-off-by: Loic Dachary <ldachary@redhat.com>
Loic Dachary [Sat, 7 Mar 2015 17:30:55 +0000 (18:30 +0100)]
Merge pull request #3900 from dachary/wip-recursive-submodules
autogen.sh: do not submodule --force if git does not support it
Loic Dachary [Sat, 7 Mar 2015 16:11:58 +0000 (17:11 +0100)]
autogen.sh: do not submodule --force if git does not support it
Signed-off-by: Loic Dachary <ldachary@redhat.com>
Loic Dachary [Sat, 7 Mar 2015 15:53:50 +0000 (16:53 +0100)]
Merge pull request #3895 from dachary/wip-recursive-submodules
doc,tests: force checkout of submodules
John Spray [Fri, 6 Mar 2015 19:18:59 +0000 (19:18 +0000)]
Merge pull request #3615 from ceph/wip-perf-watch
Performance watching CLI
Loic Dachary [Fri, 6 Mar 2015 16:08:55 +0000 (17:08 +0100)]
doc,tests: force checkout of submodules
When updating submodules, always checkout even if the HEAD is the
desired commit hash (update --force) to avoid the following:
* a directory gmock exists in hammer
* a submodule gmock replaces the directory gmock in master
* checkout master + submodule update : gmock/.git is created
* checkout hammer : the gmock directory still contains the .git from
master because it did not exist at the time and checkout won't
remove untracked directories
* checkout master + submodule update : git rev-parse HEAD is
at the desired commit although the content of the gmock directory
is from hammer
Signed-off-by: Loic Dachary <ldachary@redhat.com>
Sage Weil [Fri, 6 Mar 2015 15:50:41 +0000 (07:50 -0800)]
Merge pull request #3892 from cernceph/cephdisk
ceph-disk: activate-[all|journal] should suppress
Backport: hammer, giant, firefly
Reviewed-by: Sage Weil <sage@redhat.com>
Loic Dachary [Fri, 6 Mar 2015 14:29:22 +0000 (15:29 +0100)]
tests: sync must also be recursive
In case a submodule URL to a nested submodule changed
Signed-off-by: Loic Dachary <ldachary@redhat.com>
John Spray [Fri, 6 Mar 2015 12:16:09 +0000 (12:16 +0000)]
Merge pull request #3718 from ceph/wip-10649
mds: new OMAP storage for sessionmap
Reviewed-by: Greg Farnum <gfarnum@redhat.com>
John Spray [Thu, 12 Feb 2015 10:06:27 +0000 (10:06 +0000)]
mds: new OMAP storage for sessionmap
Fixes: #10649
Signed-off-by: John Spray <john.spray@redhat.com>
John Spray [Thu, 19 Feb 2015 11:01:21 +0000 (11:01 +0000)]
osdc: add omap op perf counters
To avoid bloating the list of counters too much,
group the OMAP operations in to wr,rd,del
Signed-off-by: John Spray <john.spray@redhat.com>
Dan van der Ster [Fri, 6 Mar 2015 10:37:32 +0000 (11:37 +0100)]
ceph-disk: activate-[all|journal] should suppress
Make the suppress-activate <device> feature work for activate-all
and activate-journal.
Signed-off-by: Dan van der Ster <daniel.vanderster@cern.ch>
Kefu Chai [Fri, 6 Mar 2015 08:19:10 +0000 (16:19 +0800)]
Merge pull request #3891 from cernceph/doc
doc: osd map cache size is a count, not MB
Reviewed-by: Kefu Chai <kchai@redhat.com>
Dan van der Ster [Fri, 6 Mar 2015 08:05:56 +0000 (09:05 +0100)]
doc: osd map cache size is a count, not MB
Signed-off-by: Dan van der Ster <daniel.vanderster@cern.ch>
Guang Yang [Wed, 4 Feb 2015 03:21:52 +0000 (03:21 +0000)]
rgw - make starting quota/gc threads configurable
Fixes: 11047
Backport: hammer
Signed-off-by: Guang Yang <yguang@yahoo-inc.com>
Loic Dachary [Thu, 5 Mar 2015 23:55:47 +0000 (00:55 +0100)]
Merge pull request #3888 from dachary/wip-gmock-submodule
ceph needs gmock/gtest to be statically linked
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Loic Dachary [Thu, 5 Mar 2015 23:06:21 +0000 (00:06 +0100)]
ceph needs gmock/gtest to be statically linked
The ceph-test package depends on gmock and gtest and needs to statically
link them because packages are not configured to distribute the
corresponding shared library files.
Update the gmock submodule to the version that is configured with
noinst libraries that will be statically linked.
The gmock submodule is modified to reference the branch in which the
ceph specific changes have been done.
http://tracker.ceph.com/issues/11040 Fixes: #11040
Signed-off-by: Loic Dachary <loic@dachary.org>
John Spray [Mon, 23 Feb 2015 12:28:32 +0000 (12:28 +0000)]
test: add unit tests for daemonperf formatting
Signed-off-by: John Spray <john.spray@redhat.com>
John Spray [Tue, 3 Feb 2015 13:13:29 +0000 (13:13 +0000)]
ceph.in: add 'daemonperf' command
This is inspired by dstat and scripts/perf-watch.py, to
give a convenient live view of an interesting subset
of the performance counters from a Ceph daemon.
Signed-off-by: John Spray <john.spray@redhat.com>
John Spray [Tue, 3 Feb 2015 17:01:01 +0000 (17:01 +0000)]
mds: fix type of some stats
These guys were marked as counters, but they were
updated with set(), not inc() -- so they should just
be normal u64s.
Signed-off-by: John Spray <john.spray@redhat.com>
John Spray [Mon, 23 Feb 2015 11:53:02 +0000 (11:53 +0000)]
mon: add nicknames to some performance counters
Signed-off-by: John Spray <john.spray@redhat.com>
John Spray [Mon, 23 Feb 2015 11:52:17 +0000 (11:52 +0000)]
osd: add nicks to some stats
This is a rough indication of what I find
useful.
Signed-off-by: John Spray <john.spray@redhat.com>
John Spray [Wed, 4 Feb 2015 08:14:46 +0000 (08:14 +0000)]
osdc: add perf counter nicknames
Signed-off-by: John Spray <john.spray@redhat.com>
John Spray [Tue, 3 Feb 2015 16:48:53 +0000 (16:48 +0000)]
mds: mark stats with nicknames
These are the stats that we would like to appear
in the new perf watch CLI mode.
Signed-off-by: John Spray <john.spray@redhat.com>
John Spray [Tue, 3 Feb 2015 16:47:32 +0000 (16:47 +0000)]
common: add optional perf counter nickname
This has two purposes:
* Identify counters that are useful in short/summary views
of a daemon's performance (only these have a nick set)
* Provide shortened versions of names that are suitable
for display in a text-mode columnar view.
Signed-off-by: John Spray <john.spray@redhat.com>
John Spray [Thu, 5 Mar 2015 15:38:58 +0000 (15:38 +0000)]
common: remove some spurious declarations
Maybe these were defined at some point in history...
Signed-off-by: John Spray <john.spray@redhat.com>
Loic Dachary [Thu, 5 Mar 2015 16:44:05 +0000 (17:44 +0100)]
Merge pull request #3886 from ceph/wip-gmock-mirror
.gitmodule_mirrors: add gmock.git mirror
Reviewed-by: Loic Dachary <ldachary@redhat.com>
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>
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>
Sage Weil [Thu, 5 Mar 2015 16:29:11 +0000 (08:29 -0800)]
.gitmodule_mirrors: add gmock.git mirror
Signed-off-by: Sage Weil <sage@redhat.com>
Kefu Chai [Thu, 5 Mar 2015 10:16:23 +0000 (18:16 +0800)]
Merge pull request #3846 from ceph/wip-da-gtest-use-submodules
Use git submodules for gmock/gtest
Signed-off-by: Kefu Chai <kchai@redhat.com>
Danny Al-Gaaf [Thu, 5 Mar 2015 08:10:48 +0000 (09:10 +0100)]
Merge pull request #3811 from tchaikov/fix-build-debug-xio
Fix build of `--with-debug --enable-xio`
Reviewed-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
Yehuda Sadeh [Thu, 5 Mar 2015 01:01:24 +0000 (17:01 -0800)]
Merge pull request #3861 from guangyy/wip-11001
rgw: do not pre-fetch data for HEAD requests
Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
Guang Yang [Tue, 3 Mar 2015 09:46:52 +0000 (09:46 +0000)]
rgw: do not pre-fetch data for HEAD requests
Backport: hammer
Signed-off-by: Guang Yang <yguang@yahoo-inc.com>
Sage Weil [Thu, 5 Mar 2015 00:11:53 +0000 (16:11 -0800)]
Merge pull request #3876 from ceph/wip-rpm-ceph-test-dependencies
#10989 ceph.spec.in: loosen ceph-test's dependencies
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Ken Dreyer [Wed, 4 Mar 2015 22:01:34 +0000 (15:01 -0700)]
ceph.spec.in: loosen ceph-test's dependencies
In Debian, the ceph-test package can be installed with any version of
ceph-common.
Prior to this commit, in RHEL, we're much more strict about which
version of the dependencies we require. We depend directly on
librados2/librbd1/libcephfs1 instead of ceph-common, and we also require
the specific versions of these libraries to match the version of
ceph-test.
For testing Ceph, it is nice to have the ability to upgrade the
librados2/librbd1/libcephfs1 libraries on a host without having to also
upgrade the ceph-test package as well.
Remove the version number requirements, and change the dependencies from
librados2/librbd1/libcephfs1 to simply "ceph-common". That will make
/etc/ceph/ and /var/log/ceph present for the tests.
http://tracker.ceph.com/issues/10989 Refs: #10989
Signed-off-by: Ken Dreyer <kdreyer@redhat.com>
John Spray [Wed, 4 Mar 2015 11:43:25 +0000 (11:43 +0000)]
Merge pull request #3804 from Ved-vampir/master
common: add perf counters description
Reviewed-by: John Spray <john.spray@redhat.com>
Reviewed-by: Loic Dachary <ldachary@redhat.com>
Reviewed-by: Sage Weil <sage@redhat.com>
Loic Dachary [Wed, 4 Mar 2015 11:26:55 +0000 (12:26 +0100)]
Merge pull request #3869 from tchaikov/print-help-on-osd
ceph.in: print help on 'osd' or 'mon'
Reviewed-by: Loic Dachary <ldachary@redhat.com>
Kefu Chai [Wed, 4 Mar 2015 06:51:34 +0000 (14:51 +0800)]
ceph.in: print help on 'osd' or 'mon'
Fixes: #10888
Signed-off-by: Kefu Chai <kchai@redhat.com>
Ved-vampir [Thu, 26 Feb 2015 11:32:29 +0000 (14:32 +0300)]
common: add perf counters description
Signed-off-by: Kiseleva Alyona <akiselyova@mirantis.com>
Yan, Zheng [Wed, 4 Mar 2015 01:52:44 +0000 (09:52 +0800)]
Merge pull request #3865 from ceph/wip-11011
mds: flush immediately in do_open_truncate
Kefu Chai [Wed, 4 Mar 2015 01:19:24 +0000 (09:19 +0800)]
Merge pull request #3862 from ceph/wip-da-fix-python
Fix pep8 python issues
Reviewed-by: Kefu Chai <kchai@redhat.com>
John Spray [Tue, 3 Mar 2015 20:14:28 +0000 (20:14 +0000)]
mds: flush immediately in do_open_truncate
Previously truncating opens were horribly laggy
for clients when the system was otherwise idle,
as they would wait for the next tick() before
proceeding.
Fixes: #11011
Signed-off-by: John Spray <john.spray@redhat.com>
Danny Al-Gaaf [Tue, 3 Mar 2015 11:52:48 +0000 (12:52 +0100)]
rados.py: fix pep8 E502, remove redundant '\' in brackets
Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
Danny Al-Gaaf [Tue, 3 Mar 2015 11:44:12 +0000 (12:44 +0100)]
rados.py: fix pep E711
Fix for:
- E711 comparison to None should be 'if cond is None:'
Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
Danny Al-Gaaf [Tue, 3 Mar 2015 11:41:21 +0000 (12:41 +0100)]
rados.py: fix pep8 indent issues
Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
Danny Al-Gaaf [Tue, 3 Mar 2015 11:14:05 +0000 (12:14 +0100)]
rados.py: fix (white)space issues
Fixes for:
- E202 whitespace before '}'
- E221 multiple spaces before operator
- E223 tab before operator
- E226 missing whitespace around arithmetic operator
- E251 unexpected spaces around keyword / parameter equals
- E261 at least two spaces before inline comment
- W293 blank line contains whitespace
Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
Danny Al-Gaaf [Tue, 3 Mar 2015 10:58:35 +0000 (11:58 +0100)]
rados.py: fix pep8 E111 indentation (spaces/tab)
Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
Danny Al-Gaaf [Tue, 3 Mar 2015 10:51:28 +0000 (11:51 +0100)]
ceph_rest_api.py: fix pep8 indentation errors
Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
Danny Al-Gaaf [Tue, 3 Mar 2015 10:23:14 +0000 (11:23 +0100)]
ceph_rest_api.py: fix pep8 whitespace issues
Fixes for:
- E226 missing whitespace around arithmetic operator
- E231 missing whitespace after ':' and ','
- E265 block comment should start with '#
Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
Danny Al-Gaaf [Tue, 3 Mar 2015 10:10:25 +0000 (11:10 +0100)]
ceph_argparse.py: pep8 E721 don't compare types, use 'isinstance()'
Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
Danny Al-Gaaf [Tue, 3 Mar 2015 10:04:34 +0000 (11:04 +0100)]
python: fix pep8 'E713 test for membership should be 'not in'
Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
Danny Al-Gaaf [Tue, 3 Mar 2015 10:00:05 +0000 (11:00 +0100)]
ceph_argparse.py: fix pep8 indentation errors
Fix for:
- E126 continuation line over-indented for hanging indent
- E128 continuation line under-indented for visual indent
- E129 visually indented line with same indent as next logical line
- E131 continuation line unaligned for hanging indent
Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
Danny Al-Gaaf [Tue, 3 Mar 2015 09:49:22 +0000 (10:49 +0100)]
ceph_argparse.py: fix pep8 E502, remove redundant '\' in brackets
Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
Danny Al-Gaaf [Tue, 3 Mar 2015 09:46:05 +0000 (10:46 +0100)]
ceph_argparse.py: fix pep8 whitespace issues
Fixes for:
- E231 missing whitespace after ':'
- E231 missing whitespace after ','
- E226 missing whitespace around arithmetic operator
Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
Danny Al-Gaaf [Sun, 1 Mar 2015 21:22:32 +0000 (22:22 +0100)]
cephfs.py: fix pep8 E127/E128 intended lines
Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
Danny Al-Gaaf [Sun, 1 Mar 2015 21:17:45 +0000 (22:17 +0100)]
cephfs.py: pep8 E225. add missing whitespace around operator
Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
Danny Al-Gaaf [Sun, 1 Mar 2015 21:16:55 +0000 (22:16 +0100)]
cephfs.py: fix pep8 E202 whitespaces
Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
Danny Al-Gaaf [Sun, 1 Mar 2015 21:15:39 +0000 (22:15 +0100)]
cephfs.py: fix inline comments
Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
Danny Al-Gaaf [Sun, 1 Mar 2015 21:04:01 +0000 (22:04 +0100)]
rbd.py: remove superfluous-parens around if
Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
Danny Al-Gaaf [Sun, 1 Mar 2015 20:59:59 +0000 (21:59 +0100)]
add tox.ini for pep8 with some errors to be ignored
Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
Danny Al-Gaaf [Sun, 1 Mar 2015 20:57:30 +0000 (21:57 +0100)]
rbd.py: fix pep8 E101/W191 wrong intended lines
Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
Danny Al-Gaaf [Sun, 1 Mar 2015 20:52:20 +0000 (21:52 +0100)]
rbd.py: fix pep8 E128 under-indented lines
Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
Danny Al-Gaaf [Sun, 1 Mar 2015 20:31:25 +0000 (21:31 +0100)]
rbd.py: fix pep8 E127 over-indented line
Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
Danny Al-Gaaf [Sun, 1 Mar 2015 20:08:32 +0000 (21:08 +0100)]
python: fix pep8 E302, add missing lines
Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
Kefu Chai [Tue, 3 Mar 2015 08:53:39 +0000 (16:53 +0800)]
Merge pull request #3842 from dachary/wip-docker-build
tests: keep intermediate docker build layers
Reviewed-by: Kefu Chai <kchai@redhat.com>
Yan, Zheng [Tue, 3 Mar 2015 07:16:56 +0000 (15:16 +0800)]
Merge pull request #3856 from ceph/wip-10982
RFC Client: do not require successful remount when unmounting
Greg Farnum [Tue, 3 Mar 2015 06:29:10 +0000 (22:29 -0800)]
Client: do not require successful remount when unmounting
Fixes: #10982
Signed-off-by: Greg Farnum <gfarnum@redhat.com>
Sage Weil [Tue, 3 Mar 2015 05:14:27 +0000 (21:14 -0800)]
doc/release-notes: add v0.92->0.93 upgrade note
Signed-off-by: Sage Weil <sage@redhat.com>
Josh Durgin [Mon, 2 Mar 2015 23:34:39 +0000 (15:34 -0800)]
Merge pull request #3831 from dachary/wip-qemu-iotests
Maipo should also use the local qemu clone
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Danny Al-Gaaf [Mon, 2 Mar 2015 19:36:23 +0000 (20:36 +0100)]
update some .gitignore files
Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
Danny Al-Gaaf [Mon, 2 Mar 2015 15:54:40 +0000 (16:54 +0100)]
submodules: --recursive needed for gtest in gmock
Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
Danny Al-Gaaf [Mon, 2 Mar 2015 20:08:46 +0000 (21:08 +0100)]
gmock: add git submodule
Add gmock submodule and point to ceph-release-1.7.0 branch.
Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
Danny Al-Gaaf [Mon, 2 Mar 2015 20:05:46 +0000 (21:05 +0100)]
gmock: remove in-tree code copy
Step needed to replace by git submodules.
Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
Yehuda Sadeh [Mon, 2 Mar 2015 18:55:34 +0000 (10:55 -0800)]
Merge pull request #3818 from rzarzynski/wip-10661
rgw: generate Content-Length in response for POST on Swift containter/object
Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
Yehuda Sadeh [Mon, 2 Mar 2015 18:50:42 +0000 (10:50 -0800)]
Merge pull request #3761 from rzarzynski/wip-10873
rgw: generate the "Date" HTTP header.
Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
Dmytro Iurchenko [Mon, 16 Feb 2015 16:47:59 +0000 (18:47 +0200)]
rgw: Swift API. Complement the response to "show container details"
OpenStack Object Storage API v1 states that X-Container-Object-Count, X-Container-Bytes-Used and user-defined metadata headers should be included in a response.
Fixes: #10666
Backport: hammer
Reported-by: Ahmad Faheem <ahmad.faheem@ril.com>
Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
Signed-off-by: Dmytro Iurchenko <diurchenko@mirantis.com>
Sage Weil [Mon, 2 Mar 2015 17:11:11 +0000 (09:11 -0800)]
Merge remote-tracking branch 'gh/hammer'
Josh Durgin [Mon, 2 Mar 2015 16:53:50 +0000 (08:53 -0800)]
Merge pull request #3844 from ceph/wip-10965
Wip 10965
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Josh Durgin [Mon, 2 Mar 2015 16:51:54 +0000 (08:51 -0800)]
Merge pull request #3843 from ceph/wip-10978
rgw: don't overwrite bucket / object owner when setting acls
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Josh Durgin [Mon, 2 Mar 2015 16:30:45 +0000 (08:30 -0800)]
Merge pull request #3812 from ceph/wip-10958
librbd: flush pending AIO before resize
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Yehuda Sadeh [Fri, 27 Feb 2015 23:32:50 +0000 (15:32 -0800)]
rgw: don't overwrite bucket / object owner when setting acls
Fixes: #10978
Backport: hammer, firefly
Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
Loic Dachary [Mon, 2 Mar 2015 13:37:55 +0000 (14:37 +0100)]
tests: keep intermediate docker build layers
Because the docker devmapper backend has an intermittent bug
https://github.com/docker/docker/issues/4036
the build of the image will sometime fail. It will eventually succeed if
the command is repeated enough times. Not removing the intermediate
layers helps speed up the operation: when repeating the command, only
the layer that failed because of the above bug is rebuilt.
Signed-off-by: Loic Dachary <ldachary@redhat.com>
Jason Dillaman [Fri, 27 Feb 2015 14:46:55 +0000 (09:46 -0500)]
librbd: flush pending AIO after acquiring lock
There was a potential race condition between a delayed AIO
operation waiting on acquiring a lock and a snap_create
flushing all pending IO. Since snap_create owned md_lock, the
delayed AIO would not be allowed to complete -- deadlocking the
flush.
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
Jason Dillaman [Fri, 27 Feb 2015 04:39:10 +0000 (23:39 -0500)]
librbd: hold snap_lock between clipping IO and registering AIO
In the case where concurrent IO is occurring when a trim resize
operation is initiated, hold the snap_lock between clipping the
IO operation and registering the pending op. That allows the
resize state machine to properly flush all operations issued
before the clip region was updated.
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
Loic Dachary [Mon, 2 Mar 2015 12:03:59 +0000 (13:03 +0100)]
Merge pull request #3839 from dachary/wip-documentation
doc: ext4 has a journal
Reviewed-by: Simon Guinot <simon.guinot@sequanux.org>
Loic Dachary [Mon, 2 Mar 2015 11:09:13 +0000 (12:09 +0100)]
doc: ext4 has a journal
Signed-off-by: Loic Dachary <ldachary@redhat.com>
Loic Dachary [Sat, 28 Feb 2015 23:27:06 +0000 (00:27 +0100)]
Merge pull request #3834 from linuxbox2/xio-build
cmake: build fixes
Reviewed-by: Loic Dachary <ldachary@redhat.com>
Matt Benjamin [Sat, 28 Feb 2015 18:58:11 +0000 (13:58 -0500)]
cmake: build fixes
* librbd
* test/ceph_dencoder
Signed-off-by: Matt Benjamin <matt@cohortfs.com>
Yehuda Sadeh [Fri, 27 Feb 2015 16:14:41 +0000 (08:14 -0800)]
rgw: update makefile to enable civetweb config
Fixes: #10965
Backport: hammer, firefly
Civetweb compilation now includes conf header to enable ipv6.
Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
Yehuda Sadeh [Fri, 27 Feb 2015 16:14:27 +0000 (08:14 -0800)]
civetweb: update submodule
Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
Haomai Wang [Sat, 28 Feb 2015 10:10:36 +0000 (18:10 +0800)]
Merge pull request #3833 from yuyuyu101/temp
TestAsyncDriver: Fix typo in ceph_test_async_driver