]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
8 years agoos/bluestore: fix _split_collections race with osr_reap 11748/head
Sage Weil [Thu, 3 Nov 2016 14:33:23 +0000 (10:33 -0400)]
os/bluestore: fix _split_collections race with osr_reap

The SharedBlobSet may not yet be empty at split time because previous
transactions may not have been reaped, leaving some Blobs still alive
even after the cache refs are cleared.  Drop them explicitly here (they
will go away shortly).

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agoMerge pull request #11726 from liewegas/wip-bluestore-fsck-omap
Sage Weil [Wed, 2 Nov 2016 13:49:11 +0000 (08:49 -0500)]
Merge pull request #11726 from liewegas/wip-bluestore-fsck-omap

os/bluestore: fsck: fix omap_head check

Reviewed-by: Igor Fedotov <ifedotov@mirantis.com>
Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
8 years agoos/bluestore: fsck: fix omap_head check 11726/head
Sage Weil [Wed, 2 Nov 2016 13:48:37 +0000 (09:48 -0400)]
os/bluestore: fsck: fix omap_head check

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agoMerge pull request #11740 from xiexingguo/xxg-wip-bluestore-1102
Sage Weil [Wed, 2 Nov 2016 13:47:53 +0000 (08:47 -0500)]
Merge pull request #11740 from xiexingguo/xxg-wip-bluestore-1102

os/bluestore: less code redundancy

Reviewed-by: Sage Weil <sage@redhat.com>
8 years agoMerge pull request #11725 from liewegas/wip-bluestore-shard-span
Sage Weil [Wed, 2 Nov 2016 13:34:50 +0000 (08:34 -0500)]
Merge pull request #11725 from liewegas/wip-bluestore-shard-span

os/bluestore: fix extent shard span check

Reviewed-by: Igor Fedotov <ifedotov@mirantis.com>
8 years agoMerge pull request #11738 from ceph/wip-cmake
Kefu Chai [Wed, 2 Nov 2016 10:44:26 +0000 (18:44 +0800)]
Merge pull request #11738 from ceph/wip-cmake

cmake: do not link erasure tests again libosd

Reviewed-by: Loic Dachary <ldachary@redhat.com>
8 years agoMerge pull request #11384 from wjwithagen/patch-14
Kefu Chai [Wed, 2 Nov 2016 10:39:28 +0000 (18:39 +0800)]
Merge pull request #11384 from wjwithagen/patch-14

test_subman.sh: Don't use --tmpdir

Reviewed-by: Loic Dachary <ldachary@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
8 years agotest_subman.sh: Don't use --tmpdir 11384/head
Willem Jan Withagen [Sun, 9 Oct 2016 23:04:34 +0000 (01:04 +0200)]
test_subman.sh: Don't use --tmpdir

test_subman.sh: Don't use --tmpdir since on most Linux-is it is consideren default
when creating a directory:
`If TEMPLATE is not specified, use tmp.XXXXXXXXXX, and --tmpdir is implied.`

And on FreeBSD --tmpdir is not available anyways.

Signed-off-by: Willem Jan Withagen <wjw@digiware.nl>
8 years agoos/bluestore: use string for most cases in _open_db() 11740/head
xie xingguo [Wed, 2 Nov 2016 09:22:23 +0000 (17:22 +0800)]
os/bluestore: use string for most cases in _open_db()

For a better readability.

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
8 years agocmake: do not link erasure tests again libosd 11738/head
Kefu Chai [Wed, 2 Nov 2016 06:54:10 +0000 (14:54 +0800)]
cmake: do not link erasure tests again libosd

they are not referencing any symbols from it. and also the tests testing
plugins are not linked against the ec plugins, they *depend* on them.

Signed-off-by: Kefu Chai <kchai@redhat.com>
8 years agoMerge pull request #11730 from ceph/wip-17654
Kefu Chai [Wed, 2 Nov 2016 02:53:24 +0000 (10:53 +0800)]
Merge pull request #11730 from ceph/wip-17654

librados-dev: install inline_memory.h

Reviewed-by: Kefu Chai <kchai@redhat.com>
8 years agoos/bluestore: drop unused parameter "deep" from _fsck_check_extents()
xie xingguo [Wed, 2 Nov 2016 01:30:10 +0000 (09:30 +0800)]
os/bluestore: drop unused parameter "deep" from _fsck_check_extents()

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
8 years agotools/ceph_objectstore_tool: handle fsck and fsck-deep op in unified path
xie xingguo [Wed, 2 Nov 2016 01:19:15 +0000 (09:19 +0800)]
tools/ceph_objectstore_tool: handle fsck and fsck-deep op in unified path

