Commit Graph

81483 Commits

Author SHA1 Message Date
Kefu Chai
4bc6269f15
Merge pull request #19276 from tchaikov/wip-volume-key
ceph-volume: do not use --key during mkfs

Reviewed-by: Alfredo Deza <adeza@redhat.com>
2017-12-07 23:31:10 +08:00
Alfredo Deza
3b9fade2b8
Merge pull request #19363 from ceph/wip-rm22282
ceph-volume: removed the explicit use of sudo

Reviewed-by: Alfredo Deza <adeza@redhat.com>
2017-12-07 09:38:20 -05:00
Rishabh Dave
39cd6f993f doc/man: mention "ls" in the ceph osd's subcommands list
Though "ls" command is explained and it's usage shown in the man page,
it is not mentioned in the subcommands list of "ceph osd" in the
beginning.

Signed-off-by: Rishabh Dave <ridave@redhat.com>
2017-12-07 20:04:19 +05:30
Alfredo Deza
09f88ce543
Merge pull request #19381 from ceph/fix_cephvol_doc
ceph-volume/doc: add missing subcommand in examples

Reviewed-by: Alfredo Deza <adeza@redhat.com>
2017-12-07 08:45:52 -05:00
Guillaume Abrioux
a284f164f3 doc: add missing subcommand in examples
Add the missing 'lvm' subcommand in examples in the documentation of
ceph-volume.

Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
2017-12-07 14:12:48 +01:00
Venky Shankar
dbf08e5177 rbd-mirror: persist image mapping timestamp on map update
Signed-off-by: Venky Shankar <vshankar@redhat.com>
2017-12-07 04:55:56 -05:00
Venky Shankar
c3ae008994 rbd-mirror: include map timestamp in image map
Signed-off-by: Venky Shankar <vshankar@redhat.com>
2017-12-07 04:55:56 -05:00
Jos Collin
1aa2e7c677 client: drop duplicate friend
Dropped duplicate friend access providing, as the below warning appears:
ceph/src/client/Client.h:764:16: warning: ‘C_Client_Remount’ is already a friend of ‘Client’ [enabled by default]
   friend class C_Client_Remount;

Signed-off-by: Jos Collin <jcollin@redhat.com>
2017-12-07 13:26:44 +05:30
Yan, Zheng
fd041a1920 client: update Dir::num_null_dentries in Dentry::{link,unlink}
Signed-off-by: "Yan, Zheng" <zyan@redhat.com>
2017-12-07 14:52:33 +08:00
Yan, Zheng
99b1b959e1 client: drop null child dentries before try pruning inode's alias
Null child dentries holds reference on inode's alias, they prevents
Client::trim_caps() from trimming the inode. Null dentries are trimmed
by Client::trim_cache() according to 'client_cache_size' config option.
So Client::trim_caps() may fail to trim as many caps as MDS asked when
client cache size is smaller than the config limit.

Fixes: http://tracker.ceph.com/issues/22293
Signed-off-by: "Yan, Zheng" <zyan@redhat.com>
2017-12-07 13:26:12 +08:00
Sage Weil
f3b2eb9d2d
Merge pull request #18276 from liewegas/wip-removed-snaps
mon,osd,osdc: refactor snap trimming (phase 1)

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
2017-12-06 21:33:08 -06:00
Josh Durgin
d10aad6be8
Merge pull request #19364 from neha-ojha/wip-preserve-cbt
qa: preserve cbt task results

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2017-12-06 19:30:15 -08:00
David Zafman
a8b8d541dd ceph-objectstore-tool: Add option "dump-import" to examine an export
Fixes: http://tracker.ceph.com/issues/22086

Signed-off-by: David Zafman <dzafman@redhat.com>
2017-12-06 17:30:47 -08:00
Sage Weil
a569052054 osd/SnapMapper: more debug around errors
Hunting http://tracker.ceph.com/issues/21557

Signed-off-by: Sage Weil <sage@redhat.com>
2017-12-06 18:10:39 -06:00
Sage Weil
ba08c2edff os/bluestore: be more verbose about omap
Signed-off-by: Sage Weil <sage@redhat.com>
2017-12-06 18:09:54 -06:00
Sage Weil
aafb3a565d qa/tasks/ceph_manager: tolerate tell osd.* error
It's possible for tell osd.* to race against an osd we stopped but the
cluster doesn't know is down yet.  In tha case we'll get ENXIO on that
osd and the command will fail.

In this context, we don't care.

