]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
9 years agoNVMEDevice: add flush perf counter calculate
Haomai Wang [Sun, 17 Jan 2016 17:18:07 +0000 (01:18 +0800)]
NVMEDevice: add flush perf counter calculate

Signed-off-by: Haomai Wang <haomai@xsky.com>
9 years agoRocksDB: add block cache size option to RocksDB
Haomai Wang [Sun, 17 Jan 2016 16:57:32 +0000 (00:57 +0800)]
RocksDB: add block cache size option to RocksDB

Signed-off-by: Haomai Wang <haomai@xsky.com>
9 years agoNVMEDevice: let perf counter do early
Haomai Wang [Sun, 17 Jan 2016 16:01:32 +0000 (00:01 +0800)]
NVMEDevice: let perf counter do early

Signed-off-by: Haomai Wang <haomai@xsky.com>
9 years agoNVMEDevice: make flush wait for all write completed
Haomai Wang [Sun, 17 Jan 2016 15:21:29 +0000 (23:21 +0800)]
NVMEDevice: make flush wait for all write completed

Signed-off-by: Haomai Wang <haomai@xsky.com>
9 years agoNVMEDevice: delay nvme aio thread start in case of logger is null
Haomai Wang [Sun, 17 Jan 2016 13:52:30 +0000 (21:52 +0800)]
NVMEDevice: delay nvme aio thread start in case of logger is null

Signed-off-by: Haomai Wang <haomai@xsky.com>
9 years agoNVMEDevice: let aio_write submit request FIFO
Haomai Wang [Fri, 15 Jan 2016 11:29:58 +0000 (19:29 +0800)]
NVMEDevice: let aio_write submit request FIFO

Signed-off-by: Haomai Wang <haomai@xsky.com>
9 years agoNVMEDevice: impl read_buffered method
Haomai Wang [Sat, 9 Jan 2016 14:12:46 +0000 (22:12 +0800)]
NVMEDevice: impl read_buffered method

Signed-off-by: Haomai Wang <haomai@xsky.com>
9 years agoNVMEDevice: adjust indent
Haomai Wang [Sat, 9 Jan 2016 13:56:37 +0000 (21:56 +0800)]
NVMEDevice: adjust indent

Signed-off-by: Haomai Wang <haomai@xsky.com>
9 years agoBlockDevice: Move KernelDevice reap ioc to BlockDevice
Haomai Wang [Fri, 8 Jan 2016 16:27:49 +0000 (00:27 +0800)]
BlockDevice: Move KernelDevice reap ioc to BlockDevice

Signed-off-by: Haomai Wang <haomai@xsky.com>
9 years agoNVMEDevice: add log message to reminder potential failed reason
Haomai Wang [Thu, 7 Jan 2016 17:20:53 +0000 (01:20 +0800)]
NVMEDevice: add log message to reminder potential failed reason

Signed-off-by: Haomai Wang <haomai@xsky.com>
9 years agoNVMEDevice: use stringify instead of std::to_string
Haomai Wang [Thu, 7 Jan 2016 16:39:24 +0000 (00:39 +0800)]
NVMEDevice: use stringify instead of std::to_string

Signed-off-by: Haomai Wang <haomai@xsky.com>
9 years agoNVMEDevice: disable flush command now
Haomai Wang [Thu, 7 Jan 2016 16:00:52 +0000 (00:00 +0800)]
NVMEDevice: disable flush command now

Signed-off-by: Haomai Wang <haomai@xsky.com>
9 years agoNVMEDevice: add perf counter
Haomai Wang [Thu, 7 Jan 2016 15:18:06 +0000 (23:18 +0800)]
NVMEDevice: add perf counter

Signed-off-by: Haomai Wang <haomai@xsky.com>
9 years agoNVMEDevice: adjust request/task memory pool size
Haomai Wang [Thu, 7 Jan 2016 14:24:16 +0000 (22:24 +0800)]
NVMEDevice: adjust request/task memory pool size

