Commit Graph

48209 Commits

Author SHA1 Message Date
Danny Al-Gaaf
e794126371 man/8/ceph.rst: fix man page --admin-daemon
The option "--admin-socket ADMIN_SOCKET/DAEMON_NAME" was blocked
as fix for #3944, fix man page to reflect it.

Fix for make warning:

doc/man/8/ceph.rst:5: SEVERE: Duplicate ID: "cmdoption-ceph--admin-socket".

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
2016-01-29 21:51:17 +01:00
Danny Al-Gaaf
cc83e80241 crush/CrushTester.cc: remove unused variable
Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
2016-01-29 21:51:17 +01:00
Danny Al-Gaaf
e892f9aa29 rbd-replay-prep.cc: replace inefficient string::find() w/ compare()
Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
2016-01-29 21:51:17 +01:00
Danny Al-Gaaf
5d14351042 crush/CrushTester.cc: remove unused variable
Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
2016-01-29 21:51:17 +01:00
Danny Al-Gaaf
0cb445733b mon/Monitor.cc: replace inefficient usage of string::find() with compare()
Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
2016-01-29 21:51:17 +01:00
Danny Al-Gaaf
1f262a1235 mds/Server.cc: use string::compare() instead of ::find()
Replace inefficient use of string::find() in conditions with
string::compare().

Changed checks in handle_set_vxattr() to call find/compare
on the 'name' only once.

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
2016-01-29 21:51:17 +01:00
Danny Al-Gaaf
fd8f18ac35 ceph_mon.cc: replace string::find() with compare()
Fix for:

[src/ceph_mon.cc:396]: (performance) Inefficient usage of string::find()
 in condition; string::compare() would be faster.

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
2016-01-29 21:51:17 +01:00
Yehuda Sadeh
30162870fd Merge pull request #6131 from rzarzynski/wip-admincreds-in-s3-keystone
rgw: support admin credentials in S3-related Keystone authentication.

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
2016-01-29 09:28:41 -08:00
Radoslaw Zarzynski
136433d521 rgw: support admin credentials in S3-related Keystone authentication.
Fixes: #13302
Backport: infernalis, hammer
Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
2016-01-29 17:12:27 +01:00
Loic Dachary
20138c6d37 Merge pull request #7298 from racpatel/wip-doc-rac2
doc :- fixing image in section ERASURE CODING

Reviewed-by: Loic Dachary <ldachary@redhat.com>
2016-01-29 21:44:42 +07:00
John Coyle
6d860ba46c cmake: musl libc does not implement backtrace. Added feature check and fallback to libexecinfo.
Signed-off-by: John Coyle <dx9err@gmail.com>
2016-01-29 08:50:46 -05:00
Sage Weil
11cbe45c9c Merge pull request #7264 from ceph/wip-doc-RGW
doc: rgw: port changes from downstream to upstream

Reviewed-by: Kefu Chai <kchai@redhat.com>
2016-01-29 08:50:07 -05:00
Sage Weil
fbe910378e Merge pull request #7244 from mikulely/fix-authtool-doc
doc: remove redundant space in ceph-authtool/monmaptool doc
2016-01-29 08:49:17 -05:00
ritz303
152f4eb09f doc: Updated the RPM section for RHEL and CentOS
Fixes: #10245

Signed-off-by: Aron Gunn <ritz_303@yahoo.com>
2016-01-29 08:44:17 -05:00
Sage Weil
1d2948fdcc Merge pull request #7027 from mathslinux/fix-s3-csharp-doc
doc: fix S3 C# example
2016-01-29 08:46:47 -05:00
Sage Weil
04289a9206 Merge pull request #7000 from zhouyuan/fix_cache_tier_doc
doc: fix misleading configuration guide on cache tiering

Reviewed-by: Sage Weil <sage@redhat.com>
2016-01-29 08:46:15 -05:00
Sage Weil
428805adf9 Merge pull request #6930 from wido/rgw-key-docs
doc: use 'ceph auth get-or-create' for creating RGW keyring

Reviewed-by: Sage Weil <sage@redhat.com>
2016-01-29 08:45:16 -05:00
Sage Weil
6684d3c363 Merge pull request #7384 from wido/mirroring
doc: script and guidelines for mirroring Ceph

