Commit Graph

56394 Commits

Author SHA1 Message Date
Kefu Chai
af1598a3b3 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>
2016-07-24 18:18:45 +08:00
Kefu Chai
b1f084a8a9 Merge pull request #10354 from stiopaa1/msg_message_addConst
msg/Message.h: add const to member function

Reviewed-by: Kefu Chai <kchai@redhat.com>
2016-07-24 15:17:57 +08:00
Loic Dachary
e990bde08d 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>
2016-07-23 21:24:31 +02:00
Nathan Cutler
e6f2d4e8fc doc: add "Prepare tenant" section to "Testing in the cloud" chapter
Signed-off-by: Nathan Cutler <ncutler@suse.com>
2016-07-23 19:24:18 +02:00
Orit Wasserman
7e87eaf570 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>
2016-07-23 15:37:59 +02:00
xie xingguo
0d4672ae07 osd: fix typo in comment of store_statfs_t
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
2016-07-23 09:01:12 +08:00
xie xingguo
c421875bab kv/MemDB: fill in statfs directly
Which is faster.

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
2016-07-23 08:57:51 +08:00
Josh Durgin
f84be8f6a6 Merge pull request #10405 from athanatos/wip-ec-pg-log
osd: fixups to explicitly persistenting missing sets

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2016-07-22 15:11:08 -07:00
Samuel Just
45995c9f63 osd_types: fix type of ChangeTracker::clean()
Signed-off-by: Samuel Just <sjust@redhat.com>
2016-07-22 14:31:09 -07:00
Samuel Just
379fa35750 osd_types: rename swap to claim, restrict to the non-tracking variant
Signed-off-by: Samuel Just <sjust@redhat.com>
2016-07-22 14:30:58 -07:00
Josh Durgin
b0e239da95 Merge pull request #10334 from ceph/wip-ec-pg-log
osd: persist the missing set explicitly

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2016-07-22 14:27:19 -07:00
Nathan Cutler
ea437e4c05 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>
2016-07-22 22:31:33 +02:00
Yehuda Sadeh
81aef8ce43 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>
2016-07-22 13:21:39 -07:00
Yehuda Sadeh
05f634c9b7 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>
2016-07-22 13:13:13 -07:00
Nathan Cutler
94e4f2190b rpm: move libatomic_ops-devel to non-distro-specific section
Signed-off-by: Nathan Cutler <ncutler@suse.com>
2016-07-22 20:42:02 +02:00
Nathan Cutler
06940e29b7 rpm: move gperftools-devel to non-distro-specific section
Signed-off-by: Nathan Cutler <ncutler@suse.com>
2016-07-22 20:42:02 +02:00
Nathan Cutler
c835f6ddf5 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>
2016-07-22 20:42:02 +02:00
Dan Mick
8c48f87ee7 Merge pull request #10322 from ceph/wip-debian-python-warnings
debian: python related changes

Reviewed-by: Dan Mick <dmick@redhat.com>
2016-07-22 11:31:30 -07:00
Abhishek Lekshmanan
637e959f95
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>
2016-07-22 17:56:05 +02:00
Ali Maredia
42916c016b 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>
2016-07-22 11:43:34 -04:00
Kefu Chai
f4cbfec581 cmake: fix the build of unittest_async_compressor
it was broken by 1e8388c

Signed-off-by: Kefu Chai <kchai@redhat.com>
2016-07-22 23:13:20 +08:00
Kefu Chai
65bd58b4f6 Merge pull request #8943 from tchaikov/wip-12287
pybind/ceph_argparse: handle non ascii unicode args