Signed-off-by: Haomai Wang <haomai@xsky.com>
9 years agoNVMEDevice: don't try to acquire lock always
Haomai Wang [Thu, 7 Jan 2016 14:11:00 +0000 (22:11 +0800)]
NVMEDevice: don't try to acquire lock always

Signed-off-by: Haomai Wang <haomai@xsky.com>
9 years agoNVMEDevice: make aio thread pause when idle
Haomai Wang [Wed, 6 Jan 2016 06:54:59 +0000 (14:54 +0800)]
NVMEDevice: make aio thread pause when idle

Signed-off-by: Haomai Wang <haomai@xsky.com>
9 years agoNVMEDevice: add retry support
Haomai Wang [Wed, 6 Jan 2016 06:47:45 +0000 (14:47 +0800)]
NVMEDevice: add retry support

Signed-off-by: Haomai Wang <haomai@xsky.com>
9 years agoNVMEDevice: add flush support
Haomai Wang [Wed, 6 Jan 2016 05:45:55 +0000 (13:45 +0800)]
NVMEDevice: add flush support

Signed-off-by: Haomai Wang <haomai@xsky.com>
9 years agoNVMEDevice: fix multi ops in one IOContext bug
Haomai Wang [Wed, 6 Jan 2016 05:16:20 +0000 (13:16 +0800)]
NVMEDevice: fix multi ops in one IOContext bug

Signed-off-by: Haomai Wang <haomai@xsky.com>
9 years agoNVMEDevice: Fix typo
Haomai Wang [Wed, 6 Jan 2016 04:10:07 +0000 (12:10 +0800)]
NVMEDevice: Fix typo

Signed-off-by: Haomai Wang <haomai@xsky.com>
9 years agoKernelDevice: Remove redundancy lines
Haomai Wang [Wed, 6 Jan 2016 04:06:46 +0000 (12:06 +0800)]
KernelDevice: Remove redundancy lines

Signed-off-by: Haomai Wang <haomai@xsky.com>
9 years agoNVMEDevice: make controller global shared
Haomai Wang [Wed, 6 Jan 2016 03:55:03 +0000 (11:55 +0800)]
NVMEDevice: make controller global shared

Signed-off-by: Haomai Wang <haomai@xsky.com>
9 years agoNVMEDevice: reorder signal in case of signaled thread modify IOContext
Haomai Wang [Tue, 5 Jan 2016 18:53:10 +0000 (02:53 +0800)]
NVMEDevice: reorder signal in case of signaled thread modify IOContext

Signed-off-by: Haomai Wang <haomai@xsky.com>
9 years agoBlueFS: Use num_pending instead of pending_aios
Haomai Wang [Tue, 5 Jan 2016 18:51:08 +0000 (02:51 +0800)]
BlueFS: Use num_pending instead of pending_aios

Signed-off-by: Haomai Wang <haomai@xsky.com>
9 years agoBlockDevice: initialize backend_priv
Haomai Wang [Tue, 5 Jan 2016 17:01:37 +0000 (01:01 +0800)]
BlockDevice: initialize backend_priv

Signed-off-by: Haomai Wang <haomai@xsky.com>
9 years agoNVMEDevice: make read/write all async
Haomai Wang [Tue, 5 Jan 2016 15:50:15 +0000 (23:50 +0800)]
NVMEDevice: make read/write all async

Signed-off-by: Haomai Wang <haomai@xsky.com>
9 years agoNVMEDevice: Fix static method
Haomai Wang [Tue, 5 Jan 2016 10:14:04 +0000 (18:14 +0800)]
NVMEDevice: Fix static method

Signed-off-by: Haomai Wang <haomai@xsky.com>
9 years agoNVMEDevice: SPDK only permit submit/poll within one thread
Haomai Wang [Tue, 5 Jan 2016 09:57:44 +0000 (17:57 +0800)]
NVMEDevice: SPDK only permit submit/poll within one thread

