]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
10 years agorgw: remove meta file after deleting bucket 4283/head
Orit Wasserman [Fri, 3 Apr 2015 11:43:31 +0000 (13:43 +0200)]
rgw: remove meta file after deleting bucket
The meta file is deleted only if the bucket meta data is not synced

Signed-off-by: Orit Wasserman <owasserm@redhat.com>
Fixes: #11149
Backport: hammer, firefly

10 years agoMerge pull request #3867 from wonzhq/fiemap
Sage Weil [Mon, 6 Apr 2015 22:48:27 +0000 (15:48 -0700)]
Merge pull request #3867 from wonzhq/fiemap

FileStore: fiemap implementation using SEEK_HOLE/SEEK_DATA

Reviewed-by: Haomai Wang <haomaiwang@gmail.com>
Reviewed-by: Sage Weil <sage@redhat.com>
10 years agoMerge pull request #3170 from tchaikov/python-rados-refactor
Sage Weil [Mon, 6 Apr 2015 22:47:33 +0000 (15:47 -0700)]
Merge pull request #3170 from tchaikov/python-rados-refactor

python-rados: extract type-checking into a decorator

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: Loic Dachary <ldachary@redhat.com>
10 years agoMerge pull request #3560 from XinzeChi/wip-pmon-all
Sage Weil [Mon, 6 Apr 2015 22:47:09 +0000 (15:47 -0700)]
Merge pull request #3560 from XinzeChi/wip-pmon-all

ceph.in: add ceph ping mon.* for ping all monitor

Reviewed-by: Loic Dachary <ldachary@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
10 years agoMerge pull request #3879 from liewegas/wip-cache-mode-none
Sage Weil [Mon, 6 Apr 2015 22:46:21 +0000 (15:46 -0700)]
Merge pull request #3879 from liewegas/wip-cache-mode-none

mon: warn if cache_mode is none and pool is a read or writ eoverlay tier

Reviewed-by: Sage Weil <sage@redhat.com>
10 years agoMerge pull request #3980 from ceph/wip-rbd-update-features
Josh Durgin [Mon, 6 Apr 2015 22:33:53 +0000 (15:33 -0700)]
Merge pull request #3980 from ceph/wip-rbd-update-features

librbd: add support for updating image features

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
10 years agoMerge remote-tracking branch 'gh/hammer'
Sage Weil [Mon, 6 Apr 2015 20:43:01 +0000 (13:43 -0700)]
Merge remote-tracking branch 'gh/hammer'

Conflicts:
src/gmock

10 years agoMerge pull request #4133 from rzarzynski/wip-10645
Yehuda Sadeh [Mon, 6 Apr 2015 18:49:50 +0000 (11:49 -0700)]
Merge pull request #4133 from rzarzynski/wip-10645

rgw: improve metadata handling on object copy operation of Swift API.

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
10 years agoMerge pull request #4280 from jdurgin/wip-lttng-build
Sage Weil [Mon, 6 Apr 2015 18:36:50 +0000 (11:36 -0700)]
Merge pull request #4280 from jdurgin/wip-lttng-build

debian: remove lttng checking from rules

Reviewed-by: Sage Weil <sage@redhat.com>
10 years agodebian: remove lttng checking from rules
Josh Durgin [Mon, 6 Apr 2015 18:08:33 +0000 (11:08 -0700)]
debian: remove lttng checking from rules

This can be done better in a separate script, which puts these in
CEPH_EXTRA_CONFIGURE_ARGS. In particular, this lets us enable
lttng for gitbuilder builds, but not release builds.

Fixes: #11333
Signed-off-by: Josh Durgin <jdurgin@redhat.com>
(cherry picked from commit a294daff0bb69a7e0951f98c9497ccb22e91e705)

10 years agodebian: remove lttng checking from rules 4280/head
Josh Durgin [Mon, 6 Apr 2015 18:08:33 +0000 (11:08 -0700)]
debian: remove lttng checking from rules

This can be done better in a separate script, which puts these in
CEPH_EXTRA_CONFIGURE_ARGS. In particular, this lets us enable
lttng for gitbuilder builds, but not release builds.

Fixes: #11333
Signed-off-by: Josh Durgin <jdurgin@redhat.com>
10 years agoUpdate PendingReleaseNotes for firefly change, rgw socket path related
Yehuda Sadeh [Mon, 6 Apr 2015 17:37:28 +0000 (10:37 -0700)]
Update PendingReleaseNotes for firefly change, rgw socket path related

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
10 years agolibrbd: remove object maps when disabling 3980/head
Jason Dillaman [Tue, 24 Mar 2015 14:19:32 +0000 (10:19 -0400)]
librbd: remove object maps when disabling

