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
Sage Weil
2d602dd84b
qa/workunits/objectstore/test_fuse.sh: no bashism
...
Signed-off-by: Sage Weil <sage@redhat.com>
2016-01-29 08:06:38 -05:00
Sahithi R V
8102d2303b
include/str_map.h removed unnecessary function overloading of
...
get_str_map()
Signed-off-by: Sahithi R V <sahithi.rv1@gmail.com>
tests successful
Signed-off-by: Sahithi R V <sahithi.rv1@gmail.com>
2016-01-29 17:52:50 +05:30
xie xingguo
da614b8cee
BlueStore: fix typo
...
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
2016-01-29 20:16:43 +08:00
Sahithi R V
fa7470a0bb
rbd_fuse:replaced pthread_mutex*() functions with ceph Mutex wrapper
...
Signed-off-by: Sahithi R V <tansy.rv@gmail.com>
2016-01-29 17:15:07 +05:30
xie xingguo
a19aa22617
kstore: flush before we really start a clone
...
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
2016-01-29 19:35:48 +08:00
xie xingguo
fb307c2026
kstore: flush before we really start a truncate
...
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
2016-01-29 19:35:47 +08:00
xie xingguo
b0bed156da
BlueStore: add fast check against empty list
...
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
2016-01-29 19:35:46 +08:00
xie xingguo
06ad784951
kstore: add fast check against empty list
...
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
2016-01-29 19:35:43 +08:00
Piotr Dałek
ddca0dc873
tools/rados: fix wrong op/object sizes in rand/seq bench
...
Metadata contain correct information about last bench write run, yet
these are ignored in subsequent bench rand/seq runs, resulting in
wrong perf numbers and failures when not using --no-verify.
Signed-off-by: Piotr Dałek <piotr.dalek@ts.fujitsu.com>
2016-01-29 11:38:53 +01:00
xie xingguo
4ad085822a
kstore: simplify open_collection logic a bit
...
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
2016-01-29 17:57:15 +08:00
xie xingguo
21b6fe6e0b
kstore: fix unmatched type of decode
...
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
2016-01-29 17:53:30 +08:00
Jiaying Ren
b99b61e9a5
ceph_osd.cc/ceph_mon.cc: cleanup unreachable exit call
...
The calling chain of usage() is:
usage()
->generic_server_usage()
->exit(1)
exit(0)
so the exit(0) after usage() would not be reached.
Signed-off-by: Jiaying Ren <jiaying.ren@umcloud.com>
2016-01-29 16:25:48 +08:00
renhwztetecs
c8c5d0a401
mon:some cleanup in MonmapMonitor.h
...
delete unused "get_monmap(MonMap &m)"
Signed-off-by: huanwen ren <ren.huanwen@zte.com.cn>
2016-01-29 13:42:32 +08:00
renhwztetecs
698e4a1c71
mon:some cleanup in MonmapMonitor.cc
...
remove the processing of ”mon add“ && “mon remove” in the preprocess_command;
delete unused "get_monmap(MonMap &m)"
Signed-off-by: huanwen ren <ren.huanwen@zte.com.cn>
2016-01-29 13:40:24 +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
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
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
xie xingguo
6f2de314e2
FuseStore: fix mountpoint leak
...
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
2016-01-29 10:26:15 +08:00
xie xingguo
6eb4aa4cc4
FuseStore: return error if encounter collection_list error
...
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
2016-01-29 10:26:15 +08:00
xie xingguo
87b7e53e70
FuseStore: fix unhandled error cases for open
...
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
2016-01-29 10:26:15 +08:00
xie xingguo
97639f665f
FuseStore: fix memory leak
...
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
2016-01-29 10:26:14 +08: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
Sage Weil
5b8c04447a
rados: make rados bench metadata backward compatible
...
We recently made a distinction between op size and object size, and broke
our ability to read metadata from old runs. Change our format to be
backward compatible.
Signed-off-by: Sage Weil <sage@redhat.com>
2016-01-28 11:00:42 -05: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
Kefu Chai
93d633a25a
mon: compact full epochs also
...
by compacting the ${prefix}.${start}..${prefix}..${end} does not
necessary compact the range of ${prefix}."full_"${start}..
${prefix}."full_"${end}. so when more and more epochs get trimmed
with out a full range compaction, the size of monitor store could
be very large.
Fixes : #14537
Signed-off-by: Kefu Chai <kchai@redhat.com>
2016-01-28 18:53:19 +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
x11562
38e2f7a8a2
rbd: simplify snap rename arguments
...
Signed-off-by: Na Xie <xie.na@h3c.com>
2016-01-28 08:55:01 +08:00
Evgeniy Firsov
18fe93c677
osd: Pass coll_t by reference
...
Signed-off-by: Evgeniy Firsov <evgeniy.firsov@sandisk.com>
Conflicts:
src/os/ObjectStore.h
src/os/bluestore/BlueStore.cc
src/os/bluestore/BlueStore.h
src/os/memstore/MemStore.h
2016-01-27 14:54:13 -08:00
Josh Durgin
1e08b21f1b
Merge pull request #7337 from clever215/rbd_nbd
...
rbd-nbd: Add an argument validation for nbds_max
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
2016-01-27 14:47:56 -08:00
Josh Durgin
22e0c8f5b3
Merge pull request #7385 from trociny/fix-journal-flush-commit-position
...
journal: flush commit position on metadata shutdown
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
2016-01-27 14:45:49 -08:00
Josh Durgin
f721fbb230
Merge pull request #7382 from dillaman/wip-14510
...
librbd: block maintenance ops until after journal is ready
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2016-01-27 14:44:59 -08:00
Somnath Roy
5e4eb3fcdd
OSD: Deleting transaction object right after applying transaction
...
Presently, the transaction object is been deleted by the Finisher
thread asynchronously. In heavy load scenario specially if we
unleash journal throttle more, we are seeing high memory usage by
the OSDs because of this. In this new scheme, with the help of
move semantics transaction objects will be deleted synchronously
from the filestore worker threads. We are seeing very much
controllable memory growth now as well as ~3 to 4% cpu usage
benefit because of some reduction of 'new' , 'delete' calls.
Signed-off-by: Somnath Roy <somnath.roy@sandisk.com>
2016-01-27 17:43:37 -05:00
Josh Durgin
22cecc435b
Merge pull request #7259 from trociny/wip-14264
...
librbd: API: async open and close
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2016-01-27 14:35:13 -08:00
Josh Durgin
8bb6c8c842
Merge pull request #7302 from dillaman/wip-14434
...
librbd: journal shut down flush race condition
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2016-01-27 14:34:57 -08:00
Josh Durgin
c7e5848afc
Merge pull request #7299 from dillaman/wip-librbd-update-features
...
librbd: fix internal handling of dynamic feature updates
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2016-01-27 14:34:43 -08:00