]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
9 years agomon: reduce CPU and memory manager pressure of pg health check 7482/head
Piotr Dałek [Tue, 2 Feb 2016 08:47:51 +0000 (09:47 +0100)]
mon: reduce CPU and memory manager pressure of pg health check

When we don't need details about which PGs are stuck, we can just iterate
once over pg_stat map and increase appropriate counters, no need to
repeatedly spam memory manager with stuck_pgs map population (we'll only
use its size). Even if we need details, first check if we actually have any
PGs in any of requested states, so in most cases we won't iterate needlessly
five times over all PG stat map.

This at least halves the time needed by pg health gathering (~3ms,
down from ~6-7ms) on cluster with 31832 PGs and Intel Xeon E5-2640
CPU.

Signed-off-by: Piotr Dałek <piotr.dalek@ts.fujitsu.com>
9 years agoMerge pull request #7473 from yehudasa/wip-14516
Orit Wasserman [Tue, 2 Feb 2016 09:10:38 +0000 (10:10 +0100)]
Merge pull request #7473 from yehudasa/wip-14516

rgw-admin: document orphans commands in usage

9 years agoMerge pull request #7451 from wjin/fix
Kefu Chai [Tue, 2 Feb 2016 06:56:12 +0000 (14:56 +0800)]
Merge pull request #7451 from wjin/fix

msg/async: fix array boundary

Reviewed-by: Haomai Wang <haomai@xsky.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agoMerge pull request #6813 from manens/pybind_rados_snapshot_read
Kefu Chai [Tue, 2 Feb 2016 03:26:47 +0000 (11:26 +0800)]
Merge pull request #6813 from manens/pybind_rados_snapshot_read

pybind: Implementation of Ioctx.set_read to allow read from snapshots

Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agorgw-admin: document orphans commands in usage 7473/head
Yehuda Sadeh [Tue, 2 Feb 2016 00:33:55 +0000 (16:33 -0800)]
rgw-admin: document orphans commands in usage

Fixes: #14516
Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
9 years agoMerge pull request #7445 from xiexingguo/xxg-wip-mem
Sage Weil [Mon, 1 Feb 2016 22:12:53 +0000 (17:12 -0500)]
Merge pull request #7445 from xiexingguo/xxg-wip-mem

osd: memstore: fix blocksize for statfs

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoos/bluestore: fix typo (again)
Sage Weil [Mon, 1 Feb 2016 20:02:20 +0000 (15:02 -0500)]
os/bluestore: fix typo (again)

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agoos/bluestore: fix typo
Sage Weil [Mon, 1 Feb 2016 19:59:42 +0000 (14:59 -0500)]
os/bluestore: fix typo

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #7400 from yuyuyu101/wip-13938
Josh Durgin [Mon, 1 Feb 2016 19:44:42 +0000 (11:44 -0800)]
Merge pull request #7400 from yuyuyu101/wip-13938

librbd: Avoid create two threads per image

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
9 years agoMerge pull request #7409 from dillaman/wip-librbd-watch-notify
Josh Durgin [Mon, 1 Feb 2016 19:42:27 +0000 (11:42 -0800)]
Merge pull request #7409 from dillaman/wip-librbd-watch-notify

tests: improve simulation of watch/notify handling

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
9 years agoMerge pull request #6562 from Aran85/authedpermcheck
Yehuda Sadeh [Mon, 1 Feb 2016 18:56:14 +0000 (10:56 -0800)]
Merge pull request #6562 from Aran85/authedpermcheck

rgw: fix the condition of  authenticated user's permit check .

9 years agoMerge pull request #7291 from majianpeng/vstart.sh
Kefu Chai [Mon, 1 Feb 2016 15:52:32 +0000 (23:52 +0800)]
Merge pull request #7291 from majianpeng/vstart.sh

vstart.sh: If use '-n' delete related source rather than consider '-k'.

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agoMerge pull request #7397 from tchaikov/wip-kill-warnings
Sage Weil [Mon, 1 Feb 2016 15:26:39 +0000 (10:26 -0500)]
Merge pull request #7397 from tchaikov/wip-kill-warnings

build: kill warnings

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agocivetweb: update submodule to silence a compile warning 7397/head
Kefu Chai [Sun, 31 Jan 2016 17:55:20 +0000 (01:55 +0800)]
civetweb: update submodule to silence a compile warning

Signed-off-by: Kefu Chai <kchai@redhat.com>
9 years agocommon,osd: remove _process(T *t) to silence warnings
Kefu Chai [Sat, 30 Jan 2016 17:49:47 +0000 (01:49 +0800)]
common,osd: remove _process(T *t) to silence warnings

* and mark the WorkQueue::_process(T *, TPHandle&) a pure virtual
  method. so we must override it