https://github.com/ceph/ceph/pull/11724/commits/181e28ba999c4134957f04183bad5c4dfc0e7062
introduces too much code redundancy, this patch simplifies it a little.

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
8 years agolibrados-dev: install inline_memory.h 11730/head
Josh Durgin [Tue, 1 Nov 2016 22:15:33 +0000 (15:15 -0700)]
librados-dev: install inline_memory.h

This is needed to compile against the c++ api since
c38869232c3c852d98fa1826632db360c5a6afd4

Fixes: http://tracker.ceph.com/issues/17654
Signed-off-by: Josh Durgin <jdurgin@redhat.com>
8 years agoMerge pull request #11697 from weiqiaomiao/wqm-wip-rgw-bilist
Yehuda Sadeh [Tue, 1 Nov 2016 20:57:07 +0000 (13:57 -0700)]
Merge pull request #11697 from weiqiaomiao/wqm-wip-rgw-bilist

rgw: fix osd crashes when execute "radosgw-admin bi list --max-entries=1" command

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
8 years agoMerge pull request #11695 from tanghaodong25/cache-logger-wip
Sage Weil [Tue, 1 Nov 2016 18:25:06 +0000 (13:25 -0500)]
Merge pull request #11695 from tanghaodong25/cache-logger-wip

os/bluestore: update cache logger after 'trim_cache' operation

Reviewed-by: Sage Weil <sage@redhat.com>
8 years agoMerge pull request #11506 from cbodley/wip-17569
Yehuda Sadeh [Tue, 1 Nov 2016 18:16:09 +0000 (11:16 -0700)]
Merge pull request #11506 from cbodley/wip-17569

rgw: clear data_sync_cr if RGWDataSyncControlCR fails

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
8 years agoMerge pull request #11707 from yehudasa/wip-17755
Matt Benjamin [Tue, 1 Nov 2016 17:51:54 +0000 (13:51 -0400)]
Merge pull request #11707 from yehudasa/wip-17755

rgw: json encode/decode index_type, allow modification

8 years agoos/bluestore: rename variable in set_lextent 11725/head
Sage Weil [Tue, 1 Nov 2016 16:44:23 +0000 (12:44 -0400)]
os/bluestore: rename variable in set_lextent

Defensive naming

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agoos/bluestore: fix shard span check in set_lextent
Sage Weil [Tue, 1 Nov 2016 16:43:58 +0000 (12:43 -0400)]
os/bluestore: fix shard span check in set_lextent

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agoos/bluestore: fsck: check for extents spanning shards
Sage Weil [Tue, 1 Nov 2016 16:34:59 +0000 (12:34 -0400)]
os/bluestore: fsck: check for extents spanning shards

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agoos/bluestore: udpate cache logger after trim_cache 11695/head
haodong [Tue, 1 Nov 2016 15:39:03 +0000 (23:39 +0800)]
os/bluestore: udpate cache logger after trim_cache

Signed-off-by: Haodong Tang <haodong.tang@intel.com>
8 years agoMerge pull request #11708 from nitinkamble/master
Sage Weil [Tue, 1 Nov 2016 17:30:52 +0000 (12:30 -0500)]
Merge pull request #11708 from nitinkamble/master

install-deps.sh: allow building on SLES systems

8 years agoMerge pull request #10767 from rzarzynski/wip-rgw-frontend-rework
Matt Benjamin [Tue, 1 Nov 2016 17:11:07 +0000 (13:11 -0400)]
Merge pull request #10767 from rzarzynski/wip-rgw-frontend-rework

rgw: frontend subsystem rework

all requested changes have been made by the author
tested by-hand w/sigv2 and sigv4, and already passed teuthology rgw suite

8 years agoMerge pull request #11724 from liewegas/wip-bluestore-fsck
Sage Weil [Tue, 1 Nov 2016 16:21:16 +0000 (11:21 -0500)]
Merge pull request #11724 from liewegas/wip-bluestore-fsck

os/bluestore: deep fsck