Signed-off-by: Sage Weil <sage@redhat.com>
2017-12-06 17:51:20 -06:00
Neha Ojha
46dee4b102 qa: preserve cbt task results
Signed-off-by: Neha Ojha <nojha@redhat.com>
2017-12-06 13:23:44 -08:00
Jason Dillaman
1d0238fb63
Merge pull request #19188 from adamwg/awg/rbd-watchers-api
librbd: Add a function to list image watchers

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
2017-12-06 15:20:13 -05:00
Jason Dillaman
f62a661c08
Merge pull request #19337 from trociny/wip-22306
pybind/rbd: fix metadata functions error handling

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
2017-12-06 15:19:27 -05:00
Vasu Kulkarni
9f1a1e0543 qa/tests: Add debug info when creating ceph volumes
Signed-off-by: Vasu Kulkarni <vasu@redhat.com>
2017-12-06 12:14:27 -08:00
Jason Dillaman
0ec9185466
Merge pull request #18967 from shun-s/wip-rbd-cp-optimize
librbd: speed up sparse copy when object map is available

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
2017-12-06 14:50:53 -05:00
Jason Dillaman
2084398ad9
Merge pull request #19251 from MahatiC/eventtrace_librbd
librbd: add eventtrace support

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
2017-12-06 14:50:01 -05:00
Jason Dillaman
3c003554be
Merge pull request #19280 from Songweibin/wip-parent-info
rbd: add parent info when moving child into trash bin

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
2017-12-06 14:48:54 -05:00
Jason Dillaman
0c2cbd0753
Merge pull request #19315 from trociny/wip-fsx-ggate
test/librbd: rbd-ggate mode for fsx

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
2017-12-06 14:48:35 -05:00
Patrick Donnelly
9867d81f53
Merge PR #18791 into master
* refs/pull/18791/head:
	mds: bump protocol for snapshot changes
	mds: force client to do snapflush
	mds: check existance of snaps when rebuilding need_snapflush
	mds: properly setup need_snapflush for flushsnap messages
	mds: properly update CInode::first and CDentry first
	mds: don't create snap inode during trans-authority rename
	mds: trim non-auth snap dentry during cache rejoin
	mds: detach unlinked inode's snaprealm from its parent
	mds: fix CInode::find_snaprealm()
	mds: fix snap dentry discover
	mds: introduce MDSMap::get_mds_set_lower_bound()
	mds: properly distinguish snaptable TABLE_OP_CREATE from TABLE_OP_UPDATE
	mds: properly set reply buffer for table request 'agree' message
	mds: make change to mds table after corresponding event get logged

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
2017-12-06 11:45:31 -08:00
Andrew Schoen
ef1b266781
Merge pull request #19351 from ceph/wip-rm22281
ceph-volume rollback on failed OSD prepare/create

Reviewed-by: Andrew Schoen <aschoen@redhat.com>
2017-12-06 11:15:02 -06:00
Andrew Schoen
aee71a3f51 ceph-volume: removed the explicit use of sudo
This will allow users to run ceph-volume on systems that do
not have sudo installed.

Fixes: http://tracker.ceph.com/issues/22282

Signed-off-by: Andrew Schoen <aschoen@redhat.com>
2017-12-06 10:40:55 -06:00
Kefu Chai
ef7359d4e2
Merge pull request #19344 from tchaikov/wip-we-need-cxx11-and-more
cmake: bail out if GCC version is less than 5.1

Reviewed-by: Sage Weil <sage@redhat.com>
2017-12-06 22:11:17 +08:00
Jiaying Ren
d247233772 vstart.sh: fix mstop.sh can not stop rgw
+ As mstop.sh find rgw processes by looking for pid file, so we need to
  specify the --pid-file option to let rgw create it.
+ Use rgw port instead of meaningless 'j k' in the file name
+ Add rgw asok support
+ Make vstart.sh respect 'radosgw' prefix (defined in mrgw.sh) instead of 'rgw'

before:

[root@ceph-node1]~/jiaying/ceph/build# ../src/mrun j ceph -w
2017-08-31 16:34:05.413931 7f69081e7700 -1 WARNING: all dangerous and experimental features are enabled.
2017-08-31 16:34:05.445024 7f69081e7700 -1 WARNING: all dangerous and experimental features are enabled.
  cluster:
    id:     9952bf4f-0829-49e3-b893-abe858b690e5
    health: HEALTH_OK

  services:
    mon: 1 daemons, quorum a
    mgr: x(active)
    mds: cephfs_a-1/1/1 up  {0=a=up:active}
    osd: 1 osds: 1 up, 1 in
    rgw: 1 daemon active

  data:
    pools:   6 pools, 48 pgs
    objects: 254 objects, 5964 bytes
    usage:   24549 MB used, 26625 MB / 51175 MB avail
    pgs:     48 active+clean

  io:
    client:   10919 B/s rd, 0 B/s wr, 10 op/s rd, 5 op/s wr

[root@ceph-node1]~/jiaying/ceph/build# ../src/mstop.sh j
2645521
pid=2645521
entity=mds pid=2645521
kill  2645521...2645132
pid=2645132
entity=mgr pid=2645132
kill  2645132...2645008
pid=2645008
entity=mon pid=2645008
kill  2645008...2645326
pid=2645326
entity=osd pid=2645326
kill  2645326...kill  2645326...#
[root@ceph-node1]~/jiaying/ceph/build# ps aux| grep radosg
root     2645832  1.0  0.0 1668120 40088 ?       Ssl  16:32   0:01 /root/jiaying/ceph/build/bin/radosgw -c /root/jiaying/ceph/build/run/j/ceph.conf --log-file=/root/jiaying/ceph/build/run/j/out/rgw.j.log --debug-ms=1 -n client.rgw --rgw_frontends=civetweb port=8001
root     2646217  0.0  0.0 112648   964 pts/3    S+   16:34   0:00 grep --color=auto radosg

after:

[root@ceph-node1]~ CEPH_NUM_MON=1 CEPH_NUM_OSD=1 CEPH_NUM_MDS=1 CEPH_NUM_MGR=1  CEPH_NUM_RGW=2 ../src/mstart.sh j  -n -X -l

[root@ceph-node1]~/jiaying/ceph/build# ../src/mstop.sh  j
2760395
pid=2760395
entity=mds pid=2760395 name=mds.a
kill  2760395...2760007
pid=2760007
entity=mgr pid=2760007 name=mgr.x
kill  2760007...2759883
pid=2759883
entity=mon pid=2759883 name=mon.a
kill  2759883...2760201
pid=2760201
entity=osd pid=2760201 name=osd.0
kill  2760201...kill  2760201...2760707
pid=2760707
entity=radosgw pid=2760707 name=radosgw.8001
kill  2760707...kill  2760707...2760714
pid=2760714
entity=radosgw pid=2760714 name=radosgw.8002
kill  2760714...kill  2760714...#

Signed-off-by: Jiaying Ren <jiaying.ren@umcloud.com>
2017-12-06 19:33:58 +08:00
Mykola Golub
54dc5dd5f0
Merge pull request #19343 from dillaman/wip-22321
ceph-dencoder: moved RBD types outside of RGW preprocessor guard

Reviewed-by: Casey Bodley <cbodley@redhat.com>
Reviewed-by: Mykola Golub <to.my.trociny@gmail.com>
2017-12-06 12:17:43 +02:00
kungf
508ea640e3 osd: change op delayed state to 'waiting for scrub'
when release rwlock, the ops waiting for rwlock are thansfered to
waiting_for_scrub if the object was blocked by scrub, the delayed
state should be changed at the same time.

Signed-off-by: kungf <yang.wang@easystack.cn>
2017-12-06 17:03:30 +08:00
Kefu Chai
cdf49ba664 debian/control: adjust ceph-{osdomap,kvstore,monstore}-tool feature move
this is a follow-up of #19328. we need to get this change into 12.2.3.
so better off do the switch somewhere after 12.2.2 which has been
tagged, and before 12.2.3, which is not tagged yet.

please note, this is not targetting master, because i want to make
sure the change number (the <num> in << 12.2.2-<num>) is correct. it
does not hurt if it's not, as long as it is ">> 12.2.2", so the replace
machinery in 12.2.3 works, and it covers the releases where the
ceph-{osdomap,kvstore,monstore}-tool are not move yet. but why don't
make it more right?

