]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
7 years agomds: update mds option descriptions 19440/head
Patrick Donnelly [Sat, 18 Nov 2017 05:13:42 +0000 (21:13 -0800)]
mds: update mds option descriptions

Fixes: http://tracker.ceph.com/issues/21764
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
7 years agomds: obsolete MDSMap option configs
Patrick Donnelly [Tue, 12 Dec 2017 19:09:19 +0000 (11:09 -0800)]
mds: obsolete MDSMap option configs

These configs were used for initialization but it is more appropriate to
require setting these file system attributes via `ceph fs set`. This is similar
to what was already done with max_mds. There are new variables added for `fs
set` where missing.

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
7 years agomds: organize Filesystem class def
Patrick Donnelly [Mon, 13 Nov 2017 07:53:22 +0000 (18:53 +1100)]
mds: organize Filesystem class def

This follows the coding style guidelines:

https://google.github.io/styleguide/cppguide.html#Declaration_Order

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
7 years agoMerge pull request #19191 from tchaikov/wip-mon-cleanup
Gregory Farnum [Mon, 11 Dec 2017 19:46:19 +0000 (11:46 -0800)]
Merge pull request #19191 from tchaikov/wip-mon-cleanup

mon: remove_is_write_ready()

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
7 years agoMerge pull request #17438 from mikulely/fix-mstop
Casey Bodley [Mon, 11 Dec 2017 19:11:06 +0000 (14:11 -0500)]
Merge pull request #17438 from mikulely/fix-mstop

vstart.sh: fix mstop.sh can not stop rgw

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Casey Bodley <cbodley@redhat.com>
7 years agoMerge PR #19432 into master
Patrick Donnelly [Mon, 11 Dec 2017 16:18:11 +0000 (08:18 -0800)]
Merge PR #19432 into master

* refs/pull/19432/head:
doc: correct the new fs allow opts

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
7 years agoMerge pull request #19416 from trociny/wip-flatten-cleanup
Jason Dillaman [Mon, 11 Dec 2017 15:01:23 +0000 (10:01 -0500)]
Merge pull request #19416 from trociny/wip-flatten-cleanup

librbd: remove unused member in FlattenRequest

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
7 years agodoc: correct the new fs allow opts 19432/head
Dan van der Ster [Mon, 11 Dec 2017 12:32:20 +0000 (13:32 +0100)]
doc: correct the new fs allow opts

Signed-off-by: Dan van der Ster <daniel.vanderster@cern.ch>
7 years agoMerge pull request #19426 from tchaikov/wip-cmake
Kefu Chai [Mon, 11 Dec 2017 08:34:41 +0000 (16:34 +0800)]
Merge pull request #19426 from tchaikov/wip-cmake

cmake: disable FAIL_ON_WARNINGS for rocksdb

7 years agocmake: disable FAIL_ON_WARNINGS for rocksdb 19426/head
Kefu Chai [Sat, 9 Dec 2017 12:18:39 +0000 (20:18 +0800)]
cmake: disable FAIL_ON_WARNINGS for rocksdb

otherwise -Werror=implicit-fallthrough will fail the build with GCC-7

Signed-off-by: Kefu Chai <kchai@redhat.com>
7 years agoMerge PR #19373 into master
Patrick Donnelly [Sun, 10 Dec 2017 00:34:24 +0000 (16:34 -0800)]
Merge PR #19373 into master

* refs/pull/19373/head:
client: drop duplicate friend

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
7 years agoMerge pull request #19417 from tchaikov/wip-install-deps-gcc
Kefu Chai [Sat, 9 Dec 2017 16:38:59 +0000 (00:38 +0800)]
Merge pull request #19417 from tchaikov/wip-install-deps-gcc

install-deps.sh: install new gcc as the default the right way

Reviewed-by: Sage Weil <sage@redhat.com>
7 years agoinstall-deps.sh: install new gcc as the default the right way 19417/head
Kefu Chai [Sat, 9 Dec 2017 09:35:28 +0000 (17:35 +0800)]
install-deps.sh: install new gcc as the default the right way

* should install software-properties-common beforehand, otherwise
  the `add-apt-repository` command will not be available.