Reviewed-by: Igor Fedotov <ifedotov@mirantis.com>
8 years agoos/bluestore: verify we can read objects on deep fsck 11724/head
Sage Weil [Tue, 1 Nov 2016 15:11:07 +0000 (11:11 -0400)]
os/bluestore: verify we can read objects on deep fsck

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agoos: add fsck deep/shallow option
Sage Weil [Fri, 28 Oct 2016 11:34:22 +0000 (06:34 -0500)]
os: add fsck deep/shallow option

deep==false checks just metadata, and deep==true will (eventually) check
all data (and checksums) too.

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agoceph_test_objectstore: fix synthetic fsck
Sage Weil [Tue, 1 Nov 2016 15:15:25 +0000 (11:15 -0400)]
ceph_test_objectstore: fix synthetic fsck

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agoMerge pull request #11537 from liewegas/wip-bluestore-parallel
Sage Weil [Tue, 1 Nov 2016 15:59:30 +0000 (10:59 -0500)]
Merge pull request #11537 from liewegas/wip-bluestore-parallel

os/bluestore: refactor bluestore_sync_submit_transaction

Reviewed-by: Somnath Roy <somnath.roy@sandisk.com>
Reviewed-by: Jianpeng Ma <jianpeng.ma@intel.com>
8 years agoMerge pull request #11661 from ceph/wip-git-ver
Sage Weil [Tue, 1 Nov 2016 15:04:10 +0000 (10:04 -0500)]
Merge pull request #11661 from ceph/wip-git-ver

cmake: fix git version string, cleanup

8 years agoos/bluestore: default to bluestore_sync_submit_transaction=true 11537/head
Sage Weil [Fri, 21 Oct 2016 19:47:21 +0000 (15:47 -0400)]
os/bluestore: default to bluestore_sync_submit_transaction=true

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agoos/bluestore: randomly inject serialize transaction submission
Sage Weil [Fri, 21 Oct 2016 15:25:38 +0000 (11:25 -0400)]
os/bluestore: randomly inject serialize transaction submission

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agoceph_test_objectstore: move main() to bottom
Sage Weil [Fri, 21 Oct 2016 15:30:08 +0000 (11:30 -0400)]
ceph_test_objectstore: move main() to bottom

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agoos/bluestore: fix {nid,blobid}_max
Sage Weil [Fri, 21 Oct 2016 14:23:19 +0000 (10:23 -0400)]
os/bluestore: fix {nid,blobid}_max

- single case to cover increases ahead of schedule or just in time
- update global max only after txn commits, eliminating race
- drop unneeded id_lock
- improve t naming

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agoos/bluestore: prevent sync transaction submit with extent freelist
Sage Weil [Wed, 19 Oct 2016 17:59:53 +0000 (13:59 -0400)]
os/bluestore: prevent sync transaction submit with extent freelist

It doesn't support unordered transactions.

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agoos/bluestore: submit txn via kv_sync_thread if ids exceed max
Sage Weil [Wed, 19 Oct 2016 17:56:19 +0000 (13:56 -0400)]
os/bluestore: submit txn via kv_sync_thread if ids exceed max

This ensures the txn will not commit before an update to the
global max.

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agoos/bluestore: refactor bluestore_sync_submit_transaction
Sage Weil [Tue, 18 Oct 2016 18:52:58 +0000 (14:52 -0400)]
os/bluestore: refactor bluestore_sync_submit_transaction

And drop bluestore_sync_transaction, at least for now.

The key change here is to make a per-txc flag indicating
whether the txn was already submitted.  This allows us
to make a choice between sync and not-sync on a per-txn
basis.

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agoMerge pull request #11721 from dachary/wip-17561-log
Kefu Chai [Tue, 1 Nov 2016 13:53:52 +0000 (21:53 +0800)]
Merge pull request #11721 from dachary/wip-17561-log

tests: TestErasureCodePluginJerasure must stop the log thread

Reviewed-by: Kefu Chai <kchai@redhat.com>
8 years agoMerge pull request #11718 from xiexingguo/xxg-wip-bluestore-1101
Sage Weil [Tue, 1 Nov 2016 13:17:43 +0000 (08:17 -0500)]
Merge pull request #11718 from xiexingguo/xxg-wip-bluestore-1101

os/bluestore: add counter to trace blob splitting

Reviewed-by: Sage Weil <sage@redhat.com>
8 years agotests: TestErasureCodePluginJerasure must stop the log thread 11721/head
Loic Dachary [Tue, 1 Nov 2016 11:24:56 +0000 (12:24 +0100)]
tests: TestErasureCodePluginJerasure must stop the log thread

