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,385 Commits 212 Branches 394 Tags 1.6 GiB
b44bd85bbf
Commit Graph

82385 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
John Spray
2cfd5fece9
Merge pull request #19972 from liewegas/wip-mgr-rados 
pybind/mgr/mgr_module: make rados handle available to all modules

Reviewed-by: John Spray <john.spray@redhat.com>
 2018-01-19 13:38:51 +00:00
Yuan Zhou
dcf70f5f64 doc: fix librbdpy example 
need to connect cluster before opening ioctx

Signed-off-by: Yuan Zhou <yuan.zhou@intel.com>
 2018-01-19 10:41:03 +08:00
Matt Benjamin
9688fcc941 rgw: URL-decode S3 and Swift object-copy URLs 
Fixes: http://tracker.ceph.com/issues/22121

Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
 2018-01-18 17:51:09 -05:00
Patrick Donnelly
dc914ba480
Merge PR #20011 into master 
* refs/pull/20011/head:
	mds: fix some typo

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
 2018-01-18 11:59:53 -08:00
Sage Weil
c2d28e2750
Merge pull request #18971 from liewegas/wip-pg-scrub-preempt 
osd/PG: allow scrub preemption

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
 2018-01-18 12:37:48 -06:00
Yuri Weinstein
c329791978
Merge pull request #19476 from qrGitHub/wip-rgw-lack-timeSkewCheck 
rgw: add time skew check in function parse_v4_auth_header

Reviewed-by: Casey Bodley <cbodley@redhat.com>
Reviewed-by: Matt Benjamin <mbenjami@redhat.com>
Reviewed-by: Adam Emerson <aemerson@redhat.com>
 2018-01-18 10:01:17 -08:00
Yuri Weinstein
7c575c88c9
Merge pull request #19826 from joke-lee/rgw_fix_s3website_redirect_location_string_length 
rgw: fix s3website redirect location string length

Reviewed-by: Casey Bodley <cbodley@redhat.com>
 2018-01-18 09:59:42 -08:00
Yuri Weinstein
47713dc51e
Merge pull request #19918 from fangyuxiangGL/lc-omap 
rgw: abort multipart if upload meta object doesn't exist

Reviewed-by: Casey Bodley <cbodley@redhat.com>
 2018-01-18 09:59:17 -08:00
Sage Weil
f942ec70a3
Merge pull request #20003 from wjwithagen/fix-PG-protected 
common: change routines to public access

Reviewed-by: Sage Weil <sage@redhat.com>
 2018-01-18 11:47:13 -06:00
Sage Weil
0580f0125b mon/OSDMonitor: squelch 'id' arg errors 
Several commands use 'id' but for other types (e.g., vector<int64_t>).

Signed-off-by: Sage Weil <sage@redhat.com>
 2018-01-18 11:46:14 -06:00
Sage Weil
918361e925 use stringsream::str(), not rdbuf() 
Fixes: http://tracker.ceph.com/issues/22715
Signed-off-by: Sage Weil <sage@redhat.com>
 2018-01-18 11:46:14 -06:00
Alfredo Deza
7cee6c8d46
Merge pull request #19949 from ceph/wip-bz1498521 
ceph-volume: adds --crush-device-class flag for lvm prepare and create

Reviewed-by: Alfredo Deza <adeza@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
 2018-01-18 08:49:53 -05:00
Jason Dillaman
7096acf546
Merge pull request #19997 from Songweibin/wip-fix-typo 
doc/rbd: fix typo s/morror/mirror

Reviewed-by: Jos Collin <jcollin@redhat.com>
Reviewed-by: Jason Dillaman <dillaman@redhat.com>
 2018-01-18 08:46:30 -05:00
