]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
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>
9 years agoceph_osd.cc/ceph_mon.cc: cleanup unreachable exit call
Jiaying Ren [Fri, 29 Jan 2016 08:25:48 +0000 (16:25 +0800)]
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>
9 years agomon:some cleanup in MonmapMonitor.h 7418/head
renhwztetecs [Fri, 29 Jan 2016 05:42:32 +0000 (13:42 +0800)]
mon:some cleanup in MonmapMonitor.h

delete unused "get_monmap(MonMap &m)"

Signed-off-by: huanwen ren <ren.huanwen@zte.com.cn>
9 years agomon:some cleanup in MonmapMonitor.cc
renhwztetecs [Fri, 29 Jan 2016 05:40:24 +0000 (13:40 +0800)]
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>
9 years agoMerge pull request #7312 from jcsp/wip-14365
Gregory Farnum [Fri, 29 Jan 2016 05:28:54 +0000 (21:28 -0800)]
Merge pull request #7312 from jcsp/wip-14365

mds, client: fix locking around handle_conf_change

Reviewed-by: Yan, Zheng <zyan@redhat.com>
9 years agoMerge remote-tracking branch 'origin/greg-fs-testing-126' 7282/head
Greg Farnum [Fri, 29 Jan 2016 05:28:48 +0000 (21:28 -0800)]
Merge remote-tracking branch 'origin/greg-fs-testing-126'

9 years agoMerge remote-tracking branch 'origin/jewel'
Greg Farnum [Fri, 29 Jan 2016 05:28:37 +0000 (21:28 -0800)]
Merge remote-tracking branch 'origin/jewel'

9 years agoMerge pull request #7297 from ukernel/jewel-13903
Gregory Farnum [Fri, 29 Jan 2016 05:28:09 +0000 (21:28 -0800)]
Merge pull request #7297 from ukernel/jewel-13903

client: properly trim unlinked inode

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
9 years agoMerge pull request #7262 from ukernel/jewel-14380
Gregory Farnum [Fri, 29 Jan 2016 05:26:06 +0000 (21:26 -0800)]
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>
9 years agoMerge pull request #7369 from mauri/fix-message-typo
Jason Dillaman [Fri, 29 Jan 2016 03:25:19 +0000 (22:25 -0500)]
Merge pull request #7369 from mauri/fix-message-typo

rbd: fix error message typo

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
9 years agoFuseStore: fix mountpoint leak 7395/head
xie xingguo [Thu, 28 Jan 2016 09:59:27 +0000 (17:59 +0800)]
FuseStore: fix mountpoint leak

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
9 years agoFuseStore: return error if encounter collection_list error
xie xingguo [Thu, 28 Jan 2016 09:55:29 +0000 (17:55 +0800)]
FuseStore: return error if encounter collection_list error

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
9 years agoFuseStore: fix unhandled error cases for open
xie xingguo [Thu, 28 Jan 2016 09:50:07 +0000 (17:50 +0800)]
FuseStore: fix unhandled error cases for open

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
9 years agoFuseStore: fix memory leak
xie xingguo [Thu, 28 Jan 2016 09:30:20 +0000 (17:30 +0800)]
FuseStore: fix memory leak

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
9 years agoMerge pull request #7387 from theanalyst/fix/gitignore
Kefu Chai [Fri, 29 Jan 2016 02:00:20 +0000 (10:00 +0800)]
Merge pull request #7387 from theanalyst/fix/gitignore

remove unused src/messages/#MOSDOp.h# file

Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agoMerge pull request #7345 from x11562/rbd_snap_rename
Josh Durgin [Thu, 28 Jan 2016 17:05:00 +0000 (09:05 -0800)]
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>
9 years agoMerge pull request #7393 from tchaikov/wip-cmake
Kefu Chai [Thu, 28 Jan 2016 16:43:38 +0000 (00:43 +0800)]
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>
9 years agoMerge pull request #7403 from rzarzynski/wip-rgw-dumpconlen-cosmetics
Orit Wasserman [Thu, 28 Jan 2016 16:30:52 +0000 (17:30 +0100)]
Merge pull request #7403 from rzarzynski/wip-rgw-dumpconlen-cosmetics

rgw: cosmetic improvements in dump_content_length()

9 years agorgw: cosmetic improvements in dump_content_length(). 7403/head
Radoslaw Zarzynski [Thu, 28 Jan 2016 16:19:56 +0000 (17:19 +0100)]
rgw: cosmetic improvements in dump_content_length().

Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
9 years agorados: make rados bench metadata backward compatible 7402/head
Sage Weil [Thu, 28 Jan 2016 16:00:42 +0000 (11:00 -0500)]
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>
9 years agoceph-objectstore-tool: disable fuse support if !HAVE_LIBFUSE 7393/head
Kefu Chai [Thu, 28 Jan 2016 12:43:45 +0000 (20:43 +0800)]
ceph-objectstore-tool: disable fuse support if !HAVE_LIBFUSE

Signed-off-by: Kefu Chai <kchai@redhat.com>
9 years agoosd: disable FuseStore if !HAVE_LIBFUSE
Kefu Chai [Thu, 28 Jan 2016 09:45:30 +0000 (17:45 +0800)]
osd: disable FuseStore if !HAVE_LIBFUSE

Signed-off-by: Kefu Chai <kchai@redhat.com>
9 years agomake: disable FuseStore if !WITH_FUSE
Kefu Chai [Thu, 28 Jan 2016 09:23:23 +0000 (17:23 +0800)]
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>
9 years agocmake: link against libfuse if HAVE_LIBFUSE
Kefu Chai [Thu, 28 Jan 2016 06:47:07 +0000 (14:47 +0800)]
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>
9 years agocmake: remove the copyright of FindSnappy.cmake
Kefu Chai [Thu, 28 Jan 2016 07:04:40 +0000 (15:04 +0800)]
cmake: remove the copyright of FindSnappy.cmake