When a log entry is created in dout.h, it holds a pointer to the

   static size_t _log_exp_length

variable. When OnExitManager::~OnExitManager from Log.cc is called
during global destruction, it may happen after the static variables
referenced by some entries have been deallocated. The flush() function
will try to access these deallocated variables via the hint_size()
method and core dump.

To prevent this race, the Log::stop() method must be called explicitly
to ensure no entries are left when the global destructors are called.

Fixes: http://tracker.ceph.com/issues/17561
Signed-off-by: Loic Dachary <ldachary@redhat.com>
8 years agoMerge pull request #10248 from ktdreyer/wip-doc-no-rpm-md
Alfredo Deza [Tue, 1 Nov 2016 12:24:17 +0000 (08:24 -0400)]
Merge pull request #10248 from ktdreyer/wip-doc-no-rpm-md

doc: rm "type=rpm-md" from yum repositories

Reviewed-by: Alfredo Deza <adeza@redhat.com>
8 years agoMerge pull request #11690 from yonghengdexin735/wip-zzz-fixword
xiexingguo [Tue, 1 Nov 2016 12:03:53 +0000 (20:03 +0800)]
Merge pull request #11690 from yonghengdexin735/wip-zzz-fixword

src/common/perf_counters.h: fix wrong word

Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
8 years agoos/bluestore: add sanity check when compress_extent_map() 11718/head
xie xingguo [Tue, 1 Nov 2016 08:08:59 +0000 (16:08 +0800)]
os/bluestore: add sanity check when compress_extent_map()

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
8 years agoos/bluestore: formatting changes
xie xingguo [Tue, 1 Nov 2016 05:53:20 +0000 (13:53 +0800)]
os/bluestore: formatting changes

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
8 years agoos/bluestore: add counter to trace blob splitting
xie xingguo [Tue, 1 Nov 2016 03:32:49 +0000 (11:32 +0800)]
os/bluestore: add counter to trace blob splitting

As we want to know if it really happens and how often does it happen.

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
8 years agoMerge pull request #11568 from dillaman/wip-17588
Mykola Golub [Tue, 1 Nov 2016 10:37:01 +0000 (12:37 +0200)]
Merge pull request #11568 from dillaman/wip-17588

librbd: cannot access non-primary image when mirroring force disabled

Reviewed-by: Mykola Golub <mgolub@mirantis.com>
8 years agoMerge pull request #11280 from ceph/wip-17440
Orit Wasserman [Tue, 1 Nov 2016 09:14:13 +0000 (10:14 +0100)]
Merge pull request #11280 from ceph/wip-17440

rgw: fixes for virtual hosting of buckets
Reviewed-by: Orit Wasserman <owasserm@redhat.com>
8 years agoMerge pull request #11559 from dillaman/wip-17618
Mykola Golub [Tue, 1 Nov 2016 07:14:07 +0000 (09:14 +0200)]
Merge pull request #11559 from dillaman/wip-17618

librbd: exclusive lock incorrectly initialized when switching to head revision

Reviewed-by: Mykola Golub <mgolub@mirantis.com>
8 years agoMerge pull request #11623 from dillaman/wip-cls-rbd-group
Mykola Golub [Tue, 1 Nov 2016 07:13:23 +0000 (09:13 +0200)]
Merge pull request #11623 from dillaman/wip-cls-rbd-group

librbd: ensure consistency groups will gracefully fail on older OSDs

Reviewed-by: Mykola Golub <mgolub@mirantis.com>
8 years agoMerge pull request #11703 from dillaman/wip-17750
Mykola Golub [Tue, 1 Nov 2016 07:11:50 +0000 (09:11 +0200)]
Merge pull request #11703 from dillaman/wip-17750

test: skip TestLibRBD.DiscardAfterWrite if skip partial discard enabled

Reviewed-by: Mykola Golub <mgolub@mirantis.com>
8 years agoMerge pull request #11714 from dachary/wip-17757-eio
Loic Dachary [Tue, 1 Nov 2016 00:29:57 +0000 (01:29 +0100)]
Merge pull request #11714 from dachary/wip-17757-eio

tests: disable failing tests