Reviewed-by: Abhishek Lekshmanan <abhishek@suse.com>
2016-01-29 08:43:31 -05:00
Sage Weil
8d560f761d Merge pull request #7435 from xiexingguo/xxg-wip-14561
osd: BlueStore: fix null pointer access

Reviewed-by: Sage Weil <sage@redhat.com>
2016-01-29 08:39:39 -05:00
Sage Weil
fb856af072 Merge pull request #7271 from somnathr/wip-transaction-delete
osd: avoid heap allocations for ObjectStore::Transaction

http://pulpito.ceph.com/sage-2016-01-28_12:50:51-rados-wip-sage-testing3---basic-mira/

Reviewed-by: Casey Bodley <cbodley@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
2016-01-29 08:33:28 -05:00
Sage Weil
a6da3706c3 Merge pull request #6440 from stiopaa1/scrubbingInfo
mon: warn if pg(s) not scrubbed

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: David Zafman <dzafman@redhat.com>
2016-01-29 08:29:23 -05:00
Sage Weil
71501a3ab4 Merge pull request #7075 from shun-s/shun-fix
global: do not start two daemons with a single pid-file

Reviewed-by: Kefu Chai <kchai@redhat.com>
2016-01-29 08:28:30 -05:00
Sage Weil
8a40b37a9e Merge pull request #7111 from chenji-kael/master
osd: FileStore: print file name before osd assert if read file failed

Reviewed-by: Sage Weil <sage@redhat.com>
2016-01-29 08:28:03 -05:00
Sage Weil
ec00cad010 Merge pull request #7268 from ifed01/wip-14400
common: snappy decompressor may assert when handling segmented input bufferlist

Reviewed-by: Haomai Wang <haomai@xsky.com>
2016-01-29 08:27:13 -05:00
Sage Weil
5deb6fd16d Merge pull request #7276 from caibo2014/fix-messager-null
mon/MonClient: avoid null pointer error when configured incorrectly

Reviewed-by: Sage Weil <sage@redhat.com>
2016-01-29 08:26:39 -05:00
Sage Weil
f642140be3 Merge pull request #7330 from ifed01/wip-pool-stat-cleanup
librados: remove duplicate definitions for rados pool_stat_t and cluster_stat_t

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2016-01-29 08:26:05 -05:00
Sage Weil
4cf7af5b43 Merge pull request #7340 from ceph/wip-portable-time
common: ake ceph_time clocks work under BSD

Reviewed-by: Erwan Velu <erwan@redhat.com>
2016-01-29 08:25:36 -05:00
Sage Weil
c5a1455d0d Merge pull request #7341 from songbaisen/song7
mon: consider the pool size when setting pool crush rule

Reviewed-by: Sage Weil <sage@redhat.com>
2016-01-29 08:24:46 -05:00
Sage Weil
22734956c0 Merge pull request #7355 from yuanjingkai/master
os/fs: fix io_getevents argument

Reviewed-by: Kefu Chai <kchai@redhat.com>
2016-01-29 08:24:04 -05:00
Sage Weil
bd9e1f211f Merge pull request #7348 from xiexingguo/xxg-wip-14484
osd: BlueStore: fix space leak

http://pulpito.ceph.com/sage-2016-01-27_18:39:48-rados-wip-sage-testing---basic-smithi/

Reviewed-by: Sage Weil <sage@redhat.com>
2016-01-29 08:23:23 -05:00
Sage Weil
f9a8c56598 Merge pull request #7368 from somnathr/wip-jemalloc-build
build: allow jemalloc enabled build with rocksdb-static

http://pulpito.ceph.com/sage-2016-01-27_18:39:48-rados-wip-sage-testing---basic-smithi/

Reviewed-by: Sage Weil <sage@redhat.com>
2016-01-29 08:22:55 -05:00
xie xingguo
d3fd52aac0 BlueStore: fix null pointer access
Fixes: #14561
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
2016-01-29 21:07:39 +08:00
Greg Farnum
13062af18c Merge remote-tracking branch 'origin/greg-fs-testing-126' 2016-01-28 21:28:48 -08:00
Greg Farnum
e3e1e3b61c Merge remote-tracking branch 'origin/jewel' 2016-01-28 21:28:37 -08:00
Gregory Farnum
248bec737e Merge pull request #7312 from jcsp/wip-14365
mds, client: fix locking around handle_conf_change

