Commit Graph

50210 Commits

Author SHA1 Message Date
Yehuda Sadeh
894738f845 Merge pull request #7630 from rzarzynski/wip-rgw-admin-token-cache
rgw: add support for caching of Keystone admin token.

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
2016-02-27 06:22:09 -08:00
Yehuda Sadeh
04884be986 Merge pull request #7825 from ceph/wip-rgw-openssl
rgw: link civetweb with openssl (Sage, Marcus Watts)

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
2016-02-27 06:17:15 -08:00
Marcus Watts
86718592c0 cmake fix: build civetweb with the right include path.
In an earlier commit, civetweb.c got moved into a separate cmake 'object'
library civetweb_common_objs so that it could be built just once for use
with several different targets.  At the time, there was a separate global
"include_directory" to give the right include path for including "civetweb.h".
A later commit in master created an rgw_a library, and restricted civetweb.h's
include path for only building rgw_a objects.  So, as the product of
these these two commits, the target_include_directories command for the
civetweb include path now needs to be applied to civetweb_common_objs
and not rgw_a.

Signed-off-by: Marcus Watts <mwatts@redhat.com>
2016-02-27 02:34:14 -05:00
Sage Weil
74d698a406 Merge pull request #7650 from avnerbh/fix1_rand
msg: add thread safety for "random" Messenger + fix wrong usage of random functions

Reviewed-by: Haomai Wang <haomai@xsky.com>
2016-02-26 18:58:28 -05:00
Sage Weil
0499ca89a0 Merge pull request #7651 from xiexingguo/xxg-wip-fixtypecheck
osd: bluestore: improve fs-type verification and tidy up

Reviewed-by: Sage Weil <sage@redhat.com>
2016-02-26 18:57:19 -05:00
Sage Weil
6e497e077d Merge pull request #7654 from rldleblanc/wip-wpq-optimization
osd: WeightedPriorityQueue: move to intrusive containers
2016-02-26 18:36:52 -05:00
Yehuda Sadeh
888021189c Merge pull request #7821 from rzarzynski/wip-rgw-14903
rgw: fix wrong handling of limit=0 during listing of Swift account.

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
2016-02-26 13:37:44 -08:00
Radoslaw Zarzynski
155f079118 rgw: change naming of utility functions in rgw_keystone.cc.
Slightly improve code formatting and const-correctness as well.

Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
2016-02-26 22:20:03 +01:00
Marcus Watts
aaa0f6fa77 Use fixed version of civetweb to avoid warning.
The warning about SSLv23_client_method is because when using dynamic
linking, this should always be non-zero.  That's inside of civetweb,
so this commit is to pull the submodule up to the fix.

Signed-off-by: Marcus Watts <mwatts@redhat.com>
2016-02-26 12:36:08 -08:00
Marcus Watts
f3925ec5ef Fix ssl link error.
When linking against -lssl, should also include -lcrypto.

// fixup merge with previous

Signed-off-by: Marcus Watts <mwatts@redhat.com>
2016-02-26 12:30:52 -08:00
Marcus Watts
b451cbb368 Use ld.so to link in ssl crypto (cmake changes).
Using dlopen() to load in ssl crypto makes me cringe.
Also it requires either installing the devel package,
or appending library versioning to the library name
civetweb tries to load, which is ugly.  This is only
a license problem for people whose system distribution
does not include openssl.

Signed-off-by: Marcus Watts <mwatts@redhat.com>
2016-02-26 12:29:47 -08:00
Radoslaw Zarzynski
ec186f4cf4 rgw: fix wrong handling of limit=0 during listing of Swift account.
Fixes: #14903
Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
2016-02-26 21:18:11 +01:00
Yehuda Sadeh
d7b47c260c Merge pull request #7777 from theanalyst/rgw/insecure-keystone
rgw: allow authentication keystone with self signed certs 

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
2016-02-26 11:18:05 -08:00
Yehuda Sadeh
381411e350 Merge pull request #7809 from cbodley/wip-rgw-includes
rgw: use pimpl pattern for RGWPeriodHistory

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
2016-02-26 10:50:04 -08:00
Yehuda Sadeh
62a2127786 Merge pull request #7822 from rzarzynski/wip-rgw-keystone-proper-parse-ordering
rgw: try to parse Keystone token in order appropriate to configuration.

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
2016-02-26 10:44:01 -08:00
Yehuda Sadeh
0e3e7bcada Merge pull request #7803 from oritwas/wip-14826
rgw: reset return code in when iterating over the bucket the objects

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
2016-02-26 10:38:12 -08:00
Radoslaw Zarzynski
80f34dcb98 rgw: try to parse Keystone token in order appropriate to configuration.
Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
2016-02-26 17:41:27 +01:00
Abhishek Lekshmanan
5d4173543f rgw: add insecure option to the http client
This allows the http client to turn off ssl certificate peer checking,
which is turned on by default. This is useful in cases like when
Keystone is SSL terminated with a self signed certificate.
The option `rgw_keystone_verify_ssl` (default true) can be toggled if
self signed certs are used, so that swift and s3 apis using keystone
authentication can work.

