]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
9 years agoman/Makefile-client.am: drop legacy cephfs tool 10444/head
Nathan Cutler [Tue, 26 Jul 2016 14:26:59 +0000 (16:26 +0200)]
man/Makefile-client.am: drop legacy cephfs tool

Somehow c76c31d312ce7a623acd99dbdedfe471c0cd445f missed this bit.

Signed-off-by: Nathan Cutler <ncutler@suse.com>
9 years agoMerge pull request #10401 from theanalyst/rgw/test-multi-nose-attr
Casey Bodley [Tue, 26 Jul 2016 13:53:58 +0000 (09:53 -0400)]
Merge pull request #10401 from theanalyst/rgw/test-multi-nose-attr

rgw: test/multi.py add a destructive attr to tests

Reviewed-by: Casey Bodley <cbodley@redhat.com>
9 years agoMerge pull request #10375 from xiexingguo/xxg-wip-fix-bmap-ut-failure
Igor Fedotov [Tue, 26 Jul 2016 12:43:21 +0000 (15:43 +0300)]
Merge pull request #10375 from xiexingguo/xxg-wip-fix-bmap-ut-failure

os/bluestore: use small encoding for bluefs extent and fnode

Reviewed-by: Igor Fedotov <ifedotov@mirantis.com>
9 years agoos/bluestore: use small encoding for bluefs extent and fnode 10375/head
xie xingguo [Thu, 21 Jul 2016 07:50:56 +0000 (15:50 +0800)]
os/bluestore: use small encoding for bluefs extent and fnode

Also change bdev of extent from uint16_t to uint8_t, which matches
the fnode prefer_bdev field better, and is good for efficiency.

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
9 years agoMerge pull request #10440 from tchaikov/wip-16686
Kefu Chai [Tue, 26 Jul 2016 11:10:09 +0000 (19:10 +0800)]
Merge pull request #10440 from tchaikov/wip-16686

msg/async: remove static member variable

Reviewed-by: Brad Hubbard <bhubbard@redhat.com>
Reviewed-by: Haomai Wang <haomai@xsky.com>
Reviewed-by: Ramana Raja <rraja@redhat.com>
Reviewed-by: John Spray <john.spray@redhat.com>
9 years agoMerge pull request #10430 from tchaikov/wip-cephtool-test.sh
Loic Dachary [Tue, 26 Jul 2016 06:51:25 +0000 (08:51 +0200)]
Merge pull request #10430 from tchaikov/wip-cephtool-test.sh

qa/workunits/cephtool/test.sh: use absolute path for TEMP_DIR

Reviewed-by: Loic Dachary <ldachary@redhat.com>
9 years agoMerge pull request #10423 from ceph/wip-16801
Kefu Chai [Tue, 26 Jul 2016 06:18:46 +0000 (14:18 +0800)]
Merge pull request #10423 from ceph/wip-16801

osd: fix the mem leak of RepGather

Reviewed-by: Samuel Just <sjust@redhat.com>
9 years agomsg/async: remove static member variable 10440/head
Kefu Chai [Tue, 26 Jul 2016 05:27:01 +0000 (13:27 +0800)]
msg/async: remove static member variable

msgr is part of libcommon. and the later is linked into both libcephfs
and librados. and hence into cephfs.so and rados.so. that's why we have
double free.

Fixes: http://tracker.ceph.com/issues/16686
Signed-off-by: Kefu Chai <kchai@redhat.com>
9 years agoMerge pull request #10304 from ukernel/wip-16610
Gregory Farnum [Tue, 26 Jul 2016 04:58:19 +0000 (21:58 -0700)]
Merge pull request #10304 from ukernel/wip-16610

ObjectCacher: fix last_write check in bh_write_adjacencies()
Reviewed-by: Greg Farnum <gfarnum@redhat.com>
9 years agoMerge pull request #10243 from jcsp/wip-cephfs-cleanup
John Spray [Mon, 25 Jul 2016 14:20:42 +0000 (15:20 +0100)]
Merge pull request #10243 from jcsp/wip-cephfs-cleanup

CephFS: misc. cleanups and remove legacy cephfs tool

Reviewed-by: Nathan Cutler <ncutler@suse.com>
9 years agoMerge pull request #9716 from xiexingguo/xxg-wip-server_droppinlock2
John Spray [Mon, 25 Jul 2016 13:29:10 +0000 (14:29 +0100)]
Merge pull request #9716 from xiexingguo/xxg-wip-server_droppinlock2

Server: drop locks and auth pins if wait for pending truncate

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
9 years agoqa/workunits/cephtool/test.sh: use absolute path for TEMP_DIR 10430/head
Kefu Chai [Mon, 25 Jul 2016 08:57:51 +0000 (16:57 +0800)]
qa/workunits/cephtool/test.sh: use absolute path for TEMP_DIR

Signed-off-by: Kefu Chai <kchai@redhat.com>
9 years agoMerge pull request #10261 from songbaisen/b1
Kefu Chai [Mon, 25 Jul 2016 08:44:08 +0000 (16:44 +0800)]
Merge pull request #10261 from songbaisen/b1