* the update-alternative commandline were copied from ceph-build,
  should remove the escape characters.

Signed-off-by: Kefu Chai <kchai@redhat.com>
7 years agolibrbd: remove unused member in FlattenRequest 19416/head
Mykola Golub [Sat, 9 Dec 2017 09:40:13 +0000 (11:40 +0200)]
librbd: remove unused member in FlattenRequest

Signed-off-by: Mykola Golub <to.my.trociny@gmail.com>
7 years agoMerge pull request #19398 from tchaikov/wip-install-deps-use-dts
Kefu Chai [Sat, 9 Dec 2017 03:51:33 +0000 (11:51 +0800)]
Merge pull request #19398 from tchaikov/wip-install-deps-use-dts

install-deps.sh: use DTS on centos if GCC is too old

Reviewed-by: Sage Weil <sage@redhat.com>
7 years agoceph.spec: use dts-7 on rhel 19398/head
Kefu Chai [Fri, 8 Dec 2017 12:02:06 +0000 (20:02 +0800)]
ceph.spec: use dts-7 on rhel

devtoolset-7 is available for RHEL, but not for centos. only dts-6 is
available for centos.

Signed-off-by: Kefu Chai <kchai@redhat.com>
7 years agoMerge pull request #19382 from rishabh-d-dave/docfix-ceph-osd-ls
Sage Weil [Sat, 9 Dec 2017 00:31:35 +0000 (18:31 -0600)]
Merge pull request #19382 from rishabh-d-dave/docfix-ceph-osd-ls

doc/man: add "ls" to "ceph osd" command's subcommands list

7 years agoMerge pull request #19005 from shinobu-x/src_krbd
Jason Dillaman [Fri, 8 Dec 2017 15:18:22 +0000 (10:18 -0500)]
Merge pull request #19005 from shinobu-x/src_krbd

rbd: drop unnecessary using declaration, etc

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
7 years agoinstall-deps.sh: enable testing repo on centos on aarch64
Kefu Chai [Fri, 8 Dec 2017 10:07:37 +0000 (18:07 +0800)]
install-deps.sh: enable testing repo on centos on aarch64

the DTS-6 is only available in the testing repo

Signed-off-by: Kefu Chai <kchai@redhat.com>
7 years agoMerge pull request #19338 from vshankar/rbd-mirror-image-map-timestamp
Jason Dillaman [Fri, 8 Dec 2017 12:15:30 +0000 (07:15 -0500)]
Merge pull request #19338 from vshankar/rbd-mirror-image-map-timestamp

rbd-mirror: persist image map timestamp

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
7 years agoMerge pull request #19383 from trociny/wip-snapshot-copy
Jason Dillaman [Fri, 8 Dec 2017 12:15:06 +0000 (07:15 -0500)]
Merge pull request #19383 from trociny/wip-snapshot-copy

librbd: deep_copy: don't create snapshots above snap_id_end

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
7 years agoinstall-deps.sh: use DTS on centos if GCC is too old
Kefu Chai [Fri, 8 Dec 2017 08:34:59 +0000 (16:34 +0800)]
install-deps.sh: use DTS on centos if GCC is too old

please note, run-make-check.sh sources install-deps.sh here to import
the $PATH and other environmental variables, which could be changed by
the the DTS "enable" script.

Signed-off-by: Kefu Chai <kchai@redhat.com>
7 years agoMerge pull request #19395 from tchaikov/wip-debian-control-upgrade
Sage Weil [Fri, 8 Dec 2017 08:34:22 +0000 (02:34 -0600)]
Merge pull request #19395 from tchaikov/wip-debian-control-upgrade

debian/control: adjust ceph-{osdomap,kvstore,monstore}-tool feature move

Reviewed-by: Sage Weil <sage@redhat.com>
7 years agoMerge pull request #19341 from tchaikov/wip-22301
Kefu Chai [Fri, 8 Dec 2017 07:24:48 +0000 (15:24 +0800)]
Merge pull request #19341 from tchaikov/wip-22301

ceph.spec: use devtoolset-6-gcc-c++ on aarch64