If the object map feature is disabled, remove any object maps
prior to disabling the feature.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
10 years agolibrbd: flag the snapshot object map as invalid when error occurs
Jason Dillaman [Tue, 24 Mar 2015 14:13:21 +0000 (10:13 -0400)]
librbd: flag the snapshot object map as invalid when error occurs

Instead of flagging the HEAD image object map as invalid when an
error occurs with a snapshot object map, properly flag the snapshot
as invalid.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
10 years agorbd: add feature enable/disable support
Jason Dillaman [Thu, 12 Mar 2015 16:10:32 +0000 (12:10 -0400)]
rbd: add feature enable/disable support

Mutable image features can now be enabled/disabled via
the rbd CLI.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
10 years agotests: add update_features test to test_librbd
Jason Dillaman [Thu, 12 Mar 2015 04:26:07 +0000 (00:26 -0400)]
tests: add update_features test to test_librbd

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
10 years agotests: add update_features test for pybind
Jason Dillaman [Thu, 12 Mar 2015 04:13:40 +0000 (00:13 -0400)]
tests: add update_features test for pybind

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
10 years agopybind: add update_features to rbd.py
Jason Dillaman [Thu, 12 Mar 2015 03:59:00 +0000 (23:59 -0400)]
pybind: add update_features to rbd.py

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
10 years agolibrbd: add update_features to librbd API
Jason Dillaman [Thu, 12 Mar 2015 02:37:46 +0000 (22:37 -0400)]
librbd: add update_features to librbd API

Allow mutable features to be enabled / disabled.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
10 years agotests: add test case for cls_rbd set_features
Jason Dillaman [Wed, 11 Mar 2015 20:51:11 +0000 (16:51 -0400)]
tests: add test case for cls_rbd set_features

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
10 years agocls_rbd_client: add set_features helper method
Jason Dillaman [Wed, 11 Mar 2015 20:26:14 +0000 (16:26 -0400)]
cls_rbd_client: add set_features helper method

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
10 years agocls_rbd: add set_features class method
Jason Dillaman [Wed, 11 Mar 2015 20:07:41 +0000 (16:07 -0400)]
cls_rbd: add set_features class method

Allow certain mutable feature flags to be updated within
an image.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
10 years agolibrbd: remove usage of snapshot features
Jason Dillaman [Thu, 12 Mar 2015 00:39:01 +0000 (20:39 -0400)]
librbd: remove usage of snapshot features

The features for the image HEAD now apply to all
snapshots within the image.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
10 years agotests: update cls_rbd_client tests for get_features changes
Jason Dillaman [Wed, 11 Mar 2015 20:18:16 +0000 (16:18 -0400)]
tests: update cls_rbd_client tests for get_features changes

Images no longer track per-snapshot features. snapshot_list
no longer needs to retrieve per-snapshot features.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
10 years agocls_rbd_client: snapshot_list no longer retrieves features
Jason Dillaman [Wed, 11 Mar 2015 22:21:47 +0000 (18:21 -0400)]
cls_rbd_client: snapshot_list no longer retrieves features

Features should now be consistent across snapshots, so
no reason to retrieve them.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
10 years agocls_rbd: get_features on snapshots returns HEAD image features
Jason Dillaman [Wed, 11 Mar 2015 19:57:02 +0000 (15:57 -0400)]
cls_rbd: get_features on snapshots returns HEAD image features

In preparation for dynamic feature bits, it probably doesn't
make sense to have snapshots have different features enabled.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
10 years agoMerge pull request #4246 from ceph/wip-11113-hammer
Sage Weil [Mon, 6 Apr 2015 15:55:51 +0000 (08:55 -0700)]
Merge pull request #4246 from ceph/wip-11113-hammer

librbd: snap_remove should ignore -ENOENT errors

10 years agodoc/release-notes: 0.67.12 are draft notes
Sage Weil [Mon, 6 Apr 2015 15:36:24 +0000 (08:36 -0700)]
doc/release-notes: 0.67.12 are draft notes

Signed-off-by: Sage Weil <sage@redhat.com>
10 years agoMerge pull request #4250 from athanatos/wip-11265
Sage Weil [Mon, 6 Apr 2015 15:07:28 +0000 (08:07 -0700)]
Merge pull request #4250 from athanatos/wip-11265