Reviewed-by: Loic Dachary <ldachary@redhat.com>
2016-07-22 22:53:31 +08:00
Daniel Gryniewicz
b3782f5bed Merge pull request #9737 from chenji-kael/wip-rgw-lifecycle
rgw:lifecycle feature [rebased]
2016-07-22 10:47:53 -04:00
Casey Bodley
74144bca3a 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>
2016-07-22 10:19:13 -04:00
Dongsheng Yang
6264acb469 tools/rbd: use create4() for both of format 1 and format 2.
Signed-off-by: Dongsheng Yang <dongsheng.yang@easystack.cn>
2016-07-22 07:04:10 -04:00
Dongsheng Yang
a187b346d7 tools/rbd: set order to default value if it is not specified in options.
Signed-off-by: Dongsheng Yang <dongsheng.yang@easystack.cn>
2016-07-22 07:04:10 -04:00
Dongsheng Yang
cfae775889 librbd: check the RBD_FEATURE_LAYERING for the features of child image.
Signed-off-by: Dongsheng Yang <dongsheng.yang@easystack.cn>
2016-07-22 07:04:10 -04:00
Dongsheng Yang
df81ba1c7f librbd: set RBD_FEATURE_STRIPINGV2 in create if needed.
Signed-off-by: Dongsheng Yang <dongsheng.yang@easystack.cn>
2016-07-22 07:04:09 -04:00
Dongsheng Yang
98251eae48 pybind: don't set the default values for the options not specified in copying
Signed-off-by: Dongsheng Yang <dongsheng.yang@easystack.cn>
2016-07-22 07:04:09 -04:00
Dongsheng Yang
4942076524 pybind: don't set the default values for the options not specified in cloning
Signed-off-by: Dongsheng Yang <dongsheng.yang@easystack.cn>
2016-07-22 07:04:09 -04:00
Dongsheng Yang
c37df5e691 pybind: don't set the default values for the options not specified in creating
Signed-off-by: Dongsheng Yang <dongsheng.yang@easystack.cn>
2016-07-22 07:04:09 -04:00
Dongsheng Yang
3508f40037 tools/rbd: set RBD_IMAGE_OPTION_FEATURES_CLEAR when --image-shared specified.
Signed-off-by: Dongsheng Yang <dongsheng.yang@easystack.cn>
2016-07-22 07:04:09 -04:00
Dongsheng Yang
22f77dd301 librbd: introduce RBD_IMAGE_OPTION_FEATURES_[SET|CLEAR] for features overwriting.
Currently, if we want to use the default options for rbd, we need to omit the
RBD_IMAGE_OPTION_FEATURES, but if we want --image-shared. we need to overwrite
something bese on the default value of image options.

This patch introduce two flags in image_options, RBD_IMAGE_OPTION_FEATURES_SET
means, we want to set something after you get the features from default, parent
or user. And RBD_IMAGE_OPTION_FEATURES_CLEAR will do a bit clear.

Signed-off-by: Dongsheng Yang <dongsheng.yang@easystack.cn>
2016-07-22 07:04:09 -04:00
Dongsheng Yang
dd299e0fca librbd/copy: set RBD_FEATURE_STRIPINGV2 in feature if stripe related options specified
Signed-off-by: Dongsheng Yang <dongsheng.yang@easystack.cn>
2016-07-22 07:04:08 -04:00
Dongsheng Yang
d97fe01cb1 librbd/clone: set RBD_FEATURE_STRIPINGV2 in feature if stripe related options specified
Signed-off-by: Dongsheng Yang <dongsheng.yang@easystack.cn>
2016-07-22 07:04:08 -04:00
Dongsheng Yang
6f5571f74a librbd: set the default options when they are not specified.
Signed-off-by: Dongsheng Yang <dongsheng.yang@easystack.cn>
2016-07-22 07:04:08 -04:00
Dongsheng Yang
a9db19991d tools/rbd: only set the options specified by user in get_image_options().
Signed-off-by: Dongsheng Yang <dongsheng.yang@easystack.cn>
2016-07-22 07:04:03 -04:00
Haomai Wang
4e7946c2f1 Merge pull request #10394 from tchaikov/wip-16772
cmake: disable unittest_async_compressor

Reviewed-by: Haomai Wang <haomai@xsky.com>
2016-07-22 18:23:09 +08:00
Gaurav Kumar Garg
b9a2048c66 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>
2016-07-22 12:14:23 +02:00
Orit Wasserman
95b46c9d5c 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>
2016-07-22 12:01:20 +02:00
Abhishek Lekshmanan
d4ecc956f6
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>
2016-07-22 10:57:45 +02:00
Kefu Chai
1e8388c345 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>
2016-07-22 16:04:30 +08:00
Kefu Chai
5864626d27 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>
2016-07-22 15:55:18 +08:00
Kefu Chai
f11acf2b15 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>
2016-07-22 15:02:12 +08:00
Kefu Chai
7db7f236b3 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>
2016-07-22 15:02:12 +08:00
Kefu Chai
48f4576de1 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>
2016-07-22 15:02:12 +08:00
Kefu Chai
abe5da0e3a 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>
2016-07-22 14:23:30 +08:00
Kefu Chai
aacba7f1e8 Merge pull request #8150 from wjwithagen/patch-3
.gitignore: exclude coredumps, logfiles and temporary testresults

Reviewed-by: Kefu Chai <kchai@redhat.com>
2016-07-22 13:39:21 +08:00
Daniel Gryniewicz
1756b74935 Add op to get Lifecycle configuration
Signed-off-by: Daniel Gryniewicz <dang@redhat.com>
2016-07-22 12:22:23 +08:00
Ji Chen
abe4b1378c 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>
2016-07-22 12:22:12 +08:00