7 years agoMerge pull request #19336 from amitkumar50/cov-misc-14
Kefu Chai [Fri, 8 Dec 2017 07:24:11 +0000 (15:24 +0800)]
Merge pull request #19336 from amitkumar50/cov-misc-14

osd,os,io: Initializing C_ProxyChunkRead members,queue,request

Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
7 years agoMerge pull request #19295 from kungf/scrub_delayed
Kefu Chai [Fri, 8 Dec 2017 07:23:30 +0000 (15:23 +0800)]
Merge pull request #19295 from kungf/scrub_delayed

osd: change op delayed state to 'waiting for scrub'

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
7 years agoMerge pull request #19345 from ivancich/wip-bring-in-dmclock
Kefu Chai [Fri, 8 Dec 2017 07:19:59 +0000 (15:19 +0800)]
Merge pull request #19345 from ivancich/wip-bring-in-dmclock

osd: pull latest dmclock subtree

Reviewed-by: Kefu Chai <kchai@redhat.com>
7 years agoMerge pull request #19027 from tangwenjun3/wip-flush-reduce
Kefu Chai [Fri, 8 Dec 2017 07:19:01 +0000 (15:19 +0800)]
Merge pull request #19027 from tangwenjun3/wip-flush-reduce

os/bluestore: reduce meaningless flush

Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
7 years agoMerge pull request #19348 from adamemerson/wip-murdering-diagnostics
Kefu Chai [Fri, 8 Dec 2017 07:17:49 +0000 (15:17 +0800)]
Merge pull request #19348 from adamemerson/wip-murdering-diagnostics

Add noreturn attribute to silence uninitialized warning

Reviewed-by: Kefu Chai <kchai@redhat.com>
7 years agodebian/control: adjust ceph-{osdomap,kvstore,monstore}-tool feature move 19395/head
Kefu Chai [Wed, 6 Dec 2017 02:19:09 +0000 (10:19 +0800)]
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>
(cherry picked from commit cdf49ba664b2c1c0250f8931d24e504ec9274561)

7 years agodebian/control: adjust ceph-{osdomap,kvstore,monstore}-tool feature move
Sage Weil [Tue, 5 Dec 2017 03:25:16 +0000 (21:25 -0600)]
debian/control: adjust ceph-{osdomap,kvstore,monstore}-tool feature move

The backport didn't make 12.2.2, but it will be in 12.2.3.

Fixes: http://tracker.ceph.com/issues/22319
Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit e0c814266fe653311673e07bd7c7dbb51d866f82)

7 years agoMerge pull request #18752 from liewegas/wip-peering-queue
Sage Weil [Fri, 8 Dec 2017 01:43:16 +0000 (19:43 -0600)]
Merge pull request #18752 from liewegas/wip-peering-queue

osd: put peering events in main sharded wq

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
7 years agolibrbd: deep_copy: move set_head to snapshot_copy state machine 19383/head
Mykola Golub [Thu, 7 Dec 2017 14:04:56 +0000 (16:04 +0200)]
librbd: deep_copy: move set_head to snapshot_copy state machine

Signed-off-by: Mykola Golub <to.my.trociny@gmail.com>
7 years agolibrbd: deep_copy: don't create snapshots above snap_id_end
Mykola Golub [Thu, 7 Dec 2017 11:09:49 +0000 (13:09 +0200)]
librbd: deep_copy: don't create snapshots above snap_id_end

Signed-off-by: Mykola Golub <to.my.trociny@gmail.com>
7 years agoMerge pull request #19244 from ceph/wip-cd-volume
vasukulkarni [Thu, 7 Dec 2017 18:54:47 +0000 (10:54 -0800)]
Merge pull request #19244 from ceph/wip-cd-volume

qa/tasks: update ceph-deploy task to use newer ceph-volume syntax

7 years agoMerge pull request #19276 from tchaikov/wip-volume-key
Kefu Chai [Thu, 7 Dec 2017 15:31:10 +0000 (23:31 +0800)]
Merge pull request #19276 from tchaikov/wip-volume-key

ceph-volume: do not use --key during mkfs