Reviewed-by: Brad Hubbard <bhubbard@redhat.com>
8 years agotests: disable failing unittest_erasure_code_plugin_jerasure 11714/head
Loic Dachary [Mon, 31 Oct 2016 23:40:14 +0000 (00:40 +0100)]
tests: disable failing unittest_erasure_code_plugin_jerasure

While figuring out what's wrong with it.

Refs: http://tracker.ceph.com/issues/17561

Signed-off-by: Loic Dachary <ldachary@redhat.com>
8 years agotests: disable failing test-erasure-eio.sh
Loic Dachary [Mon, 31 Oct 2016 22:53:58 +0000 (23:53 +0100)]
tests: disable failing test-erasure-eio.sh

While figuring out what's wrong with it.

Refs: http://tracker.ceph.com/issues/17757

Signed-off-by: Loic Dachary <ldachary@redhat.com>
8 years agoMerge pull request #11382 from yuyuyu101/wip-fix-shadow
Yuri Weinstein [Mon, 31 Oct 2016 23:37:45 +0000 (16:37 -0700)]
Merge pull request #11382 from yuyuyu101/wip-fix-shadow

osd/PGBackend: fix collection_list shadow return value

Reviewed-by: Kefu Chai <kchai@redhat.com>
tchaikov

8 years agoMerge pull request #11547 from javeme/check-pgid
Yuri Weinstein [Mon, 31 Oct 2016 23:36:17 +0000 (16:36 -0700)]
Merge pull request #11547 from javeme/check-pgid

osd/command tell: check pgid at the right time

Reviewed-by: Kefu Chai <kchai@redhat.com>
8 years agoMerge pull request #11203 from stiopaa1/osd_pg_replaceCountPart1
Yuri Weinstein [Mon, 31 Oct 2016 22:30:47 +0000 (15:30 -0700)]
Merge pull request #11203 from stiopaa1/osd_pg_replaceCountPart1

osd/PG.cc: prevent repeated searching of map/set

Reviewed-by: Sage Weil <sage@redhat.com>
8 years agoMerge pull request #11242 from stiopaa1/osd_replicatedpg_removeCount1
Yuri Weinstein [Mon, 31 Oct 2016 22:30:24 +0000 (15:30 -0700)]
Merge pull request #11242 from stiopaa1/osd_replicatedpg_removeCount1

osd/ReplicatedPG: remove unneeded use of count

Reviewed-by: Sage Weil <sage@redhat.com>
8 years agoMerge pull request #11365 from badone/wip-lsb_release-remove
Yuri Weinstein [Mon, 31 Oct 2016 22:29:25 +0000 (15:29 -0700)]
Merge pull request #11365 from badone/wip-lsb_release-remove

common: Remove the runtime dependency on lsb_release

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Ken Dreyer (Red Hat) <kdreyer@redhat.com>
8 years agotest: skip TestLibRBD.DiscardAfterWrite if skip partial discard enabled 11703/head
Jason Dillaman [Mon, 31 Oct 2016 15:08:55 +0000 (11:08 -0400)]
test: skip TestLibRBD.DiscardAfterWrite if skip partial discard enabled

Fixes: http://tracker.ceph.com/issues/17750
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
8 years agoinstall-deps.sh: allow building on SLES systems 11708/head
Nitin A Kamble [Mon, 31 Oct 2016 18:46:13 +0000 (11:46 -0700)]
install-deps.sh: allow building on SLES systems

Avoids this error on SLES systems:

> ./install-deps.sh
sles is unknown, dependencies will have to be installed manually.

Signed-off-by: Nitin A Kamble <Nitin.Kamble@Teradata.com>
8 years agorgw: json encode/decode index_type, allow modification 11707/head
Yehuda Sadeh [Mon, 31 Oct 2016 17:47:15 +0000 (10:47 -0700)]
rgw: json encode/decode index_type, allow modification

Fixes: http://tracker.ceph.com/issues/17755
We didn't dump the index_type field of RGWBucketInfo, also didn't
allow modifying it via metadata api.

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
8 years agodoc: rm "type=rpm-md" from yum repositories 10248/head
Ken Dreyer [Mon, 11 Jul 2016 15:13:49 +0000 (09:13 -0600)]
doc: rm "type=rpm-md" from yum repositories

As far as I can tell, this is only relevant to SUSE's Zypper, and yum
does not need it.