John Spray
22d6d908a1
Merge pull request #19981 from k0ste/dashboard_iops 
mgr: dashboard: show per pool IOPS on health page (#22495).

Reviewed-by: John Spray <john.spray@redhat.com>
 2018-01-18 12:46:30 +00:00
Konstantin Shalygin
9fc46d52fc
mgr: dashboard: show per pool IOPS on health page (#22495). 
Signed-off-by: Konstantin Shalygin <k0ste@k0ste.ru>
 2018-01-18 19:43:16 +07:00
Willem Jan Withagen
b185239759 common: change routines to public access 
Clang complains tafter recent changes:
/home/jenkins/workspace/ceph-master/src/osd/OSD.cc:8787:8: error: 'DeleteStart' is a protected member of 'PG'
          PG::DeleteStart())));
              ^
/home/jenkins/workspace/ceph-master/src/osd/PG.h:1870:16: note: declared protected here
  TrivialEvent(DeleteStart)
               ^
/home/jenkins/workspace/ceph-master/src/osd/OSD.cc:9136:6: error: 'DeleteSome' is a protected member of 'PG'
        PG::DeleteSome())),
            ^
/home/jenkins/workspace/ceph-master/src/osd/PG.h:1871:16: note: declared protected here
  TrivialEvent(DeleteSome)
               ^
2 errors generated.

Signed-off-by: Willem Jan Withagen <wjw@digiware.nl>
 2018-01-18 11:46:01 +01:00
songweibin
a68d08f88a doc/rbd: fix typo s/morror/mirror 
Signed-off-by: songweibin <song.weibin@zte.com.cn>
 2018-01-18 11:36:32 +08:00
John Wilkins
ee7d2dd092
Merge pull request #19931 from mikechristie/wip-doc-mnc-iscsi-updates 
Misc iSCSI doc updates

Reviewed-by: John Wilkins <jowilkin@redhat.com>
 2018-01-17 11:00:08 -08:00
Andrew Schoen
c9f7689a7a ceph-volume: print the lvm activate success message correctly 
Move the terminal.success to the methods that have access to the
correct osd_id so that they do not print None for the osd_id
in the log message.

Signed-off-by: Andrew Schoen <aschoen@redhat.com>
 2018-01-17 11:44:10 -06:00
Casey Bodley
1789a0ee46
Merge pull request #17520 from joscollin/wip-cleanup-drop-return 
rgw: Drop unnecessary return

Reviewed-by: Casey Bodley <cbodley@redhat.com>
 2018-01-17 10:18:07 -05:00
Mykola Golub
722fbb903e rbd: properly pass ceph global command line args to subprocess 
When initializing the global context, global_init parses command line
arguments and removes ceph global args from the list. As a result they
are not visible for rbd command line parser and global options were
ignored when passing them to subprocesses like nbd or ggate.

Fix this by keeping a list of ceph global init command line
arguments. To build the list we compare the list of initial command
line args and those that remain after global_init parsing.

After this fix it is possible to pass any ceph global option to a
subprocess.

Signed-off-by: Mykola Golub <mgolub@suse.com>
 2018-01-17 10:00:33 +02:00
Patrick Donnelly
9478c064d7
Merge PR #19803 into master 
* refs/pull/19803/head:
	mds: get rid of unnecessary if condition

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Reviewed-by: Sage Weil <sage@redhat.com>
 2018-01-16 20:06:37 -08:00
Patrick Donnelly
cc710979e3
Merge PR #19837 into master 
* refs/pull/19837/head:
	client: avoid recursive lock in ll_get_vino

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Reviewed-by: Jeff Layton <jlayton@redhat.com>
Reviewed-by: huanwen ren <ren.huanwen@zte.com.cn>
 2018-01-16 20:06:31 -08:00
Patrick Donnelly
bbd23ca4d5
Merge PR #19860 into master 
* refs/pull/19860/head:
	cephfs-journal-tool: add usage help info for header set <field>
	mds: add error log info
	cephfs-journal-tool: add "set pool_id" option

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
 2018-01-16 20:06:26 -08:00