mon: remove the redundant cancel_probe_timeout function

Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agoosd: fix the mem leak of RepGather 10423/head
Kefu Chai [Mon, 25 Jul 2016 03:12:14 +0000 (11:12 +0800)]
osd: fix the mem leak of RepGather

ReplicatedPG::new_repop() returns a pointer to RepGather with two refcounts,
one is held by ReplicatedPG::repop_queue, the other is supposed to be
held by the caller of this function. but it's caller
ReplicatedPG::submit_log_entries() assigns it to a
boost::intrusive_ptr<RepGather>() directly, why by default add_ref() in
its constructor. this makes the refcount 3. that's why we have a leak of
RepGather in `ReplicatedPG::new_repop(ObcLockManager&&,
boost::optional<std::function<void ()>>&&)`.

Fixes: http://tracker.ceph.com/issues/16801
Signed-off-by: Kefu Chai <kchai@redhat.com>
9 years agoMerge pull request #10319 from wjwithagen/wip-wjw-fix-posix-tests
Kefu Chai [Mon, 25 Jul 2016 06:35:33 +0000 (14:35 +0800)]
Merge pull request #10319 from wjwithagen/wip-wjw-fix-posix-tests

src/test/cli/* tests: POSIX Convert grep -P to grep -E

Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agoMerge pull request #10308 from xiexingguo/xxg-wip-fix-osd-df
Kefu Chai [Mon, 25 Jul 2016 05:23:07 +0000 (13:23 +0800)]
Merge pull request #10308 from xiexingguo/xxg-wip-fix-osd-df

mon/osdmonitor: fix incorrect output of "osd df" due to osd out

Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agoMerge pull request #10091 from rubenk/add-osd-id-to-service-description
Kefu Chai [Mon, 25 Jul 2016 04:58:16 +0000 (12:58 +0800)]
Merge pull request #10091 from rubenk/add-osd-id-to-service-description

systemd: add osd id to service description

Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agoMerge pull request #10089 from gaowanlong/omapbench_usage
Kefu Chai [Mon, 25 Jul 2016 04:54:52 +0000 (12:54 +0800)]
Merge pull request #10089 from gaowanlong/omapbench_usage

test: fix usage info of omapbench

Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agoMerge pull request #10251 from stiopaa1/osd_watch_addConsts
Kefu Chai [Mon, 25 Jul 2016 04:43:14 +0000 (12:43 +0800)]
Merge pull request #10251 from stiopaa1/osd_watch_addConsts

osd/Watch: add consts to member functions

Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agoMerge pull request #10419 from jcsp/wip-16764
Yan, Zheng [Mon, 25 Jul 2016 02:42:06 +0000 (21:42 -0500)]
Merge pull request #10419 from jcsp/wip-16764

client: fix shutdown with open inodes

9 years agoclient: fix shutdown with open inodes 10419/head
John Spray [Sun, 24 Jul 2016 16:19:55 +0000 (17:19 +0100)]
client: fix shutdown with open inodes

This piece of code was dereferencing an invalid
iterator (invalidated by call to erase())

Fixes: http://tracker.ceph.com/issues/16764
Signed-off-by: John Spray <john.spray@redhat.com>
9 years agoMerge pull request #9724 from vumrao/wip-vumrao-16130
Jason Dillaman [Sun, 24 Jul 2016 15:13:44 +0000 (11:13 -0400)]
Merge pull request #9724 from vumrao/wip-vumrao-16130

rbd: cleanup - Proxied operations shouldn't result in error messages if replayed

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
9 years agoMerge pull request #10123 from trociny/wip-16449
Jason Dillaman [Sun, 24 Jul 2016 15:12:57 +0000 (11:12 -0400)]
Merge pull request #10123 from trociny/wip-16449

librbd: prevent creation of clone from non-primary mirrored image

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
9 years agoMerge pull request #10348 from trociny/wip-16717
Jason Dillaman [Sun, 24 Jul 2016 15:07:28 +0000 (11:07 -0400)]
Merge pull request #10348 from trociny/wip-16717

test: use wrapper that respects RBD_FEATURES when creating rbd image

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
9 years agoMerge pull request #10352 from wjwithagen/wip-wjw-freebsd-cmake-2
Kefu Chai [Sun, 24 Jul 2016 10:18:45 +0000 (18:18 +0800)]
Merge pull request #10352 from wjwithagen/wip-wjw-freebsd-cmake-2

cmake: work to get inital FreeBSD stuff

Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agoMerge pull request #10354 from stiopaa1/msg_message_addConst
Kefu Chai [Sun, 24 Jul 2016 07:17:57 +0000 (15:17 +0800)]
Merge pull request #10354 from stiopaa1/msg_message_addConst

msg/Message.h: add const to member function

Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agoMerge pull request #10413 from SUSE/wip-doc-dev
Loic Dachary [Sat, 23 Jul 2016 19:24:31 +0000 (21:24 +0200)]
Merge pull request #10413 from SUSE/wip-doc-dev

doc: add Prepare tenant section to Testing in the cloud chapter

Reviewed-by: Loic Dachary <ldachary@redhat.com>
9 years agodoc: add "Prepare tenant" section to "Testing in the cloud" chapter 10413/head
Nathan Cutler [Sat, 23 Jul 2016 17:24:18 +0000 (19:24 +0200)]
doc: add "Prepare tenant" section to "Testing in the cloud" chapter

Signed-off-by: Nathan Cutler <ncutler@suse.com>
9 years agoMerge pull request #10162 from gaurav36/bug-16444-radosgw-error-message
Orit Wasserman [Sat, 23 Jul 2016 13:37:59 +0000 (15:37 +0200)]
Merge pull request #10162 from gaurav36/bug-16444-radosgw-error-message

rgw: better error message when user has no bucket created yet
Reviewed-by: Orit Wasserman <owasserm@redhat.com>
9 years agoMerge pull request #10405 from athanatos/wip-ec-pg-log
Josh Durgin [Fri, 22 Jul 2016 22:11:08 +0000 (15:11 -0700)]
Merge pull request #10405 from athanatos/wip-ec-pg-log

osd: fixups to explicitly persistenting missing sets

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
9 years agoosd_types: fix type of ChangeTracker::clean() 10405/head
Samuel Just [Wed, 20 Jul 2016 02:32:10 +0000 (19:32 -0700)]
osd_types: fix type of ChangeTracker::clean()

Signed-off-by: Samuel Just <sjust@redhat.com>
9 years agoosd_types: rename swap to claim, restrict to the non-tracking variant
Samuel Just [Wed, 20 Jul 2016 02:11:02 +0000 (19:11 -0700)]
osd_types: rename swap to claim, restrict to the non-tracking variant

Signed-off-by: Samuel Just <sjust@redhat.com>
9 years agoMerge pull request #10334 from ceph/wip-ec-pg-log
Josh Durgin [Fri, 22 Jul 2016 21:27:19 +0000 (14:27 -0700)]
Merge pull request #10334 from ceph/wip-ec-pg-log

osd: persist the missing set explicitly

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
9 years agoMerge pull request #10363 from SUSE/wip-16645
Nathan Cutler [Fri, 22 Jul 2016 20:31:33 +0000 (22:31 +0200)]
Merge pull request #10363 from SUSE/wip-16645

Fix libatomic_ops-devel in SUSE and specfile cleanup

Reviewed-by: Boris Ranto <branto@redhat.com>
Reviewed-by: Ken Dreyer <kdreyer@redhat.com>
9 years agoMerge pull request #10241 from Yan-waller/yj-wip-rgwrests3-0710
Yehuda Sadeh [Fri, 22 Jul 2016 20:21:39 +0000 (13:21 -0700)]
Merge pull request #10241 from Yan-waller/yj-wip-rgwrests3-0710

rgw: add return value checking to avoid possible subsequent `parse` exception

Reviewed-by: Abhishek Lekshmanan <abhishek@suse.com>
Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
9 years agoMerge pull request #10331 from rzarzynski/wip-rgw-keystone-doc-fix
Yehuda Sadeh [Fri, 22 Jul 2016 20:13:13 +0000 (13:13 -0700)]
Merge pull request #10331 from rzarzynski/wip-rgw-keystone-doc-fix

rgw, doc: fix formatting around Keystone-related options.

Reviewed-by: Abhishek Lekshmanan <abhishek@suse.com>
9 years agorpm: move libatomic_ops-devel to non-distro-specific section 10363/head
Nathan Cutler [Wed, 20 Jul 2016 08:23:48 +0000 (10:23 +0200)]
rpm: move libatomic_ops-devel to non-distro-specific section

Signed-off-by: Nathan Cutler <ncutler@suse.com>
9 years agorpm: move gperftools-devel to non-distro-specific section
Nathan Cutler [Wed, 20 Jul 2016 08:22:37 +0000 (10:22 +0200)]
rpm: move gperftools-devel to non-distro-specific section

Signed-off-by: Nathan Cutler <ncutler@suse.com>
9 years agorpm: use new name of libatomic_ops-devel
Nathan Cutler [Sat, 9 Jul 2016 20:55:54 +0000 (22:55 +0200)]
rpm: use new name of libatomic_ops-devel

The previous form, libatomic-ops-devel, has been deprecated since May 23, 2012.

Signed-off-by: Nathan Cutler <ncutler@suse.com>
9 years agoMerge pull request #10322 from ceph/wip-debian-python-warnings
Dan Mick [Fri, 22 Jul 2016 18:31:30 +0000 (11:31 -0700)]
Merge pull request #10322 from ceph/wip-debian-python-warnings

debian: python related changes

Reviewed-by: Dan Mick <dmick@redhat.com>
9 years agorgw: test/multi.py add a destructive attr to tests 10401/head
Abhishek Lekshmanan [Fri, 22 Jul 2016 15:56:05 +0000 (17:56 +0200)]
rgw: test/multi.py add a destructive attr to tests

Since the `test_zonegroup_remove` actually destroys a zonegroup, we
could just filter this out and run the suite as
`nosetests -a !destructive ../path/to/test-multi.py`

for provisioning a multisite mstart cluster.

Signed-off-by: Abhishek Lekshmanan <abhishek@suse.com>
9 years agoMerge pull request #10400 from tchaikov/wip-test_async_compressor
Ali Maredia [Fri, 22 Jul 2016 15:43:34 +0000 (11:43 -0400)]
Merge pull request #10400 from tchaikov/wip-test_async_compressor

cmake: fix the build of unittest_async_compressor

Reviewed-by: Ali Maredia <amaredia@redhat.com>
9 years agocmake: fix the build of unittest_async_compressor 10400/head
Kefu Chai [Fri, 22 Jul 2016 15:12:33 +0000 (23:12 +0800)]
cmake: fix the build of unittest_async_compressor

it was broken by 1e8388c

Signed-off-by: Kefu Chai <kchai@redhat.com>
9 years agoMerge pull request #8943 from tchaikov/wip-12287
Kefu Chai [Fri, 22 Jul 2016 14:53:31 +0000 (22:53 +0800)]
Merge pull request #8943 from tchaikov/wip-12287

pybind/ceph_argparse: handle non ascii unicode args

Reviewed-by: Loic Dachary <ldachary@redhat.com>
9 years agoMerge pull request #9737 from chenji-kael/wip-rgw-lifecycle
Daniel Gryniewicz [Fri, 22 Jul 2016 14:47:53 +0000 (10:47 -0400)]
Merge pull request #9737 from chenji-kael/wip-rgw-lifecycle

rgw:lifecycle feature [rebased]

9 years agoMerge pull request #10397 from theanalyst/wip-rgw-non-ec
Casey Bodley [Fri, 22 Jul 2016 14:19:13 +0000 (10:19 -0400)]
Merge pull request #10397 from theanalyst/wip-rgw-non-ec

wip: rgw multisite: preserve zone's extra pool

Reviewed-by: Casey Bodley <cbodley@redhat.com>
9 years agoMerge pull request #10394 from tchaikov/wip-16772
Haomai Wang [Fri, 22 Jul 2016 10:23:09 +0000 (18:23 +0800)]
Merge pull request #10394 from tchaikov/wip-16772

cmake: disable unittest_async_compressor

Reviewed-by: Haomai Wang <haomai@xsky.com>
9 years agorgw: better error message when user has no bucket created yet 10162/head
Gaurav Kumar Garg [Wed, 6 Jul 2016 16:56:27 +0000 (18:56 +0200)]
rgw: better error message when user has no bucket created yet

Currently when there is no bucket in the cluster and user execute
 "$radosgw-admin user  stats --uid=testid" command then rgw admin
not throwing meaningful error message.

With this fix it will show proper meaningful error message.

Fixes: http://tracker.ceph.com/issues/16444
Reported-by: Abhishek Lekshmanan <abhishek@suse.com>
Signed-off-by: Gaurav Kumar Garg <garg.gaurav52@gmail.com>
9 years agoMerge pull request #10381 from SUSE/wip-doc-rgw-cgi-warning
Orit Wasserman [Fri, 22 Jul 2016 10:01:20 +0000 (12:01 +0200)]
Merge pull request #10381 from SUSE/wip-doc-rgw-cgi-warning

doc/radosgw: rename config.rst to config-fcgi.rst
Reviewed-by: Orit Wasserman <owasserm@redhat.com>
9 years agorgw multisite: preserve zone's extra pool 10397/head
Abhishek Lekshmanan [Fri, 22 Jul 2016 08:57:45 +0000 (10:57 +0200)]
rgw multisite: preserve zone's extra pool

In current multisite scenarios,if a bucket is created in master, we end
up storing multipart metadata in `$source-zone.rgw.buckets.non-ec` pool
instead of the zone's own non-ec pool, so we end up additionally
creating this pool and storing multipart metadata entries in it. Also if
a bucket is created in a secondary zone, and we initiate a multipart
upload, before mdlog sync with master, we end up getting errors during
complete multipart requests as omap entries are partly stored in the
`$zone.rgw.buckets.non-ec` as well as `$source-zone.rgw.buckets.non-ec`
pools which leads to total number of parts mismatch.

Fixes: http://tracker.ceph.com/issues/16712
Signed-off-by: Abhishek Lekshmanan <abhishek@suse.com>
9 years agocmake: disable unittest_async_compressor 10394/head
Kefu Chai [Fri, 22 Jul 2016 08:04:28 +0000 (16:04 +0800)]
cmake: disable unittest_async_compressor

as async compressor is not used anywhere. and haomai agrees to disable
this test.

Signed-off-by: Kefu Chai <kchai@redhat.com>
9 years agopybind/ceph_argparse: handle non ascii unicode args 8943/head
Kefu Chai [Fri, 22 Jul 2016 07:55:16 +0000 (15:55 +0800)]
pybind/ceph_argparse: handle non ascii unicode args

we raise UnicodeDecodeError at seeing non-ascii args if we fail to match
it with any command signatures. instead, we should use a unicode string
for representing the error in that case. please note, the exception is
not printed at all in real-world. =)

Fixes: http://tracker.ceph.com/issues/12287
Signed-off-by: Kefu Chai <kchai@redhat.com>
9 years agodebian: use python:Depends for ceph-{common,base,osd}'s deps 10322/head
Kefu Chai [Sun, 17 Jul 2016 14:05:37 +0000 (22:05 +0800)]
debian: use python:Depends for ceph-{common,base,osd}'s deps

* ceph-base: use ${python:Depends} instead of listing the python
  dependencies manually, dh_python2 will scan the requirements
  of ceph-detect-init. and fill the subst var for us.
* ceph-common: add ${python:Depends}, as it packages ceph,
  and ceph-brag client.
* ceph-osd: it packages ceph-disk, so should add ${python:Depends}
  as its dependencies.

dh_python2 will figure them out.

Signed-off-by: Kefu Chai <kchai@redhat.com>
9 years agodebian: depends on python-all-dev instead of python-dev
Kefu Chai [Sun, 17 Jul 2016 12:07:12 +0000 (20:07 +0800)]
debian: depends on python-all-dev instead of python-dev

* debian/control: Build-Depends: s/python-dev/python-all-dev/, per
    https://wiki.debian.org/Python/FAQ#Build_dependencies

Signed-off-by: Kefu Chai <kchai@redhat.com>
9 years agodebian: remove ${shlibs:Depends} from python-* packages
Kefu Chai [Sun, 17 Jul 2016 09:21:04 +0000 (17:21 +0800)]
debian: remove ${shlibs:Depends} from python-* packages

* debian/control:
  as we have listed the linked libraries in Depends section, for example,
  python-rados depends on librados. and we don't need `dpkg-shlibdeps` to
  help figure out shared library substvar dependencies for us. by removing
  them, we can silence the warnings of
```
warning: dpkg-shlibdeps: package could avoid a useless dependency if
debian/python-rados/usr/lib/python2.7/dist-packages/rados.x86_64-linux-gnu.so
was not linked against libpthread.so.0 (it uses none of the library's
symbols)
```
  -lpthread is introduced by `python-config --ldflags` but it turns out we
  are not using any symbols from pthread in the extension directly. and
  pthread is included in glibc. so this does not added any extra
  dependency to python-* pacakges. but it's desirable to have less
  warnings.
* debian/rules: exclude python-* packages from dh_shlibdeps, as we will
  not use it to prepare the shlib deps substvars for these packages any
  more.

Signed-off-by: Kefu Chai <kchai@redhat.com>
9 years agodebian: do not run dh-python against non-python packages
Kefu Chai [Sun, 17 Jul 2016 08:56:59 +0000 (16:56 +0800)]
debian: do not run dh-python against non-python packages

some packages do not package python modules or scripts. so override
dh_python2 to exclude them.

this change silences warnings like:
```
warning: dpkg-gencontrol: package ceph-mon: unused substitution
variable ${python:Provides}
```

Signed-off-by: Kefu Chai <kchai@redhat.com>
9 years agoMerge pull request #8150 from wjwithagen/patch-3
Kefu Chai [Fri, 22 Jul 2016 05:39:21 +0000 (13:39 +0800)]
Merge pull request #8150 from wjwithagen/patch-3

.gitignore: exclude coredumps, logfiles and temporary testresults

Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agoAdd op to get Lifecycle configuration 9737/head
Daniel Gryniewicz [Thu, 14 Jul 2016 16:39:53 +0000 (12:39 -0400)]
Add op to get Lifecycle configuration

Signed-off-by: Daniel Gryniewicz <dang@redhat.com>
9 years agoRGW:lifecycle feature[rebase]
Ji Chen [Mon, 13 Jun 2016 02:32:34 +0000 (10:32 +0800)]
RGW:lifecycle feature[rebase]
As same as amazon S3 interface,"PUT Bucket lifecycle" and
"DELETE Bucket lifecycle" have been implemented,
"GET Bucket lifecycle" not realized yet as S3cmd has not
realize it also.
The feature`s main point is to remove expire file per day.
Files transfer from hot layer to cold layer is not supported.
ToDo:Maybe to transfer from replicate pool to EC pool or
from ssd to sata pool will be valuable.

Now put all buckets which should do lifecycle into shard
objects in .rgw.lc pool.

lifecycle config file format:
<LifecycleConfiguration>
    <Rule>
        <ID>sample-rule</ID>
        <Prefix></Prefix>
        <Status>enable</Status>
        <Expiration>
           <Days>1</Days>
        </Expiration>
    </Rule>
</LifecycleConfiguration>

Signed-off-by: Ji Chen <insomnia@139.com>
9 years agoMerge pull request #9089 from SirishaGuduru/bugfix15603
Yehuda Sadeh [Thu, 21 Jul 2016 21:12:09 +0000 (14:12 -0700)]
Merge pull request #9089 from SirishaGuduru/bugfix15603

doc: Modification for "TEST S3 ACCESS" section  in "INSTALL CEPH OBJECT GATEWAY" page

Reviewed-by: Abhishek Lekshmanan <abhishek@suse.com>
Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
9 years agoMerge pull request #10388 from yehudasa/wip-rgw-sync-err-injection
Casey Bodley [Thu, 21 Jul 2016 21:07:41 +0000 (17:07 -0400)]
Merge pull request #10388 from yehudasa/wip-rgw-sync-err-injection

rgw: add configurables for {data,meta} sync error injection

Reviewed-by: Casey Bodley <cbodley@redhat.com>
9 years agorgw: add configurables for {data,meta} sync error injection 10388/head
Yehuda Sadeh [Thu, 21 Jul 2016 20:26:09 +0000 (13:26 -0700)]
rgw: add configurables for {data,meta} sync error injection

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
9 years agoRevert RGW torrent
Daniel Gryniewicz [Thu, 21 Jul 2016 16:02:26 +0000 (12:02 -0400)]
Revert RGW torrent

Revert the RGW torrent commit for now, it was causing issues.

Signed-off-by: Daniel Gryniewicz <dang@redhat.com>
9 years agoMerge pull request #10377 from chhabaramesh/extent_alloc
Kefu Chai [Thu, 21 Jul 2016 15:01:35 +0000 (23:01 +0800)]
Merge pull request #10377 from chhabaramesh/extent_alloc

os/bluestore:Fix size calculation in bitallocator

Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agoMerge pull request #9589 from zhouruisong/master
Daniel Gryniewicz [Thu, 21 Jul 2016 13:54:19 +0000 (09:54 -0400)]
Merge pull request #9589 from zhouruisong/master

rgw:add a s3 API of make torrent for a object

9 years agodoc/radosgw: rename config.rst to config-fcgi.rst 10381/head
Nathan Cutler [Thu, 21 Jul 2016 12:17:08 +0000 (14:17 +0200)]
doc/radosgw: rename config.rst to config-fcgi.rst

This file documents how to configure RGW to use Apache/FastCGI, so rename
the file and modify the title and intro to make that clear.

Also, add a note that CGI can pose a security risk - e.g. http://httpoxy.org

Signed-off-by: Nathan Cutler <ncutler@suse.com>
9 years agoMerge pull request #10244 from jcsp/wip-cephfs-health-doc
John Spray [Thu, 21 Jul 2016 11:32:45 +0000 (12:32 +0100)]
Merge pull request #10244 from jcsp/wip-cephfs-health-doc

doc/cephfs: explain the various health messages

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
9 years agodoc/cephfs: explain the various health messages 10244/head
John Spray [Thu, 7 Jul 2016 15:45:08 +0000 (16:45 +0100)]
doc/cephfs: explain the various health messages

Signed-off-by: John Spray <john.spray@redhat.com>
9 years agoos/bluestore:Fix size calculation in bitallocator 10377/head
Ramesh Chander [Thu, 21 Jul 2016 06:05:07 +0000 (23:05 -0700)]
os/bluestore:Fix size calculation in bitallocator

Signed-off-by: Ramesh Chander <Ramesh.Chander@sandisk.com>
9 years agoMerge pull request #10149 from wjwithagen/patch-12
Kefu Chai [Thu, 21 Jul 2016 09:22:10 +0000 (17:22 +0800)]
Merge pull request #10149 from wjwithagen/patch-12

CMakeList.txt: link ceph_objectstore_tool against fuse only if WITH_FUSE

Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agosrc/tools/CMakeLists.txt: conditionalise the FUSE usage 10149/head
Willem Jan Withagen [Thu, 21 Jul 2016 07:59:08 +0000 (09:59 +0200)]
src/tools/CMakeLists.txt: conditionalise the FUSE usage

Signed-off-by: Willem Jan Withagen <wjw@digiware.nl>
9 years agoMerge pull request #10366 from ceph/wip-cmake-debian 10390/head
Kefu Chai [Thu, 21 Jul 2016 03:00:55 +0000 (11:00 +0800)]
Merge pull request #10366 from ceph/wip-cmake-debian

debian: bump compat to 9

Reviewed-by: Casey Bodley <cbodley@redhat.com>
Reviewed-by: Dan Mick <dmick@redhat.com>
9 years agoMerge pull request #10361 from ceph/wip-cmake
Kefu Chai [Thu, 21 Jul 2016 02:42:15 +0000 (10:42 +0800)]
Merge pull request #10361 from ceph/wip-cmake

cmake changes

Reviewed-by: Ali Maredia <amaredia@redhat.com>
9 years agoMerge pull request #10355 from yehudasa/wip-16742
Yehuda Sadeh [Wed, 20 Jul 2016 22:43:40 +0000 (15:43 -0700)]
Merge pull request #10355 from yehudasa/wip-16742

rgw: back off bucket sync on failures, don't store marker

Reviewed-by: Casey Bodley <cbodley@redhat.com>
9 years agorgw: fix collection of object sync errors 10355/head
Yehuda Sadeh [Wed, 20 Jul 2016 19:59:50 +0000 (12:59 -0700)]
rgw: fix collection of object sync errors

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
9 years agorgw: fix marker tracker completion handling
Yehuda Sadeh [Wed, 20 Jul 2016 19:43:48 +0000 (12:43 -0700)]
rgw: fix marker tracker completion handling

Was not tracking high markers correctly. Could only work if there was a single
hole in the completion range. Just keep a map of all the complete entries.

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
9 years agorgw: collect() stops if error encoutered
Yehuda Sadeh [Wed, 20 Jul 2016 19:42:52 +0000 (12:42 -0700)]
rgw: collect() stops if error encoutered

and returns true if needed to be called again

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
9 years agodebian: bump compat to 9 10366/head
Kefu Chai [Wed, 20 Jul 2016 09:28:40 +0000 (17:28 +0800)]
debian: bump compat to 9

dh_auto_configure set -DCMAKE_BUILD_TYPE=None so the default does not
take effect at all. this is on purpose, see [1].

and dpkg-buildflags is able to produce the suggested compiling flags by
debian policy. dh_* can pass these flags to cmake only if it works at
compat>=9, see [2].

and we are safe to move to compat 9, as jewel's supported debian based
distro is jessie (with debhelper 9.20150101), ubuntu trusty (with
debhelper 9.20131227ubuntu1)

---
[1] https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=701233#35
[2] https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=653916

Fixes: http://tracker.ceph.com/issues/16744
Signed-off-by: Kefu Chai <kchai@redhat.com>
9 years agoMerge pull request #10368 from oritwas/wip-rgw-upgrade-period-commit
Casey Bodley [Wed, 20 Jul 2016 17:53:56 +0000 (13:53 -0400)]
Merge pull request #10368 from oritwas/wip-rgw-upgrade-period-commit

rgw: fix upgrade from old multisite to new multisite configuration

Reviewed-by: Casey Bodley <cbodley@redhat.com>
9 years agoMerge pull request #10360 from ceph/wip-include-include
Ali Maredia [Wed, 20 Jul 2016 16:56:34 +0000 (12:56 -0400)]
Merge pull request #10360 from ceph/wip-include-include

cmake: add_subdirectory(include)

Reviewed-by: Ali Maredia <amaredia@redhat.com>
9 years agoMerge pull request #10315 from onyb/wip-cephfs-pypi
John Spray [Wed, 20 Jul 2016 16:34:05 +0000 (17:34 +0100)]
Merge pull request #10315 from onyb/wip-cephfs-pypi

pybind: Rework cephfs/setup.py for PyPI

Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agoMerge pull request #10316 from batrick/mds-standby-assertions
John Spray [Wed, 20 Jul 2016 14:43:43 +0000 (15:43 +0100)]
Merge pull request #10316 from batrick/mds-standby-assertions

mds: add assertions for standby_daemons invariant

Reviewed-by: John Spray <john.spray@redhat.com>
9 years agoMerge pull request #10347 from renhwztetecs/renhw-wip-test-add-fsdump
John Spray [Wed, 20 Jul 2016 14:43:00 +0000 (15:43 +0100)]
Merge pull request #10347 from renhwztetecs/renhw-wip-test-add-fsdump

test/mds: add fs dump in test_ceph_argparse.py

Reviewed-by: John Spray <john.spray@redhat.com>
9 years agoMerge pull request #10202 from xiaoxichen/fix_16588
John Spray [Wed, 20 Jul 2016 14:36:05 +0000 (15:36 +0100)]
Merge pull request #10202 from xiaoxichen/fix_16588

mds/MDSMap default metadata pool to -1 (was: output None instead of 0 when no fs present.)

Reviewed-by: John Spray <john.spray@redhat.com>
9 years agoMerge pull request #9864 from ajarr/wip-15615
John Spray [Wed, 20 Jul 2016 14:15:18 +0000 (15:15 +0100)]
Merge pull request #9864 from ajarr/wip-15615

ceph_volume_client: store authentication metadata

Reviewed-by: John Spray <john.spray@redhat.com>
9 years agoREADME.FreeBSD: Cmake instructions 10352/head
Willem Jan Withagen [Wed, 20 Jul 2016 13:59:57 +0000 (15:59 +0200)]
README.FreeBSD: Cmake instructions

Signed-off-by: Willem Jan Withagen <wjw@digiware.nl>
9 years agoFindNSS.cmake: find includes in /usr/local/includes/nss/nss
Willem Jan Withagen [Tue, 19 Jul 2016 14:23:14 +0000 (16:23 +0200)]
FindNSS.cmake: find includes in /usr/local/includes/nss/nss

Signed-off-by: Willem Jan Withagen <wjw@digiware.nl>
9 years agoCMakeLists.txt: Add FreeBSD isms
Willem Jan Withagen [Tue, 19 Jul 2016 14:17:23 +0000 (16:17 +0200)]
CMakeLists.txt: Add FreeBSD isms

Signed-off-by: Willem Jan Withagen <wjw@digiware.nl>
9 years agodo_freebsd-cmake.sh: script to cmake on FreeBSD
Willem Jan Withagen [Tue, 19 Jul 2016 14:15:02 +0000 (16:15 +0200)]
do_freebsd-cmake.sh: script to cmake on FreeBSD

Signed-off-by: Willem Jan Withagen <wjw@digiware.nl>
9 years agoMerge pull request #10327 from xiexingguo/xxg-wip-bluestore-2016-07-18
Mark Nelson [Wed, 20 Jul 2016 13:28:40 +0000 (08:28 -0500)]
Merge pull request #10327 from xiexingguo/xxg-wip-bluestore-2016-07-18

os/bluestore: misc fixes/cleanups

Mark's Comments:
This passed "ceph_test_objectstore --gtest_filter=*/2".
This PR may have contributed to write performance improvements along with #10257.