Signed-off-by: Ken Dreyer <kdreyer@redhat.com>
8 years agolibrbd: unit test cases and minor fixes for mirror::DisableRequest 11568/head
Jason Dillaman [Wed, 19 Oct 2016 20:26:46 +0000 (16:26 -0400)]
librbd: unit test cases and minor fixes for mirror::DisableRequest

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
8 years agocls/journal: use librados::IoCtx reference for helper state machines
Jason Dillaman [Wed, 19 Oct 2016 20:25:46 +0000 (16:25 -0400)]
cls/journal: use librados::IoCtx reference for helper state machines

This facilitates being able to properly mock test cases around journal
cls method calls.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
8 years agolibrbd: restore journal access when force disabling mirroring
Jason Dillaman [Wed, 19 Oct 2016 14:55:05 +0000 (10:55 -0400)]
librbd: restore journal access when force disabling mirroring

If mirroring is force disabled on a demoted image, the journal was
being left in an inconsistent ownership state.

Fixes: http://tracker.ceph.com/issues/17588
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
8 years agolibrbd: new async journal promote state machine
Jason Dillaman [Tue, 18 Oct 2016 13:18:43 +0000 (09:18 -0400)]
librbd: new async journal promote state machine

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
8 years agolibrbd: new async journal open state machine
Jason Dillaman [Tue, 18 Oct 2016 03:51:51 +0000 (23:51 -0400)]
librbd: new async journal open state machine

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
8 years agolibrbd: move journal tag decode helpers to shared location
Jason Dillaman [Tue, 18 Oct 2016 02:44:55 +0000 (22:44 -0400)]
librbd: move journal tag decode helpers to shared location

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
8 years agolibrbd: re-add support for disabling a corrupt journal
Jason Dillaman [Tue, 18 Oct 2016 01:26:19 +0000 (21:26 -0400)]
librbd: re-add support for disabling a corrupt journal

Fixes: http://tracker.ceph.com/issues/16740
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
8 years agomake-dist: do not use make_version (and remove it) 11661/head
Sage Weil [Thu, 27 Oct 2016 16:39:20 +0000 (11:39 -0500)]
make-dist: do not use make_version (and remove it)

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agomake-dist: do not generate ceph_ver.h
Sage Weil [Wed, 26 Oct 2016 14:51:06 +0000 (09:51 -0500)]
make-dist: do not generate ceph_ver.h

cmake does this on its own, and puts it in a different location (the build
dir).

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agosrc/CMakeLists.txt: remove leading 'v' from version string
Sage Weil [Wed, 26 Oct 2016 12:34:45 +0000 (07:34 -0500)]
src/CMakeLists.txt: remove leading 'v' from version string

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agoMerge pull request #11249 from wido/osd-flush-journal-shutdown
Sage Weil [Mon, 31 Oct 2016 14:06:14 +0000 (09:06 -0500)]
Merge pull request #11249 from wido/osd-flush-journal-shutdown

osd: Flush Journal on shutdown

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Haomai Wang <haomai@xsky.com>
8 years agoMerge pull request #11686 from ceph/wip-ceph-rest-api-new-addr
Sage Weil [Mon, 31 Oct 2016 14:05:22 +0000 (09:05 -0500)]
Merge pull request #11686 from ceph/wip-ceph-rest-api-new-addr

ceph-rest-api: understand the new style entity_addr_t representation

Reviewed-by: Sage Weil <sage@redhat.com>
8 years agoMerge pull request #11530 from markhpc/wip-rocksdb_tuning
Sage Weil [Mon, 31 Oct 2016 14:03:05 +0000 (09:03 -0500)]
Merge pull request #11530 from markhpc/wip-rocksdb_tuning

common/config_opts.h: Optimized RocksDB WAL settings.

8 years agorgw: fix osd crashes when execute "radosgw-admin bi list --max-entries=1" command 11697/head
weiqiaomiao [Mon, 31 Oct 2016 05:59:55 +0000 (13:59 +0800)]
rgw: fix osd crashes when execute "radosgw-admin bi list --max-entries=1" command

Fixes: http://tracker.ceph.com/issues/17745
Signed-off-by: weiqiaomiao <wei.qiaomiao@zte.com.cn>
8 years agoMerge pull request #11688 from stiopaa1/mds_snapserver_addConstToMemFun
Brad Hubbard [Sun, 30 Oct 2016 21:24:51 +0000 (07:24 +1000)]
Merge pull request #11688 from stiopaa1/mds_snapserver_addConstToMemFun