ECTransaction: write out the hinfo key on touch as well

Reviewed-by: Sage Weil <sage@redhat.com>
10 years agoMerge pull request #4251 from athanatos/wip-11284
Sage Weil [Mon, 6 Apr 2015 15:07:15 +0000 (08:07 -0700)]
Merge pull request #4251 from athanatos/wip-11284

ReplicatedPG::promote_object: do not create obc if not promoting

Reviewed-by: Sage Weil <sage@redhat.com>
10 years agoMerge pull request #4278 from nilamdyuti/wip-doc-ceph-object-gateway
Ken Dreyer [Mon, 6 Apr 2015 14:23:11 +0000 (08:23 -0600)]
Merge pull request #4278 from nilamdyuti/wip-doc-ceph-object-gateway

doc: Corrects some content for Debian-based distros in simple gateway
configuration file.

Reviewed-by: Ken Dreyer <kdreyer@redhat.com>
10 years agodoc: Corrects some content for Debian-based distros in simple gateway 4278/head
Nilamdyuti Goswami [Mon, 6 Apr 2015 13:21:17 +0000 (18:51 +0530)]
doc: Corrects some content for Debian-based distros in simple gateway
configuration file.

Signed-off-by: Nilamdyuti Goswami <ngoswami@redhat.com>
10 years agoMerge pull request #4238 from ceph/wip-9580
Loic Dachary [Mon, 6 Apr 2015 10:15:38 +0000 (12:15 +0200)]
Merge pull request #4238 from ceph/wip-9580

ceph-disk: make journal setup conditional on osd backend

Reviewed-by: Travis Rhoden <trhoden@redhat.com>
Reviewed-by: Loic Dachary <ldachary@redhat.com>
10 years agoMerge pull request #4244 from dachary/wip-9580 4238/head
Sage Weil [Mon, 6 Apr 2015 00:25:05 +0000 (17:25 -0700)]
Merge pull request #4244 from dachary/wip-9580

tests for ceph-disk: make journal setup conditional on osd backend

10 years agotests: add ceph-disk.sh activate for memstore 4244/head
Loic Dachary [Wed, 1 Apr 2015 14:36:09 +0000 (16:36 +0200)]
tests: add ceph-disk.sh activate for memstore

Add a test for the activation of the memstore objectstore and verify
that it works without specifying a journal.

Signed-off-by: Loic Dachary <ldachary@redhat.com>
10 years agotests: move rados put/get tests in a function
Loic Dachary [Wed, 1 Apr 2015 14:31:05 +0000 (16:31 +0200)]
tests: move rados put/get tests in a function

Add the test_pool_read_write function to share the rados put / get test
that demonstrate the osd that has been created can actually be used. Use
it from the both the regular device and dmcrypt tests.

Signed-off-by: Loic Dachary <ldachary@redhat.com>
10 years agotests: ceph-disk.sh dmcrypt tests use test_setup_dev_and_run
Loic Dachary [Wed, 1 Apr 2015 13:01:25 +0000 (15:01 +0200)]
tests: ceph-disk.sh dmcrypt tests use test_setup_dev_and_run

Instead of duplicating the device construction / destruction logic for
dmcrypt tests, use test_setup_dev_and_run to do it. It is now able to
recover from devmapper leftover which may occur when a cryptsetup test
fails.

Signed-off-by: Loic Dachary <ldachary@redhat.com>
10 years agotests: merge ceph-disk.sh activate dmcrypt functions
Loic Dachary [Wed, 1 Apr 2015 12:58:43 +0000 (14:58 +0200)]
tests: merge ceph-disk.sh activate dmcrypt functions

The activate_dmcrypt_plain_dev_body and activate_dmcrypt_dev_body
functions are almost identical, merge them and differentiate with an
argument.

Signed-off-by: Loic Dachary <ldachary@redhat.com>
10 years agotests: add test_setup_dev_and_run to ceph-disk.sh
Loic Dachary [Wed, 1 Apr 2015 12:54:10 +0000 (14:54 +0200)]
tests: add test_setup_dev_and_run to ceph-disk.sh

Move test_activate_dev to test_setup_dev_and_run and make it
run the function given in argument. test_activate_dev calls
test_setup_dev_and_run and no longer needs to implement device
allocation or destruction.

Signed-off-by: Loic Dachary <ldachary@redhat.com>
10 years agotests: improve ceph-disk.sh setup/teardown
Loic Dachary [Wed, 1 Apr 2015 12:44:17 +0000 (14:44 +0200)]
tests: improve ceph-disk.sh setup/teardown