Reviewed-by: Alfredo Deza <adeza@redhat.com>
7 years agodoc/man: mention "ls" in the ceph osd's subcommands list 19382/head
Rishabh Dave [Thu, 7 Dec 2017 13:14:41 +0000 (18:44 +0530)]
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>
7 years agoMerge pull request #19381 from ceph/fix_cephvol_doc
Alfredo Deza [Thu, 7 Dec 2017 13:45:52 +0000 (08:45 -0500)]
Merge pull request #19381 from ceph/fix_cephvol_doc

ceph-volume/doc: add missing subcommand in examples

Reviewed-by: Alfredo Deza <adeza@redhat.com>
7 years agodoc: add missing subcommand in examples 19381/head
Guillaume Abrioux [Thu, 7 Dec 2017 13:12:48 +0000 (14:12 +0100)]
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>
7 years agorbd-mirror: persist image mapping timestamp on map update 19338/head
Venky Shankar [Wed, 29 Nov 2017 04:04:39 +0000 (23:04 -0500)]
rbd-mirror: persist image mapping timestamp on map update

Signed-off-by: Venky Shankar <vshankar@redhat.com>
7 years agorbd-mirror: include map timestamp in image map
Venky Shankar [Wed, 29 Nov 2017 04:03:37 +0000 (23:03 -0500)]
rbd-mirror: include map timestamp in image map

Signed-off-by: Venky Shankar <vshankar@redhat.com>
7 years agoclient: drop duplicate friend 19373/head
Jos Collin [Thu, 7 Dec 2017 07:56:37 +0000 (13:26 +0530)]
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>
7 years agoMerge pull request #18276 from liewegas/wip-removed-snaps
Sage Weil [Thu, 7 Dec 2017 03:33:08 +0000 (21:33 -0600)]
Merge pull request #18276 from liewegas/wip-removed-snaps

mon,osd,osdc: refactor snap trimming (phase 1)

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
7 years agoMerge pull request #19364 from neha-ojha/wip-preserve-cbt
Josh Durgin [Thu, 7 Dec 2017 03:30:15 +0000 (19:30 -0800)]
Merge pull request #19364 from neha-ojha/wip-preserve-cbt

qa: preserve cbt task results

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
7 years agoqa: preserve cbt task results 19364/head
Neha Ojha [Wed, 6 Dec 2017 21:23:44 +0000 (13:23 -0800)]
qa: preserve cbt task results

Signed-off-by: Neha Ojha <nojha@redhat.com>
7 years agoMerge pull request #19188 from adamwg/awg/rbd-watchers-api
Jason Dillaman [Wed, 6 Dec 2017 20:20:13 +0000 (15:20 -0500)]
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>
7 years agoMerge pull request #19337 from trociny/wip-22306
Jason Dillaman [Wed, 6 Dec 2017 20:19:27 +0000 (15:19 -0500)]
Merge pull request #19337 from trociny/wip-22306

pybind/rbd: fix metadata functions error handling

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
7 years agoqa/tests: Add debug info when creating ceph volumes 19244/head
Vasu Kulkarni [Wed, 6 Dec 2017 20:13:40 +0000 (12:13 -0800)]
qa/tests: Add debug info when creating ceph volumes

Signed-off-by: Vasu Kulkarni <vasu@redhat.com>
7 years agoMerge pull request #18967 from shun-s/wip-rbd-cp-optimize
Jason Dillaman [Wed, 6 Dec 2017 19:50:53 +0000 (14:50 -0500)]
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>
7 years agoMerge pull request #19251 from MahatiC/eventtrace_librbd
Jason Dillaman [Wed, 6 Dec 2017 19:50:01 +0000 (14:50 -0500)]
Merge pull request #19251 from MahatiC/eventtrace_librbd

librbd: add eventtrace support

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
7 years agoMerge pull request #19280 from Songweibin/wip-parent-info
Jason Dillaman [Wed, 6 Dec 2017 19:48:54 +0000 (14:48 -0500)]
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>
7 years agoMerge pull request #19315 from trociny/wip-fsx-ggate
Jason Dillaman [Wed, 6 Dec 2017 19:48:35 +0000 (14:48 -0500)]
Merge pull request #19315 from trociny/wip-fsx-ggate