mds/SnapServer: add const to member function

Reviewed-by: Brad Hubbard <bhubbard@redhat.com>
8 years agomds/SnapServer: add const to member function 11688/head
Michal Jarzabek [Sat, 29 Oct 2016 20:52:10 +0000 (21:52 +0100)]
mds/SnapServer: add const to member function

Signed-off-by: Michal Jarzabek <stiopa@gmail.com>
8 years agoceph-rest-api: understand the new style entity_addr_t representation 11686/head
Kefu Chai [Sat, 29 Oct 2016 17:19:06 +0000 (01:19 +0800)]
ceph-rest-api: understand the new style entity_addr_t representation

the new entity_addr_t representation was introduced by 3561eb3, we
should update ceph_rest_api.py accordingly.

Fixes: http://tracker.ceph.com/issues/17742
Signed-off-by: Kefu Chai <kchai@redhat.com>
8 years agoMerge pull request #10993 from Vicente-Cheng/fix-alloc-choose_tries
Kefu Chai [Sun, 30 Oct 2016 03:54:59 +0000 (11:54 +0800)]
Merge pull request #10993 from Vicente-Cheng/fix-alloc-choose_tries

crush: make counting of choose_tries consistent

Reviewed-by: Kefu Chai <kchai@redhat.com>
8 years agoMerge pull request #11246 from badone/wip-set_xattr_limits_via_conf-fix
Kefu Chai [Sun, 30 Oct 2016 03:54:16 +0000 (11:54 +0800)]
Merge pull request #11246 from badone/wip-set_xattr_limits_via_conf-fix

os/filestore: Fix erroneous WARNING: max attr too small

Reviewed-by: Kefu Chai <kchai@redhat.com>
8 years agoMerge pull request #11614 from runsisi/wip-fix-PK11_FreeSymKey-segfault
Kefu Chai [Sun, 30 Oct 2016 03:50:51 +0000 (11:50 +0800)]
Merge pull request #11614 from runsisi/wip-fix-PK11_FreeSymKey-segfault

auth: fix NULL pointer access when trying to delete CryptoAESKeyHandler instance

Reviewed-by: Kefu Chai <kchai@redhat.com>
8 years agoMerge pull request #11654 from hjwsm1989/fix
Kefu Chai [Sun, 30 Oct 2016 03:49:49 +0000 (11:49 +0800)]
Merge pull request #11654 from hjwsm1989/fix

mon: print the num_pools and num_objects in 'ceph -s -f json/json-p…

Reviewed-by: Kefu Chai <kchai@redhat.com>
8 years agoMerge pull request #11639 from atheism/mgr-PyModules-remove-duplicated-else-if
Kefu Chai [Sun, 30 Oct 2016 03:48:51 +0000 (11:48 +0800)]
Merge pull request #11639 from atheism/mgr-PyModules-remove-duplicated-else-if

mgr: PyModules.cc: remove duplicated if condition for fs_map

Reviewed-by: Kefu Chai <kchai@redhat.com>
8 years agoMerge pull request #11659 from tchaikov/wip-delete-cct-later
Kefu Chai [Sun, 30 Oct 2016 03:47:06 +0000 (11:47 +0800)]
Merge pull request #11659 from tchaikov/wip-delete-cct-later

librados: postpone cct deletion

Reviewed-by: Sage Weil <sage@redhat.com>
8 years agosrc/common/perf_counters.h:fix wrong word 11690/head
zhang.zezhu [Sun, 30 Oct 2016 01:35:44 +0000 (01:35 +0000)]
src/common/perf_counters.h:fix wrong word

Signed-off-by: zhang.zezhu <zhang.zezhu@zte.com.cn>
8 years agoMerge pull request #11314 from jcsp/wip-mgr-flake8
Kefu Chai [Sat, 29 Oct 2016 04:21:33 +0000 (12:21 +0800)]
Merge pull request #11314 from jcsp/wip-mgr-flake8

pybind: clean up mgr stuff for flake8

Reviewed-by: Kefu Chai <kchai@redhat.com>
8 years agoMerge pull request #11650 from wjwithagen/wip-wjw-log-loging
Kefu Chai [Sat, 29 Oct 2016 04:11:08 +0000 (12:11 +0800)]
Merge pull request #11650 from wjwithagen/wip-wjw-log-loging

