RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2024-12-24 20:33:27 +00:00
Code Issues Packages Projects Releases Wiki Activity
71,716 Commits 211 Branches 394 Tags 1.2 GiB
0807f384bf
Commit Graph

71716 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Yuri Weinstein
0807f384bf Merge pull request #14857 from joscollin/wip-arch-cpuid 
arch: use __get_cpuid instead of do_cpuid

Reviewed-by: Kefu Chai <kchai@redhat.com>
 2017-05-02 09:04:09 -07:00
Sage Weil
94a873090e Merge pull request #12669 from hjwsm1989/unfound-objects 
osd/PG: fix possible overflow on unfound objects

Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
 2017-05-02 10:54:19 -05:00
Sage Weil
56104449da Merge pull request #12882 from wonzhq/pglog-fixes 
osd: pglog trimming fixes

Reviewed-by: Sage Weil <sage@redhat.com>
 2017-05-02 10:53:26 -05:00
Sage Weil
fcd64d75ab Merge pull request #14444 from liewegas/wip-past-intervals 
osd: simplify past_intervals representation

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
 2017-05-02 10:51:37 -05:00
Sage Weil
3b4e4d0077 Merge pull request #14898 from tchaikov/wip-clean-pending_created_pgs 
mon/OSDMonitor: cleanup pending_created_pgs after done with it

Reviewed-by: Sage Weil <sage@redhat.com>
 2017-05-02 10:51:12 -05:00
Sage Weil
7f97f363e8 Merge pull request #14904 from tchaikov/wip-19638-followon 
osd: stop mgrc earlier in shutdown()

Reviewed-by: Sage Weil <sage@redhat.com>
 2017-05-02 10:50:52 -05:00
Yuri Weinstein
3a6801751d Merge pull request #14858 from dmick/wip-config-dump 
mon/ConfigKeyService: add 'config-key dump' to show keys and vals

Reviewed-by: Sage Weil <sage@redhat.com>
 2017-05-02 08:25:16 -07:00
Yuri Weinstein
f7cf9d14b8 Merge pull request #14870 from smithfarm/wip-gperftools 
build/ops: rpm: gperftools-devel >= 2.4

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Ken Dreyer <kdreyer@redhat.com>
 2017-05-02 08:23:59 -07:00
Kefu Chai
1edcf1cb11 Merge pull request #14869 from wjwithagen/wip-wjw-cmake-uuid 
cmake: fix the linked lib reference of unittest_rgw_crypto

Reviewed-by: Kefu Chai <kchai@redhat.com>
 2017-05-02 14:41:19 +08:00
Kefu Chai
958e76d7f6 Merge pull request #14900 from jupiturliu/organization_map 
mailmap: add Alibaba into organization map

Reviewed-by: Kefu Chai <kchai@redhat.com>
 2017-05-02 14:28:41 +08:00
Kefu Chai
46da7ee760 Merge pull request #14895 from liewegas/wip-19778 
kv: move 'bluestore-kv' hackery out of KeyValueDB into ceph-kvstore-tool

Reviewed-by: Kefu Chai <kchai@redhat.com>
 2017-05-02 11:05:54 +08:00
Kefu Chai
4121a3fef7 Merge pull request #14853 from liewegas/wip-aio 
os/fs/aio: use small_vector for aio_t; clean up header location

Reviewed-by: Kefu Chai <kchai@redhat.com>
 2017-05-02 10:33:38 +08:00
Kefu Chai
611572a610 OSD: stop mgrc earlier in shutdown() 
it's better this way, as MgrClient is more like an internal consumer
of the services offered by OSD, instead of service privider. it could
prevent future problem if we can stop it earlier in the shutdown
process.

see also: http://tracker.ceph.com/issues/19638
Signed-off-by: Kefu Chai <kchai@redhat.com>
 2017-05-02 09:45:16 +08:00
Sage Weil
f36f0dbcdb Merge pull request #14897 from tchaikov/wip-19814 
mon/OSDMonitor: update creating_pgs using pending_creatings

Reviewed-by: Sage Weil <sage@redhat.com>
 2017-05-01 20:31:43 -05:00
Sage Weil
7d85bee4b5 Merge pull request #14889 from joscollin/wip-test-write-operations-warning 
test: c_write_operations.cc: silence warning from -Wsign-compare
 2017-05-01 20:30:49 -05:00
Sage Weil
19f2455b76 Merge pull request #14888 from joscollin/wip-test-read-operations-warning 
test: c_read_operations.cc: silence warning from -Wsign-compare
 2017-05-01 20:30:35 -05:00
Sage Weil
475daee9c7 Merge pull request #14799 from xiaoxichen/optimiztic_pg_active 
osd/PG.cc: Optimistic estimation on PG.last_active

Reviewed-by: Sage Weil <sage@redhat.com>
 2017-05-01 20:30:23 -05:00
Sage Weil
d3b461eac0 Merge pull request #14790 from wjwithagen/wip-wjw-cleanup-unused-variable-v2 
common: Fix unused variable references warnings