Address all possible failure cases, when ceph-disk.sh completes or when
it starts with leftover from a previous interrupted run. It is assumed
that ceph-disk.sh will crash at any point.

* umount all mount points that belong to ceph-disk.sh (check the
  absolute path of the directory)
* dmsetup remove all device mapper nodes found to hold a loop device
  that ceph-disks.sh no longer uses
* losetup --detach all loop devices that ceph-disks.sh no longer uses

Signed-off-by: Loic Dachary <ldachary@redhat.com>
10 years agotests: do not use -e in ceph-disk.sh
Loic Dachary [Wed, 1 Apr 2015 12:38:29 +0000 (14:38 +0200)]
tests: do not use -e in ceph-disk.sh

The tests explicitly return on error when relevant. Add two error cases:

* detect when the allocation of a loop device fails.
* in the outer loop, return immediately if one of the test fails

Signed-off-by: Loic Dachary <ldachary@redhat.com>
10 years agotests: reduce ceph-disk.sh verbosity
Loic Dachary [Wed, 1 Apr 2015 12:35:34 +0000 (14:35 +0200)]
tests: reduce ceph-disk.sh verbosity

Signed-off-by: Loic Dachary <ldachary@redhat.com>
10 years agoMerge pull request #4256 from dachary/wip-dumpling-release-notes
Sage Weil [Sun, 5 Apr 2015 17:35:26 +0000 (10:35 -0700)]
Merge pull request #4256 from dachary/wip-dumpling-release-notes

doc/release-notes: final dumpling v0.67.12 release notes

10 years agoMerge pull request #4263 from dachary/wip-man-install
Kefu Chai [Fri, 3 Apr 2015 02:25:36 +0000 (10:25 +0800)]
Merge pull request #4263 from dachary/wip-man-install

rhel 6 needs python-sphinx10

Reviewed-by: Kefu Chai <kchai@redhat.com>
10 years agoman: using sphinx-1.0-build if no sphinx-build 4263/head
Loic Dachary [Thu, 2 Apr 2015 23:46:36 +0000 (01:46 +0200)]
man: using sphinx-1.0-build if no sphinx-build

On RHEL 6 and CentOS 6 sphinx 1.0+ which is required to build man pages
is packaged as sphinx10 instead of sphinx and the binary is
sphinx-1.0-build instead of sphinx-build.

Signed-off-by: Loic Dachary <ldachary@redhat.com>
10 years agospec.in: sphinx -b man needs sphinx > 1.0
Loic Dachary [Thu, 2 Apr 2015 23:38:15 +0000 (01:38 +0200)]
spec.in: sphinx -b man needs sphinx > 1.0

It is used to build the man pages.

Signed-off-by: Loic Dachary <ldachary@rehdat.com>
10 years agoMerge pull request #4115 from dzafman/wip-dzmanfix
Loic Dachary [Thu, 2 Apr 2015 23:33:07 +0000 (01:33 +0200)]
Merge pull request #4115 from dzafman/wip-dzmanfix

doc, mon: Add ceph osd pool get <poolname> all to man page

Reviewed-by: Loic Dachary <ldachary@redhat.com>
10 years agoMerge pull request #4262 from dachary/wip-man-install
Loic Dachary [Thu, 2 Apr 2015 22:55:55 +0000 (00:55 +0200)]
Merge pull request #4262 from dachary/wip-man-install

man: add conf.py to the list of distributed files

10 years agoman: add conf.py to the list of distributed files 4262/head
Loic Dachary [Thu, 2 Apr 2015 22:22:01 +0000 (00:22 +0200)]
man: add conf.py to the list of distributed files

Otherwise packages won't build as it's not included in the tarbal.

Signed-off-by: Loic Dachary <ldachary@redhat.com>
10 years agoMerge pull request #4260 from nilamdyuti/wip-doc-ceph-object-gateway
Loic Dachary [Thu, 2 Apr 2015 21:25:14 +0000 (23:25 +0200)]
Merge pull request #4260 from nilamdyuti/wip-doc-ceph-object-gateway

Replaces reference to mod_fastcgi with mod_proxy_fcgi in gateway docs

Reviewed-by: Ken Dreyer <kdreyer@redhat.com>
10 years agoMerge pull request #4149 from objoo/mailmap-for-hammer-2
Loic Dachary [Thu, 2 Apr 2015 21:19:01 +0000 (23:19 +0200)]
Merge pull request #4149 from objoo/mailmap-for-hammer-2