Signed-off-by: Haomai Wang <haomai@xsky.com>
9 years agoNVMEDevice: fix unknown serial number problem
Haomai Wang [Tue, 5 Jan 2016 09:19:20 +0000 (17:19 +0800)]
NVMEDevice: fix unknown serial number problem

Signed-off-by: Haomai Wang <haomai@xsky.com>
9 years agoNVMEDevice: wrap C header file
Haomai Wang [Tue, 5 Jan 2016 05:54:20 +0000 (13:54 +0800)]
NVMEDevice: wrap C header file

Signed-off-by: Haomai Wang <haomai@xsky.com>
9 years agoMakefile: let spdk/dpdk libraries linked in upper layer
Haomai Wang [Tue, 5 Jan 2016 05:54:00 +0000 (13:54 +0800)]
Makefile: let spdk/dpdk libraries linked in upper layer

Signed-off-by: Haomai Wang <haomai@xsky.com>
9 years agoNVMEDevice: add spdk/pci.h
Haomai Wang [Mon, 4 Jan 2016 16:25:47 +0000 (00:25 +0800)]
NVMEDevice: add spdk/pci.h

Signed-off-by: Haomai Wang <haomai@xsky.com>
9 years agoNVMEDevice: nvme.h use _Static_assert which from c11
Haomai Wang [Mon, 4 Jan 2016 16:20:08 +0000 (00:20 +0800)]
NVMEDevice: nvme.h use _Static_assert which from c11

Signed-off-by: Haomai Wang <haomai@xsky.com>
9 years agoNVMEDevice: let IOContext can use NVMEDevice pointer
Haomai Wang [Mon, 4 Jan 2016 16:07:32 +0000 (00:07 +0800)]
NVMEDevice: let IOContext can use NVMEDevice pointer

Signed-off-by: Haomai Wang <haomai@xsky.com>
9 years agoNVMEDevice: remove unused variables
Haomai Wang [Mon, 4 Jan 2016 16:04:14 +0000 (00:04 +0800)]
NVMEDevice: remove unused variables

Signed-off-by: Haomai Wang <haomai@xsky.com>
9 years agoconfigure.ac: fix spdk external header location
Haomai Wang [Mon, 4 Jan 2016 15:55:00 +0000 (23:55 +0800)]
configure.ac: fix spdk external header location

Signed-off-by: Haomai Wang <haomai@xsky.com>
9 years agoBlueFS: fix comparison warning
Haomai Wang [Mon, 4 Jan 2016 14:36:25 +0000 (22:36 +0800)]
BlueFS: fix comparison warning

Signed-off-by: Haomai Wang <haomai@xsky.com>
9 years agoBlockDevice: Add override to explicit
Haomai Wang [Mon, 4 Jan 2016 14:33:58 +0000 (22:33 +0800)]
BlockDevice: Add override to explicit

Signed-off-by: Haomai Wang <haomai@xsky.com>
9 years agoBlockDevice: Fix compile error
Haomai Wang [Mon, 4 Jan 2016 14:30:05 +0000 (22:30 +0800)]
BlockDevice: Fix compile error

Signed-off-by: Haomai Wang <haomai@xsky.com>
9 years agoNVMEDevice: fix compile error
Haomai Wang [Mon, 4 Jan 2016 14:17:08 +0000 (22:17 +0800)]
NVMEDevice: fix compile error

Signed-off-by: Haomai Wang <haomai@xsky.com>
9 years agoNVMEDevice: use device name instead of path
Haomai Wang [Mon, 4 Jan 2016 14:13:31 +0000 (22:13 +0800)]
NVMEDevice: use device name instead of path

Signed-off-by: Haomai Wang <haomai@xsky.com>
9 years agomakefile: add SPDK detect and NVMEDevice to Makefile
Haomai Wang [Mon, 4 Jan 2016 09:57:02 +0000 (17:57 +0800)]
makefile: add SPDK detect and NVMEDevice to Makefile