* and mark all override methods with the "override" specifier.

Signed-off-by: Kefu Chai <kchai@redhat.com>
9 years agorgw: fix the condition of authenticated user's permit check 6562/head
Zengran Zhang [Mon, 1 Feb 2016 04:58:58 +0000 (23:58 -0500)]
rgw: fix the condition of authenticated user's permit check

before fix:
put a bucket under one user with authenticated-read permit
> ./s3curl.pl http://myobs.com/mybucket --put --H "x-amz-acl: authenticated-read"
GET the bucket with anonymous user
> curl http://myobs.com/mybucket -X GET

> successed!

after fix:
anonymous cant GET the authenticated-read bucket
other users who authenticated could GET it

Signed-off-by: Zengran Zhang <zhangzengran@h3c.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 agoEvent: fix array boundary 7451/head
Wei Jin [Sun, 31 Jan 2016 09:55:22 +0000 (17:55 +0800)]
Event: fix array boundary

fd should be less than nevent when deleting

Signed-off-by: Wei Jin <wjin.cn@gmail.com>
9 years agocmake: fix "jobserver unavailable" warning
Kefu Chai [Sun, 31 Jan 2016 08:27:12 +0000 (16:27 +0800)]
cmake: fix "jobserver unavailable" warning

use ${MAKE} so the make command can be properly propagated to their
children

Signed-off-by: Kefu Chai <kchai@redhat.com>
9 years agocmake: disable unused-variable warning for rocksdb
Kefu Chai [Sat, 30 Jan 2016 17:58:34 +0000 (01:58 +0800)]
cmake: disable unused-variable warning for rocksdb

Signed-off-by: Kefu Chai <kchai@redhat.com>
9 years agorgw: fix the signed/unsigned comparison warning
Kefu Chai [Sat, 30 Jan 2016 17:38:51 +0000 (01:38 +0800)]
rgw: fix the signed/unsigned comparison warning

Signed-off-by: Kefu Chai <kchai@redhat.com>
9 years agorados: bench: fix the signed/unsigned comparison warning
Kefu Chai [Sat, 30 Jan 2016 17:37:18 +0000 (01:37 +0800)]
rados: bench: fix the signed/unsigned comparison warning

Signed-off-by: Kefu Chai <kchai@redhat.com>
9 years agocmake: remove duplicated HAVE_EXECINFO_H macro
Kefu Chai [Sat, 30 Jan 2016 17:12:12 +0000 (01:12 +0800)]
cmake: remove duplicated HAVE_EXECINFO_H macro

fixes the `"HAVE_EXECINFO_H" redefined` warning

Signed-off-by: Kefu Chai <kchai@redhat.com>
9 years agoos/*stores: fix hidden warnings
Kefu Chai [Thu, 28 Jan 2016 10:15:26 +0000 (02:15 -0800)]
os/*stores: fix hidden warnings

the CollectionHandle variant methods are hidden by the subclasses
who do not override it. so the compiler complains. by adding
"using" statement we expose them again.

Signed-off-by: Kefu Chai <kchai@redhat.com>
9 years agoos/bluestore: fix unsigned/signed comparision warning
Kefu Chai [Thu, 28 Jan 2016 10:14:41 +0000 (02:14 -0800)]
os/bluestore: fix unsigned/signed comparision warning

Signed-off-by: Kefu Chai <kchai@redhat.com>
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 agoos/memstore: return empty list if offset overflows 7445/head
xie xingguo [Sat, 30 Jan 2016 09:02:08 +0000 (17:02 +0800)]
os/memstore: return empty list if offset overflows

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
9 years agoos/memstore: fix wrong blocksize for statfs
xie xingguo [Sat, 30 Jan 2016 08:59:42 +0000 (16:59 +0800)]
os/memstore: fix wrong blocksize for statfs

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
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 agolibrbd: use task finisher per CephContext 7400/head
Haomai Wang [Thu, 28 Jan 2016 09:13:00 +0000 (17:13 +0800)]
librbd: use task finisher per CephContext

Signed-off-by: Haomai Wang <haomai@xsky.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 agolibrados_test_stub: watch/notify now behaves similar to librados 7409/head
Jason Dillaman [Thu, 28 Jan 2016 19:35:54 +0000 (14:35 -0500)]
librados_test_stub: watch/notify now behaves similar to librados

Notifications are executed via the same librados AIO callback
thread, so it's now possible to catch deadlock.

Signed-off-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 agotests: simulate writeback flush during snap create
Jason Dillaman [Thu, 28 Jan 2016 17:40:18 +0000 (12:40 -0500)]
tests: simulate writeback flush during snap create

Signed-off-by: Jason Dillaman <dillaman@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()