RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-01-04 02:02:36 +00:00
Code Issues Packages Projects Releases Wiki Activity
82,421 Commits 212 Branches 394 Tags 1.6 GiB
a95ba20de6
Commit Graph

82421 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
huanwen ren
a95ba20de6 mon/paxosservice: cleanup 
Signed-off-by: huanwen ren <ren.huanwen@zte.com.cn>
 2018-01-23 19:42:39 +08:00
John Spray
cd70aa2cf3
Merge pull request #20005 from jcsp/wip-mgr-minor 
mgr: remove a few junk lines

Reviewed-by: Kefu Chai <kchai@redhat.com>
 2018-01-23 10:17:50 +00:00
John Spray
e1af667314 mgr: remove a few junk lines 
Signed-off-by: John Spray <john.spray@redhat.com>
 2018-01-23 10:17:15 +00:00
Kefu Chai
04d90a7d2c
Merge pull request #19988 from liewegas/wip-22673 
osd: only exit if *latest* map(s) say we are destroyed

Reviewed-by: Kefu Chai <kchai@redhat.com>
 2018-01-23 15:48:11 +08:00
Sage Weil
3911a2ae49
Merge pull request #20059 from ceph/wip-rm22427 
doc/ceph-volume OSD use the fsid file, not the osd_fsid
 2018-01-22 18:16:10 -06:00