Reviewed-by: Kefu Chai <kchai@redhat.com>
 2017-05-01 20:30:03 -05:00
Sage Weil
5f1c03e536 Merge pull request #14330 from ivancich/wip-bring-in-dmclock 
dmclock: initial commit of dmclock QoS library
 2017-05-01 20:29:43 -05:00
Sage Weil
0bded75235 Merge pull request #14896 from liewegas/wip-19638 
osd: stop MgrClient callbacks on shutdown

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
 2017-05-01 20:25:29 -05:00
Sage Weil
2d6be11c2f Merge pull request #14899 from liewegas/wip-19433 
ceph_test_rados_api_watch_notify: make LibRadosWatchNotify.Watch3Timeout tolerate thrashing

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
 2017-05-01 20:24:48 -05:00
Sage Weil
5376b83b39 Merge pull request #14901 from liewegas/wip-19552 
osdc/Objecter: fix pool dne corner case

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
 2017-05-01 20:23:52 -05:00
Kefu Chai
6ce6acf526 Merge pull request #14881 from tchaikov/wip-crosscompiling-armhf 
cmake: enable cross-compilation of boost 

Reviewed-by: Casey Bodley <cbodley@redhat.com>
 2017-05-02 09:19:51 +08:00
Sage Weil
e4874b4091 Merge pull request #14788 from liewegas/wip-jewel-x-rgw 
qa/suites/jewel-x/point-to-point: don't scane for keys on second s3tests either

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
 2017-05-01 17:12:39 -05:00
Sage Weil
d60c1c40ce osdc/Objecter: fix pool dne corner case 
We have a request that is queued before a pool exists, there is one
epoch where it exists, and then the pool disappears again.  The two maps
are processed at the same time.  For the first we set needs_resend, map to
an osd, and remove from the homeless sessin.  For the second, the pool
dne, we set osd back to -1, and send a map check request.  Finally,
handle_osd_maps scans need_resend, sees the pool dne, and removes from
need_resend.  The difference from the "usual" case is that we are neither
on the need_resend list nor on the homeless session.

Fix this by concluding immediately that the pool existed (briefly) and
then no longer exists.

Fixes: http://tracker.ceph.com/issues/19552
Signed-off-by: Sage Weil <sage@redhat.com>
 2017-05-01 15:10:44 -05:00
James Liu
a76e476bda doc:Adding Alibaba into organization map 
Signed-off-by: James Liu <james.liu@alibaba-inc.com>
 2017-05-01 13:00:11 -07:00
Sage Weil
a28282b157 ceph_test_rados_api_watch_notify: make LibRadosWatchNotify.Watch3Timeout tolerate thrashing 
If the PG moves we will reconnect and fail to time out.
Wait for longer so that we mask the effects of osd thrashing.

Fixes: http://tracker.ceph.com/issues/19433
Signed-off-by: Sage Weil <sage@redhat.com>
 2017-05-01 13:21:30 -04:00
Kefu Chai
793c2f2297 mon/OSDMonitor: cleanup pending_created_pgs after done with it 
Signed-off-by: Kefu Chai <kchai@redhat.com>
 2017-05-02 01:11:06 +08:00
Kefu Chai
b2d29568d7 mon/OSDMonitor: update creating_pgs using pending_creatings 
* without this change, in OSDMonitor::update_pending_pgs(), creating_pgs
  is updated directly without lock, and the change will be overwritten
  with pending changes eventually. so we should update it using
  pending_creatings
* also, should acquire the lock in OSDMonitor::send_pg_creates() when
  reading creating_pgs_by_osd_epoch and createing_pgs.

Fixes: http://tracker.ceph.com/issues/19814
Signed-off-by: Kefu Chai <kchai@redhat.com>
 2017-05-01 23:48:59 +08:00
Radoslaw Zarzynski
56baf955ad Merge pull request #14775 from Jing-Scott/wip-con-obj-bulkupload 
rgw: add support container and object levels of swift bulkupload

Reviewed-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
 2017-05-01 17:44:36 +02:00
Kefu Chai
ab77b1dd6a Merge pull request #14892 from tchaikov/wip-kill-warnings 
test: kill warnings

Reviewed-by: Loic Dachary <ldachary@redhat.com>
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
 2017-05-01 23:43:51 +08:00
Radoslaw Zarzynski
b4099a9a61 Merge pull request #14750 from theanalyst/rgw/fix/frontend_array 
rgw: civetweb don't go past the array index while calling mg_start

Reviewed-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
 2017-05-01 17:17:45 +02:00
Casey Bodley
cb041c9b16 Merge pull request #14359 from Jing-Scott/remove-zg-dup-post 
rgw multisite: remove the redundant post in OPT_ZONEGROUP_MODIFY

Reviewed-by: Casey Bodley <cbodley@redhat.com>
 2017-05-01 10:54:41 -04:00