Signed-off-by: Haomai Wang <haomai@xsky.com>
9 years agoBlueStore: Add BlockDevice ability to create different backend
Haomai Wang [Mon, 4 Jan 2016 09:45:27 +0000 (17:45 +0800)]
BlueStore: Add BlockDevice ability to create different backend

Signed-off-by: Haomai Wang <haomai@xsky.com>
9 years agoBlueStore: abostract BlockDevice based KernelDevice and NVMEDevice
Haomai Wang [Tue, 5 Jan 2016 19:45:17 +0000 (03:45 +0800)]
BlueStore: abostract BlockDevice based KernelDevice and NVMEDevice

Signed-off-by: Haomai Wang <haomai@xsky.com>
9 years agobluestore: rename BlockDevice to KernelDevice matching NVMEDevice
Haomai Wang [Mon, 4 Jan 2016 09:21:40 +0000 (17:21 +0800)]
bluestore: rename BlockDevice to KernelDevice matching NVMEDevice

Signed-off-by: Haomai Wang <haomai@xsky.com>
9 years agobluestore: add NVMEDevice backend
Haomai Wang [Mon, 4 Jan 2016 09:20:18 +0000 (17:20 +0800)]
bluestore: add NVMEDevice backend

Signed-off-by: Haomai Wang <haomai@xsky.com>
9 years agoMerge pull request #7266 from sahithi-rv/master 6985/head
Sage Weil [Sun, 31 Jan 2016 15:03:14 +0000 (10:03 -0500)]
Merge pull request #7266 from sahithi-rv/master

common/str_map: cleanup: replaced get_str_map() function overloading by using default parameters for delimiters

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #7344 from songbaisen/song8
Sage Weil [Sun, 31 Jan 2016 15:02:13 +0000 (10:02 -0500)]
Merge pull request #7344 from songbaisen/song8

crush: add safety assert

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #7363 from cxwshawn/mon-sync-fix
Sage Weil [Sun, 31 Jan 2016 15:01:24 +0000 (10:01 -0500)]
Merge pull request #7363 from cxwshawn/mon-sync-fix

mon: add mon_config_key prefix when sync full

Fixes: #14577
Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #7383 from liewegas/wip-bluestore
Sage Weil [Sun, 31 Jan 2016 15:00:10 +0000 (10:00 -0500)]
Merge pull request #7383 from liewegas/wip-bluestore

osd: bluestore: some new c++11-isms, a couple reverts

9 years agoMerge pull request #7014 from efirs/ef_replace_coll_t_by_const_coll_t_ref
Sage Weil [Sat, 30 Jan 2016 14:04:21 +0000 (09:04 -0500)]
Merge pull request #7014 from efirs/ef_replace_coll_t_by_const_coll_t_ref

osd: reduce CPU usage by replacing coll_t by const coll_t&

Reviewed-by: Haomai Wang <haomai@xsky.com>
Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #7333 from xdonghai/xdh1
Sage Weil [Sat, 30 Jan 2016 14:03:56 +0000 (09:03 -0500)]
Merge pull request #7333 from xdonghai/xdh1

osd: FileStore: modify the format of colon

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #7392 from tianshan/wip-14536
Sage Weil [Sat, 30 Jan 2016 14:03:17 +0000 (09:03 -0500)]
Merge pull request #7392 from tianshan/wip-14536

rados: fix race condition in load-gen complete callback

Reviewed-by: Piotr Dałek <piotr.dalek@ts.fujitsu.com>
9 years agoMerge pull request #7395 from xiexingguo/xxg-wip-fuse
Sage Weil [Sat, 30 Jan 2016 14:02:47 +0000 (09:02 -0500)]
Merge pull request #7395 from xiexingguo/xxg-wip-fuse

os/fusestore: add error handling

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #7396 from tchaikov/wip-14537
Sage Weil [Sat, 30 Jan 2016 14:00:12 +0000 (09:00 -0500)]
Merge pull request #7396 from tchaikov/wip-14537