Reviewed-by: Mark Nelson <mnelson@redhat.com>
9 years agoMerge pull request #10257 from chhabaramesh/extent_alloc
Mark Nelson [Wed, 20 Jul 2016 13:22:31 +0000 (08:22 -0500)]
Merge pull request #10257 from chhabaramesh/extent_alloc

os/bluestore: extent alloc functionality for stupid and bitmap allocator

Mark's Comments:
This passed "ceph_test_objectstore --gtest_filter=*/2".
This PR appears to result in a large sequential write performance increase (Up to ~3.5X), and may contribute to a small random write performance increase as well.

Reviewed-by: Mark Nelson <mnelson@redhat.com>
9 years agorgw: fix upgrade from old multisite to new multisite configuration 10368/head
Orit Wasserman [Wed, 20 Jul 2016 11:02:03 +0000 (13:02 +0200)]
rgw: fix upgrade from old multisite to new multisite configuration

We need to store the updated current period after adding the old converted regions

Fixes: http://tracker.ceph.com/issues/16751
Signed-off-by: Orit Wasserman <owasserm@redhat.com>
9 years agosrc/test/cli/* tests: POSIX Convert grep -P to grep -E (v2) 10319/head
Willem Jan Withagen [Sat, 16 Jul 2016 17:01:42 +0000 (19:01 +0200)]
src/test/cli/* tests: POSIX Convert grep -P to grep -E (v2)

 - FreeBSD does not have grep -P
 - [Posix grep]: replace \t by [[:space:]]

Signed-off-by: Willem Jan Withagen <wjw@digiware.nl>
9 years agoMerge pull request #9082 from stiopaa1/osd_TestOpsSocketHook_removeUnneededParam
Kefu Chai [Wed, 20 Jul 2016 10:07:40 +0000 (18:07 +0800)]
Merge pull request #9082 from stiopaa1/osd_TestOpsSocketHook_removeUnneededParam

pass string by const ref and add override to virtual function

Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agoMerge pull request #9667 from SUSE/wip-15984
Boris Ranto [Wed, 20 Jul 2016 09:01:43 +0000 (11:01 +0200)]
Merge pull request #9667 from SUSE/wip-15984

ceph-osd-prestart.sh: drop Upstart-specific code

Reviewed-by: Boris Ranto <branto@redhat.com>
9 years agoMerge pull request #10339 from tchaikov/wip-16675
Kefu Chai [Wed, 20 Jul 2016 09:00:38 +0000 (17:00 +0800)]
Merge pull request #10339 from tchaikov/wip-16675

selinux: allow read /proc/<pid>/cmdline

Reviewed-by: Boris Ranto <branto@redhat.com>
9 years agocmake: remove unused Findfio.cmake 10361/head
Kefu Chai [Wed, 20 Jul 2016 08:22:29 +0000 (16:22 +0800)]
cmake: remove unused Findfio.cmake

Signed-off-by: Kefu Chai <kchai@redhat.com>
9 years agocmake: Findfcgi.cmake cleanups
Kefu Chai [Wed, 20 Jul 2016 08:20:59 +0000 (16:20 +0800)]
cmake: Findfcgi.cmake cleanups

FindPackageHandleStandardArgs() takes care of the find_package()
boilderplate stuff. so no need to repeat them. and remove the checkings
in env variables.

Signed-off-by: Kefu Chai <kchai@redhat.com>
9 years agocmake: do not include $lrc_srcs in unittest_erasure_code_lrc
Kefu Chai [Wed, 20 Jul 2016 08:01:53 +0000 (16:01 +0800)]
cmake: do not include $lrc_srcs in unittest_erasure_code_lrc

as ${lrc_srcs} is not defined in the scope where
unittest_erasure_code_lrc is added as a target. and instead we link
unittest_erasure_code_lrc against ec_lrc dynamic library. so we can
safely remove ${lrc_srcs} from unittest_erasure_code_lrc.

Signed-off-by: Kefu Chai <kchai@redhat.com>
9 years agocmake: s/EXTRA_LIBS/EXTRALIBS/
Kefu Chai [Wed, 20 Jul 2016 07:47:49 +0000 (15:47 +0800)]
cmake: s/EXTRA_LIBS/EXTRALIBS/

it's a typo, i think. as EXTRA_LIBS is never defined anywhere.

Signed-off-by: Kefu Chai <kchai@redhat.com>