Casey Bodley
6ac2dbf89e Merge pull request #14390 from shashalu/drop-unused-param 
rgw: drop unused param "bucket" from select_bucket_placement

Reviewed-by: Casey Bodley <cbodley@redhat.com>
 2017-05-01 10:54:01 -04:00
Casey Bodley
1e0b919e51 Merge pull request #14839 from chardan/jfw-wip-halflife_atomic_t-ebirah 
rgw: migrate atomic_t to std::atomic<> (ebirah)

Reviewed-by: Casey Bodley <cbodley@redhat.com>
 2017-05-01 10:53:00 -04:00
Casey Bodley
0e30e3ef01 Merge pull request #14845 from cbodley/wip-rgw-qa-s3tests 
qa/rgw: add cluster name to path when s3tests scans rgw log

Reviewed-by: Daniel Gryniewicz <dang@redhat.com>
 2017-05-01 10:49:12 -04:00
Sage Weil
83c45ad6a4 osd: stop MgrClient callbacks on shutdown 
Stop the MgrClient callbacks to report PG stats at the
start of shutdown() so that we don't get a callback
during/after we are done shutting down.

Protect the cb update with the MgrClient's lock so that
we don't race with MgrClient::send_report() itself.

Fixes: http://tracker.ceph.com/issues/19638
Signed-off-by: Sage Weil <sage@redhat.com>
 2017-05-01 10:33:36 -04:00
Sage Weil
732ad1364e kv: move 'bluestore-kv' hackery out of KeyValueDB into ceph-kvstore-tool 
This avoids contaminating libkv with ObjectStore/BlueStore.  It also makes
the blustore kv startup slightly less weird (no need to skip the open
step).

Fixes: http://tracker.ceph.com/issues/19778
Signed-off-by: Sage Weil <sage@redhat.com>
 2017-05-01 10:24:03 -04:00
Kefu Chai
8b8646f7ac test/librados: silence -Woverloaded-virtual warning 
Signed-off-by: Kefu Chai <kchai@redhat.com>
 2017-05-01 22:19:55 +08:00
Kefu Chai
c83c62ea9b test/librbd: silence warning from -Wsign-compare 
Signed-off-by: Kefu Chai <kchai@redhat.com>
 2017-05-01 22:13:40 +08:00
Matt Benjamin
1c9a48cec8 Merge pull request #14770 from rzarzynski/wip-rgw-19754 
rgw: fix RadosGW hang during multi-chunk upload of AWSv4.
 2017-05-01 10:09:10 -04:00
Sage Weil
1e0162fecc Merge pull request #14887 from liewegas/wip-kraken-x 
qa/suites/upgrade/kraken-x: misc fixes
 2017-05-01 06:55:30 -05:00
Sage Weil
feb532c6d6 Merge pull request #14890 from xiexingguo/wip-fix-bluestore-typo 
os/bluestore: fix typo(s/trasnaction/transaction/)
 2017-05-01 06:43:53 -05:00
Willem Jan Withagen
dee22f307f os/filestore/FileJournal.cc: fix unused warning 
Signed-off-by: Willem Jan Withagen <wjw@digiware.nl>
 2017-05-01 11:09:03 +02:00
Willem Jan Withagen
9f1e5a92f8 msg/async/net_handler.cc: fix unused reference for option 
- If no option value is to be supplied or returned,
     optval may be NULL
 - ignore priority options for FreeBSD

Signed-off-by: Willem Jan Withagen <wjw@digiware.nl>
 2017-05-01 11:09:03 +02:00
Kefu Chai
e5a8d89d1c cmake: pass compiler and linker down to zstd 
so it can respect the setting specfied by user.

Signed-off-by: Kefu Chai <kchai@redhat.com>
 2017-05-01 15:49:59 +08:00
Kefu Chai
5126f55319 test/librbd: print uint64_t in a platform neutral way 
Signed-off-by: Kefu Chai <kchai@redhat.com>
 2017-05-01 15:45:42 +08:00
Kefu Chai
c8ca98ed02 crush: pass by const reference to kill compiling error 
i have following error when compiling with gcc-6 on armhf

ceph/src/crush/CrushCompiler.cc: In member function 'int
CrushCompiler::decompile(std::ostream&)':
ceph/src/crush/CrushCompiler.cc:462:45: error: invalid initialization of
non-const reference of type 'std::pair<const long unsigned int,
crush_choo
se_arg_map>&' from an rvalue of type 'std::pair<const long unsigned int,
crush_choose_arg_map>'
       int ret = decompile_choose_args(i, out);

Signed-off-by: Kefu Chai <kchai@redhat.com>
 2017-05-01 15:45:42 +08:00
Kefu Chai
4e0f7b48b0 cls/rbd: print uint64_t in a platform neutral way 
Signed-off-by: Kefu Chai <kchai@redhat.com>
 2017-05-01 15:45:42 +08:00
xie xingguo
42a9930aef os/bluestore: fix typo(s/trasnaction/transaction/) 
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
 2017-05-01 15:32:59 +08:00