mon: compact full epochs also

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #7402 from liewegas/wip-rados-bench
Sage Weil [Sat, 30 Jan 2016 13:59:55 +0000 (08:59 -0500)]
Merge pull request #7402 from liewegas/wip-rados-bench

rados: make rados bench metadata backward compatible

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
9 years agoMerge pull request #7418 from renhwsky/renhw-wip-monmapmonitor-cleanup
Sage Weil [Sat, 30 Jan 2016 13:59:37 +0000 (08:59 -0500)]
Merge pull request #7418 from renhwsky/renhw-wip-monmapmonitor-cleanup

mon: some cleanup in MonmapMonitor.cc

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Joao Eduardo Luis <joao@suse.de>
9 years agoMerge pull request #7420 from mikulely/fix-osd-mon-exit-issue
Sage Weil [Sat, 30 Jan 2016 13:59:01 +0000 (08:59 -0500)]
Merge pull request #7420 from mikulely/fix-osd-mon-exit-issue

osd, mon: fix exit issue

Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agoMerge pull request #7430 from xiexingguo/xxg-wip-kstore
Sage Weil [Sat, 30 Jan 2016 13:58:35 +0000 (08:58 -0500)]
Merge pull request #7430 from xiexingguo/xxg-wip-kstore

osd: kstore: fix decode logic and add flush

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #7432 from branch-predictor/bp-fix-read-bench
Sage Weil [Sat, 30 Jan 2016 13:49:33 +0000 (08:49 -0500)]
Merge pull request #7432 from branch-predictor/bp-fix-read-bench

rados: fix wrong op/object sizes in rand/seq bench

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #7436 from liewegas/wip-bash
Sage Weil [Sat, 30 Jan 2016 13:48:45 +0000 (08:48 -0500)]
Merge pull request #7436 from liewegas/wip-bash

tests: qa/workunits/objectstore/test_fuse.sh: no bashism

9 years agoMerge pull request #7404 from sahithi-rv/Mutex
Josh Durgin [Fri, 29 Jan 2016 23:14:57 +0000 (15:14 -0800)]
Merge pull request #7404 from sahithi-rv/Mutex

rbd_fuse: replaced pthread_mutex*() functions with ceph Mutex wrapper

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
9 years agotools/rados/rados.cc: fix race condition in load-gen complete callback 7392/head
Tianshan Qu [Thu, 28 Jan 2016 06:38:09 +0000 (14:38 +0800)]
tools/rados/rados.cc: fix race condition in load-gen complete callback

Fixes: #14536
Signed-off-by: Tianshan Qu <tianshan@xsky.com>
9 years agoMerge pull request #6131 from rzarzynski/wip-admincreds-in-s3-keystone
Yehuda Sadeh [Fri, 29 Jan 2016 17:28:41 +0000 (09:28 -0800)]
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>
9 years agorgw: support admin credentials in S3-related Keystone authentication. 6131/head
Radoslaw Zarzynski [Fri, 29 Jan 2016 11:14:41 +0000 (12:14 +0100)]
rgw: support admin credentials in S3-related Keystone authentication.

Fixes: #13302
Backport: infernalis, hammer
Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
9 years agoMerge pull request #7298 from racpatel/wip-doc-rac2
Loic Dachary [Fri, 29 Jan 2016 14:44:42 +0000 (21:44 +0700)]
Merge pull request #7298 from racpatel/wip-doc-rac2

doc :- fixing image in section ERASURE CODING

Reviewed-by: Loic Dachary <ldachary@redhat.com>
9 years agoceph_osd.cc: fix unreachable flush call 7420/head
Jiaying Ren [Fri, 29 Jan 2016 08:29:01 +0000 (16:29 +0800)]
ceph_osd.cc: fix unreachable flush call

The calling chain for generic_server_usage():

  generic_server_usage()
    ->generic_usage(true)
    ->exit(1)
  cout.flush()

any statements after generic_server_usage() would not be reached,so we
need to flush cout in generic_usage().