Fixes: #14583
Reported-by: Karol Mroz <mroz.karol@gmail.com>
Signed-off-by: Abhishek Lekshmanan <abhishek@suse.com>
2016-02-26 17:20:01 +01:00
Casey Bodley
dff62e47ef rgw: use pimpl pattern for RGWPeriodHistory
this removes the dependency on RGWPeriod from rgw_rados.h, which breaks
a circular dependency between rgw_rados.h -> rgw_metadata.h ->
rgw_period_history.h -> rgw_rados.h

Reported-by: Willem Jan Withagen <wjw@digiware.nl>
Signed-off-by: Casey Bodley <cbodley@redhat.com>
2016-02-26 10:54:03 -05:00
Sage Weil
39671f1f4d doc: final v9.2.1 release notes
Signed-off-by: Sage Weil <sage@redhat.com>
2016-02-26 10:24:22 -05:00
Sage Weil
8689a61504 Merge pull request #7694 from Abhishekvrshny/wip-infernalis-release-notes
release-notes: draft v9.2.1 release notes
2016-02-26 10:24:20 -05:00
Sage Weil
d3db533a4f Merge pull request #7813 from xiexingguo/xxg-wip-doc
doc: small fixes
2016-02-26 09:54:20 -05:00
xiexingguo
ca50f42359 doc: batch small fixes, including typo, syntax etc.
Signed-off-by: xiexingguo <xie.xingguo@zte.com.cn>
2016-02-26 23:25:02 +08:00
xiexingguo
dc7e027ea5 doc: fix typo
Signed-off-by: xiexingguo <xie.xingguo@zte.com.cn>
2016-02-26 22:39:57 +08:00
Loic Dachary
86e2987fcf Merge pull request #7805 from ErwanAliasr1/evelu-check-btrfs
Fixing BTFS issue at 'make check'

Reviewed-by: Loic Dachary <ldachary@redhat.com>
2016-02-26 11:34:42 +07:00
Haomai Wang
e236ebdc25 Merge pull request #7802 from branch-predictor/bp-increase-async-threads
config: increase default async op threads

Reviewed-by: Haomai Wang <haomai@xsky.com>
2016-02-26 10:45:45 +08:00
Ali Maredia
5f935455ac Merge pull request #7808 from cbodley/wip-cmake-jerasure
cmake: add ErasureCode.cc to jerasure plugins
2016-02-25 15:09:09 -05:00
Casey Bodley
753221e2cf cmake: add ErasureCode.cc to jerasure plugins
Signed-off-by: Casey Bodley <cbodley@redhat.com>
2016-02-25 14:58:18 -05:00
Sage Weil
aa92f9dff0 rgw: link against system openssl (instead of dlopen at runtime)
Signed-off-by: Sage Weil <sage@redhat.com>
2016-02-25 11:44:10 -08:00
Casey Bodley
0dd061c3ed Merge pull request #7748 from ceph/wip-cmake-2-22-16
cmake: fix paths to various EC source files
2016-02-25 14:06:16 -05:00
Ali Maredia
83b4aab3a8 cmake: installing _tp libraries into lib
Signed-off-by: Ali Maredia <amaredia@redhat.com>
2016-02-25 14:02:11 -05:00
Ali Maredia
2e4ad9ea7d cmake: Removed _tp libraries from linking
Signed-off-by: Ali Maredia <amaredia@redhat.com>
2016-02-25 13:48:26 -05:00
Radoslaw Zarzynski
18da92f32b rgw: add support for caching of Keystone admin token.
Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
2016-02-25 18:34:16 +01:00
Erwan Velu
c2e6102955 test/ceph_objectstore_tool: Deleting btrfs subvolumes before exiting
When running the ceph_objectstore_tool test suite, we shall delete the btrfs
subvolumes that have been created before trying deleting the content unless that will generate a permission denied
issue.

Signed-off-by: Erwan Velu <erwan@redhat.com>
2016-02-25 18:14:32 +01:00
Erwan Velu
9ae89269f8 ceph-helpers: Delete remaining subvolumes on destroy_osd()
Before deleting $dir/$id, we have to delete the associated subvolumes unless the
rm will fail.

Signed-off-by: Erwan Velu <erwan@redhat.com>
2016-02-25 16:46:49 +01:00
Jason Dillaman
0c44f20a30 Merge pull request #7793 from tchaikov/wip-fix-dencoder-MirrorImage
cls_rbd: fix the test for ceph-dencoder

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
2016-02-25 10:33:19 -05:00
Orit Wasserman
e23fdcbbce rgw: reset return code in when iterating over the bucket the objects
Fixes: #14826