mailmap for hammer / master 2nd batch

Reviewed-by: Loic Dachary <ldachary@redhat.com>
10 years agomailmap: Ian Kelling affiliation 4149/head
Yann Dupont [Wed, 25 Mar 2015 21:00:45 +0000 (22:00 +0100)]
mailmap: Ian Kelling affiliation

Signed-off-by: Yann Dupont <yann@objoo.org>
10 years agomailmap: Vartika Rai affiliation
Yann Dupont [Wed, 25 Mar 2015 20:57:41 +0000 (21:57 +0100)]
mailmap: Vartika Rai affiliation

Signed-off-by: Yann Dupont <yann@objoo.org>
10 years agomailmap: Alexandre Marangone affiliation
Yann Dupont [Wed, 25 Mar 2015 20:55:41 +0000 (21:55 +0100)]
mailmap: Alexandre Marangone affiliation

(probably a previous typo)

Signed-off-by: Yann Dupont <yann@objoo.org>
10 years agomailmap: Steve Capper affiliation
Yann Dupont [Wed, 25 Mar 2015 20:48:07 +0000 (21:48 +0100)]
mailmap: Steve Capper affiliation

Signed-off-by: Yann Dupont <yann@objoo.org>
10 years agomailmap: Simon Guinot affiliation
Yann Dupont [Wed, 25 Mar 2015 20:41:05 +0000 (21:41 +0100)]
mailmap: Simon Guinot affiliation

(somewhat reverse 2afe1e3c4419fb0638d6ed21a83d8204675cd29e )

Signed-off-by: Yann Dupont <yann@objoo.org>
Reviewed-by: Simon Guinot <simon.guinot@sequanux.org>
10 years agomailmap: Yazen Ghannam affiliation
Yann Dupont [Wed, 25 Mar 2015 20:39:35 +0000 (21:39 +0100)]
mailmap: Yazen Ghannam affiliation

Signed-off-by: Yann Dupont <yann@objoo.org>
10 years agomailmap: Lee Revell affiliation
Yann Dupont [Mon, 23 Mar 2015 21:41:21 +0000 (21:41 +0000)]
mailmap: Lee Revell affiliation

Signed-off-by: Yann Dupont <yann@objoo.org>
Reviewed-by: Loic Dachary <ldachary@redhat.com>
10 years agomailmap: Zhi (David) Zhang affiliation
Yann Dupont [Mon, 23 Mar 2015 21:31:43 +0000 (21:31 +0000)]
mailmap: Zhi (David) Zhang affiliation
And name normalization

Signed-off-by: Yann Dupont <yann@objoo.org>
Reviewed-by: Loic Dachary <ldachary@redhat.com>
10 years agomailmap: Bosse Klykken affiliation
Yann Dupont [Mon, 23 Mar 2015 21:23:33 +0000 (21:23 +0000)]
mailmap: Bosse Klykken affiliation

Signed-off-by: Yann Dupont <yann@objoo.org>
Reviewed-by: Loic Dachary <ldachary@redhat.com>
10 years agomailmap: Dmitry Yatsushkevich affiliation
Yann Dupont [Mon, 23 Mar 2015 21:21:04 +0000 (21:21 +0000)]
mailmap: Dmitry Yatsushkevich affiliation

Signed-off-by: Yann Dupont <yann@objoo.org>
Reviewed-by: Loic Dachary <ldachary@redhat.com>
10 years agomailmap: Greg Farnum affiliation
Yann Dupont [Mon, 23 Mar 2015 21:17:04 +0000 (21:17 +0000)]
mailmap: Greg Farnum affiliation

Signed-off-by: Yann Dupont <yann@objoo.org>
Reviewed-by: Loic Dachary <ldachary@redhat.com>
10 years agomailmap: Boris Ranto affiliation
Yann Dupont [Mon, 23 Mar 2015 21:14:46 +0000 (21:14 +0000)]
mailmap: Boris Ranto affiliation

Signed-off-by: Yann Dupont <yann@objoo.org>
Reviewed-by: Loic Dachary <ldachary@redhat.com>
10 years agodoc: Fix .gitignore for man directory 4115/head
David Zafman [Thu, 2 Apr 2015 18:45:13 +0000 (11:45 -0700)]
doc: Fix .gitignore for man directory

Caused by: 301fe6cbf2c8b04d0650fe60de65c3cdc7a8ac95