test/librbd: rbd-ggate mode for fsx

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
7 years agoMerge PR #18791 into master
Patrick Donnelly [Wed, 6 Dec 2017 19:45:31 +0000 (11:45 -0800)]
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>
7 years agoMerge pull request #19351 from ceph/wip-rm22281
Andrew Schoen [Wed, 6 Dec 2017 17:15:02 +0000 (11:15 -0600)]
Merge pull request #19351 from ceph/wip-rm22281

ceph-volume rollback on failed OSD prepare/create

Reviewed-by: Andrew Schoen <aschoen@redhat.com>
7 years agoMerge pull request #19344 from tchaikov/wip-we-need-cxx11-and-more
Kefu Chai [Wed, 6 Dec 2017 14:11:17 +0000 (22:11 +0800)]
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>
7 years agovstart.sh: fix mstop.sh can not stop rgw 17438/head
Jiaying Ren [Mon, 4 Sep 2017 06:40:05 +0000 (14:40 +0800)]
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>
7 years agoMerge pull request #19343 from dillaman/wip-22321
Mykola Golub [Wed, 6 Dec 2017 10:17:43 +0000 (12:17 +0200)]
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>
7 years agoosd: change op delayed state to 'waiting for scrub' 19295/head
kungf [Mon, 27 Nov 2017 10:35:45 +0000 (18:35 +0800)]
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>
7 years agoMerge pull request #19333 from amitkumar50/cov-osd-4
Xie Xingguo [Wed, 6 Dec 2017 07:33:12 +0000 (15:33 +0800)]
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>
7 years agoMerge pull request #19334 from amitkumar50/cov-misc-13
Xie Xingguo [Wed, 6 Dec 2017 07:30:36 +0000 (15:30 +0800)]
Merge pull request #19334 from amitkumar50/cov-misc-13

test: Initializing ChunkReadOp members

Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
7 years agoMerge PR #18849 into master
Patrick Donnelly [Wed, 6 Dec 2017 06:35:57 +0000 (22:35 -0800)]
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>
7 years agoMerge PR #18941 into master
Patrick Donnelly [Wed, 6 Dec 2017 06:35:52 +0000 (22:35 -0800)]
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>
7 years agoMerge PR #19089 into master
Patrick Donnelly [Wed, 6 Dec 2017 06:35:48 +0000 (22:35 -0800)]
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>
7 years agoMerge PR #19092 into master
Patrick Donnelly [Wed, 6 Dec 2017 06:35:43 +0000 (22:35 -0800)]
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>
7 years agoMerge PR #19218 into master
Patrick Donnelly [Wed, 6 Dec 2017 06:35:38 +0000 (22:35 -0800)]
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>
7 years agoMerge PR #19224 into master
Patrick Donnelly [Wed, 6 Dec 2017 06:35:33 +0000 (22:35 -0800)]
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>
7 years agoMerge PR #19237 into master
Patrick Donnelly [Wed, 6 Dec 2017 06:35:25 +0000 (22:35 -0800)]
Merge PR #19237 into master

* refs/pull/19237/head:
mds: get rid of the redundant code

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
7 years agoMerge pull request #19347 from ceph/wip-rm22326
Andrew Schoen [Tue, 5 Dec 2017 21:43:56 +0000 (15:43 -0600)]
Merge pull request #19347 from ceph/wip-rm22326

ceph-volume: warn on missing ceph.conf file

Reviewed-by: Andrew Schoen <aschoen@redhat.com>
7 years agoceph-volume lvm.create rollback osd creation when prepare or activate fails 19351/head
Alfredo Deza [Tue, 5 Dec 2017 20:31:55 +0000 (15:31 -0500)]
ceph-volume lvm.create rollback osd creation when prepare or activate fails

Signed-off-by: Alfredo Deza <adeza@redhat.com>
7 years agoceph-volume lvm.create fallback to bluestore when objectstore is not specified
Alfredo Deza [Tue, 5 Dec 2017 15:22:05 +0000 (10:22 -0500)]
ceph-volume lvm.create fallback to bluestore when objectstore is not specified

Signed-off-by: Alfredo Deza <adeza@redhat.com>
7 years agoceph-volume lvm.prepare fallback to bluestore when objectstore is not specified
Alfredo Deza [Tue, 5 Dec 2017 15:21:20 +0000 (10:21 -0500)]
ceph-volume lvm.prepare fallback to bluestore when objectstore is not specified