Signed-off-by: Jiaying Ren <jiaying.ren@umcloud.com>
9 years agocmake: musl libc does not implement backtrace. Added feature check and fallback to...
John Coyle [Thu, 15 Oct 2015 02:54:05 +0000 (22:54 -0400)]
cmake: musl libc does not implement backtrace. Added feature check and fallback to libexecinfo.

Signed-off-by: John Coyle <dx9err@gmail.com>
9 years agoMerge pull request #7264 from ceph/wip-doc-RGW
Sage Weil [Fri, 29 Jan 2016 13:50:07 +0000 (08:50 -0500)]
Merge pull request #7264 from ceph/wip-doc-RGW

doc: rgw: port changes from downstream to upstream

Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agoMerge pull request #7244 from mikulely/fix-authtool-doc
Sage Weil [Fri, 29 Jan 2016 13:49:17 +0000 (08:49 -0500)]
Merge pull request #7244 from mikulely/fix-authtool-doc

doc: remove redundant space in ceph-authtool/monmaptool doc

9 years agodoc: Updated the RPM section for RHEL and CentOS
ritz303 [Thu, 14 Jan 2016 18:40:19 +0000 (12:40 -0600)]
doc: Updated the RPM section for RHEL and CentOS

Fixes: #10245
Signed-off-by: Aron Gunn <ritz_303@yahoo.com>
9 years agoMerge pull request #7027 from mathslinux/fix-s3-csharp-doc
Sage Weil [Fri, 29 Jan 2016 13:46:47 +0000 (08:46 -0500)]
Merge pull request #7027 from mathslinux/fix-s3-csharp-doc

doc: fix S3 C# example

9 years agoMerge pull request #7000 from zhouyuan/fix_cache_tier_doc
Sage Weil [Fri, 29 Jan 2016 13:46:15 +0000 (08:46 -0500)]
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>
9 years agoMerge pull request #6930 from wido/rgw-key-docs
Sage Weil [Fri, 29 Jan 2016 13:45:16 +0000 (08:45 -0500)]
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>
9 years agoMerge pull request #7384 from wido/mirroring
Sage Weil [Fri, 29 Jan 2016 13:43:31 +0000 (08:43 -0500)]
Merge pull request #7384 from wido/mirroring

doc: script and guidelines for mirroring Ceph

Reviewed-by: Abhishek Lekshmanan <abhishek@suse.com>
9 years agoMerge pull request #7435 from xiexingguo/xxg-wip-14561
Sage Weil [Fri, 29 Jan 2016 13:39:39 +0000 (08:39 -0500)]
Merge pull request #7435 from xiexingguo/xxg-wip-14561

osd: BlueStore: fix null pointer access

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #7271 from somnathr/wip-transaction-delete
Sage Weil [Fri, 29 Jan 2016 13:33:28 +0000 (08:33 -0500)]
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>
9 years agoMerge pull request #6440 from stiopaa1/scrubbingInfo
Sage Weil [Fri, 29 Jan 2016 13:29:23 +0000 (08:29 -0500)]
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>
9 years agoMerge pull request #7075 from shun-s/shun-fix
Sage Weil [Fri, 29 Jan 2016 13:28:30 +0000 (08:28 -0500)]
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>
9 years agoMerge pull request #7111 from chenji-kael/master
Sage Weil [Fri, 29 Jan 2016 13:28:03 +0000 (08:28 -0500)]
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>
9 years agoMerge pull request #7268 from ifed01/wip-14400
Sage Weil [Fri, 29 Jan 2016 13:27:13 +0000 (08:27 -0500)]
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>
9 years agoMerge pull request #7276 from caibo2014/fix-messager-null
Sage Weil [Fri, 29 Jan 2016 13:26:39 +0000 (08:26 -0500)]
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>
9 years agoMerge pull request #7330 from ifed01/wip-pool-stat-cleanup
Sage Weil [Fri, 29 Jan 2016 13:26:05 +0000 (08:26 -0500)]
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>
9 years agoMerge pull request #7340 from ceph/wip-portable-time
Sage Weil [Fri, 29 Jan 2016 13:25:36 +0000 (08:25 -0500)]
Merge pull request #7340 from ceph/wip-portable-time