Signed-off-by: David Zafman <dzafman@redhat.com>
10 years agodoc: Add ceph osd pool get <poolname> all to man page
David Zafman [Fri, 20 Mar 2015 22:34:14 +0000 (15:34 -0700)]
doc: Add ceph osd pool get <poolname> all to man page

Caused by: ea6192116cb1af4b8f4964cf7d5c69f164680205

Signed-off-by: David Zafman <dzafman@redhat.com>
10 years agomon: Add MIN_READ_RECENCY_FOR_PROMOTE to ONLY_TIER_CHOICES
David Zafman [Fri, 20 Mar 2015 22:56:16 +0000 (15:56 -0700)]
mon: Add MIN_READ_RECENCY_FOR_PROMOTE to ONLY_TIER_CHOICES

Signed-off-by: David Zafman <dzafman@redhat.com>
10 years agodoc: Updates the radosgw man page with some changes. 4260/head
Nilamdyuti Goswami [Thu, 2 Apr 2015 17:53:14 +0000 (23:23 +0530)]
doc: Updates the radosgw man page with some changes.

Signed-off-by: Nilamdyuti Goswami <ngoswami@redhat.com>
10 years agodoc: Updates simple gateway configuration file with some changes.
Nilamdyuti Goswami [Thu, 2 Apr 2015 17:51:26 +0000 (23:21 +0530)]
doc: Updates simple gateway configuration file with some changes.

Signed-off-by: Nilamdyuti Goswami <ngoswami@redhat.com>
10 years agodoc: Updates gateway installation doc with some changes.
Nilamdyuti Goswami [Thu, 2 Apr 2015 17:48:26 +0000 (23:18 +0530)]
doc: Updates gateway installation doc with some changes.

Signed-off-by: Nilamdyuti Goswami <ngoswami@redhat.com>
10 years agoMerge branch 'wip-doc-ceph-object-gateway' of https://github.com/nilamdyuti/ceph...
Nilamdyuti Goswami [Thu, 2 Apr 2015 17:35:22 +0000 (23:05 +0530)]
Merge branch 'wip-doc-ceph-object-gateway' of https://github.com/nilamdyuti/ceph into wip-doc-ceph-object-gateway

10 years agodoc: Updates the configuration of mod_proxy_fcgi in terms of localhost
Nilamdyuti Goswami [Thu, 2 Apr 2015 14:12:54 +0000 (19:42 +0530)]
doc: Updates the configuration of mod_proxy_fcgi in terms of localhost
tcp and unix domain socket.

Signed-off-by: Nilamdyuti Goswami <ngoswami@redhat.com>
10 years agodoc: Corrects syntax highlighting in the simple gateway configuration doc.
Nilamdyuti Goswami [Thu, 2 Apr 2015 13:56:08 +0000 (19:26 +0530)]
doc: Corrects syntax highlighting in the simple gateway configuration doc.

Signed-off-by: Nilamdyuti Goswami <ngoswami@redhat.com>
10 years agodoc: Corrects syntax highlighting in gateway installation doc.
Nilamdyuti Goswami [Thu, 2 Apr 2015 13:51:46 +0000 (19:21 +0530)]
doc: Corrects syntax highlighting in gateway installation doc.

Signed-off-by: Nilamdyuti Goswami <ngoswami@redhat.com>
10 years agodoc: Updates the simple gateway configuration doc with configuration for
Nilamdyuti Goswami [Thu, 2 Apr 2015 11:19:58 +0000 (16:49 +0530)]
doc: Updates the simple gateway configuration doc with configuration for
mod_proxy_fcgi instead of mod_fastcgi.

Fixes: #3299
Signed-off-by: Nilamdyuti Goswami <ngoswami@redhat.com>
10 years agodoc: Replaces reference to mod_fastcgi with mod_proxy_fcgi in gateway
Nilamdyuti Goswami [Thu, 2 Apr 2015 11:14:38 +0000 (16:44 +0530)]
doc: Replaces reference to mod_fastcgi with mod_proxy_fcgi in gateway
installation doc.

Fixes: #3299
Signed-off-by: Nilamdyuti Goswami <ngoswami@redhat.com>
10 years agoMerge pull request #4142 from ceph/wip-no-more-dot-8
Loic Dachary [Thu, 2 Apr 2015 15:42:23 +0000 (17:42 +0200)]
Merge pull request #4142 from ceph/wip-no-more-dot-8

doc: generate man pages in man/Makefile