Sage Weil
d431de74de
Merge pull request #19979 from k0ste/prometheus_metadata 
mgr: prometheus: set metadata metrics value to '1' (#22717).

Reviewed-by: John Spray <john.spray@redhat.com>
Reviewed-by: Jan Fajerski <jfajerski@suse.com>
 2018-01-22 18:15:34 -06:00
Sage Weil
eafa6e0ef6
Merge pull request #19980 from k0ste/prometheus_latency 
mgr: prometheus: added osd commit/apply latency metrics (#22718).

Reviewed-by: Jan Fajerski <jfajerski@suse.com>
Reviewed-by: John Spray <john.spray@redhat.com>
 2018-01-22 18:14:12 -06:00
Sage Weil
f9e02d51d7
Merge pull request #19986 from tchaikov/wip-denc-size-t-featured 
denc: should check element's type not 'size_t'

Reviewed-by: Adam Emerson <aemerson@redhat.com>
 2018-01-22 17:51:34 -06:00
Sage Weil
6f7e54dbf7
Merge pull request #20028 from mogeb/steady-clock-rados 
rados: use WaitInterval()'s return value instead of manual timing

Reviewed-by: Sage Weil <sage@redhat.com>
 2018-01-22 17:51:02 -06:00
Sage Weil
ffe3eb10ed
Merge pull request #20044 from tchaikov/wip-22419 
osd: update store with options after pg is created 

Reviewed-by: Sage Weil <sage@redhat.com>
 2018-01-22 17:50:07 -06:00
Sage Weil
92f7b56250
Merge pull request #20032 from liewegas/wip-name-shadowing 
mon/OSDMonitor: rename outer name declaration to avoid shadowing

Reviewed-by: Kefu Chai <kchai@redhat.com>
 2018-01-22 17:49:09 -06:00
Sage Weil
6eb85b3ac6
Merge pull request #20015 from cbodley/wip-crypto-- 
crypto: remove cryptopp library

Reviewed-by: Kefu Chai <kchai@redhat.com>
 2018-01-22 17:48:20 -06:00
Sage Weil
b4c91da985
Merge pull request #20029 from tchaikov/wip-osx-build 
osdc,os,osd: fix build on osx

Reviewed-by: Adam Emerson <aemerson@redhat.com>
 2018-01-22 17:48:00 -06:00
Sage Weil
12e6166397
Merge pull request #20046 from tchaikov/wip-22711 
test: reduce the chance to have degraded PGs

Reviewed-by: Sage Weil <sage@redhat.com>
 2018-01-22 17:46:30 -06:00
Alfredo Deza
a5f26c622b doc/ceph-volume OSD use the fsid file, not the osd_fsid 
Signed-off-by: Alfredo Deza <adeza@redhat.com>
 2018-01-22 15:16:40 -05:00
Alfredo Deza
b020674f1e
Merge pull request #19960 from gohighsec/default_bluestore 
doc: update man page to explain ceph-volume support bluestore

Reviewed-by: Alfredo Deza <adeza@redhat.com>
 2018-01-22 14:42:58 -05:00
Matt Benjamin
debb6b9040
Merge pull request #20034 from linuxbox2/wip-rgw-altlatchfix 
rgw_file: alternate fix deadlock on lru eviction
 2018-01-22 13:50:39 -05:00
Sage Weil
b44bd85bbf
Merge pull request #20030 from tchaikov/wip-doc-cxx11 
doc/dev/cxx: add C++11 ABI related doc
 2018-01-22 10:49:14 -06:00
Casey Bodley
42f5d04269
Merge pull request #19708 from qrGitHub/wip-rgw-unused-variable4 
rgw: drop unused variable bucket_instance_ids

Reviewed-by: Casey Bodley <cbodley@redhat.com>
Reviewed-by: Jos Collin <jcollin@redhat.com>
 2018-01-22 10:16:03 -05:00
John Spray
b25efca3ac
Merge pull request #18717 from shinobu-x/sk_mgr_daemonserver_using_get_val 
mgr/DaemonServer.cc: [Cleanup] Change to using  get_val template function

Reviewed-by: John Spray <john.spray@redhat.com>
 2018-01-22 14:30:26 +00:00
Sage Weil
fc8bbaf002
Merge pull request #19362 from myoungwon/wip-manifest-rados-op-promote 
osd, librados: add a rados op (TIER_PROMOTE)

Reviewed-by: Sage Weil <sage@redhat.com>
 2018-01-22 08:21:24 -06:00
John Spray
6e1b4b159e
Merge pull request #20045 from shangzhong/doc-cephfs-multimds 
doc: redundant "cephfs" when set the "allow_multimds"

Reviewed-by: John Spray <john.spray@redhat.com>
 2018-01-22 14:20:40 +00:00
John Spray
c05d96330d
Merge pull request #19744 from jan--f/mgr-prometheus-standby-mondown 
pybind/mgr/prometheus: add StandbyModule and handle failed MON cluster

Reviewed-by: John Spray <john.spray@redhat.com>
 2018-01-22 13:29:48 +00:00
Kefu Chai
74c9cfc466 test: reduce the chance to have degraded PGs 
in test_mon_osd_misc(), there is good chance that the cluster chooses
to use an unbalanced weight because of the data distribution at that moment.
but this setting could prevent the CRUSH from choosing enough number of
OSDs for test_mon_cephdf_commands(), where 32 PGs are to be created. so
it's more likely that the CRUSH fails to pick enough OSDs for all PGs.
that's why we have a curr_object_copies_rate = 0.5.

so, in this change, pg=pgp=1 is specified for the new pool.

Fixes: http://tracker.ceph.com/issues/22711
Signed-off-by: Kefu Chai <kchai@redhat.com>
 2018-01-22 21:24:58 +08:00
Jan Fajerski
4a45b02539 qa/tasks/mgr: add test_prometheus; smoke tests for prometheus module 
Signed-off-by: Jan Fajerski <jfajerski@suse.com>
 2018-01-22 13:21:45 +01:00
Jan Fajerski
ff471d485c pybing/mgr/prometheus: tidy up cherrypy engine start and stop 
Calling cherrypy.engine.block() in the stanby module results in a failing
mgr failover.

Signed-off-by: Jan Fajerski <jfajerski@suse.com>
 2018-01-22 13:21:09 +01:00
Kefu Chai
85847c50e6
Merge pull request #19965 from ovh/bp-reorder-mimic-fields 
osd_types.cc: reorder fields in serialized pg_stat_t

Reviewed-by: Sage Weil <sage@redhat.com>
 2018-01-22 19:58:50 +08:00
Kefu Chai
d3785b4338
Merge pull request #19963 from runsisi/wip-cmake 
cmake: do not find bzip2/lz4 for rocksdb

Reviewed-by: Kefu Chai <kchai@redhat.com>
 2018-01-22 19:58:24 +08:00
Kefu Chai
8cbee479da
Merge pull request #19944 from badone/wip-better-prepare_command_pool_set-E2BIG-error-message 
mon/OSDMonitor: Better prepare_command_pool_set E2BIG error message

Reviewed-by: Kefu Chai <kchai@redhat.com>
 2018-01-22 19:58:01 +08:00
Kefu Chai
979921244c
Merge pull request #19934 from david-z/wip-rocksdb-dump-mem 
kv/RocksDB: get index and filter blocks memory usage

Reviewed-by: Sage Weil <sage@redhat.com>
 2018-01-22 19:57:24 +08:00
Shangzhong Zhu
e7d555b033 doc: redundant "cephfs" when set the "allow_multimds" 
Signed-off-by: Shangzhong Zhu <zhu.shangzhong@zte.com.cn>
 2018-01-22 19:46:16 +08:00
John Spray
67abd1248b
Merge pull request #19948 from tchaikov/wip-standby-module-get-config 
pybind/mgr/mgr_module: add default param for MgrStandbyModule.get_con…

Reviewed-by: John Spray <john.spray@redhat.com>
 2018-01-22 10:53:49 +00:00
Kefu Chai
bc7de8b124 pybind/mgr/mgr_module: add default param for MgrStandbyModule.get_config() 
this matches its counterpart of MgrModule.

Signed-off-by: Kefu Chai <kchai@redhat.com>
 2018-01-22 16:58:12 +08:00
Kefu Chai
41fd3503d0
Merge pull request #19863 from renhwztetecs/renhw-wip-common-time 
common/time: add time.h for Alpine build

Reviewed-by: John Coyle <dx9err@gmail.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
 2018-01-22 16:38:24 +08:00
Kefu Chai
f5e7a8da11
Merge pull request #19899 from smithfarm/wip-rip-rcceph 
build/ops: rpm: rip out rcceph script

Reviewed-by: Ken Dreyer <kdreyer@redhat.com>
Reviewed-by: Boris Ranto <branto@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
 2018-01-22 16:36:23 +08:00
Kefu Chai
43b2e512e6 osd: update store with options after pg is created 
Fixes: http://tracker.ceph.com/issues/22419
Signed-off-by: Kefu Chai <kchai@redhat.com>
 2018-01-22 16:10:38 +08:00
Kefu Chai
d0f6705945 Revert "osd/PG: pass pool options to ObjectStore on pg create" 
pg is not created by the underlying store, hence the
osd->store->set_collection_opts() call always returns -ENOENT.

This reverts commit 37d7fd3b21.

Signed-off-by: Kefu Chai <kchai@redhat.com>
 2018-01-22 16:10:13 +08:00
Kefu Chai
e7bdf589db osd/PG: print a space after __func__ in log message 
Signed-off-by: Kefu Chai <kchai@redhat.com>
 2018-01-22 13:09:47 +08:00
Sage Weil
bfd84c9004
Merge pull request #19998 from liewegas/wip-22715 
fix broken use of streamstream::rdbuf()

Reviewed-by: Kefu Chai <kchai@redhat.com>
 2018-01-21 14:29:40 -06:00
Matt Benjamin
3cf0880f86 rgw_file: alternate fix deadlock on lru eviction 
This change is an alternate fix for two problems found and fixed
by Yao Zongyou <yaozongyou@vip.qq.com>.

The deadlock can be avoided just by not taking it in the recycle
case, which invariantly holds the lock.

The invalidation of the insert iterator by the recyle-path unlink
we'd like to handle as a condition in order to preserve the cached
insertion point optimization we get in the common case.  (The
original behavior was, indeed, incorrect.)

Based on feedback from Yao, removed the RGWFileHandle dtor version
of the unlink check, which I think happened twice.

Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
 2018-01-20 09:56:20 -05:00
Gregory Farnum
50dc08cffd
Merge pull request #19597 from joscollin/wip-lspools-output 
mon: align lspools output

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
 2018-01-19 10:01:38 -08:00
Matt Benjamin
213c98ac09
Merge pull request #19936 from linuxbox2/wip-rgw-22121 
rgw: URL-decode S3 and Swift object-copy URLs
 2018-01-19 12:23:44 -05:00
Kefu Chai
40d3bc073f
Merge pull request #20019 from zhouyuan/fix_librbdpy_example 
doc: fix librbdpy example

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
Reviewed-By: Kefu Chai <kchai@redhat.com>
 2018-01-19 23:43:22 +08:00
Kefu Chai
92c2dd2750 doc/dev/cxx: add C++11 ABI related doc 
Signed-off-by: Kefu Chai <kchai@redhat.com>
 2018-01-19 23:40:43 +08:00
Jason Dillaman
a4aecca1da
Merge pull request #19577 from vshankar/wip-policy-state-machine-rollback 
rbd-mirror: rollback state transitions in image policy

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
 2018-01-19 10:33:18 -05:00
Jason Dillaman
cac0506713
Merge pull request #19821 from trociny/wip-nbd-global-options 
rbd: properly pass ceph global command line args to subprocess

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
 2018-01-19 10:33:05 -05:00
Jason Dillaman
5f3443608b
Merge pull request #19912 from adamemerson/wip-minimax-rbd 
librbd: prefer templates to macros

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
 2018-01-19 10:32:52 -05:00
Jason Dillaman
4e0dc282e4
Merge pull request #19937 from trociny/wip-rbd-showmapped 
rbd: adjusted "showmapped" JSON and XML formatted output

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
 2018-01-19 10:32:39 -05:00
Casey Bodley
52e3cb77ef common: remove typedef for byte 
Signed-off-by: Casey Bodley <cbodley@redhat.com>
 2018-01-19 10:25:41 -05:00
Casey Bodley
a18f0589c0 common: remove cryptopp digest impls 
Signed-off-by: Casey Bodley <cbodley@redhat.com>
 2018-01-19 10:25:41 -05:00