Commit Graph

59280 Commits

Author SHA1 Message Date
Sage Weil
2bb9f9bcb3 Merge pull request #11661 from ceph/wip-git-ver
cmake: fix git version string, cleanup
2016-11-01 10:04:10 -05:00
Kefu Chai
0d93b608b8 Merge pull request #11721 from dachary/wip-17561-log
tests: TestErasureCodePluginJerasure must stop the log thread

Reviewed-by: Kefu Chai <kchai@redhat.com>
2016-11-01 21:53:52 +08:00
Sage Weil
c0c0f4664e 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>
2016-11-01 08:17:43 -05:00
Loic Dachary
17fe16d461 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>
2016-11-01 13:33:08 +01:00
Alfredo Deza
6d01da687c 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>
2016-11-01 08:24:17 -04:00
xiexingguo
bafec40191 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>
2016-11-01 20:03:53 +08:00
xie xingguo
332e07f4ca os/bluestore: add sanity check when compress_extent_map()
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
2016-11-01 18:37:29 +08:00
xie xingguo
822e3afecf os/bluestore: formatting changes
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
2016-11-01 18:37:29 +08:00
xie xingguo
d85f2dcff4 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>
2016-11-01 18:37:21 +08:00
Mykola Golub
478d666a89 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>
2016-11-01 12:37:01 +02:00
Orit Wasserman
63e86e542e Merge pull request #11280 from ceph/wip-17440
rgw: fixes for virtual hosting of buckets
Reviewed-by: Orit Wasserman <owasserm@redhat.com>
2016-11-01 10:14:13 +01:00
Mykola Golub
7b7d0984f0 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>
2016-11-01 09:14:07 +02:00
Mykola Golub
ef4f128a26 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>
2016-11-01 09:13:23 +02:00
Mykola Golub
3189a7dff6 Merge pull request #11703 from dillaman/wip-17750
test: skip TestLibRBD.DiscardAfterWrite if skip partial discard enabled

Reviewed-by: Mykola Golub <mgolub@mirantis.com>
2016-11-01 09:11:50 +02:00
Loic Dachary
564a5b3979 Merge pull request #11714 from dachary/wip-17757-eio
tests: disable failing tests

Reviewed-by: Brad Hubbard <bhubbard@redhat.com>
2016-11-01 01:29:57 +01:00
Loic Dachary
d72353824e 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>
2016-11-01 00:42:49 +01:00
Loic Dachary
f018c9ec08 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>
2016-11-01 00:38:09 +01:00
Yuri Weinstein
98e5931b06 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
2016-10-31 16:37:45 -07:00
Yuri Weinstein
bf9df72899 Merge pull request #11547 from javeme/check-pgid
osd/command tell: check pgid at the right time

Reviewed-by: Kefu Chai <kchai@redhat.com>
2016-10-31 16:36:17 -07:00
Yuri Weinstein
79536a562c 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>
2016-10-31 15:30:47 -07:00
Yuri Weinstein
2efa73f346 Merge pull request #11242 from stiopaa1/osd_replicatedpg_removeCount1
osd/ReplicatedPG: remove unneeded use of count

Reviewed-by: Sage Weil <sage@redhat.com>
2016-10-31 15:30:24 -07:00
Yuri Weinstein
a7dae73800 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>
2016-10-31 15:29:25 -07:00
Jason Dillaman
20406aef3e test: skip TestLibRBD.DiscardAfterWrite if skip partial discard enabled
Fixes: http://tracker.ceph.com/issues/17750
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2016-10-31 16:18:56 -04:00
Ken Dreyer
932a0e9862 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>
2016-10-31 11:29:30 -06:00
Jason Dillaman
b8589691d7 librbd: unit test cases and minor fixes for mirror::DisableRequest
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2016-10-31 10:57:14 -04:00
Jason Dillaman
552acd3a07 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>
2016-10-31 10:57:14 -04:00
Jason Dillaman
86a0c1e5e3 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>
2016-10-31 10:57:14 -04:00
Jason Dillaman
3bc9f51c58 librbd: new async journal promote state machine
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2016-10-31 10:57:14 -04:00
Jason Dillaman
7187383291 librbd: new async journal open state machine
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2016-10-31 10:57:14 -04:00
Jason Dillaman
f59f0d4955 librbd: move journal tag decode helpers to shared location
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2016-10-31 10:57:14 -04:00
Jason Dillaman
06a84eef70 librbd: re-add support for disabling a corrupt journal
Fixes: http://tracker.ceph.com/issues/16740
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2016-10-31 10:57:14 -04:00
Sage Weil
f3f74ddb3d make-dist: do not use make_version (and remove it)
Signed-off-by: Sage Weil <sage@redhat.com>
2016-10-31 10:10:47 -04:00
Sage Weil
dd6d3d920b 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>
2016-10-31 10:10:47 -04:00
Sage Weil
aa188e3bed src/CMakeLists.txt: remove leading 'v' from version string
Signed-off-by: Sage Weil <sage@redhat.com>
2016-10-31 10:10:46 -04:00
Sage Weil
70a061ff6b 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>
2016-10-31 09:06:14 -05:00
Sage Weil
dab6c28446 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>
2016-10-31 09:05:22 -05:00
Sage Weil
abcb93cd27 Merge pull request #11530 from markhpc/wip-rocksdb_tuning
common/config_opts.h: Optimized RocksDB WAL settings.
2016-10-31 09:03:05 -05:00
Brad Hubbard
7a633e44e4 Merge pull request #11688 from stiopaa1/mds_snapserver_addConstToMemFun
mds/SnapServer: add const to member function

Reviewed-by: Brad Hubbard <bhubbard@redhat.com>
2016-10-31 07:24:51 +10:00
Michal Jarzabek
2eb96d5718 mds/SnapServer: add const to member function
Signed-off-by: Michal Jarzabek <stiopa@gmail.com>
2016-10-30 08:28:03 +00:00
Kefu Chai
f50086db55 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>
2016-10-30 15:06:44 +08:00
Kefu Chai
ee5a43caf8 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>
2016-10-30 11:54:59 +08:00
Kefu Chai
a8f50e7e6b 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>
2016-10-30 11:54:16 +08:00
Kefu Chai
c28580be0d 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>
2016-10-30 11:50:51 +08:00
Kefu Chai
134102127e 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>
2016-10-30 11:49:49 +08:00
Kefu Chai
25d43f4d32 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>
2016-10-30 11:48:51 +08:00
Kefu Chai
9ae1fe88ff Merge pull request #11659 from tchaikov/wip-delete-cct-later
librados: postpone cct deletion

Reviewed-by: Sage Weil <sage@redhat.com>
2016-10-30 11:47:06 +08:00
zhang.zezhu
8ac02e9a29 src/common/perf_counters.h:fix wrong word
Signed-off-by: zhang.zezhu <zhang.zezhu@zte.com.cn>
2016-10-30 02:26:37 +00:00
Kefu Chai
5354e7c26f Merge pull request #11314 from jcsp/wip-mgr-flake8
pybind: clean up mgr stuff for flake8

Reviewed-by: Kefu Chai <kchai@redhat.com>
2016-10-29 12:21:33 +08:00
Kefu Chai
278632c28f 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>
2016-10-29 12:11:08 +08:00
Kefu Chai
15ebffaf4e 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>
2016-10-29 11:43:07 +08:00