Reviewed-by: Loic Dachary <ldachary@redhat.com>
10 years agodoc: Updates the configuration of mod_proxy_fcgi in terms of localhost
Nilamdyuti Goswami [Thu, 2 Apr 2015 14:12:54 +0000 (19:42 +0530)]
doc: Updates the configuration of mod_proxy_fcgi in terms of localhost
tcp and unix domain socket.

Signed-off-by: Nilamdyuti Goswami <ngoswami@redhat.com>
10 years agoMerge pull request #4220 from jdurgin/wip-librados-global-flags
Loic Dachary [Thu, 2 Apr 2015 14:02:55 +0000 (16:02 +0200)]
Merge pull request #4220 from jdurgin/wip-librados-global-flags

Revert "librados: remove the unused flags."

Reviewed-by: Loic Dachary <ldachary@redhat.com>
10 years agodoc: Corrects syntax highlighting in the simple gateway configuration doc.
Nilamdyuti Goswami [Thu, 2 Apr 2015 13:56:08 +0000 (19:26 +0530)]
doc: Corrects syntax highlighting in the simple gateway configuration doc.

Signed-off-by: Nilamdyuti Goswami <ngoswami@redhat.com>
10 years agodoc: Corrects syntax highlighting in gateway installation doc.
Nilamdyuti Goswami [Thu, 2 Apr 2015 13:51:46 +0000 (19:21 +0530)]
doc: Corrects syntax highlighting in gateway installation doc.

Signed-off-by: Nilamdyuti Goswami <ngoswami@redhat.com>
10 years agodoc: Updates the simple gateway configuration doc with configuration for
Nilamdyuti Goswami [Thu, 2 Apr 2015 11:19:58 +0000 (16:49 +0530)]
doc: Updates the simple gateway configuration doc with configuration for
mod_proxy_fcgi instead of mod_fastcgi.

Fixes: #3299
Signed-off-by: Nilamdyuti Goswami <ngoswami@redhat.com>
10 years agodoc: Replaces reference to mod_fastcgi with mod_proxy_fcgi in gateway
Nilamdyuti Goswami [Thu, 2 Apr 2015 11:14:38 +0000 (16:44 +0530)]
doc: Replaces reference to mod_fastcgi with mod_proxy_fcgi in gateway
installation doc.

Fixes: #3299
Signed-off-by: Nilamdyuti Goswami <ngoswami@redhat.com>
10 years agoMerge pull request #4201 from tchaikov/xlist-iterator
Loic Dachary [Thu, 2 Apr 2015 10:49:30 +0000 (12:49 +0200)]
Merge pull request #4201 from tchaikov/xlist-iterator

xlist: add compare operator for iterator

Reviewed-by: Loic Dachary <ldachary@redhat.com>
10 years agodoc/release-notes: final dumpling v0.67.12 release notes 4256/head
Loic Dachary [Thu, 2 Apr 2015 09:52:47 +0000 (11:52 +0200)]
doc/release-notes: final dumpling v0.67.12 release notes

http://tracker.ceph.com/issues/10560 Refs: #10560

Signed-off-by: Loic Dachary <ldachary@redhat.com>
10 years agoMerge pull request #4068 from dachary/wip-opensuse
Loic Dachary [Thu, 2 Apr 2015 09:32:09 +0000 (11:32 +0200)]
Merge pull request #4068 from dachary/wip-opensuse

tests: add OpenSUSE 13.2 dockerfile

Reviewed-by: Owen Synge <osynge@suse.com>
10 years agoMerge pull request #4167 from dzafman/wip-11184
Samuel Just [Thu, 2 Apr 2015 04:03:37 +0000 (21:03 -0700)]
Merge pull request #4167 from dzafman/wip-11184

Fix 11184 by filtering the log

Reviewed-by: Samuel Just <sjust@redhat.com>
10 years agolibrbd: snap_remove should ignore -ENOENT errors 4246/head
Jason Dillaman [Mon, 16 Mar 2015 22:40:49 +0000 (18:40 -0400)]
librbd: snap_remove should ignore -ENOENT errors

If the attempt to deregister the snapshot from the parent
image fails with -ENOENT, ignore the error as it is safe
to assume that the child is not associated with the parent.

Fixes: #11113
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit cf8094942ccdba831e03e5a79451cfa5d78a135f)

10 years agolibrbd: get_parent_info should protect against invalid parent
Jason Dillaman [Mon, 16 Mar 2015 22:35:07 +0000 (18:35 -0400)]
librbd: get_parent_info should protect against invalid parent