Signed-off-by: Alfredo Deza <adeza@redhat.com>
7 years agoceph-volume lvm.prepare rollback osd when prepare fails and an osd id was generated
Alfredo Deza [Tue, 5 Dec 2017 15:11:03 +0000 (10:11 -0500)]
ceph-volume lvm.prepare rollback osd when prepare fails and an osd id was generated

Signed-off-by: Alfredo Deza <adeza@redhat.com>
7 years agoceph-volume lvm.common create a rollback_osd utility to cleanup failed osd prepare...
Alfredo Deza [Tue, 5 Dec 2017 15:08:35 +0000 (10:08 -0500)]
ceph-volume lvm.common create a rollback_osd utility to cleanup failed osd prepare/create calls

Signed-off-by: Alfredo Deza <adeza@redhat.com>
7 years agopybind/rbd: raise KeyError when metadata does not exist 19337/head
Mykola Golub [Tue, 5 Dec 2017 13:48:58 +0000 (15:48 +0200)]
pybind/rbd: raise KeyError when metadata does not exist

Signed-off-by: Mykola Golub <to.my.trociny@gmail.com>
7 years agorados: Add noreturn attribute to silence uninitialized warning 19348/head
Adam C. Emerson [Tue, 5 Dec 2017 19:29:48 +0000 (14:29 -0500)]
rados: Add noreturn attribute to silence uninitialized warning

Marking the `usage_exit` function as noreturn lets the compiler know
that execution won't continue beyond the statement where it's called,
so the path that would lead to the variables being used uninitialized
doesn't count.

Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
7 years agoceph-volume test logging ignored ceph.conf file 19347/head
Alfredo Deza [Tue, 5 Dec 2017 18:59:22 +0000 (13:59 -0500)]
ceph-volume test logging ignored ceph.conf file

Signed-off-by: Alfredo Deza <adeza@redhat.com>
7 years agoceph-volume main warn on inability to load ceph.conf, don't raise
Alfredo Deza [Tue, 5 Dec 2017 18:58:53 +0000 (13:58 -0500)]
ceph-volume main warn on inability to load ceph.conf, don't raise

Signed-off-by: Alfredo Deza <adeza@redhat.com>
7 years agoosd,os,io: Initializing C_ProxyChunkRead members,queue,request 19336/head
amitkuma [Tue, 5 Dec 2017 16:08:35 +0000 (21:38 +0530)]
osd,os,io: Initializing C_ProxyChunkRead members,queue,request

Fixes the coverity issue:

2. uninit_member: Non-static class member op_index is not initialized
in this constructor nor in any functions that it calls.
4. uninit_member: Non-static class member req_offset is not initialized
in this constructor nor in any functions that it calls.
CID 1424845 (#1 of 1): Uninitialized scalar field (UNINIT_CTOR)
6. uninit_member: Non-static class member req_total_len is not
initialized in this constructor nor in any functions that it calls.

CID 1422461 (#1 of 1): Uninitialized pointer field (UNINIT_CTOR)
2. uninit_member: Non-static class member queue is not initialized
in this constructor nor in any functions that it calls.

CID 1422362 (#1 of 1): Uninitialized pointer field (UNINIT_CTOR)
2. uninit_member: Non-static class member request is not initialized
in this constructor nor in any functions that it calls

Signed-off-by: Amit Kumar amitkuma@redhat.com
7 years agoinstall-deps.sh: install centos-release-scl-rh on aarch64 19341/head
Kefu Chai [Tue, 5 Dec 2017 15:22:17 +0000 (23:22 +0800)]
install-deps.sh: install centos-release-scl-rh on aarch64

Signed-off-by: Kefu Chai <kchai@redhat.com>
7 years agoceph.spec: use devtoolset-6-gcc-c++ on aarch64
Kefu Chai [Tue, 5 Dec 2017 14:47:23 +0000 (22:47 +0800)]
ceph.spec: use devtoolset-6-gcc-c++ on aarch64

see https://github.com/sclorg/centos-release-scl
see https://buildlogs.centos.org/centos/7/sclo/aarch64/rh/

Fixes: http://tracker.ceph.com/issues/22301
Signed-off-by: Kefu Chai <kchai@redhat.com>
7 years agotest: Initializing ChunkReadOp members 19334/head
amitkuma [Tue, 5 Dec 2017 15:38:53 +0000 (21:08 +0530)]
test: Initializing ChunkReadOp members

Fixes the coverity issue:
2. uninit_member: Non-static class member offset is not
initialized in this constructor nor in any functions that it calls.
4. uninit_member: Non-static class member length is not
initialized in this constructor nor in any functions that it calls.

CID 1424433 (#1 of 1): Uninitialized scalar field (UNINIT_CTOR)
6. uninit_member: Non-static class member tgt_offset is not initialized
in this constructor nor in any functions that it calls.

Signed-off-by: Amit Kumar amitkuma@redhat.com
7 years agoosd: Initializing start_offset,last_offset,offset 19333/head
amitkuma [Tue, 5 Dec 2017 15:31:52 +0000 (21:01 +0530)]
osd: Initializing start_offset,last_offset,offset

Fixes the coverity issues:

2. uninit_member: Non-static class member start_offset
is not initialized in this constructor nor in any functions
that it calls.

CID 1424396 (#1 of 1): Uninitialized scalar field (UNINIT_CTOR)
4. uninit_member: Non-static class member last_offset is not
initialized in this constructor nor in any functions that it calls.

CID 1424658 (#1 of 1): Uninitialized scalar field (UNINIT_CTOR)
2. uninit_member: Non-static class member offset is not initialized
in this constructor nor in any functions that it calls.

Signed-off-by: Amit Kumar <amitkuma@redhat.com>
7 years agoMerge commit 'c00eaf7446cbe456aa93bf8b05cf0a224dedca49' into wip-bring-in-dmclock 19345/head
J. Eric Ivancich [Tue, 5 Dec 2017 15:28:49 +0000 (10:28 -0500)]
Merge commit 'c00eaf7446cbe456aa93bf8b05cf0a224dedca49' into wip-bring-in-dmclock

Signed-off-by: J. Eric Ivancich <ivancich@redhat.com>
7 years agoSquashed 'src/dmclock/' changes from d1ff03b667..6f9250b4e9
J. Eric Ivancich [Tue, 5 Dec 2017 15:28:48 +0000 (10:28 -0500)]
Squashed 'src/dmclock/' changes from d1ff03b667..6f9250b4e9

6f9250b4e9 Merge pull request #45 from TaewoongKim/reduce_phasetype_size
343e4105a6 Reduce the size of enum class PhaseType

git-subtree-dir: src/dmclock
git-subtree-split: 6f9250b4e97860373b782e918044de40ed197c87

7 years agocmake: bail out if GCC version is less than 5.1 19344/head
Kefu Chai [Tue, 5 Dec 2017 14:59:48 +0000 (22:59 +0800)]
cmake: bail out if GCC version is less than 5.1

Signed-off-by: Kefu Chai <kchai@redhat.com>
7 years agoceph-dencoder: moved RBD types outside of RGW preprocessor guard 19343/head
Jason Dillaman [Tue, 5 Dec 2017 14:58:04 +0000 (09:58 -0500)]
ceph-dencoder: moved RBD types outside of RGW preprocessor guard

Fixes: http://tracker.ceph.com/issues/22321
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
7 years agopybind/rbd: fix metadata functions error handling
Mykola Golub [Tue, 5 Dec 2017 13:48:23 +0000 (15:48 +0200)]
pybind/rbd: fix metadata functions error handling

Fixes: http://tracker.ceph.com/issues/22306
Signed-off-by: Mykola Golub <to.my.trociny@gmail.com>
7 years agoMerge pull request #19101 from ifed01/wip-ifed-extending-fio
Igor Fedotov [Tue, 5 Dec 2017 13:41:19 +0000 (14:41 +0100)]
Merge pull request #19101 from ifed01/wip-ifed-extending-fio

test/fio: extend fio objectstore plugin to better simulate OSD behavior

7 years agoMerge pull request #18863 from tchaikov/wip-devtoolset-7
Kefu Chai [Tue, 5 Dec 2017 13:27:42 +0000 (21:27 +0800)]
Merge pull request #18863 from tchaikov/wip-devtoolset-7

build/ops: use devtoolset-7 on centos/rhel-7

Reviewed-by: Sage Weil <sage@redhat.com>
7 years agoMerge pull request #18812 from tchaikov/wip-pybind-rados-service-api
Kefu Chai [Tue, 5 Dec 2017 12:33:58 +0000 (20:33 +0800)]
Merge pull request #18812 from tchaikov/wip-pybind-rados-service-api

pybind/rados: add rados_service_*()

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
7 years agoMerge pull request #19307 from tchaikov/wip-drop-ubuntu-trusty
Kefu Chai [Tue, 5 Dec 2017 12:31:58 +0000 (20:31 +0800)]
Merge pull request #19307 from tchaikov/wip-drop-ubuntu-trusty

qa,doc: drop support of ubuntu trusty

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
7 years agorbd: comment/msg cleanup 19280/head
songweibin [Tue, 5 Dec 2017 04:14:21 +0000 (12:14 +0800)]
rbd: comment/msg cleanup

Signed-off-by: songweibin <song.weibin@zte.com.cn>
7 years agorbd: list parent info with "--long" when image child is in trash
songweibin [Tue, 5 Dec 2017 01:53:31 +0000 (09:53 +0800)]
rbd: list parent info with "--long" when image child is in trash

We can get child's parent information even it's in
trash bin if "--long" flag is specified.

Signed-off-by: songweibin <song.weibin@zte.com.cn>
7 years agomds: bump protocol for snapshot changes 18791/head
Yan, Zheng [Mon, 4 Dec 2017 03:32:42 +0000 (11:32 +0800)]
mds: bump protocol for snapshot changes

Signed-off-by: "Yan, Zheng" <zyan@redhat.com>
7 years agomds: force client to do snapflush
Yan, Zheng [Wed, 23 Aug 2017 11:37:54 +0000 (19:37 +0800)]
mds: force client to do snapflush

Snap inodes that are waiting for flush are auth pinned, they affect
subtree/dirfrag frozen. Force client to do snapflush after waiting
for a period of time.

Signed-off-by: "Yan, Zheng" <zyan@redhat.com>
7 years agomds: check existance of snaps when rebuilding need_snapflush
Yan, Zheng [Wed, 23 Aug 2017 10:07:19 +0000 (18:07 +0800)]
mds: check existance of snaps when rebuilding need_snapflush

do nothing if there is no snap

Signed-off-by: "Yan, Zheng" <zyan@redhat.com>
7 years agomds: properly setup need_snapflush for flushsnap messages
Yan, Zheng [Thu, 17 Aug 2017 06:28:16 +0000 (14:28 +0800)]
mds: properly setup need_snapflush for flushsnap messages

When processing a cap flush message that is re-sent, it's possble
that the sender has already released all WR caps. So can't rely on
CEPH_CAP_ANY_WR check in MDCache:cow_inode().

Signed-off-by: "Yan, Zheng" <zyan@redhat.com>
7 years agomds: properly update CInode::first and CDentry first
Yan, Zheng [Wed, 26 Jul 2017 02:07:17 +0000 (10:07 +0800)]
mds: properly update CInode::first and CDentry first

Signed-off-by: "Yan, Zheng" <zyan@redhat.com>
7 years agoinstall-deps.sh: use gcc-7 on trusty 18863/head
Kefu Chai [Sun, 12 Nov 2017 05:07:35 +0000 (13:07 +0800)]
install-deps.sh: use gcc-7 on trusty

* always install gcc-7 on trusty
* point g++ to g++-7 if not yet

Signed-off-by: Kefu Chai <kchai@redhat.com>
7 years agoceph.spec: use devtoolset-7-gcc-c++ on centos/rhel
Kefu Chai [Fri, 10 Nov 2017 12:05:49 +0000 (20:05 +0800)]
ceph.spec: use devtoolset-7-gcc-c++ on centos/rhel

for better performance.

Signed-off-by: Kefu Chai <kchai@redhat.com>