Signed-off-by: Orit Wasserman <owasserm@redhat.com>
2016-02-25 16:11:15 +01:00
Kefu Chai
a704270287 cls_rbd: fix the test for ceph-dencoder
initialize MirrorImage::state to a certain value, otherwise the
generated test instances would be undetermined, and hence fail
the dencoder tests.

Signed-off-by: Kefu Chai <kchai@redhat.com>
2016-02-25 23:07:49 +08:00
Loic Dachary
7131c977f0 Merge pull request #7792 from tchaikov/wip-13505
fix FTBFS introduced by d0af316

Reviewed-by: Loic Dachary <ldachary@redhat.com>
2016-02-25 22:04:26 +07:00
Erwan Velu
cd0389ddb1 ceph-helpers.sh: Deleting forgoten btrfs subvolumes
While running a make check on a btrfs system, many subvolumes are let at the end
of the build. It's pretty common to have several hundreds of those.

btrfs is pretty sensible to the path when requesting a subvolume removal.
The current code was misleading the path and didn't deleted the remaining
volumes.

This patch list the current subvolumes, filter thoses created by the
test process and ajust the path because brtfs reports
  erwan/chroot/ceph/src/testdir/test-7202/dev/osd1/snap_439
while regarding the current working directory we want to delete :
  testdir/test-7202/dev/osd1/snap_439

Signed-off-by: Erwan Velu <erwan@redhat.com>
2016-02-25 15:33:10 +01:00
Piotr Dałek
ba70bdb303 config: increase default async op threads
Default value of two async threads is enough for light workloads,
but is insufficient for heavy ones, reducing maximum throughput on
slower CPUs that have plenty of logical cores. Three async threads
give noticeable perf jump without any noticeable downsides.

Signed-off-by: Piotr Dałek <piotr.dalek@ts.fujitsu.com>
2016-02-25 15:12:52 +01:00
Loic Dachary
61ab9e8e70 Merge pull request #7731 from SUSE/wip-shebang
ceph_detect_init/__init__.py: remove shebang

Reviewed-by: Loic Dachary <ldachary@redhat.com>
2016-02-25 21:03:21 +07:00
Kefu Chai
557c3bfe0d osd: always cleanup the scrub results
the destructor of Scrub::Store asserts that `this->results` should
always be empty when it is free'd. before this change, if we are
repairing, the results is not flushed or cleaned up, this crashes
osd daemon when a new PG internval comes. also we should not keep
the results around even we don't want to populate them to the omap
if we are repairing, it's just a waste.

Signed-off-by: Kefu Chai <kchai@redhat.com>
2016-02-25 21:47:30 +08:00
Kefu Chai
b0b402193d pybind: fix the FTBFS introduced by d0af316
Signed-off-by: Kefu Chai <kchai@redhat.com>
2016-02-25 21:47:30 +08:00
Kefu Chai
67aa66ee9c Merge pull request #7734 from dachary/wip-14834-pidfile-test
tests: test_pidfile.sh lingering processes

Reviewed-by: Kefu Chai <kchai@redhat.com>
2016-02-25 16:19:08 +08:00
Kefu Chai
ac7d11ad73 librados: add missing tracpoint for scrub APIs
Signed-off-by: Kefu Chai <kchai@redhat.com>
2016-02-24 22:39:57 -08:00
Loic Dachary
c1e1c8d18e tests: test_pidfile.sh lingering processes
For the mon, using ps aux to find the process will only show part of the
command line and the $RUNID may be missing. For the OSD, the $RUNID is
passed using an environment variable and will not show at all.

There is no need to test both ceph-osd and ceph-mon since they both end
up in the same code path, pidfile_write. Add a log line that only shows
when the --pid-file is empty and grep for it in the simplest possible
way.

The TEST_pidfile test failed to kill a process because there was
no pidfile with its pid. This is fixed by backuping the pidfile before
it is modified.

http://tracker.ceph.com/issues/14834 Fixes: #14834

Signed-off-by: Loic Dachary <loic@dachary.org>
2016-02-25 12:24:00 +07:00
Kefu Chai
ce1169d245 Merge pull request #6898 from tchaikov/wip-13505
add scrub persist/query API

Reviewed-by: Samuel Just <sjust@redhat.com>
2016-02-25 12:48:14 +08:00
Kefu Chai
e2374c43c9 rados: add "list-inconsistent-snapset" cmd
to list inconsistent snapsets of a given PG, this command exposes
get_inconsistent_snapsets() rados API to user.

Fixes: #13505
Signed-off-by: Kefu Chai <kchai@redhat.com>
2016-02-25 12:41:55 +08:00
Kefu Chai
8018eab344 rados: add "list-inconsistent-obj" cmd
to list inconsistent objects of a given PG, this command exposes
get_inconsistent_objects() rados API to user.

Signed-off-by: Kefu Chai <kchai@redhat.com>
2016-02-25 12:41:55 +08:00