get_parent_info should return -ENOENT if the image does not
have an associated parent image.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit 21afd0ef8e1fb81c5ace5fd403513c542e2413e3)

10 years agoMerge pull request #4221 from xiaoxichen/rbd_discard_skip
Josh Durgin [Wed, 1 Apr 2015 17:35:58 +0000 (10:35 -0700)]
Merge pull request #4221 from xiaoxichen/rbd_discard_skip

Add rbd_discard_skip_zeroing flag

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
10 years agoMerge pull request #4213 from xiaoxichen/wip-new-rocksdb
Sage Weil [Wed, 1 Apr 2015 17:05:03 +0000 (10:05 -0700)]
Merge pull request #4213 from xiaoxichen/wip-new-rocksdb

RocksDB configuration

Reviewed-by: Sage Weil <sage@redhat.com>
10 years agoMerge pull request #4208 from dmitryya/ceph_argparse_improvement
Kefu Chai [Wed, 1 Apr 2015 13:38:55 +0000 (21:38 +0800)]
Merge pull request #4208 from dmitryya/ceph_argparse_improvement

ceph_argparse: Remove code duplication and generalize ceph_argparse_with* routines

Reviewed-by: Kefu Chai <kchai@redhat.com>
10 years agoAdd rbd_skip_partial_discard flag 4221/head
Xiaoxi Chen [Mon, 30 Mar 2015 11:56:59 +0000 (19:56 +0800)]
Add rbd_skip_partial_discard flag

If we want to discard a range of an object, we will zero(use fallocate
to punch a hole) the range now. In general this introduce some overhead(extra writes).

If the filesystem ontop of RBD holding lots of small files, this
behavior will bring big performance penalty.

Adding a flag that allow user to control if they want to zero the
range.

Signed-off-by: Xiaoxi Chen <xiaoxi.chen@intel.com>
10 years agoceph-disk: follow ceph-osd hints when setting up journal
Sage Weil [Wed, 1 Apr 2015 00:19:32 +0000 (17:19 -0700)]
ceph-disk: follow ceph-osd hints when setting up journal

- If the journal is required, require it.
- If the journal is not allowed, do not allow one to be specified
- If the journal is not wanted, to not set one up by default when none is
provided.

See #9580

Signed-off-by: Sage Weil <sage@redhat.com>
10 years agoceph-osd: add --check-wants-journal, --check-allows-journal
Sage Weil [Tue, 31 Mar 2015 20:49:35 +0000 (13:49 -0700)]
ceph-osd: add --check-wants-journal, --check-allows-journal

Completes OSD side of #9580

Signed-off-by: Sage Weil <sage@redhat.com>
10 years agoceph-osd: fix usage
Sage Weil [Tue, 31 Mar 2015 20:44:08 +0000 (13:44 -0700)]
ceph-osd: fix usage

Signed-off-by: Sage Weil <sage@redhat.com>
10 years agoMerge pull request #4235 from ceph/wip-rbd-unit-tests
Josh Durgin [Tue, 31 Mar 2015 19:36:18 +0000 (12:36 -0700)]
Merge pull request #4235 from ceph/wip-rbd-unit-tests

tests: exercise all RBD features during unit testing

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
10 years agoMerge pull request #4232 from ceph/fix-make-conf
Josh Durgin [Tue, 31 Mar 2015 19:34:00 +0000 (12:34 -0700)]
Merge pull request #4232 from ceph/fix-make-conf

Fix make conf

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
10 years agoMerge pull request #4236 from ceph/wip-verify-mds-journal-makefile
Gregory Farnum [Tue, 31 Mar 2015 19:27:34 +0000 (12:27 -0700)]
Merge pull request #4236 from ceph/wip-verify-mds-journal-makefile

mds: update Makefile for removed script

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
10 years agomds: update Makefile for removed script 4236/head
John Spray [Tue, 31 Mar 2015 19:15:28 +0000 (20:15 +0100)]
mds: update Makefile for removed script

Oversight in "mds: remove verify-mds-journal.sh script"

Signed-off-by: John Spray <john.spray@redhat.com>
10 years agoceph_argparse: generalize ceph_argparse_with* routines 4208/head
Dmitry Yatsushkevich [Fri, 27 Mar 2015 22:34:24 +0000 (15:34 -0700)]
ceph_argparse: generalize ceph_argparse_with* routines

Remove code duplication by generalizing ceph_argparse_with{int,float,longlong}
routines - make one template function for those cases.

Signed-off-by: Dmitry Yatsushkevich <dyatsushkevich@mirantis.com>