Log: Replace namespace log with logging

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Casey Bodley <cbodley@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
8 years agoMerge pull request #11680 from tchaikov/wip-17728
Kefu Chai [Sat, 29 Oct 2016 03:43:07 +0000 (11:43 +0800)]
Merge pull request #11680 from tchaikov/wip-17728

test/ceph_test_msgr: do not use Message::middle for holding transient…

Reviewed-by: Haomai Wang <haomai@xsky.com>
8 years agoMerge pull request #11397 from dzafman/wip-scrub-misc
David Zafman [Fri, 28 Oct 2016 18:17:12 +0000 (11:17 -0700)]
Merge pull request #11397 from dzafman/wip-scrub-misc

Reviewed-by: Kefu Chai <kchai@redhat.com>
8 years agotest/ceph_test_msgr: do not use Message::middle for holding transient data 11680/head
Kefu Chai [Fri, 28 Oct 2016 17:54:58 +0000 (01:54 +0800)]
test/ceph_test_msgr: do not use Message::middle for holding transient data

Message::middle is used for holding encoded data, so we we can not stuff
it with payload and leave the "payload" field empty. this change
refactors the ceph_test_msgr by introducing a Payload class which
encodes all test data in it.

Fixes: http://tracker.ceph.com/issues/17728
Signed-off-by: Kefu Chai <kchai@redhat.com>
8 years agoMerge pull request #11677 from ceph/wip-rocksdb-no-march-native
Kefu Chai [Fri, 28 Oct 2016 13:48:39 +0000 (21:48 +0800)]
Merge pull request #11677 from ceph/wip-rocksdb-no-march-native

rocksdb: do not build with --march=native

Reviewed-by: Bassam Tabbara <bassam.tabbara@quantum.com>
Reviewed-by: Brad Hubbard <bhubbard@redhat.com>
8 years agoMerge pull request #11678 from tchaikov/wip-silence-rbd-warning
Jason Dillaman [Fri, 28 Oct 2016 13:23:18 +0000 (09:23 -0400)]
Merge pull request #11678 from tchaikov/wip-silence-rbd-warning

librbd: silence the unused variable warning

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
8 years agolibrbd: silence the unused variable warning 11678/head
Kefu Chai [Fri, 28 Oct 2016 12:28:26 +0000 (20:28 +0800)]
librbd: silence the unused variable warning

Signed-off-by: Kefu Chai <kchai@redhat.com>
8 years agorocksdb: do not build with --march=native 11677/head
Kefu Chai [Fri, 28 Oct 2016 11:00:10 +0000 (19:00 +0800)]
rocksdb: do not build with --march=native

we can not assume that building host has the same arch (or the same cpu
capability) with the target machine.

Signed-off-by: Kefu Chai <kchai@redhat.com>
8 years agoMerge pull request #11663 from stiopaa1/mds_mdslog_addConstToMemFunc
Sage Weil [Fri, 28 Oct 2016 10:52:23 +0000 (05:52 -0500)]
Merge pull request #11663 from stiopaa1/mds_mdslog_addConstToMemFunc

mds/MDLog: add const to member functions

8 years agoMerge pull request #11668 from Enproduktion/master
Sage Weil [Fri, 28 Oct 2016 10:49:25 +0000 (05:49 -0500)]
Merge pull request #11668 from Enproduktion/master

doc: Fixed mapping error in legacy mds command

8 years agoMerge pull request #11446 from ukernel/wip-cephfs-scan-links
John Spray [Fri, 28 Oct 2016 10:03:12 +0000 (11:03 +0100)]
Merge pull request #11446 from ukernel/wip-cephfs-scan-links

tools/cephfs: add scan_links command which fixes linkages errors

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
8 years agoMerge pull request #11609 from stiopaa1/mds_snaprealm_unneededuseofcount
John Spray [Fri, 28 Oct 2016 10:01:59 +0000 (11:01 +0100)]
Merge pull request #11609 from stiopaa1/mds_snaprealm_unneededuseofcount

mds/SnapRealm: remove unneeded use of count

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
8 years agoMerge pull request #11625 from stiopaa1/mds_damageTable_removeUnneededCount
John Spray [Fri, 28 Oct 2016 10:01:34 +0000 (11:01 +0100)]
Merge pull request #11625 from stiopaa1/mds_damageTable_removeUnneededCount

mds/DamageTable.cc: remove unneeded use of count

Reviewed-by: Greg Farnum <gfarnum@redhat.com>