common: ake ceph_time clocks work under BSD

Reviewed-by: Erwan Velu <erwan@redhat.com>
9 years agoMerge pull request #7341 from songbaisen/song7
Sage Weil [Fri, 29 Jan 2016 13:24:46 +0000 (08:24 -0500)]
Merge pull request #7341 from songbaisen/song7

mon: consider the pool size when setting pool crush rule

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #7355 from yuanjingkai/master
Sage Weil [Fri, 29 Jan 2016 13:24:04 +0000 (08:24 -0500)]
Merge pull request #7355 from yuanjingkai/master

os/fs: fix io_getevents argument

Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agoMerge pull request #7348 from xiexingguo/xxg-wip-14484
Sage Weil [Fri, 29 Jan 2016 13:23:23 +0000 (08:23 -0500)]
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>
9 years agoMerge pull request #7368 from somnathr/wip-jemalloc-build
Sage Weil [Fri, 29 Jan 2016 13:22:55 +0000 (08:22 -0500)]
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>
9 years agoBlueStore: fix null pointer access 7435/head
xie xingguo [Fri, 29 Jan 2016 13:07:39 +0000 (21:07 +0800)]
BlueStore: fix null pointer access

Fixes: #14561
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
9 years agoqa/workunits/objectstore/test_fuse.sh: no bashism 7436/head
Sage Weil [Fri, 29 Jan 2016 13:06:38 +0000 (08:06 -0500)]
qa/workunits/objectstore/test_fuse.sh: no bashism

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agoinclude/str_map.h removed unnecessary function overloading of 7266/head
Sahithi R V [Mon, 18 Jan 2016 17:23:24 +0000 (22:53 +0530)]
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>
9 years agoBlueStore: fix typo 7430/head
xie xingguo [Fri, 29 Jan 2016 12:16:43 +0000 (20:16 +0800)]
BlueStore: fix typo

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
9 years agorbd_fuse:replaced pthread_mutex*() functions with ceph Mutex wrapper 7404/head
Sahithi R V [Thu, 28 Jan 2016 17:46:25 +0000 (23:16 +0530)]
rbd_fuse:replaced pthread_mutex*() functions with ceph Mutex wrapper

Signed-off-by: Sahithi R V <tansy.rv@gmail.com>
9 years agokstore: flush before we really start a clone
xie xingguo [Fri, 29 Jan 2016 10:42:19 +0000 (18:42 +0800)]
kstore: flush before we really start a clone

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
9 years agokstore: flush before we really start a truncate
xie xingguo [Fri, 29 Jan 2016 10:40:37 +0000 (18:40 +0800)]
kstore: flush before we really start a truncate

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
9 years agoBlueStore: add fast check against empty list
xie xingguo [Fri, 29 Jan 2016 10:05:27 +0000 (18:05 +0800)]
BlueStore: add fast check against empty list

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
9 years agokstore: add fast check against empty list
xie xingguo [Fri, 29 Jan 2016 10:01:19 +0000 (18:01 +0800)]
kstore: add fast check against empty list

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
9 years agotools/rados: fix wrong op/object sizes in rand/seq bench 7432/head
Piotr Dałek [Fri, 29 Jan 2016 10:38:53 +0000 (11:38 +0100)]
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>
9 years agokstore: simplify open_collection logic a bit
xie xingguo [Fri, 29 Jan 2016 09:57:15 +0000 (17:57 +0800)]
kstore: simplify open_collection logic a bit

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
9 years agokstore: fix unmatched type of decode
xie xingguo [Fri, 29 Jan 2016 09:53:30 +0000 (17:53 +0800)]
kstore: fix unmatched type of decode

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>