as we've basically removed all the HyperTable code.

Signed-off-by: Kefu Chai <kchai@redhat.com>
9 years agomon: compact full epochs also 7396/head
Kefu Chai [Thu, 28 Jan 2016 10:09:53 +0000 (02:09 -0800)]
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>
9 years agoScript and Guidelines for mirroring Ceph 7384/head
Wido den Hollander [Fri, 18 Dec 2015 15:40:38 +0000 (16:40 +0100)]
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>
9 years agoMerge pull request #6875 from dx9/wip-cmake-ccache
Kefu Chai [Thu, 28 Jan 2016 07:35:16 +0000 (15:35 +0800)]
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>
9 years agorbd: simplify snap rename arguments 7345/head
x11562 [Tue, 26 Jan 2016 05:52:46 +0000 (13:52 +0800)]
rbd: simplify snap rename arguments

Signed-off-by: Na Xie <xie.na@h3c.com>
9 years agoosd: Pass coll_t by reference 7014/head
Evgeniy Firsov [Tue, 8 Dec 2015 20:25:38 +0000 (12:25 -0800)]
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

9 years agoMerge pull request #7337 from clever215/rbd_nbd
Josh Durgin [Wed, 27 Jan 2016 22:47:56 +0000 (14:47 -0800)]
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>
9 years agoMerge pull request #7385 from trociny/fix-journal-flush-commit-position
Josh Durgin [Wed, 27 Jan 2016 22:45:49 +0000 (14:45 -0800)]
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>
9 years agoMerge pull request #7382 from dillaman/wip-14510
Josh Durgin [Wed, 27 Jan 2016 22:44:59 +0000 (14:44 -0800)]
Merge pull request #7382 from dillaman/wip-14510

librbd: block maintenance ops until after journal is ready

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
9 years agoOSD: Deleting transaction object right after applying transaction 7271/head
Somnath Roy [Mon, 18 Jan 2016 19:48:24 +0000 (14:48 -0500)]
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>
9 years agoMerge pull request #7259 from trociny/wip-14264
Josh Durgin [Wed, 27 Jan 2016 22:35:13 +0000 (14:35 -0800)]
Merge pull request #7259 from trociny/wip-14264

librbd: API: async open and close

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
9 years agoMerge pull request #7302 from dillaman/wip-14434
Josh Durgin [Wed, 27 Jan 2016 22:34:57 +0000 (14:34 -0800)]
Merge pull request #7302 from dillaman/wip-14434

librbd: journal shut down flush race condition

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
9 years agoMerge pull request #7299 from dillaman/wip-librbd-update-features
Josh Durgin [Wed, 27 Jan 2016 22:34:43 +0000 (14:34 -0800)]
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>
9 years agogitignore: ignore backup files from editors etc. 7387/head
Abhishek Lekshmanan [Wed, 27 Jan 2016 22:23:18 +0000 (23:23 +0100)]
gitignore: ignore backup files from editors etc.

Signed-off-by: Abhishek Lekshmanan <abhishek@suse.com>
9 years agoremove unused source file
Abhishek Lekshmanan [Wed, 27 Jan 2016 22:16:00 +0000 (23:16 +0100)]
remove unused source file

This file was possibly accidentally committed in the tree, thanks
@BranchPredictor for bringing this up in irc

Signed-off-by: Abhishek Lekshmanan <abhishek@suse.com>
9 years agoMerge pull request #7381 from ceph/wip-rgw-static-website-yehuda
Yehuda Sadeh [Wed, 27 Jan 2016 20:36:35 +0000 (12:36 -0800)]
Merge pull request #7381 from ceph/wip-rgw-static-website-yehuda

RGW static website feature
 - currently disabled by default
 - partial error page handling
 - a few known failures

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
Reviewed-by: Robin H. Johnson <robin.johnson@dreamhost.com>
9 years agojournal: flush commit position on metadata shutdown 7385/head
Mykola Golub [Sun, 24 Jan 2016 10:26:36 +0000 (12:26 +0200)]
journal: flush commit position on metadata shutdown

A crash was observed on JournalTrimmer destroy, which was called
by the Journaler after metadata shutdown. JournalTrimmer destructor
also calls flush_commit_position, but at that time metadata m_timer
is already null and it crushed there.

Signed-off-by: Mykola Golub <mgolub@mirantis.com>
9 years agoMerge pull request #7223 from liewegas/wip-collection-handles
Sage Weil [Wed, 27 Jan 2016 19:45:11 +0000 (14:45 -0500)]
Merge pull request #7223 from liewegas/wip-collection-handles

osd: collection handles

Reviewed-by: Casey Bodley <cbodley@redhat.com>
9 years agoMerge pull request #7134 from liewegas/wip-fusestore
Sage Weil [Wed, 27 Jan 2016 19:39:21 +0000 (14:39 -0500)]
Merge pull request #7134 from liewegas/wip-fusestore

osd: implement fuse interface for ObjectStore

Reviewed-by: Samuel Just <sjust@redhat.com>
9 years agoosd: use collection handle where possible 7223/head
Sage Weil [Mon, 18 Jan 2016 16:10:05 +0000 (11:10 -0500)]
osd: use collection handle where possible

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agoosd: associate a CollectionHandle& with PGBackend
Sage Weil [Mon, 18 Jan 2016 17:43:11 +0000 (12:43 -0500)]
osd: associate a CollectionHandle& with PGBackend

Make this a ref to the PG's handle because the backend is
constructed before the handle is opened.

Signed-off-by: Sage Weil <sage@redhat.com>