Signed-off-by: Kefu Chai <kchai@redhat.com>
2017-12-06 17:02:07 +08:00
Xie Xingguo
1447259110
Merge pull request #19333 from amitkumar50/cov-osd-4
osd: Initializing start_offset,last_offset,offset

Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
2017-12-06 15:33:12 +08:00
Xie Xingguo
44f29bf67d
Merge pull request #19334 from amitkumar50/cov-misc-13
test: Initializing ChunkReadOp members

Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
2017-12-06 15:30:36 +08:00
Patrick Donnelly
b50e9b8187
Merge PR #18849 into master
* refs/pull/18849/head:
	mds:improve mds perf counters can statistics filesystem operations number and latency

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
2017-12-05 22:35:57 -08:00
Patrick Donnelly
380324a502
Merge PR #18941 into master
* refs/pull/18941/head:
	discard the mdsload clear after prep_rebalance in case we want to export it for debugging
	make sure that MDBalancer uses heartbeat info from the same epoch

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Reviewed-by: Zheng Yan <zyan@redhat.com>
2017-12-05 22:35:52 -08:00
Patrick Donnelly
c196e8bdea
Merge PR #19089 into master
* refs/pull/19089/head:
	client: xlist link dentries instead of set
	client: cleanup Dentry definition

Reviewed-by: Zheng Yan <zyan@redhat.com>
2017-12-05 22:35:48 -08:00
Patrick Donnelly
60edf95103
Merge PR #19092 into master
* refs/pull/19092/head:
	mds: remove useless check in Migrator::export_dir
	mds: ignore export pin for unlinked directory

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
2017-12-05 22:35:43 -08:00
Patrick Donnelly
583d072394
Merge PR #19218 into master
* refs/pull/19218/head:
	client: quit on failed remount during dentry invalidate test

Reviewed-by: Zheng Yan <zyan@redhat.com>
2017-12-05 22:35:38 -08:00
Patrick Donnelly
6a8665b12b
Merge PR #19224 into master
* refs/pull/19224/head:
	mds: use find instead of count in CInode::get_dirfrag

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Reviewed-by: Zheng Yan <zyan@redhat.com>
2017-12-05 22:35:33 -08:00
Patrick Donnelly
8c68b538c1
Merge PR #19237 into master
* refs/pull/19237/head:
	mds: get rid of the redundant code

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
2017-12-05 22:35:25 -08:00
David Zafman
b20eeada31 ceph-objectstore-tool: Remove unused map section from log dump
Caused by: 44cb6d3064

Signed-off-by: David Zafman <dzafman@redhat.com>
2017-12-05 21:08:25 -08:00
Jos Collin
3b6d6031ca mon,mgr,doc,test: standardize argument as role
`ceph rmfailed` refers to its argument as "who" and `ceph repaired` refers to its argument as "rank". We should make these commands and others consistent by standardizing the argument as "role".

Fixes: http://tracker.ceph.com/issues/21393

Signed-off-by: Jos Collin <jcollin@redhat.com>
2017-12-06 10:01:25 +05:30
David Zafman
5083287845 ceph-objectstore-tool: Fix output of section type number
Signed-off-by: David Zafman <dzafman@redhat.com>
2017-12-05 19:40:33 -08:00
David Zafman
c6896cccc3 ceph-objectstore-tool: Improve ceph-objectstore-tool usage output
Remove unused argument test-align

Caused by: 1c8731c31e

Positional arguments are described by usage() because
the parsing code creates descriptions like "--object" for the
object positional argument.

Signed-off-by: David Zafman <dzafman@redhat.com>
2017-12-05 19:37:37 -08:00
Shinobu Kinjo
85758234ca common: Remove ceph_clock_gettime, extern keyword
ceph_clock_gettime is only used in src/tools/rbd/action/Trash.cc

Signed-off-by: Shinobu Kinjo <shinobu@redhat.com>
2017-12-05 21:38:31 -05:00
Andrew Schoen
813276ef6a
Merge pull request #19347 from ceph/wip-rm22326
ceph-volume: warn on missing ceph.conf file

Reviewed-by: Andrew Schoen <aschoen@redhat.com>
2017-12-05 15:43:56 -06:00
Alfredo Deza
07be6fe0ab ceph-volume lvm.create rollback osd creation when prepare or activate fails
Signed-off-by: Alfredo Deza <adeza@redhat.com>
2017-12-05 15:32:10 -05:00
Alfredo Deza
6781d6498e ceph-volume lvm.create fallback to bluestore when objectstore is not specified
Signed-off-by: Alfredo Deza <adeza@redhat.com>
2017-12-05 15:32:10 -05:00
Alfredo Deza
9b17ad2f8f ceph-volume lvm.prepare fallback to bluestore when objectstore is not specified
Signed-off-by: Alfredo Deza <adeza@redhat.com>
2017-12-05 15:32:10 -05:00