Reviewed-by: Yan, Zheng <zyan@redhat.com>
2016-01-28 21:28:54 -08:00
Gregory Farnum
63b4d625ec Merge pull request #7297 from ukernel/jewel-13903
client: properly trim unlinked inode

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
2016-01-28 21:28:09 -08:00
Gregory Farnum
5aef0189b6 Merge pull request #7262 from ukernel/jewel-14380
Be more careful about the "mds setmap" command to prevent breakage.

Reviewed-by: John Spray <john.spray@redhat.com>
2016-01-28 21:26:06 -08:00
Jason Dillaman
70e8f4427e Merge pull request #7369 from mauri/fix-message-typo
rbd: fix error message typo

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
2016-01-28 22:25:19 -05:00
Kefu Chai
a30bc39a35 Merge pull request #7387 from theanalyst/fix/gitignore
remove unused src/messages/#MOSDOp.h# file

Reviewed-by: Kefu Chai <kchai@redhat.com>
2016-01-29 10:00:20 +08:00
Josh Durgin
60d0df5c69 Merge pull request #7345 from x11562/rbd_snap_rename
rbd: add "--dest-snap" optional for snap rename

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
2016-01-28 09:05:00 -08:00
Kefu Chai
2d75c9d85b Merge pull request #7393 from tchaikov/wip-cmake
fix the autotools and cmake build (the new fusestore needs libfuse)

Reviewed-by: Piotr Dałek <piotr.dalek@ts.fujitsu.com>
Reviewed-by: Casey Bodley <cbodley@redhat.com>
2016-01-29 00:43:38 +08:00
Orit Wasserman
9f27053faf Merge pull request #7403 from rzarzynski/wip-rgw-dumpconlen-cosmetics
rgw: cosmetic improvements in dump_content_length()
2016-01-28 17:30:52 +01:00
Radoslaw Zarzynski
57db464ea8 rgw: cosmetic improvements in dump_content_length().
Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
2016-01-28 17:19:56 +01:00
Kefu Chai
157bf3eb61 ceph-objectstore-tool: disable fuse support if !HAVE_LIBFUSE
Signed-off-by: Kefu Chai <kchai@redhat.com>
2016-01-28 23:36:45 +08:00
Kefu Chai
b2e5c55886 osd: disable FuseStore if !HAVE_LIBFUSE
Signed-off-by: Kefu Chai <kchai@redhat.com>
2016-01-28 23:36:45 +08:00
Kefu Chai
563206cc43 make: disable FuseStore if !WITH_FUSE
* configure.ac: "#define HAVE_LIBFUSE" if libfuse is found
* os/Makefile.am: do not compile FuseStore.cc if libfuse is not found

Signed-off-by: Kefu Chai <kchai@redhat.com>
2016-01-28 23:36:45 +08:00
Kefu Chai
63d3d2bec7 cmake: link against libfuse if HAVE_LIBFUSE
* use ${FUSE_LIBRARIES} instead of "fuse" when referencing libfuse.
* do not compile FuseStore.cc if !HAVE_LIBFUSE.
* CMakeLists.txt: s/HAVE_FUSE/HAVE_LIBFUSE/, to match with the one
  defined for config.h.in.cmake, otherwise we need two vars:
  HAVE_LIBFUSE, and HAVE_FUSE

Signed-off-by: Kefu Chai <kchai@redhat.com>
2016-01-28 23:36:45 +08:00
Kefu Chai
fd8ab0bd07 cmake: remove the copyright of FindSnappy.cmake
as we've basically removed all the HyperTable code.

Signed-off-by: Kefu Chai <kchai@redhat.com>
2016-01-28 20:50:51 +08:00
Wido den Hollander
1e4dfae0b4 Script and Guidelines for mirroring Ceph
This commit introduces a script which admins can use to mirror
the Ceph packages to their local systems.

With this script they can easily sync from a mirror local to them.

The README explains user on how and when to sync the sources and
how they can become a official mirror for Ceph.

Signed-off-by: Wido den Hollander <wido@42on.com>
2016-01-28 10:08:39 +01:00
Kefu Chai
5d91e6d398 Merge pull request #6875 from dx9/wip-cmake-ccache
cmake: support ccache via a WITH_CCACHE build option

Reviewed-by: Casey Bodley <cbodley@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
2016-01-28 15:35:16 +08:00